lib/vendorer.rb in vendorer-0.1.10 vs lib/vendorer.rb in vendorer-0.1.11

@@ -1,6 +1,7 @@
 require 'tempfile'
+require 'tmpdir'
 
 class Vendorer
   def initialize(options={})
     @options = options
     @sub_path = []
@@ -8,32 +9,35 @@
 
   def parse(content)
     eval(content, nil, 'Vendorfile', 1)
   end
 
-  def file(path, url)
+  def file(path, url=nil)
     path = complete_path(path)
     update_or_not path do
       run "mkdir -p #{File.dirname(path)}"
-      run "curl '#{url}' -L -o #{path}"
-      raise "Downloaded empty file" unless File.exist?(path)
+      if @copy_from_url
+        copy_from_path(path, url)
+      else
+        run "curl '#{url}' -L -o #{path}"
+        raise "Downloaded empty file" unless File.exist?(path)
+      end
       yield path if block_given?
     end
   end
 
   def folder(path, url=nil, options={})
-    if url
+    if @copy_from_path or url
       path = complete_path(path)
       update_or_not path do
         run "rm -rf #{path}"
         run "mkdir -p #{File.dirname(path)}"
-        run "git clone '#{url}' #{path}"
-        if commit = (options[:ref] || options[:tag] || options[:branch])
-          run "cd #{path} && git checkout '#{commit}'"
+        if @copy_from_path
+          copy_from_path(path, url)
+        else
+          download_repository(url, path, options)
         end
-        run("cd #{path} && git submodule update --init --recursive")
-        run "rm -rf #{path}/.git"
         yield path if block_given?
       end
     else
       @sub_path << path
       yield
@@ -57,10 +61,19 @@
       (l.start_with? '#' or l.empty?) ? l : "# #{l}"
     end.join("\n")
     File.open('Vendorfile', 'w') { |f| f.write(examples.strip) }
   end
 
+  def from(url, options={})
+    Dir.mktmpdir do |tmpdir|
+      download_repository url, tmpdir, options
+      @copy_from_url, @copy_from_path = url, tmpdir
+      yield
+      @copy_from_url = @copy_from_path = nil
+    end
+  end
+
   private
 
   def update_or_not(path)
     update_requested = (@options[:update] and (@options[:update] == true or path.start_with?(@options[:update]+'/') or path == @options[:update]))
     if update_requested or not File.exist?(path)
@@ -81,7 +94,23 @@
     raise output unless $?.success?
   end
 
   def complete_path(path)
     File.join(@sub_path + [path])
+  end
+
+  def download_repository(url, to, options)
+    run "git clone '#{url}' #{to}"
+    if commit = (options[:ref] || options[:tag] || options[:branch])
+      run "cd #{to} && git checkout '#{commit}'"
+    end
+    run "cd #{to} && git submodule update --init --recursive"
+    run "rm -rf #{to}/.git"
+  end
+
+  def copy_from_path(dest_path, src_path)
+    src_path ||= dest_path
+    copy_from = File.join(@copy_from_path, src_path)
+    raise "'#{src_path}' not found in #{@copy_from_url}" unless File.exist?(copy_from)
+    run "cp -Rp #{copy_from} #{dest_path}"
   end
 end