anvil-cli 0.13.0 → 0.14.0

data/lib/anvil/manifest.rb

@@ -4,6 +4,7 @@ require "net/http"
 require "net/https"
 require "pathname"
 require "rest_client"
+require "find"
 
 class Anvil::Manifest
 
@@ -126,7 +127,7 @@ private
 
   def directory_manifest(dir, options={})
     root = Pathname.new(dir)
-    ignore = options[:ignore] || []
+    ignore = (options[:ignore] || []) + [".anvil", ".git"]
 
     if File.exists?("#{dir}/.slugignore")
       File.read("#{dir}/.slugignore").split("\n").each do |match|
@@ -136,19 +137,21 @@ private
       end
     end
 
-    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 =~ /\.anvil/
-      next(hash) if file =~ /\.git/
-      next(hash) if file =~ /\.swp$/
-      next(hash) unless file =~ /^[A-Za-z0-9\-\_\.\/]*$/
-      hash[relative] = file_manifest(file)
-      hash
+    manifest = {}
+    Find.find(dir) do |path|
+      relative = Pathname.new(path).relative_path_from(root).to_s
+      if File.directory?(path)
+        Find.prune if ignore.include?(relative) || ignore.include?(relative + "/")
+        next
+      end
+      next if ignore.include?(relative)
+      next if %w( . .. ).include?(File.basename(path))
+      next if File.pipe?(path)
+      next if path =~ /\.swp$/
+      next unless path =~ /^[A-Za-z0-9\-\_\.\/]*$/
+      manifest[relative] = file_manifest(path)
     end
+    manifest
   end
 
   def file_manifest(file)

data/lib/anvil/version.rb

@@ -1,3 +1,3 @@
 module Anvil
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anvil-cli
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progress
-  requirement: &70121012006000 !ruby/object:Gem::Requirement
+  requirement: &70222498148920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70121012006000
+  version_requirements: *70222498148920
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70121012005440 !ruby/object:Gem::Requirement
+  requirement: &70222498164760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70121012005440
+  version_requirements: *70222498164760
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70121012004840 !ruby/object:Gem::Requirement
+  requirement: &70222498164160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.15.2
   type: :runtime
   prerelease: false
-  version_requirements: *70121012004840
+  version_requirements: *70222498164160
 description: Alternate Heroku build workflow
 email: david@dollar.io
 executables: