refactor renamed dependencies

cmd/main.js

@@ -11,11 +11,11 @@ var cliSpec = require('../specs/cli.json');
 var packageSpec = require('../package.json');
 var clc = require('cli-color-tty')(true);
 var _ = require('lodash');
-var State = require('dapple-utils/state.js');
-var utils = require('dapple-utils/utils.js');
+var State = require('dapple-core/state.js');
+var utils = require('dapple-core/utils.js');
 
 var chainModule = require('dapple-chain');
-var scriptModule = require('dapplescript');
+var scriptModule = require('dapple-script');
 
 var state = new State(cliSpec);
 
@@ -209,8 +209,6 @@ if (cli.install) {
     nameFilter = new RegExp(cli['<RegExp>'],
       /[A-Z\\\.\[\]\^\$\*\+\{\}\(\)\?\|]/.test(cli['<RegExp>']) ? '' : 'i');
   }
-
-
 
   // var provider = chainModule.web3Provider({
   //   mode: 'temporary'

doc/chain.md

@@ -116,7 +116,7 @@ environments:
         address: '0xecf8f87f810ecf450940c9f60066b4a7a501d6a7'
 ```
 
-Then we write a small dapplescript:
+Then we write a small dapple-script:
 ```
 // ./send.ds
 import eth_token

lib/dependency.js

@@ -9,7 +9,7 @@ var req = require('lazreq')({
   deasync: 'deasync',
   ipfsAPI: 'ipfs-api',
   os: 'os',
-  Web3Factory: 'dapple-utils/web3Factory.js',
+  Web3Factory: 'dapple-core/web3Factory.js',
   Workspace: './workspace.js',
   ipfs: './ipfs.js'
 });

lib/pipelines.js

@@ -13,10 +13,8 @@ var filter = require('gulp-filter');
 var loggers = require('../lib/loggers.js');
 var streams = require('../lib/streams');
 var Workspace = require('../lib/workspace.js');
-var Web3Factory = require('dapple-utils/web3Factory');
+var Web3Factory = require('dapple-core/web3Factory');
 var deasync = require('deasync');
-// TODO - modularize
-var scriptModule = require('dapplescript');
 
 // This file contains collections of streams that have been packaged up into
 // discreet "pipelines" which are ultimately themselves streams. This helps keep

lib/streams/publish.js

@@ -6,7 +6,7 @@ var Ipfs = require('../ipfs.js');
 var schemas = require('../schemas.js');
 var Dapphub = require('dapphub');
 // var Dapphubdb = require('../dapphub_registry.js');
-var Web3Factory = require('dapple-utils/web3Factory.js');
+var Web3Factory = require('dapple-core/web3Factory.js');
 
 var createPackageHeader = function (contracts, rootHash, dappfile, schema) {
   // TODO - validate dappfile

package.json

@@ -46,13 +46,12 @@
     "cli-color-tty": "^2.0.0",
     "dapphub": "0.0.7",
     "dapple-chain": "^0.0.6",
-    "dapple-utils": "^0.1.0",
-    "dapplescript": "^0.0.5",
+    "dapple-core": "^0.1.0",
+    "dapple-script": "^0.0.5",
     "deasync": "^0.1.4",
     "dir-compare": "0.0.2",
     "docopt": "^0.6.2",
     "ethereumjs-lib": "^3.0.0",
-    "ethersim": "git+https://github.com/nexusdev/EtherSim.git",
     "file": "^0.2.2",
     "fs-extra": "^0.26.3",
     "fs-readdir-recursive": "^1.0.0",