vendorer 0.1.10 → 0.1.11

data/Gemfile.lock

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

data/Readme.md

@@ -72,6 +72,7 @@ Author
 ### [Contributors](http://github.com/grosser/vendorer/contributors)
  - [Kurtis Rainbolt-Greene](https://github.com/krainboltgreene)
  - [Ivan K.](https://github.com/divout)
+ - [Matt Brictson](https://github.com/mbrictson)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/vendorer/version.rb

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

data/lib/vendorer.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'tmpdir'
 
 class Vendorer
   def initialize(options={})
@@ -10,28 +11,31 @@ class Vendorer
     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
@@ -59,6 +63,15 @@ class Vendorer
     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)
@@ -84,4 +97,20 @@ class Vendorer
   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

data/spec/vendorer_spec.rb

@@ -13,7 +13,7 @@ describe Vendorer do
   end
 
   def write(file, content)
-    File.open(file,'w'){|f| f.write(content) }
+    File.open(file, 'w') { |f| f.write(content) }
   end
 
   def read(file)
@@ -138,9 +138,9 @@ describe Vendorer do
         simple_vendorfile
         vendorer
         run 'chmod 711 public/javascripts/jquery.min.js'
-        lambda{
+        lambda {
           vendorer 'update'
-        }.should_not change{ run('ls -l public/javascripts').split("\n") }
+        }.should_not change { run('ls -l public/javascripts').split("\n") }
       end
     end
 
@@ -170,7 +170,7 @@ describe Vendorer do
       write 'Vendorfile', "folder 'vendor/plugins/parallel_tests', 'https://github.com/grosser/parallel_tests.git'"
       vendorer
       ls('vendor/plugins').should == ["parallel_tests"]
-      read('vendor/plugins/parallel_tests/Gemfile').should include('parallel')
+      read('vendor/plugins/parallel_tests/Gemfile').should include('cucumber')
     end
 
     it "reports errors when the Vendorfile is broken" do
@@ -280,7 +280,7 @@ describe Vendorer do
 
       it "can update a nested file" do
         vendorer
-        write('public/javascripts/jquery.js','Foo')
+        write('public/javascripts/jquery.js', 'Foo')
         vendorer 'update'
         read('public/javascripts/jquery.js').should include('jQuery')
       end
@@ -293,8 +293,8 @@ describe Vendorer do
         file 'xxx.js', 'http://code.jquery.com/jquery-latest.min.js'
         "
         vendorer
-        write('public/javascripts/jquery.js','Foo')
-        write('xxx.js','Foo')
+        write('public/javascripts/jquery.js', 'Foo')
+        write('xxx.js', 'Foo')
         vendorer 'update public/javascripts'
         read('xxx.js').should == "Foo"
         read('public/javascripts/jquery.js').should include('jQuery')
@@ -330,9 +330,10 @@ describe Vendorer do
         run "cd #{folder} && git commit -am 'initial'"
       end
 
-      let(:vendorer){
+      let(:vendorer) {
         v = Vendorer.new
-        def v.puts(x);end # silence
+        def v.puts(x) # silence
+        end
         v
       }
 
@@ -422,7 +423,7 @@ describe Vendorer do
 
       it "created Vendorfile contains commented out examples" do
         Vendorer.new('init').init
-        read("Vendorfile").split("\n").each{|l| l.should =~ /^(#|\s*$)/ }
+        read("Vendorfile").split("\n").each { |l| l.should =~ /^(#|\s*$)/ }
       end
 
       it "created Vendorfile contains many examples" do
@@ -441,4 +442,106 @@ describe Vendorer do
       end
     end
   end
+
+  describe "#from" do
+    it "returns to normal after the block" do
+      write "Vendorfile", "
+        from '../../.git' do
+          file 'Readme.md'
+        end
+        file 'jquery.js', 'http://code.jquery.com/jquery-latest.min.js'
+      "
+      vendorer
+      ls(".").should =~ ['Readme.md', 'Vendorfile', 'jquery.js']
+      read('jquery.js').should include("jQuery")
+    end
+
+    it "can checkout a specific version" do
+      write "Vendorfile", "
+          from '../../.git', :tag => 'v0.1.0' do
+            file 'lib/vendorer/version.rb'
+          end
+        "
+      vendorer
+      read('lib/vendorer/version.rb').should include("0.1.0")
+    end
+
+    context "with file" do
+      it "copies" do
+        write "Vendorfile", "
+          from '../../.git' do
+            file 'Readme.md'
+          end
+        "
+        vendorer
+        ls(".").should == ['Readme.md', 'Vendorfile']
+      end
+
+      it "copies to/from a nested location" do
+        write "Vendorfile", "
+          from '../../.git' do
+            file 'foo/bar/renamed.rb', 'lib/vendorer.rb'
+          end
+        "
+        vendorer
+        ls(".").should == ['foo', 'Vendorfile']
+        ls("./foo/bar").should == ['renamed.rb']
+      end
+
+      it "renames" do
+        write "Vendorfile", "
+          from '../../.git' do
+            file 'Readme.renamed', 'Readme.md'
+          end
+        "
+        vendorer
+        ls(".").should == ['Readme.renamed', 'Vendorfile']
+      end
+    end
+
+    context "with folder" do
+      it "copies" do
+        write "Vendorfile", "
+          from '../../.git' do
+            folder 'lib'
+          end
+        "
+        vendorer
+        ls(".").should == ['lib', 'Vendorfile']
+        ls("./lib").should == ['vendorer', 'vendorer.rb']
+      end
+
+      it "copies to/from a nested location" do
+        write "Vendorfile", "
+          from '../../.git' do
+            folder 'foo/bar', 'lib/vendorer'
+          end
+        "
+        vendorer
+        ls(".").should == ['foo', 'Vendorfile']
+        ls("./foo/bar").should == ['version.rb']
+      end
+
+      it "renames" do
+        write "Vendorfile", "
+          from '../../.git' do
+            folder 'foo', 'lib'
+          end
+        "
+        vendorer
+        ls(".").should == ['foo', 'Vendorfile']
+        ls("./foo").should == ['vendorer', 'vendorer.rb']
+      end
+    end
+
+    it "gives 'not found' error for non-existent file" do
+      write "Vendorfile", "
+        from '../../.git', :tag => 'b1e6460' do
+          file 'bogus'
+        end
+      "
+      output = vendorer '', :raise => true
+      output.should include("'bogus' not found in ../../.git")
+    end
+  end
 end

metadata

@@ -1,32 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vendorer
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.1.11
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 10
-  version: 0.1.10
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-28 00:00:00 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: michael@grosser.it
-executables: 
+executables:
 - vendorer
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -39,37 +30,34 @@ files:
 - spec/vendorer_spec.rb
 - vendorer.gemspec
 homepage: http://github.com/grosser/vendorer
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1583849555704471697
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1583849555704471697
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Keep your vendor files up to date
 test_files: []
-