embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,843 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

262 Commits

Author SHA1 Message Date
Jonathan Rainville e3a93a6d61 add storageProcessesLauncher that can work for swarm or ipfs 2018-05-30 10:57:25 -04:00
Jonathan Rainville 56f25ebba1 clonflict for silent 2018-05-30 10:57:25 -04:00
Iuri Matias 8fa325a7af
Merge pull request #452 from embark-framework/DomainNameResolution 
ENS Domain name resolution initial integration
 2018-05-27 08:12:26 -04:00
VoR0220 f5a29c7f4d make namesystem service come from a config file for future development 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-25 12:25:02 -05:00
emizzle 5b4e829675 * Adds auto cors updates to geth command when blockchain started via run command. 
* Fixes issues with storage/webserver configs not enabled but still having their values put in to geth cors
* Adds fixes for not including port when port  == false
* Refactors of cors logic, and also now in a generic location so can be used by both `embark blockchain` and when blockchain started in separate process
 2018-05-25 11:00:26 +10:00
Jonathan Rainville 471a4b9efb oopsie 2018-05-23 11:19:12 -04:00
Jonathan Rainville 77fad169aa add process exit 2018-05-23 11:17:03 -04:00
Jonathan Rainville 4815555a89 remove engine onReady 2018-05-23 11:17:02 -04:00
Jonathan Rainville 6145c0b92c start node only when no node is present 2018-05-23 11:17:02 -04:00
Iuri Matias 315d8c2197 fix merge 2018-05-23 11:17:02 -04:00
Jonathan Rainville 4bdf469131 conflict in en.json 2018-05-23 11:17:02 -04:00
Jonathan Rainville e69b8bab56 conflict in en.json 2018-05-23 11:17:02 -04:00
Jonathan Rainville 2062f9032c conflict in en.json 2018-05-23 11:17:01 -04:00
Jonathan Rainville c6b555af4e use event for when engine is ready to deploy 2018-05-23 11:17:01 -04:00
Jonathan Rainville 3fcc36a7a1 launch blockchain in separate process 
works but still cant getAccounts
 2018-05-23 11:17:01 -04:00
Jonathan Rainville 5f3361d030 conflict in en.json 2018-05-23 11:16:56 -04:00
Jonathan Rainville 592b4ed4fd conflict in code_generator 2018-05-23 11:16:13 -04:00
Iuri Matias 68c277cad1 remove unneded references to web3 objects; leave clarifying notes 2018-05-23 11:15:05 -04:00
RJ Catalano 380b2258e7
Merge pull request #432 from embark-framework/addCompileOnlyFlag 
add command for only compiling contracts in build command
 2018-05-17 16:56:50 -05:00
VoR0220 dd9e85fa27 add command for only compiling contracts in build command 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-17 15:37:57 -05:00
emizzle 627bf0c939 Removed `platform` from the upload command line option as it is being specified in the storage.json config. 
Removed duplicates from en.json.

Fixed upload error message bug showing encoded interpolated string
 2018-05-17 17:38:17 +10:00
Jonathan Rainville 7b1a219b51 pass isDev to engine so that it can show a warning 2018-05-14 14:32:19 -04:00
Iuri Matias 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -04:00
Richard Ramos 3f8450f060 Extra functionality for deciding which elements to include in a graph 2018-05-04 16:17:12 -04:00
Iuri Matias 0cffff067a
Merge pull request #390 from embark-framework/features/add-swarm-to-embarkjs 
Added swarm support in embarkjs, isAvailable for messages/storage, swarm/ipfs checks
 2018-05-01 18:52:22 -04:00
Jonathan Rainville 2ad852667e add early returns and lint 2018-05-01 09:38:13 -04:00
Jonathan Rainville 67c932c77d fix contracts in dashboard by removing the double evaluation 2018-05-01 09:20:19 -04:00
Eric Mastro 2bb977df76 WIP to merge in other swarm changes 
Adding swarm to embarkjs. WIP.

Add 'auto' setting for geth CORS and websockets origin

* 'auto' now supported for `rpcCorsDomain` and `wsOrigins` in the blockchain config.
* 'auto' set to the default value in blockchain config for test and demo apps.
test add config and contract and add test

addFileToPipeline test and registerBeforeDeploy with new arg

add more registers but generation one fails in run

WIP commit

Undo changes to test config.

Merge pull request #381 from embark-framework/features/cors-auto

Add 'auto' setting for geth CORS and websockets origin
fix a bug where upload cmd used plugin name

don't error if it's an empty dapp with no contracts yet

