anvil-cli 0.0.6 → 0.1.0

data/lib/anvil/cli.rb

@@ -2,6 +2,7 @@ require "anvil"
 require "anvil/builder"
 require "anvil/manifest"
 require "anvil/version"
+require "progress"
 require "thor"
 require "uri"
 
@@ -30,9 +31,18 @@ class Anvil::CLI < Thor
       Anvil::Builder.new(source)
     else
       manifest = Anvil::Manifest.new(File.expand_path(source))
-      print "Uploading app... "
-      count = manifest.upload
-      puts "done, #{count} files uploaded"
+      print "Checking for files to sync... "
+      missing = manifest.missing
+      puts "done, #{missing.length} files needed"
+
+      if missing.length > 0
+        Progress.start("Uploading", missing.map { |hash, file| file["size"].to_i }.inject(&:+))
+        manifest.upload(missing.keys) do |file|
+          Progress.step file["size"].to_i
+        end
+        puts "Uploading, done                                    "
+      end
+
       manifest
     end
 
@@ -41,6 +51,8 @@ class Anvil::CLI < Thor
     end
 
     old_stdout.puts slug_url if options[:pipeline]
+  rescue Anvil::Builder::BuildError => ex
+    error "Build Error: #{ex.message}"
   end
 
   desc "version", "Display Anvil version"

data/lib/anvil/manifest.rb

@@ -74,9 +74,21 @@ class Anvil::Manifest
     res.headers[:location]
   end
 
-  def upload
-    missing = json_decode(anvil["/manifest/diff"].post(:manifest => self.to_json).to_s)
-    upload_hashes missing
+  def manifest_by_hash(manifest)
+    manifest.inject({}) do |ax, (name, file)|
+      ax.update file["hash"] => file.merge("name" => name)
+    end
+  end
+
+  def missing
+    mbh = manifest_by_hash(@manifest)
+    json_decode(anvil["/manifest/diff"].post(:manifest => self.to_json).to_s).inject({}) do |ax, hash|
+      ax.update hash => mbh[hash]
+    end
+  end
+
+  def upload(missing, &blk)
+    upload_hashes missing, &blk
     missing.length
   end
 
@@ -107,6 +119,7 @@ private
       next(hash) if File.pipe?(file)
       next(hash) if file =~ /\.git/
       next(hash) if file =~ /\.swp$/
+      next(hash) unless file =~ /^[A-Za-z0-9\-\_\.\/]*$/
       hash[Pathname.new(file).relative_path_from(root).to_s] = file_manifest(file)
       hash
     end
@@ -117,6 +130,7 @@ private
     manifest = {
       "mtime" => stat.mtime.to_i,
       "mode"  => "%o" % stat.mode,
+      "size"  => stat.size.to_s
     }
     if File.symlink?(file)
       manifest["link"] = File.readlink(file)
@@ -138,7 +152,8 @@ private
     error "error uploading #{filename}: #{ex.http_body}"
   end
 
-  def upload_hashes(hashes)
+  def upload_hashes(hashes, &blk)
+    mbh = manifest_by_hash(@manifest)
     filenames_by_hash = @manifest.inject({}) do |ax, (name, file_manifest)|
       ax.update file_manifest["hash"] => File.join(@dir.to_s, name)
     end
@@ -152,6 +167,7 @@ private
       Thread.new do
         hashes.each do |hash|
           upload_file filenames_by_hash[hash], hash
+          blk.call mbh[hash]
         end
       end
     end

data/lib/anvil/version.rb

@@ -1,3 +1,3 @@
 module Anvil
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anvil-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: progress
+  requirement: &70322453636400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70322453636400
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70359909240180 !ruby/object:Gem::Requirement
+  requirement: &70322453635920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70359909240180
+  version_requirements: *70322453635920
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70359909256060 !ruby/object:Gem::Requirement
+  requirement: &70322453635460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +43,7 @@ dependencies:
         version: 0.15.2
   type: :runtime
   prerelease: false
-  version_requirements: *70359909256060
+  version_requirements: *70322453635460
 description: Alternate Heroku build workflow
 email: david@dollar.io
 executables: