vendorer 0.1.11 → 0.1.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vendorer (0.1.11)
+    vendorer (0.1.12)
 
 GEM
   remote: http://rubygems.org/

data/Readme.md

@@ -52,6 +52,14 @@ folder 'vendor/plugins/parallel_tests', 'https://github.com/grosser/parallel_tes
 folder 'vendor/assets/javascripts' do
   file 'jquery.js', 'http://code.jquery.com/jquery-latest.js'
 end
+
+# Copy files & folders from repos (also works with private repos)
+from 'https://github.com/grosser/parallel_tests.git' do
+  file 'Readme.md'
+  file 'target-folder/file.rb', 'lib/parallel_tests.rb'
+  folder 'spec'
+  folder 'renamed-folder', 'spec'
+end
 ```
 <!-- extracted by vendorer init -->
 

data/lib/vendorer.rb

@@ -12,31 +12,31 @@ class Vendorer
   end
 
   def file(path, url=nil)
-    path = complete_path(path)
-    update_or_not path do
-      run "mkdir -p #{File.dirname(path)}"
+    target_path = complete_path(path)
+    update_or_not target_path do
+      run "mkdir -p #{File.dirname(target_path)}"
       if @copy_from_url
-        copy_from_path(path, url)
+        copy_from_path(target_path, url || path)
       else
-        run "curl '#{url}' -L -o #{path}"
-        raise "Downloaded empty file" unless File.exist?(path)
+        run "curl '#{url}' -L -o #{target_path}"
+        raise "Downloaded empty file" unless File.exist?(target_path)
       end
-      yield path if block_given?
+      yield target_path if block_given?
     end
   end
 
   def folder(path, url=nil, options={})
     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)}"
+      target_path = complete_path(path)
+      update_or_not target_path do
+        run "rm -rf #{target_path}"
+        run "mkdir -p #{File.dirname(target_path)}"
         if @copy_from_path
-          copy_from_path(path, url)
+          copy_from_path(target_path, url || path)
         else
-          download_repository(url, path, options)
+          download_repository(url, target_path, options)
         end
-        yield path if block_given?
+        yield target_path if block_given?
       end
     else
       @sub_path << path

data/lib/vendorer/version.rb

@@ -1,3 +1,3 @@
 class Vendorer
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/spec/vendorer_spec.rb

@@ -95,7 +95,7 @@ describe Vendorer do
       write 'Vendorfile', "file 'xxx.js', 'http://NOTFOUND'"
       result = vendorer '', :raise => true
       # different errors on travis / local
-      raise result unless result.include?("resolve host 'NOTFOUND'") or result.include?('Downloaded empty file')
+      raise result unless result.include?("NOTFOUND") or result.include?('Downloaded empty file')
     end
 
     describe "with update" do
@@ -182,21 +182,21 @@ describe Vendorer do
 
     it "can download from local" do
       vendorer
-      ls('').should == ["its_recursive", "Vendorfile"]
+      ls('').should =~ ["its_recursive", "Vendorfile"]
       read('its_recursive/Gemfile').should include('rake')
     end
 
     it "can handle a trailing slash" do
       write 'Vendorfile', "folder 'its_recursive/', '../../.git'"
       output = vendorer
-      ls('').should == ["its_recursive", "Vendorfile"]
+      ls('').should =~ ["its_recursive", "Vendorfile"]
       read('its_recursive/Gemfile').should include('rake')
       output.should_not include('//')
     end
 
     it "does not keep .git folder so everything can be checked in" do
       vendorer
-      ls('its_recursive/.git').first.should include('cannot access')
+      ls('its_recursive/.git').first.should =~ /cannot access|No such file or directory/
     end
 
     it "does not update an existing folder" do
@@ -474,7 +474,7 @@ describe Vendorer do
           end
         "
         vendorer
-        ls(".").should == ['Readme.md', 'Vendorfile']
+        ls(".").should =~ ['Readme.md', 'Vendorfile']
       end
 
       it "copies to/from a nested location" do
@@ -484,8 +484,8 @@ describe Vendorer do
           end
         "
         vendorer
-        ls(".").should == ['foo', 'Vendorfile']
-        ls("./foo/bar").should == ['renamed.rb']
+        ls(".").should =~ ['foo', 'Vendorfile']
+        ls("./foo/bar").should =~ ['renamed.rb']
       end
 
       it "renames" do
@@ -495,7 +495,7 @@ describe Vendorer do
           end
         "
         vendorer
-        ls(".").should == ['Readme.renamed', 'Vendorfile']
+        ls(".").should =~ ['Readme.renamed', 'Vendorfile']
       end
     end
 
@@ -507,8 +507,8 @@ describe Vendorer do
           end
         "
         vendorer
-        ls(".").should == ['lib', 'Vendorfile']
-        ls("./lib").should == ['vendorer', 'vendorer.rb']
+        ls(".").should =~ ['lib', 'Vendorfile']
+        ls("./lib").should =~ ['vendorer', 'vendorer.rb']
       end
 
       it "copies to/from a nested location" do
@@ -518,8 +518,8 @@ describe Vendorer do
           end
         "
         vendorer
-        ls(".").should == ['foo', 'Vendorfile']
-        ls("./foo/bar").should == ['version.rb']
+        ls(".").should =~ ['foo', 'Vendorfile']
+        ls("./foo/bar").should =~ ['version.rb']
       end
 
       it "renames" do
@@ -529,8 +529,25 @@ describe Vendorer do
           end
         "
         vendorer
-        ls(".").should == ['foo', 'Vendorfile']
-        ls("./foo").should == ['vendorer', 'vendorer.rb']
+        ls(".").should =~ ['foo', 'Vendorfile']
+        ls("./foo").should =~ ['vendorer', 'vendorer.rb']
+      end
+    end
+
+    context "with folder nesting" do
+      it "copies" do
+        write "Vendorfile", "
+          folder 'foo' do
+            from '../../.git' do
+              folder 'lib'
+              file 'Gemfile'
+            end
+          end
+        "
+        vendorer
+        ls(".").should =~ ['foo', 'Vendorfile']
+        ls("./foo").should =~ ['Gemfile', 'lib']
+        ls("./foo/lib").should =~ ['vendorer', 'vendorer.rb']
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendorer
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1583849555704471697
+      hash: 3814910532642010770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,10 +53,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1583849555704471697
+      hash: 3814910532642010770
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Keep your vendor files up to date