Merge pull request #383 from embark-framework/no_contracts

don't error if it's an empty dapp with no contracts yet
remove duplicated entry

force zepplein version for travis

Merge pull request #384 from embark-framework/chores/test-allpligin-apis

Small fixes for plugin APIs
intercept logs in the app itself - stopgap fix

Merge pull request #385 from embark-framework/console_logs_fix

intercept logs in the app itself - stopgap fix
* removed unneeded provider property.
* add 'swarm' as a provider in the storage.config
* update method for swarm service check

Merge branch 'develop' into features/add-swarm-to-embarkjs


More work to add swarm to embarkjs

* added eth-lib to parse result of swarm text
* changed "currentStorage" and "currentMessages" to "currentProvider" for consistency.
* added protocol to storage config
* selectively starts storage service depending on which one is configured in the storage config
* run service check for ipfs/swarm prior to uploaded
* added swarm methods for embarkjs

Updated code based on code review

check if testrpc is installed and warn if not

Merge pull request #386 from embark-framework/bug_fix/test-rpc-not-installed

check if testrpc is installed and warn if not
Removed timeout

Removed spacer

Merge pull request #382 from embark-framework/react-demo

Updating embark demo to use react instead of jquery
fix on contract add

Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp

Fix adding a contract
redeploy with right config on config change

fix tests

reset watchers after build to make sure files remain watch

Merge pull request #389 from embark-framework/bug_fix/file-changes-not-watched

Fix files not being watched
Merge pull request #388 from embark-framework/bug_fix/changing-contract-config

Redeploy with right config on config change
Added swarm support in embarkjs and isAvailable for messages/storage

* reverted currentProvider back to currentStorage and currentMessages
* added `EmbarkJS.Storage.isAvailable` and `EmbarkJS.Messages.isAvailable()` and underlying provider functions for Whisper, Orbit, IPFS, and Swarm
* Finished swarm implementation in embarkjs plus cleanup
* updated test app storage config to swarm to show swarm config option

Merge branch 'develop' into features/add-swarm-to-embarkjs
 2018-04-30 15:56:43 +10:00
Jonathan Rainville 4a9ff1fe9d check if testrpc is installed and warn if not 2018-04-27 09:16:29 -04:00
Iuri Matias 17c33ad075
Merge pull request #384 from embark-framework/chores/test-allpligin-apis 
Small fixes for plugin APIs
 2018-04-26 17:06:05 -04:00
Jonathan Rainville d046feb83d fix a bug where upload cmd used plugin name 2018-04-26 14:00:41 -04:00
Eric Mastro ef0bcbf405 Add 'auto' setting for geth CORS and websockets origin 
* 'auto' now supported for `rpcCorsDomain` and `wsOrigins` in the blockchain config.
* 'auto' set to the default value in blockchain config for test and demo apps.
 2018-04-26 21:37:00 +10:00
Eric Mastro 4c39a3f589
Merge branch 'develop' into bug_fix/upload-to-swarm 2018-04-26 19:05:56 +10:00
Jonathan Rainville f39acbdd42 get context from cmd ran and use arrays of contexts 2018-04-25 10:34:17 -04:00
Jonathan Rainville 51c2c8f880 check context and on changing context, load plugins that work 2018-04-24 14:42:56 -04:00
emizzle cc30ff390e Implemented PR review changes 
* Removed config init from `cmd.js` for upload.
* refactored `upload()` to use engine services instead of loading and using plugins directly.
* now passing web3 directly to the `Swarm` constructor
 2018-04-24 10:27:11 +10:00
emizzle c05915b0e9 swarm deploy refactored to use web3.bzz instead of command line 
* `Embark.upload()` refactored to build own `Engine` and services so `web3` could be passed to `Swarm` module
* `Swarm.deploy()` modified to use `web3.bzz.upload()`
* needs detection of running swarm node
 2018-04-20 17:39:45 +10:00
Iuri Matias e1a9023bb2
Merge pull request #370 from embark-framework/feature/log-level-as-argument 
Support setting log level as an argument
 2018-04-19 13:03:00 -04:00
emizzle 96495b99c3 Support setting log level as an argument 
* Add loglevel and logfile switch to `embark build`
* Support existing `loglevel` and `logfile` switch for `embark run/upload`
* make casing consistent for `loglevel` and `logfile`
* remove passing engine to `build()` and instead pass needed objects in options.
* prevent duplicate plugin initiation (above point)
* allow `Events` object to be passed to `Engine` constructor and `init()`
* prevent echo of upload commands to allow interception and control via logging
 2018-04-19 14:25:43 +10:00
