20baf5ee9f
call path.join once and store in fspath var
2017-03-22 21:46:59 +09:00
37a7259999
this fixes problems where concatenating the path string would fail, e.g. non-unix systems.
2017-03-22 20:32:16 +09:00
b186bf966c
fixed merge conflicts
2017-03-22 14:13:58 +09:00
1a8e5a5abd
fixes async on blockchains
2017-03-21 16:26:45 -03:00
af4cacf496
fixes async on blockchains
2017-03-21 15:28:36 -03:00
3e0e1fda0c
fixes for runing on meteor
2017-03-21 14:52:02 -03:00
3637b2e06e
update the initTests method of embark to reflect the new structure of test.js
2017-03-21 18:55:15 +10:00
2a39290158
start the web3 service for the build task so that contracts can be deployed
2017-03-21 18:22:16 +10:00
5fa32754fb
show error message if unable to deploy contracts due to web3 client being unavailable
2017-03-21 17:47:26 +10:00
447f967061
add service check functionality to plugin api
2017-03-16 07:31:52 -04:00
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
124177c8fc
speed up testing
2017-03-13 00:21:19 +09:00
383b3c31a5
speed up test class - unstable
2017-03-12 12:23:30 +09:00
f64474b861
dont require () at end of requires
2017-03-12 11:59:13 +09:00
9eb4887d37
add backwards compatbility for tests with a deprecation message
2017-03-11 21:49:12 -05:00
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
54420b327e
detect when ethereum node comes back online and redeploy
2017-03-11 12:27:10 -05:00
8d8ff671f7
if monitor is already running then init service
2017-03-11 11:48:12 -05:00
5cf287a747
implement stopCheck
2017-03-11 11:23:42 -05:00
2dec088a9b
add service check error
2017-03-11 11:17:52 -05:00
c514765d0b
move misc utils modules to their own folder
2017-03-11 11:03:20 -05:00
92f9df4117
remove async extension to a module
2017-03-11 10:52:02 -05:00
c2c41549c1
cleanup; remove unneded requires
2017-03-11 10:38:05 -05:00
ea70d09e8c
move ethereum and whisper checks; refactor web3 connection
2017-03-11 10:29:45 -05:00
4bf31328e2
use eachObject to avoid async issues; support non-recurrent checks
2017-03-11 07:32:16 -05:00
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
b25a0ecbc7
Merge branch 'develop' of github.com:iurimatias/embark-framework into make_cli_faster
2017-03-11 10:59:52 +09:00
b590312e20
cleanup empty lines after function
2017-03-11 00:13:59 +09:00
dc9084b8a6
Dropped 'this' in Cmd and set internal var Embar to self execute
2017-03-11 00:07:08 +09:00
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
a4369ecd4e
implement (previously empty) stopMonitor method
2017-03-10 06:44:17 -05:00
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
2de9292bd6
Merge branch 'develop' of github.com:iurimatias/embark-framework into one_version
2017-03-08 23:54:17 +09:00
83f3e1c5ee
dot notation preferred
2017-03-08 23:52:17 +09:00
f5aafa4242
Setting host and port parameters back according to develop branch
2017-03-08 09:51:58 -05:00
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
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
026909aa91
fix other timeout issues in tests outside of core framework code
2017-03-08 23:41:16 +09:00
486fbec108
read version in from package.json instead of strings
2017-03-08 23:20:23 +09:00
70868de81b
changes undefined process.exit(code) to process.exit(9)
2017-03-08 19:29:19 +09:00
71121cdc4b
update to 2.4.0
2017-03-07 06:39:56 -05:00
b42031de6b
fix cmd line webserver host override
2017-03-06 22:08:43 -05:00
96d1361dd8
support defaults when new config files are not found, for backwards compatibility
2017-03-05 21:27:33 -05:00
007be84f23
add config to the plugin api (temporary)
2017-03-05 20:25:09 -05:00
8325943bd7
add new events for output generation and first deployment
2017-03-05 11:00:47 -05:00
a797f8fcf6
fix account selection when it isn't configured; improve error message on tests
2017-03-04 21:51:28 -05:00
fd6af8af2e
refactor condition
2017-03-04 20:35:15 -05:00
a527573796
separate the different functions in deployContracts
2017-03-04 20:14:47 -05:00
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
85659987d9
add support for website config file; reflect real web server config in the dashboard
2017-03-04 14:20:28 -05:00
269552aee0
add events to plugin api
2017-03-04 12:42:24 -05:00
3db27c14cb
add exception to dealWithConfigsMethods; it's simple enough
2017-03-03 21:51:23 -05:00
617d263341
reduce complexity of engine main metod
2017-03-03 21:48:32 -05:00
383d69c194
handle cmd error
2017-03-03 21:11:53 -05:00
94cca83670
simplify test constructor
2017-03-03 21:06:44 -05:00
6799e1d8a5
remove comment
2017-03-03 01:25:14 -05:00
cd45a2be77
refactor, move calls to engine; fix tests
2017-03-03 01:22:12 -05:00
6784fa662c
pass path when listening to file change event
2017-03-02 21:31:07 -05:00
d5ebd7d748
fix for current refactor: on an asset change don't redeploy
2017-03-02 20:23:03 -05:00
fe30f4b040
make cmd call async
2017-03-02 08:15:35 -05:00
4c5cb95209
refactor: extract method for cmd interpreter
2017-03-02 07:44:24 -05:00
11eca918a1
add cc rule
2017-03-01 21:28:27 -05:00
d4f7eca2c5
make cc happy; use join path
2017-03-01 21:15:02 -05:00
09fbd66417
put callback call at the end
2017-03-01 21:09:55 -05:00
c0bcc15023
simplify condition; return callback
2017-03-01 21:08:28 -05:00
dbb0b0b171
track deployed contracts taking into account swarm hash inserted by solc
2017-03-01 20:52:58 -05:00
b7cd296716
make abi generation independent of deployment
2017-02-28 23:29:16 -05:00
1674adee4a
add config to specify available providers for each component
2017-02-28 21:43:03 -05:00
09e58977e4
generate final embarkjs file depending on components enabled
2017-02-28 21:26:15 -05:00
e61f0f102d
generate storage and communication abi; disable deployment if config is disabled
2017-02-28 20:42:03 -05:00
c500bb4988
fix error display with refactored compilation module
2017-02-28 08:03:03 -05:00
5477b7f11c
fix options varible; make cc happy
2017-02-27 07:49:25 -05:00
e806a14af6
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-02-27 06:57:30 -05:00
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
2642325868
Fix scoping
2017-02-26 14:33:58 -08:00
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
0060dbe53f
don't exit if blockchain is not available
2017-02-26 14:56:43 -05:00
a153859caf
herge branch 'refactor_e' into develop
2017-02-25 23:32:08 -05:00
0dc21abd3c
fix compiler argument
2017-02-25 23:20:57 -05:00
562efc6f14
test fixes
2017-02-25 22:57:22 -05:00
5fc2d97609
fix so child process doesn't hang some cmds
2017-02-25 22:39:40 -05:00
85519e95d8
add new deploy manager to build cmd
2017-02-25 20:45:40 -05:00
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
e9ce9dc6f1
add redeploy; don't reload compiler if it's already loaded
2017-02-25 15:47:35 -05:00
d73eb802ea
refactor deployment
2017-02-24 22:49:34 -05:00
4b119fffde
add solc wrapper
2017-02-24 19:27:27 -05:00
a2a27bb0c2
start refactoring deployment steps
2017-02-24 08:20:03 -05:00
a0f4953c17
add TODO for pipeline event
2017-02-24 06:28:06 -05:00
3433c75554
refactor pipeline to use events instead
2017-02-24 06:18:57 -05:00
3d240c9d84
temporary fix for --nodashboard issue in develop
2017-02-23 20:50:55 -05:00
550b81c9b2
remove unnecessary concatenation
2017-02-23 19:49:48 -05:00
0db2b663ad
make cc happy
2017-02-23 19:45:25 -05:00
de37c94b2e
Implemented logic to show version of the connected IPFS node on the dashboard
2017-02-23 17:18:05 -05:00
e3cbf3c680
Better name for services. Output Geth version is important
2017-02-22 08:21:45 -05:00
4f1317dcdd
Minor typo in help message
2017-02-22 08:10:33 -05:00
87ff194ce4
extract method for determing rpc options
2017-02-21 21:04:15 -05:00
b29f23e28c
extract method for determing network type
2017-02-21 21:01:38 -05:00
d67982ac71
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-02-21 20:54:16 -05:00
b5ff1add40
simplify blockchain constructor
2017-02-21 20:54:07 -05:00
dd03c747f7
Fixed logic to prevent node exception when running command 'embark blockchain' outside the Dapp folder
2017-02-21 15:45:10 -05:00
0e03d8f435
refactor: move dashboard board init logic into a separate module
2017-02-20 18:02:17 -05:00
cf0ea4299e
support disabling blockchain stack; tolerate lack of web3 object
2017-02-20 17:12:13 -05:00
d1701c4031
add missing enable options to boilerplate configs; add communication initializer
2017-02-20 16:29:59 -05:00
a9e4435b77
use specified environment when creating data dirs for .embark
2017-02-20 16:11:27 -05:00
1a436dcc12
add support for light and fast options; add default pass folders
2017-02-20 15:53:55 -05:00
e4bcdf7f12
improve help message
2017-02-19 20:13:30 -05:00
3890b4a38e
refactor to use method to determine app root path, instead of constantly using relative paths
2017-02-19 20:01:42 -05:00
73a536c52e
refactor to use method to determine app root path, instead of constantly using relative paths
2017-02-19 19:44:16 -05:00
8b5e3aa3ab
adjust paths
2017-02-19 18:52:41 -05:00
a8193277da
start refactoring index.js
2017-02-19 13:18:43 -05:00
5e4ad9a7e5
reorder requires in a more logical manner
2017-02-19 13:17:28 -05:00
07d1631d9d
move command history to its own module
2017-02-19 12:59:02 -05:00
1868788342
reorgnize code structure
2017-02-19 12:51:32 -05:00
8da0e80751
move fs methods into their own module
2017-02-19 11:37:54 -05:00
4e8546863c
remove unnecessary calls()
2017-02-19 09:11:17 -05:00
19d35a563e
replace glob matching functionality
2017-02-19 00:00:01 -05:00
38c98f16fa
use nodejs http lib directly to check service status
2017-02-18 23:17:43 -05:00
c312943248
use saner library to deal with fs
2017-02-18 22:40:42 -05:00
3f3a129276
isolate eval in a module
2017-02-18 16:53:49 -05:00
a83cc6a44a
move shelljs scopes to utils; require locally so it doesn't polute the global space
2017-02-18 16:06:39 -05:00
08ba95576d
move request to utils module
2017-02-18 15:27:08 -05:00
2596eb5873
add missing require
2017-02-18 15:07:19 -05:00
86cd2a15d1
move merge to utils module
2017-02-18 14:45:57 -05:00
58b1f504d5
move grunt methods to utils module
2017-02-18 14:37:07 -05:00
833102d175
advice on typing --help when a wrong command is inputed
2017-02-18 14:22:45 -05:00
561caa9b0b
move join path into utils module
2017-02-18 14:10:01 -05:00
55275136b0
clean up; remove unneded requires
2017-02-18 09:39:13 -05:00
68d4f5e2fa
avoid intercepting logs when using cmds that don't need plugins and the logger
2017-02-18 09:23:19 -05:00
38aca05e28
remove unneded plugin dependency from abi
2017-02-18 09:09:36 -05:00
655114b394
add config to specify geth command
2017-02-18 08:55:33 -05:00
03a6b6c48d
option added
2017-02-18 08:41:18 -05:00
eb36af87b0
add support for the bootnodes config
2017-02-18 08:24:23 -05:00
566812696d
take configuration options from config and command line arguments when running simulator
2017-02-18 08:01:03 -05:00
e6d998fd1a
If no arguments are passed to embark, then display help by default
2017-02-17 14:34:07 -05:00
c339732cd6
make compiler module async
2017-02-17 07:14:44 -05:00
27a3a9c3f2
clean up compiler file; remove unused code
2017-02-17 06:16:56 -05:00
fcd88b9e4a
reorder component initialization make log clearer; improve log messages to make them clearer
2017-02-15 20:56:18 -05:00
617d40086c
add web3 to console help
2017-02-15 20:35:42 -05:00
bd99a75048
advice user when an unknown command is typed in the console
2017-02-15 20:24:42 -05:00
a511979cd1
make console output clearer
2017-02-15 20:08:47 -05:00
63da0773ae
log creating directory as a trace log level
2017-02-15 19:32:29 -05:00
097088821b
support generating abi file only
2017-02-15 19:27:23 -05:00
40ddfff425
support configuring simulator in the tests
2017-02-12 10:01:46 -05:00
ff09e05965
fix for when maxpeers config is 0
2017-02-11 11:53:11 -05:00
6984c13ac6
read storage and communication config files; use & initialize storage depending on config
2017-02-10 07:44:06 -05:00
d0c020dce5
update to 2.3.0
2017-02-08 06:38:26 -05:00
f37bc46f8e
fix specs; clarify production enviroment (livenet not production); exec testrpc directly
2017-02-08 06:31:57 -05:00
135c3c06a7
finclude transaction cost in gas estimation
2017-02-06 21:34:10 -05:00
fc2c6a41ee
cleanup
2017-02-06 21:08:11 -05:00
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
e8db6dc8a0
fix tests
2017-02-06 06:55:42 -05:00
4e026fb6e7
support directories in pipeline
2017-02-06 06:51:27 -05:00
1cdcaee7d9
fix specs
2017-02-06 06:51:27 -05:00
0ec3fba352
if target is directory then copy files
2017-02-06 06:51:27 -05:00
6822a9b08c
implement compiler plugin
2017-02-06 06:51:27 -05:00
2e9a4bb28a
implement several plugins
2017-02-06 06:51:27 -05:00
352eadab98
add console plugin support
2017-02-06 06:51:26 -05:00
0e0b0c99d3
update docs
2017-02-06 06:51:26 -05:00
0b88d2fa69
show loading message; immediatly check for services instead of waiting 5 secs
2017-02-06 06:51:26 -05:00
136f099b57
remove console log
2017-02-06 06:51:26 -05:00
b72a42cfb3
add plugin config options; update pipeline plugin implementation
2017-02-06 06:51:26 -05:00
4075490fee
add plugin for pipeline
2017-02-06 06:51:26 -05:00
ccdfaf61f2
implement plugin support: implement support for client-side web3 providers and contracts plugins
2017-02-06 06:51:26 -05:00
ce6c10b4d1
Actually use the fucking `options` object when setting up tests
2017-02-04 22:57:46 -05:00
0942b710e3
Fix broken test deployment shit
2017-02-04 18:04:38 -05:00
361e1ec94a
compatbility fix for latest geth
2017-02-03 07:01:59 -05:00
87f1e01dd9
clear noise from demo generation
2017-01-13 19:17:29 -05:00
f7bbc1ddc2
update to 2.2.1
2017-01-13 07:46:36 -05:00
087578c8e6
add spec for contracs config; fix contracts arguments when it's an instanceOf
2017-01-12 20:42:33 -05:00
97a49f3136
update to 2.2.0
2017-01-11 06:57:57 -05:00
d1cb5266ca
Merge branch 'swarm' into develop
2017-01-08 15:47:43 -05:00
26f2ad7407
refactor ipfs and swarm code
2017-01-08 13:19:27 -05:00
c53d92baa5
refactor deployments to upload command
2017-01-07 20:37:48 -05:00
15b8d9b33e
supporting uploading dapp to swarm
2017-01-07 16:52:29 -05:00
13cf92a4f5
add orbit to embarkjs
2017-01-07 00:03:03 -05:00
30b03383ee
fix bug with adjusting gas
2016-12-26 11:47:57 -05:00
910cee5431
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2016-12-02 06:51:10 -05:00
004d1eecf4
add missing return to determineArguments method
2016-12-02 06:48:32 -05:00
f31a78754f
Merge pull request #203 from webpolis/webpolis-patch-1
...
Add missing argument
2016-12-02 06:19:50 -05:00
cae39d85be
embark build wasn't deploying assets
2016-11-28 17:14:39 -03:00
a100d307ff
Add missing argument
2016-11-27 13:59:54 -03:00
668e0be0c3
Setting web3 on Embark Test constructor so it can be used before deploying contracts
2016-11-08 09:31:02 +00:00
0a26fa98ce
define version in the main object
2016-10-30 22:37:06 -04:00
59f9d9fdf0
handle errors
2016-10-30 22:04:25 -04:00
c7bd478dde
handle error if no accounts are found
2016-10-30 21:56:19 -04:00
b01f18916e
return callback
2016-10-30 21:52:58 -04:00
eb7c89045e
log any error with the services
2016-10-30 21:47:21 -04:00
c893c34fd2
add errors in test
2016-10-30 21:35:08 -04:00
52244cca8e
move gas adjust to its own method
2016-10-30 21:31:29 -04:00
99c528c230
simplify method dealing with instanceOf
2016-10-30 20:48:16 -04:00
5c283b5232
support maxpeers option
2016-10-30 20:35:11 -04:00
6920ae9481
refactor to use commonOptions method
2016-10-30 20:21:28 -04:00
a5bc17f0de
use config port when calling geth
2016-10-30 20:15:57 -04:00
e58671e742
refactor common geth command options into the a common method
2016-10-30 20:08:45 -04:00
0a2a26fd29
fix network config type
2016-10-30 20:01:25 -04:00
5c05b7f8d9
simplify whisper config condition
2016-10-30 19:53:23 -04:00
88bdd662de
refactor determining method arguments
2016-10-30 19:38:40 -04:00
df7ff3916f
handle error on deploy all
2016-10-30 19:28:45 -04:00
e44bd3a22e
handle error on contract deplyoment
2016-10-30 19:22:09 -04:00
ac67c80576
return callbacks
2016-10-30 19:17:31 -04:00
c30a289945
handle error if no accounts are found
2016-10-30 19:14:38 -04:00
67074ee60f
update to 2.1.3
2016-10-30 08:57:44 -04:00
0524b17309
update to 2.1.3
2016-10-30 08:56:13 -04:00
a9fbd5f6a5
make --no-color option available
2016-10-29 22:35:22 -04:00
7bccb73f01
support --dashboard option
2016-10-29 22:30:41 -04:00
655f56f893
support --noserver option
2016-10-29 22:00:54 -04:00
60285ea1c0
support specifying web server hostname through -b option
2016-10-29 21:41:50 -04:00
caaf3acde5
use path join
2016-10-29 14:13:06 -04:00
41273a4517
remove trailing commas
2016-10-29 14:07:42 -04:00
06879ccdd6
return callback
2016-10-29 13:55:06 -04:00
549e33317b
use path join
2016-10-29 13:50:54 -04:00
60f487da38
use path join
2016-10-29 12:35:16 -04:00
bd3b05bb00
refactor condition to avoid checking for void 0
2016-10-29 12:24:13 -04:00
814c2bc4a4
return callbacks
2016-10-29 12:15:50 -04:00
9a09e206ae
refactor contract build method
2016-10-29 12:02:07 -04:00
215a823c35
update to 2.1.2
2016-10-29 11:16:43 -04:00
00dd8ecf91
display compilation and/or deployment error in the logs and status instead of crashing
2016-10-29 11:08:10 -04:00
816e67370a
refactor duplicated build & deploy process
2016-10-29 10:33:54 -04:00
c9a52c11b0
update to 2.1.1
2016-10-25 19:44:12 -04:00
19735884c0
add support for -p option in embark run to specify web server port
2016-10-25 19:33:24 -04:00
a6397b3fe9
update to 2.1.0
2016-10-24 06:14:35 -04:00
3ea6e53218
get contract from contract list, not compiled contracts
2016-10-23 11:15:35 -04:00
42fd369cf4
remove trailing commas
2016-10-22 20:16:00 -04:00
9de3d20ee9
remove trailing commas
2016-10-22 20:10:25 -04:00
4b1a16b100
add jshint exceptions and TODO
2016-10-22 17:29:06 -04:00
835047c755
fix lint errors
2016-10-22 13:29:41 -06:00
4989876135
display ethereum node name and embark version in available services
2016-10-22 12:11:47 -04:00
f337ffd418
clarify web3 error msg
2016-10-22 11:57:36 -04:00
bcdba3f8bc
clarify gas amount msg
2016-10-22 11:48:47 -04:00
ae3bcb1060
fix gas settings; add information of gas used with deployment
2016-10-22 09:42:52 -04:00
d05cf90b5b
display error in contract status
2016-10-21 07:16:15 -04:00
907a358e5b
add some tabs to adjust status message
2016-10-20 23:34:31 -04:00
f747c757c5
if the contract is set to not deploy, display information correctly on the dashboard
2016-10-20 23:31:42 -04:00
727e2d0923
set the default limit if the contract deploy option is false
2016-10-20 23:22:31 -04:00
bf509e8b27
don't return a contract from the chains.json if it has no address
2016-10-20 23:21:32 -04:00
f9dbbd9243
update to 2.0.1
2016-10-19 07:38:32 -04:00
fa17170878
add version number to cmd
2016-10-16 12:41:28 -04:00
23a7f03cc4
add more tests; fix issue with selecting selecting non-default environment contract configuration
2016-10-15 15:54:19 -04:00
5a6a9e8b94
join serpent and solidity contracts
2016-10-15 08:22:18 -04:00
969e4015cb
add test for abi and blockchain config; fix whisper config
2016-10-14 07:01:54 -04:00
ab42ae92d5
support nodiscover option; add warnings to cors settings
2016-10-07 07:15:29 -04:00
47736b6eed
add check for ipfs
2016-10-06 07:40:24 -04:00
a19a690d3d
fix relative paths to js files
2016-10-06 07:40:24 -04:00
8a1fd3a165
jshint it
2016-10-06 07:40:24 -04:00
8711b75462
add support for more simulators
2016-10-06 07:40:24 -04:00
9d6e7b79bd
implement onDeploy
2016-10-06 07:40:24 -04:00
fcc808b9f4
add ipfs and tests cmd
2016-10-06 07:40:24 -04:00
b0458c6fab
fix logging in test
2016-10-06 07:40:23 -04:00
5ae091ffb5
refactor ipfs module
2016-10-06 07:40:23 -04:00
fb41ce8a66
remove old files
2016-10-06 07:40:23 -04:00
Todd Baur
ramiro
roo2
Iuri Matias
Andy Nogueira
DeviateFish
Daniel Benton
Steven Ireland
Nicolas Iglesias
ed0wolf
Aleš Katona