anvil-cli 0.1.2 → 0.2.0

data/lib/anvil/cli.rb

@@ -1,5 +1,6 @@
 require "anvil"
 require "anvil/builder"
+require "anvil/engine"
 require "anvil/manifest"
 require "anvil/version"
 require "progress"
@@ -16,41 +17,7 @@ class Anvil::CLI < Thor
   method_option :pipeline,  :type => :boolean, :aliases => "-p", :desc => "Pipe compile output to stderr and put the slug url on stdout"
 
   def build(source=nil)
-    if options[:pipeline]
-      old_stdout = $stdout.dup
-      $stdout = $stderr
-    end
-
-    source ||= "."
-
-    build_options = {
-      :buildpack => prepare_buildpack(options[:buildpack].to_s)
-    }
-
-    builder = if is_url?(source)
-      Anvil::Builder.new(source)
-    else
-      manifest = Anvil::Manifest.new(File.expand_path(source))
-      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
-
-    slug_url = builder.build(build_options) do |chunk|
-      print chunk
-    end
-
-    old_stdout.puts slug_url if options[:pipeline]
+    Anvil::Engine.build(source, options)
   rescue Anvil::Builder::BuildError => ex
     error "Build Error: #{ex.message}"
   end
@@ -58,31 +25,7 @@ class Anvil::CLI < Thor
   desc "version", "Display Anvil version"
 
   def version
-    puts Anvil::VERSION
-  end
-
-private
-
-  def is_url?(string)
-    URI.parse(string).scheme rescue nil
-  end
-
-  def prepare_buildpack(buildpack)
-    if buildpack == ""
-      buildpack
-    elsif is_url?(buildpack)
-      buildpack
-    elsif buildpack =~ /\A\w+\/\w+\Z/
-      "http://buildkits-dev.s3.amazonaws.com/buildpacks/#{buildpack}.tgz"
-    elsif File.exists?(buildpack) && File.directory?(buildpack)
-      print "Uploading buildpack... "
-      manifest = Anvil::Manifest.new(buildpack)
-      manifest.upload
-      manifest.save
-      puts "done"
-    else
-      error "unrecognized buildpack specification: #{buildpack}"
-    end
+    Anvil::Engine.version
   end
 
 end

data/lib/anvil/engine.rb

@@ -0,0 +1,93 @@
+require "anvil"
+require "anvil/builder"
+require "anvil/manifest"
+require "anvil/version"
+require "progress"
+require "thor"
+require "thread"
+require "uri"
+
+class Anvil::Engine < Thor
+
+  def self.build(source, options={})
+    if options[:pipeline]
+      old_stdout = $stdout.dup
+      $stdout = $stderr
+    end
+
+    source ||= "."
+
+    build_options = {
+      :buildpack => prepare_buildpack(options[:buildpack].to_s)
+    }
+
+    builder = if is_url?(source)
+      Anvil::Builder.new(source)
+    else
+      manifest = Anvil::Manifest.new(File.expand_path(source))
+      upload_missing manifest
+      manifest
+    end
+
+    slug_url = builder.build(build_options) do |chunk|
+      print chunk
+    end
+
+    old_stdout.puts slug_url if options[:pipeline]
+  end
+
+  def self.version
+    puts Anvil::VERSION
+  end
+
+  def self.is_url?(string)
+    URI.parse(string).scheme rescue nil
+  end
+
+  def self.prepare_buildpack(buildpack)
+    if buildpack == ""
+      buildpack
+    elsif is_url?(buildpack)
+      buildpack
+    elsif buildpack =~ /\A\w+\/\w+\Z/
+      "http://buildkits-dev.s3.amazonaws.com/buildpacks/#{buildpack}.tgz"
+    elsif File.exists?(buildpack) && File.directory?(buildpack)
+      manifest = Anvil::Manifest.new(buildpack)
+      upload_missing manifest, "buildpack"
+      manifest.save
+    else
+      error "unrecognized buildpack specification: #{buildpack}"
+    end
+  end
+
+  def self.upload_missing(manifest, title="app")
+    print "Checking for files to sync for #{title}... "
+    missing = manifest.missing
+    puts "done, #{missing.length} files needed"
+
+    return if missing.length.zero?
+
+    queue = Queue.new
+    total_size = missing.map { |hash, file| file["size"].to_i }.inject(&:+)
+
+    display = Thread.new do
+      Progress.start "Uploading", total_size
+      while (msg = queue.pop).first != :done
+        case msg.first
+          when :step then Progress.step msg.last.to_i
+        end
+      end
+      puts "Uploading... done                                    "
+    end
+
+    if missing.length > 0
+      manifest.upload(missing.keys) do |file|
+        queue << [:step, file["size"].to_i]
+      end
+      queue << [:done, nil]
+    end
+
+    display.join
+  end
+
+end

data/lib/anvil/manifest.rb

@@ -87,7 +87,7 @@ class Anvil::Manifest
     end
   end
 
-  def upload(hashes=missing, &blk)
+  def upload(missing, &blk)
     upload_hashes missing, &blk
     missing.length
   end

data/lib/anvil/version.rb

@@ -1,3 +1,3 @@
 module Anvil
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anvil-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progress
-  requirement: &70196229688420 !ruby/object:Gem::Requirement
+  requirement: &70248977317820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196229688420
+  version_requirements: *70248977317820
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70196229687860 !ruby/object:Gem::Requirement
+  requirement: &70248977317260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70196229687860
+  version_requirements: *70248977317260
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70196229687260 !ruby/object:Gem::Requirement
+  requirement: &70248977316660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.15.2
   type: :runtime
   prerelease: false
-  version_requirements: *70196229687260
+  version_requirements: *70248977316660
 description: Alternate Heroku build workflow
 email: david@dollar.io
 executables:
@@ -54,6 +54,7 @@ files:
 - bin/anvil
 - lib/anvil/builder.rb
 - lib/anvil/cli.rb
+- lib/anvil/engine.rb
 - lib/anvil/helpers.rb
 - lib/anvil/manifest.rb
 - lib/anvil/okjson.rb