anvil-cli 0.11.0 → 0.12.0

data/lib/anvil/engine.rb

@@ -20,7 +20,7 @@ class Anvil::Engine
     source ||= "."
 
     build_options = {
-      :buildpack => prepare_buildpack(options[:buildpack].to_s)
+      :buildpack => prepare_buildpack(options[:buildpack] || read_anvil_metadata(source, "buildpack"))
     }
 
     builder = if is_url?(source)
@@ -37,9 +37,8 @@ class Anvil::Engine
       print chunk
     end
 
-    unless is_url?(source)
-      write_anvil_metadata source, "cache", manifest.cache_url
-    end
+    write_anvil_metadata source, "buildpack", options[:buildpack].to_s
+    write_anvil_metadata source, "cache",     manifest.cache_url
 
     old_stdout.puts slug_url if options[:pipeline]
 
@@ -50,11 +49,8 @@ class Anvil::Engine
     puts Anvil::VERSION
   end
 
-  def self.is_url?(string)
-    URI.parse(string).scheme rescue nil
-  end
-
   def self.prepare_buildpack(buildpack)
+    buildpack = buildpack.to_s
     if buildpack == ""
       buildpack
     elsif is_url?(buildpack)

data/lib/anvil/helpers.rb

@@ -17,11 +17,17 @@ module Anvil::Helpers
     dir
   end
 
+  def is_url?(string)
+    URI.parse(string).scheme rescue nil
+  end
+
   def read_anvil_metadata(root, name)
+    return nil if is_url?(root)
     File.open(File.join(anvil_metadata_dir(root), name)).read.chomp rescue nil
   end
 
   def write_anvil_metadata(root, name, data)
+    return if is_url?(root)
     File.open(File.join(anvil_metadata_dir(root), name), "w") do |file|
       file.puts data
     end

data/lib/anvil/version.rb

@@ -1,3 +1,3 @@
 module Anvil
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anvil-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progress
-  requirement: &70095931235780 !ruby/object:Gem::Requirement
+  requirement: &70121889750420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70095931235780
+  version_requirements: *70121889750420
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70095931235200 !ruby/object:Gem::Requirement
+  requirement: &70121889749840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70095931235200
+  version_requirements: *70121889749840
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70095931234600 !ruby/object:Gem::Requirement
+  requirement: &70121889749300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.15.2
   type: :runtime
   prerelease: false
-  version_requirements: *70095931234600
+  version_requirements: *70121889749300
 description: Alternate Heroku build workflow
 email: david@dollar.io
 executables: