Iuri Matias
ec9293af60
get rid of mocha requirement
2017-07-02 00:27:14 -04:00
Iuri Matias
ccf78b4ff2
exit process after each mocha run
2017-07-01 23:22:01 -04:00
Iuri Matias
9a8a8d7da2
first step at getting rid of mocha/embark on package.json
2017-07-01 23:11:42 -04:00
Iuri Matias
88c1a16453
fix contract address and make module exports compatible
2017-07-01 22:04:29 -04:00
Iuri Matias
0eb462a89c
generate contract js file
2017-07-01 12:55:46 -04:00
Iuri Matias
4f90e62790
include specific contract config given contract name
2017-07-01 12:55:46 -04:00
Iuri Matias
b473d68a1e
include specific contract config given contract name
2017-07-01 12:55:46 -04:00
Iuri Matias
cdc75c91e1
fix contract extension file matching
2017-06-29 07:39:12 -04:00
Iuri Matias
ffbf6a70c5
include whisper version in the dashboard
2017-06-27 17:05:35 -04:00
Iuri Matias
cbf6f6ec5c
default to embarkDApp as the new dapp
2017-06-27 15:45:30 -04:00
Iuri Matias
590dfe8925
fix template generator
2017-06-26 16:48:05 -04:00
Iuri Matias
5b60c3effa
fix issue with orbit config
2017-06-26 15:25:22 -04:00
Iuri Matias
1bbacd1c5d
make linter happy
2017-06-26 09:02:58 -04:00
Iuri Matias
2a2a5820fc
fix testing functionality in develop
2017-06-26 09:01:54 -04:00
Iuri Matias
84f7149aaf
fix contracts loading; add warning for whisper version; update web3.js
2017-06-25 12:56:14 -04:00
Iuri Matias
a6c8e83d40
fix conflicts
2017-06-24 22:35:27 -04:00
Antonio Tenorio Fornés
6f93d7e824
use npm dependencies management for ipfs, web3 and orbit, and remove them from js/ folder.
2017-06-21 18:58:15 +02:00
Antonio Tenorio Fornés
46e18e34c5
remove duplicate dependency
2017-06-21 18:57:25 +02:00
Iuri Matias
4bb7f18155
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-06-19 06:33:07 -04:00
Carl Mönnig
f38b9bc1d6
fix for no accounts on init with warning messages
2017-06-18 13:16:11 +02:00
Nathan Hernandez
4202d5e832
Update solc to 0.4.11
...
The solidity compiler was at 0.4.8, 3 patches behind. At some point the
output of the compiler changed, `compiler.js` reflects those changes.
I'm not sure if other properties changed.
2017-06-02 21:20:27 -04:00
roo2
5232f0e74d
fix crash in logger if message is null or undefined
2017-04-09 14:55:24 +10:00
Iuri Matias
47f313b12c
generate json files
2017-04-04 06:37:50 -04:00
Iuri Matias
3c1ca7f457
remove unneded require
2017-04-02 14:54:34 -04:00
Iuri Matias
dd7984bcda
use version from constructor parameter
2017-04-02 14:49:19 -04:00
Iuri Matias
86335e0c74
move http request to utils
2017-04-02 14:40:10 -04:00
Iuri Matias
2373d14d6b
add options to runCommand
2017-04-02 14:30:00 -04:00
Iuri Matias
9ce25d7651
refactor services check to use on/off and let monitor decide colors
2017-04-01 23:22:43 -04:00
Iuri Matias
f4dbeb4b7e
revert some of the recent changes
2017-03-31 07:39:33 -04:00
Iuri Matias
faf0e1ff48
revert some of the recent changes
2017-03-31 07:34:43 -04:00
Todd Baur
780fc197f3
remove static since we want these exposed
2017-03-30 22:31:23 +09:00
Todd Baur
613e4e6abe
integration testing fixes
2017-03-30 22:16:46 +09:00
Todd Baur
8a5604eec6
var -> let
2017-03-30 20:52:49 +09:00
Todd Baur
7599f43a3b
fixed problem with double this.client in blockchain.js
2017-03-30 20:48:22 +09:00
Todd Baur
fbe3f302b2
cleanup code from linter feedback
2017-03-30 20:38:14 +09:00
Todd Baur
65f6827b05
merge develop branch
2017-03-30 20:29:55 +09:00
Todd Baur
648b27920c
merge develop branch
2017-03-30 20:26:03 +09:00
Iuri Matias
36633bf60c
the lint is mother the lint is father
2017-03-30 07:16:15 -04:00
Todd Baur
67f325f5a0
migrate all the code to ES6
2017-03-30 20:12:39 +09:00
Iuri Matias
c2ca2563bc
revert change that was refering to a relative path for embark.json
2017-03-30 07:04:13 -04:00
Iuri Matias
504e68d5fc
Merge pull request #259 from Exartu/develop
...
readme documentation update
2017-03-30 07:02:52 -04:00
Iuri Matias
8dc87b7cbc
Merge pull request #258 from toadkicker/use_path_in_tmpl_gen
...
this fixes problems where concatenating the path string would fail
2017-03-30 07:01:11 -04:00
Iuri Matias
7bdc934e40
revert test change to previous state
2017-03-30 06:58:24 -04:00
Iuri Matias
fc36bccee5
Merge pull request #257 from aletheia-foundation/develop
...
Show error message if unable to deploy contracts. Include ethereumjs-testrpc
2017-03-30 06:57:04 -04:00
ramiro
604635f3e3
added async simulator
2017-03-29 17:47:04 -03:00
Todd Baur
a66f002a18
swap path -> util.joinPath
2017-03-30 03:13:48 +09:00
Todd Baur
5bf1475ea4
swap more var -> let
2017-03-30 02:50:05 +09:00
Todd Baur
e3b9c01205
fix linter complaints
2017-03-30 02:18:00 +09:00
Todd Baur
4ae5757bae
add back in missing load commands
2017-03-30 02:04:35 +09:00
Todd Baur
2f5c647c39
this changes Embark to an EventEmitter and adds more event handling for loading and fetching plugins. It introduces a dependency on underscore and underscore string. It adds defenses against null/invalid options objects.
2017-03-30 00:37:30 +09:00
Todd Baur
20baf5ee9f
call path.join once and store in fspath var
2017-03-22 21:46:59 +09:00
Todd Baur
37a7259999
this fixes problems where concatenating the path string would fail, e.g. non-unix systems.
2017-03-22 20:32:16 +09:00
Todd Baur
b186bf966c
fixed merge conflicts
2017-03-22 14:13:58 +09:00
ramiro
1a8e5a5abd
fixes async on blockchains
2017-03-21 16:26:45 -03:00
ramiro
af4cacf496
fixes async on blockchains
2017-03-21 15:28:36 -03:00
ramiro
3e0e1fda0c
fixes for runing on meteor
2017-03-21 14:52:02 -03:00
roo2
3637b2e06e
update the initTests method of embark to reflect the new structure of test.js
2017-03-21 18:55:15 +10:00
roo2
2a39290158
start the web3 service for the build task so that contracts can be deployed
2017-03-21 18:22:16 +10:00
roo2
5fa32754fb
show error message if unable to deploy contracts due to web3 client being unavailable
2017-03-21 17:47:26 +10:00
Iuri Matias
447f967061
add service check functionality to plugin api
2017-03-16 07:31:52 -04:00
Iuri Matias
e8c8a85713
fix broken js generation on asset change: (temporarily) revert change to not deploy on asset change and force redeploy of everything
2017-03-12 21:32:06 -04:00
Todd Baur
124177c8fc
speed up testing
2017-03-13 00:21:19 +09:00
Todd Baur
383b3c31a5
speed up test class - unstable
2017-03-12 12:23:30 +09:00
Todd Baur
f64474b861
dont require () at end of requires
2017-03-12 11:59:13 +09:00
Iuri Matias
9eb4887d37
add backwards compatbility for tests with a deprecation message
2017-03-11 21:49:12 -05:00
Iuri Matias
1534bf6207
Merge pull request #242 from toadkicker/make_cli_faster
...
this is a quick attempt at speeding up the init of CLI…
2017-03-11 21:18:20 -05:00
Iuri Matias
54420b327e
detect when ethereum node comes back online and redeploy
2017-03-11 12:27:10 -05:00
Iuri Matias
8d8ff671f7
if monitor is already running then init service
2017-03-11 11:48:12 -05:00
Iuri Matias
5cf287a747
implement stopCheck
2017-03-11 11:23:42 -05:00
Iuri Matias
2dec088a9b
add service check error
2017-03-11 11:17:52 -05:00
Iuri Matias
c514765d0b
move misc utils modules to their own folder
2017-03-11 11:03:20 -05:00
Iuri Matias
92f9df4117
remove async extension to a module
2017-03-11 10:52:02 -05:00
Iuri Matias
c2c41549c1
cleanup; remove unneded requires
2017-03-11 10:38:05 -05:00
Iuri Matias
ea70d09e8c
move ethereum and whisper checks; refactor web3 connection
2017-03-11 10:29:45 -05:00
Iuri Matias
4bf31328e2
use eachObject to avoid async issues; support non-recurrent checks
2017-03-11 07:32:16 -05:00
Iuri Matias
173c571147
remove old services monitor; add new services monitor to engine; move previous checks to their modules inits
2017-03-10 22:00:30 -05:00
Todd Baur
b25a0ecbc7
Merge branch 'develop' of github.com:iurimatias/embark-framework into make_cli_faster
2017-03-11 10:59:52 +09:00
Todd Baur
b590312e20
cleanup empty lines after function
2017-03-11 00:13:59 +09:00
Todd Baur
dc9084b8a6
Dropped 'this' in Cmd and set internal var Embar to self execute
2017-03-11 00:07:08 +09:00
Todd Baur
835899cf6e
this is a quick attempt at speeding up the init of CLI by changing Embark.js to a reveal module pattern and moving the requires into the functions that need them. It removes the circular reference between Cmd and Embark, which is the biggest hit to speed. It also changes how the binary starts by importing Cmd instead of Embark.
2017-03-10 23:43:52 +09:00
Iuri Matias
a4369ecd4e
implement (previously empty) stopMonitor method
2017-03-10 06:44:17 -05:00
Iuri Matias
02cb5b7f1f
Merge pull request #237 from nogueian/develop
...
Fixed issue with logic to detect if IPFS node is online
2017-03-08 20:34:20 -05:00
Todd Baur
2de9292bd6
Merge branch 'develop' of github.com:iurimatias/embark-framework into one_version
2017-03-08 23:54:17 +09:00
Todd Baur
83f3e1c5ee
dot notation preferred
2017-03-08 23:52:17 +09:00
Andy Nogueira
f5aafa4242
Setting host and port parameters back according to develop branch
2017-03-08 09:51:58 -05:00
Iuri Matias
c1d2bd170e
Merge pull request #230 from toadkicker/add_mocha_timeouts
...
add this.timeout(15000) to tests to allow the solc enough space to work
2017-03-08 09:47:08 -05:00
Andy Nogueira
82042c01c6
Fixed issue with logic to detect if IPFS node is online. If the IPFS node is not running and there's another service in the computer running on port 5001 it could cause an exception.
2017-03-08 09:46:15 -05:00
Todd Baur
026909aa91
fix other timeout issues in tests outside of core framework code
2017-03-08 23:41:16 +09:00
Todd Baur
486fbec108
read version in from package.json instead of strings
2017-03-08 23:20:23 +09:00
Todd Baur
70868de81b
changes undefined process.exit(code) to process.exit(9)
2017-03-08 19:29:19 +09:00
Iuri Matias
71121cdc4b
update to 2.4.0
2017-03-07 06:39:56 -05:00
Iuri Matias
b42031de6b
fix cmd line webserver host override
2017-03-06 22:08:43 -05:00
Iuri Matias
96d1361dd8
support defaults when new config files are not found, for backwards compatibility
2017-03-05 21:27:33 -05:00
Iuri Matias
007be84f23
add config to the plugin api (temporary)
2017-03-05 20:25:09 -05:00
Iuri Matias
8325943bd7
add new events for output generation and first deployment
2017-03-05 11:00:47 -05:00
Iuri Matias
a797f8fcf6
fix account selection when it isn't configured; improve error message on tests
2017-03-04 21:51:28 -05:00
Iuri Matias
fd6af8af2e
refactor condition
2017-03-04 20:35:15 -05:00
Iuri Matias
a527573796
separate the different functions in deployContracts
2017-03-04 20:14:47 -05:00
Iuri Matias
16275f13e5
if any account is configured in blockchain.json then use it as the default account for deploying contracts
2017-03-04 19:17:39 -05:00
Iuri Matias
85659987d9
add support for website config file; reflect real web server config in the dashboard
2017-03-04 14:20:28 -05:00
Iuri Matias
269552aee0
add events to plugin api
2017-03-04 12:42:24 -05:00
Iuri Matias
3db27c14cb
add exception to dealWithConfigsMethods; it's simple enough
2017-03-03 21:51:23 -05:00
Iuri Matias
617d263341
reduce complexity of engine main metod
2017-03-03 21:48:32 -05:00
Iuri Matias
383d69c194
handle cmd error
2017-03-03 21:11:53 -05:00
Iuri Matias
94cca83670
simplify test constructor
2017-03-03 21:06:44 -05:00
Iuri Matias
6799e1d8a5
remove comment
2017-03-03 01:25:14 -05:00
Iuri Matias
cd45a2be77
refactor, move calls to engine; fix tests
2017-03-03 01:22:12 -05:00
Iuri Matias
6784fa662c
pass path when listening to file change event
2017-03-02 21:31:07 -05:00
Iuri Matias
d5ebd7d748
fix for current refactor: on an asset change don't redeploy
2017-03-02 20:23:03 -05:00
Iuri Matias
fe30f4b040
make cmd call async
2017-03-02 08:15:35 -05:00
Iuri Matias
4c5cb95209
refactor: extract method for cmd interpreter
2017-03-02 07:44:24 -05:00
Iuri Matias
11eca918a1
add cc rule
2017-03-01 21:28:27 -05:00
Iuri Matias
d4f7eca2c5
make cc happy; use join path
2017-03-01 21:15:02 -05:00
Iuri Matias
09fbd66417
put callback call at the end
2017-03-01 21:09:55 -05:00
Iuri Matias
c0bcc15023
simplify condition; return callback
2017-03-01 21:08:28 -05:00
Iuri Matias
dbb0b0b171
track deployed contracts taking into account swarm hash inserted by solc
2017-03-01 20:52:58 -05:00
Iuri Matias
b7cd296716
make abi generation independent of deployment
2017-02-28 23:29:16 -05:00
Iuri Matias
1674adee4a
add config to specify available providers for each component
2017-02-28 21:43:03 -05:00
Iuri Matias
09e58977e4
generate final embarkjs file depending on components enabled
2017-02-28 21:26:15 -05:00
Iuri Matias
e61f0f102d
generate storage and communication abi; disable deployment if config is disabled
2017-02-28 20:42:03 -05:00
Iuri Matias
c500bb4988
fix error display with refactored compilation module
2017-02-28 08:03:03 -05:00
Iuri Matias
5477b7f11c
fix options varible; make cc happy
2017-02-27 07:49:25 -05:00
Iuri Matias
e806a14af6
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-02-27 06:57:30 -05:00
Iuri Matias
60a617a28e
don't intercept console error in plugins, causes too much issues; need to research a better way
2017-02-26 18:47:52 -05:00
DeviateFish
2642325868
Fix scoping
2017-02-26 14:33:58 -08:00
DeviateFish
5cf9048099
Add more options to testing setup
...
Ability to retrieve the logger from contract deployment, as well as
override the default `embark.json`
2017-02-26 14:33:14 -08:00
Iuri Matias
0060dbe53f
don't exit if blockchain is not available
2017-02-26 14:56:43 -05:00
Iuri Matias
a153859caf
herge branch 'refactor_e' into develop
2017-02-25 23:32:08 -05:00
Iuri Matias
0dc21abd3c
fix compiler argument
2017-02-25 23:20:57 -05:00
Iuri Matias
562efc6f14
test fixes
2017-02-25 22:57:22 -05:00
Iuri Matias
5fc2d97609
fix so child process doesn't hang some cmds
2017-02-25 22:39:40 -05:00
Iuri Matias
85519e95d8
add new deploy manager to build cmd
2017-02-25 20:45:40 -05:00
DeviateFish
289ece9df6
Updates to boilerplate and template creation
...
Update `test` command to run `embark test`
Update `name` in `package.json` to be something more easily replaceable.
Use `sed` to replace above flag with DApp name
2017-02-25 14:34:45 -08:00
Iuri Matias
e9ce9dc6f1
add redeploy; don't reload compiler if it's already loaded
2017-02-25 15:47:35 -05:00
Iuri Matias
d73eb802ea
refactor deployment
2017-02-24 22:49:34 -05:00
Iuri Matias
4b119fffde
add solc wrapper
2017-02-24 19:27:27 -05:00
Iuri Matias
a2a27bb0c2
start refactoring deployment steps
2017-02-24 08:20:03 -05:00
Iuri Matias
a0f4953c17
add TODO for pipeline event
2017-02-24 06:28:06 -05:00
Iuri Matias
3433c75554
refactor pipeline to use events instead
2017-02-24 06:18:57 -05:00
Iuri Matias
3d240c9d84
temporary fix for --nodashboard issue in develop
2017-02-23 20:50:55 -05:00
Iuri Matias
550b81c9b2
remove unnecessary concatenation
2017-02-23 19:49:48 -05:00
Iuri Matias
0db2b663ad
make cc happy
2017-02-23 19:45:25 -05:00
Andy Nogueira
de37c94b2e
Implemented logic to show version of the connected IPFS node on the dashboard
2017-02-23 17:18:05 -05:00
Andy Nogueira
e3cbf3c680
Better name for services. Output Geth version is important
2017-02-22 08:21:45 -05:00
Andy Nogueira
4f1317dcdd
Minor typo in help message
2017-02-22 08:10:33 -05:00
Iuri Matias
87ff194ce4
extract method for determing rpc options
2017-02-21 21:04:15 -05:00
Iuri Matias
b29f23e28c
extract method for determing network type
2017-02-21 21:01:38 -05:00
Iuri Matias
d67982ac71
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-02-21 20:54:16 -05:00
Iuri Matias
b5ff1add40
simplify blockchain constructor
2017-02-21 20:54:07 -05:00
Andy Nogueira
dd03c747f7
Fixed logic to prevent node exception when running command 'embark blockchain' outside the Dapp folder
2017-02-21 15:45:10 -05:00
Iuri Matias
0e03d8f435
refactor: move dashboard board init logic into a separate module
2017-02-20 18:02:17 -05:00
Iuri Matias
cf0ea4299e
support disabling blockchain stack; tolerate lack of web3 object
2017-02-20 17:12:13 -05:00
Iuri Matias
d1701c4031
add missing enable options to boilerplate configs; add communication initializer
2017-02-20 16:29:59 -05:00
Iuri Matias
a9e4435b77
use specified environment when creating data dirs for .embark
2017-02-20 16:11:27 -05:00
Iuri Matias
1a436dcc12
add support for light and fast options; add default pass folders
2017-02-20 15:53:55 -05:00
Iuri Matias
e4bcdf7f12
improve help message
2017-02-19 20:13:30 -05:00
Iuri Matias
3890b4a38e
refactor to use method to determine app root path, instead of constantly using relative paths
2017-02-19 20:01:42 -05:00
Iuri Matias
73a536c52e
refactor to use method to determine app root path, instead of constantly using relative paths
2017-02-19 19:44:16 -05:00
Iuri Matias
8b5e3aa3ab
adjust paths
2017-02-19 18:52:41 -05:00
Iuri Matias
a8193277da
start refactoring index.js
2017-02-19 13:18:43 -05:00
Iuri Matias
5e4ad9a7e5
reorder requires in a more logical manner
2017-02-19 13:17:28 -05:00
Iuri Matias
07d1631d9d
move command history to its own module
2017-02-19 12:59:02 -05:00
Iuri Matias
1868788342
reorgnize code structure
2017-02-19 12:51:32 -05:00
Iuri Matias
8da0e80751
move fs methods into their own module
2017-02-19 11:37:54 -05:00
Iuri Matias
4e8546863c
remove unnecessary calls()
2017-02-19 09:11:17 -05:00
Iuri Matias
19d35a563e
replace glob matching functionality
2017-02-19 00:00:01 -05:00
Iuri Matias
38c98f16fa
use nodejs http lib directly to check service status
2017-02-18 23:17:43 -05:00
Iuri Matias
c312943248
use saner library to deal with fs
2017-02-18 22:40:42 -05:00
Iuri Matias
3f3a129276
isolate eval in a module
2017-02-18 16:53:49 -05:00
Iuri Matias
a83cc6a44a
move shelljs scopes to utils; require locally so it doesn't polute the global space
2017-02-18 16:06:39 -05:00
Iuri Matias
08ba95576d
move request to utils module
2017-02-18 15:27:08 -05:00
Iuri Matias
2596eb5873
add missing require
2017-02-18 15:07:19 -05:00
Iuri Matias
86cd2a15d1
move merge to utils module
2017-02-18 14:45:57 -05:00
Iuri Matias
58b1f504d5
move grunt methods to utils module
2017-02-18 14:37:07 -05:00
Iuri Matias
833102d175
advice on typing --help when a wrong command is inputed
2017-02-18 14:22:45 -05:00
Iuri Matias
561caa9b0b
move join path into utils module
2017-02-18 14:10:01 -05:00
Iuri Matias
55275136b0
clean up; remove unneded requires
2017-02-18 09:39:13 -05:00
Iuri Matias
68d4f5e2fa
avoid intercepting logs when using cmds that don't need plugins and the logger
2017-02-18 09:23:19 -05:00
Iuri Matias
38aca05e28
remove unneded plugin dependency from abi
2017-02-18 09:09:36 -05:00
Iuri Matias
655114b394
add config to specify geth command
2017-02-18 08:55:33 -05:00
Iuri Matias
03a6b6c48d
option added
2017-02-18 08:41:18 -05:00
Iuri Matias
eb36af87b0
add support for the bootnodes config
2017-02-18 08:24:23 -05:00
Iuri Matias
566812696d
take configuration options from config and command line arguments when running simulator
2017-02-18 08:01:03 -05:00
Andy Nogueira
e6d998fd1a
If no arguments are passed to embark, then display help by default
2017-02-17 14:34:07 -05:00
Iuri Matias
c339732cd6
make compiler module async
2017-02-17 07:14:44 -05:00
Iuri Matias
27a3a9c3f2
clean up compiler file; remove unused code
2017-02-17 06:16:56 -05:00
Iuri Matias
fcd88b9e4a
reorder component initialization make log clearer; improve log messages to make them clearer
2017-02-15 20:56:18 -05:00
Iuri Matias
617d40086c
add web3 to console help
2017-02-15 20:35:42 -05:00
Iuri Matias
bd99a75048
advice user when an unknown command is typed in the console
2017-02-15 20:24:42 -05:00
Iuri Matias
a511979cd1
make console output clearer
2017-02-15 20:08:47 -05:00
Iuri Matias
63da0773ae
log creating directory as a trace log level
2017-02-15 19:32:29 -05:00
Iuri Matias
097088821b
support generating abi file only
2017-02-15 19:27:23 -05:00
Iuri Matias
40ddfff425
support configuring simulator in the tests
2017-02-12 10:01:46 -05:00
Iuri Matias
ff09e05965
fix for when maxpeers config is 0
2017-02-11 11:53:11 -05:00
Iuri Matias
6984c13ac6
read storage and communication config files; use & initialize storage depending on config
2017-02-10 07:44:06 -05:00
Iuri Matias
d0c020dce5
update to 2.3.0
2017-02-08 06:38:26 -05:00
Iuri Matias
f37bc46f8e
fix specs; clarify production enviroment (livenet not production); exec testrpc directly
2017-02-08 06:31:57 -05:00
Iuri Matias
135c3c06a7
finclude transaction cost in gas estimation
2017-02-06 21:34:10 -05:00
Iuri Matias
fc2c6a41ee
cleanup
2017-02-06 21:08:11 -05:00
Iuri Matias
5840e57079
log pipeline file read on a trace level instead of info to reduce initial console log size
2017-02-06 07:03:14 -05:00