anvil-cli 0.3.1 → 0.4.0

data/lib/anvil/engine.rb

@@ -1,5 +1,6 @@
 require "anvil"
 require "anvil/builder"
+require "anvil/helpers"
 require "anvil/manifest"
 require "anvil/version"
 require "progress"
@@ -8,6 +9,8 @@ require "uri"
 
 class Anvil::Engine
 
+  extend Anvil::Helpers
+
   def self.build(source, options={})
     if options[:pipeline]
       old_stdout = $stdout.dup
@@ -23,7 +26,9 @@ class Anvil::Engine
     builder = if is_url?(source)
       Anvil::Builder.new(source)
     else
-      manifest = Anvil::Manifest.new(File.expand_path(source))
+      manifest = Anvil::Manifest.new(File.expand_path(source),
+        :cache  => read_anvil_metadata(source, "cache"),
+        :ignore => options[:ignore])
       upload_missing manifest
       manifest
     end

data/lib/anvil/manifest.rb

@@ -15,10 +15,11 @@ class Anvil::Manifest
   attr_reader :dir
   attr_reader :manifest
 
-  def initialize(dir=nil, cache_url=nil)
+  def initialize(dir=nil, options={})
     @dir = dir
-    @manifest = @dir ? directory_manifest(@dir) : {}
-    @cache_url = cache_url
+    @ignore = options[:ignore] || []
+    @manifest = @dir ? directory_manifest(@dir, :ignore => @ignore) : {}
+    @cache_url = options[:cache]
   end
 
   def build(options={})
@@ -110,17 +111,20 @@ private
     ENV["ANVIL_HOST"] || "https://api.anvilworks.org"
   end
 
-  def directory_manifest(dir)
+  def directory_manifest(dir, options={})
     root = Pathname.new(dir)
+    ignore = options[:ignore] || []
 
     Dir.glob(File.join(dir, "**", "*"), File::FNM_DOTMATCH).inject({}) do |hash, file|
+      relative = Pathname.new(file).relative_path_from(root).to_s
+      next(hash) if ignore.include?(relative)
       next(hash) if %w( . .. ).include?(File.basename(file))
       next(hash) if File.directory?(file)
       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[relative] = file_manifest(file)
       hash
     end
   end

data/lib/anvil/version.rb

@@ -1,3 +1,3 @@
 module Anvil
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anvil-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progress
-  requirement: &70297907289980 !ruby/object:Gem::Requirement
+  requirement: &70276172888580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70297907289980
+  version_requirements: *70276172888580
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70297907288800 !ruby/object:Gem::Requirement
+  requirement: &70276172887600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70297907288800
+  version_requirements: *70276172887600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70297907287880 !ruby/object:Gem::Requirement
+  requirement: &70276172886560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.15.2
   type: :runtime
   prerelease: false
-  version_requirements: *70297907287880
+  version_requirements: *70276172886560
 description: Alternate Heroku build workflow
 email: david@dollar.io
 executables: