Merge pull request #2848 from reitermarkus/refactoring

Refactor SVN and cURL download strategies.

4 files changed, 44 insertions, 3 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/container/criteria.rb b/Library/Homebrew/cask/lib/hbc/container/criteria.rb
index 66ecb8c87..52f171d6a 100644
--- a/Library/Homebrew/cask/lib/hbc/container/criteria.rb
+++ b/Library/Homebrew/cask/lib/hbc/container/criteria.rb
@@ -13,9 +13,11 @@ module Hbc
       end
 
       def magic_number(regex)
+        return false if path.directory?
+
         # 262: length of the longest regex (currently: Hbc::Container::Tar)
-        @magic_number ||= File.open(@path, "rb") { |f| f.read(262) }
-        @magic_number =~ regex
+        @magic_number ||= File.open(path, "rb") { |f| f.read(262) }
+        @magic_number.match?(regex)
       end
     end
   end
diff --git a/Library/Homebrew/cask/lib/hbc/container/directory.rb b/Library/Homebrew/cask/lib/hbc/container/directory.rb
new file mode 100644
index 000000000..e4bb1095b
--- /dev/null
+++ b/Library/Homebrew/cask/lib/hbc/container/directory.rb
@@ -0,0 +1,24 @@
+require "hbc/container/base"
+
+module Hbc
+  class Container
+    class Directory < Base
+      def self.me?(*)
+        false
+      end
+
+      def extract
+        @path.children.each do |child|
+          next if skip_path?(child)
+          FileUtils.cp child, @cask.staged_path
+        end
+      end
+
+      private
+
+      def skip_path?(*)
+        false
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/cask/lib/hbc/container/executable.rb b/Library/Homebrew/cask/lib/hbc/container/executable.rb
index 848f6d4be..af3b36fd1 100644
--- a/Library/Homebrew/cask/lib/hbc/container/executable.rb
+++ b/Library/Homebrew/cask/lib/hbc/container/executable.rb
@@ -8,7 +8,7 @@ module Hbc
         return true if criteria.magic_number(/^#!\s*\S+/)
 
         begin
-          MachO.open(criteria.path).header.executable?
+          criteria.path.file? && MachO.open(criteria.path).header.executable?
         rescue MachO::MagicError
           false
         end
diff --git a/Library/Homebrew/cask/lib/hbc/container/svn_repository.rb b/Library/Homebrew/cask/lib/hbc/container/svn_repository.rb
new file mode 100644
index 000000000..cae613b2d
--- /dev/null
+++ b/Library/Homebrew/cask/lib/hbc/container/svn_repository.rb
@@ -0,0 +1,15 @@
+require "hbc/container/directory"
+
+module Hbc
+  class Container
+    class SvnRepository < Directory
+      def self.me?(criteria)
+        criteria.path.join(".svn").directory?
+      end
+
+      def skip_path?(path)
+        path.basename.to_s == ".svn"
+      end
+    end
+  end
+end