emizzle d985a5ed69 Fixing `--logLevel` option for `embark run` 
Intercepting logs for embark run and including logLevel for displayed logs.
 2018-04-17 16:17:59 +10:00
emizzle a3d2cc9a2c Moved console "ready" message to write after outputDone event is emitted 2018-04-17 14:11:22 +10:00
Eric Mastro 8bdf79b19a Handling for error during build. 2018-04-15 20:31:26 +10:00
Eric Mastro 8fc978eb50 * Removed duplicated code to build and deploy contracts and replaced with a call to the build function. 
* Updated upload functions to use async `exec` and removed returns from the callbacks.
 2018-04-15 20:31:16 +10:00
Eric Mastro c1c61de2d5 Passed in success messaging to async callback. 2018-04-15 20:31:08 +10:00
Eric Mastro 31a2a27e9a #156326148 Updates to build and upload process and fixes for test_app/test.html 
* Updated build to include deployment of contracts 
* updated the plugin uploadCmd to be a Promise for better bubbling of errors and messaging.
* updated test.js imports so functionality works correctly.
 2018-04-15 20:30:59 +10:00
Eric Mastro 6b7af4b647 #156326148 Build contracts and dapp before upload. 2018-04-15 20:30:52 +10:00
Iuri Matias 82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts 
Graphviz contracts
 2018-04-13 11:29:23 -04:00
Jonathan Rainville f37b09a371 fix build process on windows 2018-04-09 16:14:07 -04:00
Richard Ramos 7dcae55b8b Added events to graph and fixed problems in IDE 2018-03-23 10:02:23 -04:00
Richard Ramos 01eaa0fe7f Generating basic diagram that includes methods 2018-03-23 10:02:23 -04:00
Richard Ramos d7b33a309b Changed logic of deploy manager to be able to only compile the code and not deploy it 2018-03-23 10:02:23 -04:00
Richard Ramos 9e469cc83e Initial commit for graphviz functionality 
- Added required packages
- Added command to cmd.js
- Created graph.js to contain graph logic
 2018-03-23 10:02:23 -04:00
Iuri Matias 9582efbe65 fix logger call 2018-03-15 17:18:20 -04:00
Iuri Matias 83227beaa1 add option to specify a logfile to output the logs 2018-03-10 13:45:56 -05:00
Iuri Matias c456c405c4 update tests 2018-03-10 12:52:37 -05:00
Iuri Matias b7b5f1b365 move services state event call to monitor itself 2018-03-10 12:46:02 -05:00
Iuri Matias 445133cfdf move setStatus from logger to event bus 2018-02-27 15:49:21 -05:00
Iuri Matias 3b60793b25 remove old jshint directives 2018-02-07 19:49:54 -05:00
Iuri Matias 10c4c75236 move tests related files to their own folder 2018-01-19 21:13:20 -05:00
Iuri Matias 61c00819ec add reset cmd 2018-01-11 09:22:58 -05:00
Iuri Matias dee49ec5ed add createPlugin; move cmds to library managers 2017-12-30 15:52:51 -05:00
Iuri Matias 50f1072372 move upload to its own module 2017-12-26 19:55:42 -05:00
Iuri Matias 02634d0bda warn is terminal window is too small 2017-12-19 15:14:09 -05:00
Iuri Matias 113bb25142 add webserver start/stop cmd 2017-12-17 18:34:41 -05:00
Iuri Matias e2cbc2a488 fix linting issues 2017-12-05 18:14:46 -05:00
Iuri Matias 460f78cc55 update events name for code generation 2017-10-17 07:03:13 -04:00
Iuri Matias 2dc1941e48 rename ABIGenerator (very old legacy reasons) to more apropriate CodeGenerator 2017-08-03 19:29:09 -04:00
Iuri Matias 414c875082 add versions command 2017-07-06 19:50:36 -04:00
Iuri Matias 232f6fc88b support list of fallbacks for dapp web3 connection, support separate connection config for deployment 2017-07-06 18:48:20 -04:00
Iuri Matias 263fdb6d8b support specifying file or folder when running tests 2017-07-02 11:32:16 -04:00
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 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 3c1ca7f457 remove unneded require 2017-04-02 14:54:34 -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 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 504e68d5fc Merge pull request #259 from Exartu/develop 
readme documentation update
 2017-03-30 07:02:52 -04:00
Iuri Matias 7bdc934e40 revert test change to previous state 2017-03-30 06:58:24 -04: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
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
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 c514765d0b move misc utils modules to their own folder 2017-03-11 11:03:20 -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