elm_install 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c2927819a68d5b12b552f5c9defa2d9e4895c9
-  data.tar.gz: 5a4b0f36210f3488ee332cb94713ad07119e70f3
+  metadata.gz: 68ac8a8d664399020fed3aab08c9f510dfc0b342
+  data.tar.gz: f4fcd64db986475dd59293484060510fd7a039fd
 SHA512:
-  metadata.gz: c58abacd3ea979c21953df4004e73b5aa855e64e5543c939a5dd28a77515532baecbe289bce4e58675092e651b64091f11a06b0e4d4c09aac5d44af9a4fd86f6
-  data.tar.gz: ef6731190aee0039cfdd550dfba32587c7b7269f0f770d54249834eabed6cdf6424e52b974f4e00e51b6921df42b5854133054ecbb1379cb2cc575abc0e81585
+  metadata.gz: 84484f3b601baeb593ec56dc8fb751b015795a64855ede99038bd245f4cd379103c756a58d05264ce8f4d2cc6c76403fe57499e83346ba16590ba995cb4b9c18
+  data.tar.gz: 34745ee40861cf12e2511e6998b003239a09ac591defbd5f7889f0ad8d3aab0b0855ba6e17f49fb47f13d0d2be7d08865ae3480419236ff830ec8e2373d2a245

data/.gitignore

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

data/Gemfile.lock

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

data/lib/elm_install/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-github-install",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Install Elm packages directly from Git repositories",
   "scripts": {
     "install": "node scripts/install.js",
@@ -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"

data/packaging/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 ruby '2.2.2'
 
-gem 'elm_install', '1.1.0'
+gem 'elm_install', '1.2.0'

data/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)

data/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elm_install
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Gusztáv Szikszai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git