Merge pull request #33 from gdotdesign/development

Install to dist directory alongside the scripts.

.gitignore

@@ -10,3 +10,4 @@ coverage
 test.elm
 test.rb
 index.html
+scripts/dist*

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elm_install (1.1.1)
+    elm_install (1.1.0)
       adts (~> 0.1.2)
       commander (~> 4.4, >= 4.4.2)
       contracts (~> 0.16.0)

lib/elm_install/version.rb

@@ -1,4 +1,4 @@
 module ElmInstall
   # The version of ElmInstall
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

package.json

@@ -16,7 +16,9 @@
   },
   "dependencies": {
     "adm-zip": "^0.4.7",
+    "progress": "^2.0.0",
     "request": "2.74.0",
+    "request-progress": "^3.0.0",
     "shelljs": "0.7.5",
     "tar-fs": "1.15.0",
     "tmp": "^0.0.31"

scripts/install.js

@@ -1,6 +1,8 @@
+var progress = require('request-progress')
+var ProgressBar = require('progress')
 var request = require('request')
-var shell = require('shelljs')
 var AdmZip = require('adm-zip')
+var shell = require('shelljs')
 var tar = require('tar-fs')
 var path = require('path')
 var zlib = require('zlib')
@@ -13,7 +15,11 @@ var version =
   fs.readFileSync(versionPath, 'utf-8')
     .match(/(\d+\.\d+\.\d+)/)[1]
 
-var homedir = path.join(os.homedir(), '.elm-install')
+var homedir = path.join(__dirname, 'dist-' + version)
+
+// We already have that version downloaded
+if(fs.existsSync(homedir)){ process.exit() }
+
 var platform = os.platform()
 var arch = process.arch
 
@@ -29,12 +35,31 @@ var packageUrl = function(suffix) {
   ].join('/')
 }
 
-var download = function(suffix){
-  console.log(
-    'Downloading and extracting the binary from: ' + packageUrl(suffix))
+var downloadRequest = function(url) {
+  var bar, lastTransferred
 
-  request
-    .get(packageUrl(suffix))
+  return progress(request.get(url))
+    .on("progress", function(data){
+      if (bar) {
+        bar.tick(data.size.transferred - lastTransferred)
+        lastTransferred = data.size.transferred
+      } else {
+        lastTransferred = 0
+        bar = new ProgressBar(
+          'Downloading and extracting the binary: [:bar] :rate/bps :percent :etas',
+          {
+            total: data.size.total,
+            incomplete: ' ',
+            complete: '=',
+            width: 60
+          }
+        )
+      }
+    })
+}
+
+var download = function(suffix){
+  downloadRequest(packageUrl(suffix))
     .pipe(zlib.createGunzip())
     .pipe(extractor)
 }
@@ -53,10 +78,7 @@ if(platform === 'linux' && arch === 'x64') {
       'elm-install-' + version + '-win32.zip'
     ].join('/')
 
-  console.log('Downloading and extracting the binary from: ' + url)
-
-  request
-    .get(url)
+  downloadRequest(url)
     .pipe(fs.createWriteStream(tmpFile.name))
     .on('finish', function(){
       var zip = new AdmZip(tmpFile.name)

scripts/run.js

@@ -10,7 +10,7 @@ var version =
   fs.readFileSync(versionPath, 'utf-8')
     .match(/(\d+\.\d+\.\d+)/)[1]
 
-var homedir = path.join(os.homedir(), '.elm-install')
+var homedir = path.join(__dirname, 'dist-' + version)
 var platform = os.platform()
 var arch = process.arch