morph-cli 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f141dfe873eb87eb7f74f794227095bebe00e50e
-  data.tar.gz: 6f4afec44517a94e2798929498c1f3e64b5d2fbd
+  metadata.gz: fa0d4c14299f1e0183f2fec27301748bd986cf4f
+  data.tar.gz: 892eb198890a0c097b742e315b871856798f017a
 SHA512:
-  metadata.gz: 5ed5a62464f087f09f1df699954027d6d7020f22fca49a61b7c6d5aaca293edfb19d148a973771bc9adb6abf8a41ec27205c1d90e83dc5f56e350fcdb7be290b
-  data.tar.gz: ec7ed61018b19ed4adc5c29d6f6fe95b58fcfbdac3b1ba433a22b187df19bb516d57d3482a4beb7b3574ec01cbb3c3ad9dda2a7e777cbf184bc5fbc45cd54814
+  metadata.gz: 7c71ccc75fa1083eb32bf823ce5a6bbb9883a75eb0f81aa336ad7be1d04becb3a753c4211bf2ebb483c552c38102655c144af5a6a5fab9494c842e29883a1a0f
+  data.tar.gz: 8a5cdd7e66176f41da7b04fc2f4a3ea108bbc7ebd46d2689923a2ff00fd0a28da6e41f24fd5f31ef6457aebe4ec65640fbd66cefdcfe1611171dcfb1d08c3232

data/lib/morph-cli.rb

@@ -1,11 +1,21 @@
 require "morph-cli/version"
 require 'yaml'
 require 'find'
+require 'filesize'
 
 module MorphCLI
   def self.execute(directory, development, env_config)
-    puts "Uploading and running..."
-    file = MorphCLI.create_tar(directory, MorphCLI.all_paths(directory))
+    all_paths = MorphCLI.all_paths(directory)
+
+    if !all_paths.find{ |file| /scraper\.[\S]+$/ =~ file }
+      $stderr.puts "Can't find scraper to upload. Expected to find a file called scraper.rb, scraper.php, scraper.py, scraper.pl, scraper.js, etc to upload"
+      exit(1)
+    end
+
+    size = MorphCLI.get_dir_size(directory, all_paths)
+    puts "Uploading #{size}..."
+
+    file = MorphCLI.create_tar(directory, all_paths)
     buffer = ""
     block = Proc.new do |http_response|
       if http_response.code == "200"
@@ -102,6 +112,14 @@ module MorphCLI
     File.new('/tmp/out', 'r')
   end
 
+  def self.get_dir_size(directory, paths)
+    size = 0
+    in_directory(directory) do
+      paths.each { |entry| size += File.size(entry) }
+    end
+    Filesize.from("#{size} B").pretty
+  end
+
   # Relative paths to all the files in the given directory (recursive)
   # (except for anything below a directory starting with ".")
   def self.all_paths(directory)

data/lib/morph-cli/version.rb

@@ -1,3 +1,3 @@
 module MorphCLI
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/morph-cli.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "> 0.17"
   spec.add_dependency "rest-client"
   spec.add_dependency 'archive-tar-minitar'
+  spec.add_dependency "filesize", ">= 0.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morph-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Matthew Landauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: filesize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement