vendorer 0.1.4 → 0.1.5

data/Gemfile.lock

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

data/Readme.md

@@ -20,23 +20,30 @@ Add a `Vendorfile` to your project root:
     # execute a block after updates
     file 'public/javascripts/jquery.js', 'http://code.jquery.com/jquery.js' do |path|
       puts "Do something useful with #{path}"
+      rewrite(path){|content| content.gsub(/\r\n/,\n).gsub(/\t/,'  ') }
     end
 
     # checkout a specific :ref/:tag/:branch
     folder 'vendor/plugins/parallel_tests', 'https://github.com/grosser/parallel_tests.git', :tag => 'v0.6.10'
 
+    # DRY folders
+    folder 'public/javascripts' do
+      file 'jquery.js', 'http://code.jquery.com/jquery-latest.js'
+    end
+
 Call `vendorer`
 
 If you added something new: `vendorer`
 
-If you want to update all dependencies: `vendorer update`
+Update all dependencies: `vendorer update`
+
+Update one dependencies: `vendorer update public/javascripts/jquery.min.js`
 
-If you want to update one dependencies: `vendorer update public/javasctips/jquery.min.js`
+Update everything in a folder: `vendorer update public/javascripts`
 
 
 TODO
 ====
- - `folder 'vendor' do` which will remove everything that is not vendored via Vendorfile on `vendorer update` or `vendorer update vendor`
  - nice error message when no Vendorfile was found
 
 Author

data/lib/vendorer/version.rb

@@ -1,3 +1,3 @@
 class Vendorer
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/vendorer.rb

@@ -1,12 +1,14 @@
+require 'tempfile'
+
 class Vendorer
   def initialize(options)
     @options = options
+    @sub_path = []
     eval(File.read('Vendorfile'))
   end
 
-  private
-
   def file(path, url)
+    path = complete_path(path)
     update_or_not path do
       run "mkdir -p #{File.dirname(path)}"
       run "curl '#{url}' -o #{path}"
@@ -15,23 +17,38 @@ class Vendorer
     end
   end
 
-  def folder(path, url, options={})
-    update_or_not path do
-      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}'"
+  def folder(path, url=nil, options={})
+    if 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}'"
+        end
+        run "rm -rf #{path}/.git"
+        yield path if block_given?
       end
-      run "rm -rf #{path}/.git"
-      yield path if block_given?
+    else
+      @sub_path << path
+      yield
+      @sub_path.pop
     end
   end
 
+  def rewrite(path)
+    content = File.read(path)
+    result = yield content
+    File.open(path,'w'){|f| f.write(result) }
+  end
+
+  private
+
   def update_or_not(path)
-    update_requested = (@options[:update] and (@options[:update] == true or @options[:update] == 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)
       puts "updating #{path}"
-      run "rm -rf #{path}"
       yield
     else
       puts "keeping #{path}"
@@ -47,4 +64,8 @@ class Vendorer
     end
     raise output unless $?.success?
   end
+
+  def complete_path(path)
+    (@sub_path + [path]).join('/')
+  end
 end

data/spec/vendorer_spec.rb

@@ -22,11 +22,17 @@ describe Vendorer do
     File.size("spec/tmp/#{file}")
   end
 
+  def run(cmd)
+    result = `cd spec/tmp && #{cmd} 2>&1`
+    raise result unless $?.success?
+    result
+  end
+
   def ls(path)
     `ls spec/tmp/#{path} 2>&1`.split("\n")
   end
 
-  def run(args='', options={})
+  def vendorer(args='', options={})
     out = `cd spec/tmp && bundle exec ../../bin/vendorer #{args} 2>&1`
     raise out if $?.success? == !!options[:raise]
     out
@@ -38,70 +44,95 @@ describe Vendorer do
     end
 
     it "shows its version via -v" do
-      run('-v').should == "#{Vendorer::VERSION}\n"
+      vendorer('-v').should == "#{Vendorer::VERSION}\n"
     end
 
     it "shows its version via --version" do
-      run('--version').should == "#{Vendorer::VERSION}\n"
+      vendorer('--version').should == "#{Vendorer::VERSION}\n"
     end
   end
 
   describe 'help' do
     it "shows help via -h" do
-      run('-h').should include("Usage")
+      vendorer('-h').should include("Usage")
     end
 
     it "shows help via --help" do
-      run('--help').should include("Usage")
+      vendorer('--help').should include("Usage")
     end
   end
 
   describe '.file' do
-    context "with working Vendorfile" do
-      before do
-        write 'Vendorfile', "file 'public/javascripts/jquery.min.js', 'http://code.jquery.com/jquery-latest.min.js'"
-        run
-      end
+    def simple_vendorfile
+      write 'Vendorfile', "file 'public/javascripts/jquery.min.js', 'http://code.jquery.com/jquery-latest.min.js'"
+    end
 
-      it "can download via hash syntax" do
-        ls('public/javascripts').should == ["jquery.min.js"]
-        read('public/javascripts/jquery.min.js').should include('jQuery')
-      end
+    it "can download a new file" do
+      simple_vendorfile
+      vendorer
+      ls('public/javascripts').should == ["jquery.min.js"]
+      read('public/javascripts/jquery.min.js').should include('jQuery')
+    end
 
-      it "does not update an existing file" do
-        write('public/javascripts/jquery.min.js', 'Foo')
-        run
-        read('public/javascripts/jquery.min.js').should == 'Foo'
-      end
+    it "does not update an existing file" do
+      simple_vendorfile
+      vendorer
+      write('public/javascripts/jquery.min.js', 'Foo')
+      vendorer
+      read('public/javascripts/jquery.min.js').should == 'Foo'
+    end
+
+    it "fails with a nice message if the Vendorfile is broken" 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')
+    end
 
-      it "can update a file" do
+    describe "with update" do
+      it "updates all files when update is called" do
+        simple_vendorfile
+        vendorer
         write('public/javascripts/jquery.min.js', 'Foo')
-        run 'update'
+        vendorer 'update'
         read('public/javascripts/jquery.min.js').should include('jQuery')
       end
 
-      it "can update a single file" do
-        write 'Vendorfile', "
-          file 'public/javascripts/jquery.min.js', 'http://code.jquery.com/jquery-latest.min.js'
+      context "with multiple files" do
+        before do
+          write 'Vendorfile', "
           file 'public/javascripts/jquery.js', 'http://code.jquery.com/jquery-latest.js'
-        "
-        run
-        read('public/javascripts/jquery.js').should include('jQuery')
-        read('public/javascripts/jquery.min.js').should include('jQuery')
-
-        write('public/javascripts/jquery.js', 'Foo')
-        write('public/javascripts/jquery.min.js', 'Foo')
-        run 'update public/javascripts/jquery.js'
-        size('public/javascripts/jquery.min.js').should == 3
-        size('public/javascripts/jquery.js').should > 300
+          file 'public/javascripts/jquery.js.min', 'http://code.jquery.com/jquery-latest.min.js'
+          "
+          vendorer
+          read('public/javascripts/jquery.js').should include('jQuery')
+          read('public/javascripts/jquery.js.min').should include('jQuery')
+
+          write('public/javascripts/jquery.js', 'Foo')
+          write('public/javascripts/jquery.js.min', 'Foo')
+        end
+
+        it "updates a single file when update is called with the file" do
+          vendorer 'update public/javascripts/jquery.js.min'
+          size('public/javascripts/jquery.js.min').should > 300
+          size('public/javascripts/jquery.js').should == 3
+        end
+
+        it "does not update a file that starts with the same path" do
+          vendorer 'update public/javascripts/jquery.js'
+          size('public/javascripts/jquery.js').should > 300
+          size('public/javascripts/jquery.js.min').should == 3
+        end
       end
-    end
 
-    it "fails with a nice message if the Vendorfile is broken" do
-      write 'Vendorfile', "file 'xxx.js', 'http://NOTFOUND'"
-      result = run '', :raise => true
-      # different errors on travis / local
-      raise result unless result.include?("resolve host 'NOTFOUND'") or result.include?('Downloaded empty file')
+      it "does not change file modes" do
+        simple_vendorfile
+        vendorer
+        run 'chmod 711 public/javascripts/jquery.min.js'
+        lambda{
+          vendorer 'update'
+        }.should_not change{ run('ls -l public/javascripts').split("\n") }
+      end
     end
 
     context "with a passed block" do
@@ -111,67 +142,70 @@ describe Vendorer do
       end
 
       it "runs the block after update" do
-        run.should include(@output)
+        vendorer.should include(@output)
       end
 
       it "does not run the block when not updating" do
-        run
-        run.should_not include(@output)
+        vendorer
+        vendorer.should_not include(@output)
       end
     end
   end
 
   describe '.folder' do
-    it "can download via hash syntax" do
+    before do
+      write 'Vendorfile', "folder 'its_recursive', '../../.git'"
+    end
+
+    it "can download from remote" do
       write 'Vendorfile', "folder 'vendor/plugins/parallel_tests', 'https://github.com/grosser/parallel_tests.git'"
-      run
+      vendorer
       ls('vendor/plugins').should == ["parallel_tests"]
       read('vendor/plugins/parallel_tests/Gemfile').should include('parallel')
     end
 
     it "reports errors when the Vendorfile is broken" do
       write 'Vendorfile', "folder 'vendor/plugins/parallel_tests', 'https://blob'"
-      output = run '', :raise => true
+      output = vendorer '', :raise => true
       # different errors on travis / local
       raise unless output.include?('Connection refused') or output.include?('resolve host')
     end
 
-    context "with a fast,local repository" do
-      before do
-        write 'Vendorfile', "folder 'its_recursive', '../../.git'"
-        run
-      end
-
-      it "can download" do
-        ls('').should == ["its_recursive", "Vendorfile"]
-        read('its_recursive/Gemfile').should include('rake')
-      end
+    it "can download from local" do
+      vendorer
+      ls('').should == ["its_recursive", "Vendorfile"]
+      read('its_recursive/Gemfile').should include('rake')
+    end
 
-      it "does not keep .git folder so everything can be checked in" do
-        ls('its_recursive/.git').first.should include('cannot access')
-      end
+    it "does not keep .git folder so everything can be checked in" do
+      vendorer
+      ls('its_recursive/.git').first.should include('cannot access')
+    end
 
-      it "does not update an existing folder" do
-        write('its_recursive/Gemfile', 'Foo')
-        run
-        read('its_recursive/Gemfile').should == 'Foo'
-      end
+    it "does not update an existing folder" do
+      vendorer
+      write('its_recursive/Gemfile', 'Foo')
+      vendorer
+      read('its_recursive/Gemfile').should == 'Foo'
+    end
 
-      it "can update a folder" do
+    describe 'update' do
+      it "updates a folder" do
+        vendorer
         write('its_recursive/Gemfile', 'Foo')
-        run 'update'
+        vendorer 'update'
         read('its_recursive/Gemfile').should include('rake')
       end
 
-      it "can update a single file" do
+      it "can update a specific folder" do
         write 'Vendorfile', "
           folder 'its_recursive', '../../.git'
           folder 'its_really_recursive', '../../.git'
         "
-        run
+        vendorer
         write('its_recursive/Gemfile', 'Foo')
         write('its_really_recursive/Gemfile', 'Foo')
-        run 'update its_recursive'
+        vendorer 'update its_recursive'
         size('its_really_recursive/Gemfile').should == 3
         size('its_recursive/Gemfile').should > 30
       end
@@ -180,37 +214,100 @@ describe Vendorer do
     describe "git options" do
       it "can checkout by :ref" do
         write 'Vendorfile', "folder 'its_recursive', '../../.git', :ref => 'b1e6460'"
-        run
+        vendorer
         read('its_recursive/Readme.md').should include('CODE EXAMPLE')
       end
 
       it "can checkout by :branch" do
         write 'Vendorfile', "folder 'its_recursive', '../../.git', :branch => 'b1e6460'"
-        run
+        vendorer
         read('its_recursive/Readme.md').should include('CODE EXAMPLE')
       end
 
       it "can checkout by :tag" do
         write 'Vendorfile', "folder 'its_recursive', '../../.git', :tag => 'b1e6460'"
-        run
+        vendorer
         read('its_recursive/Readme.md').should include('CODE EXAMPLE')
       end
     end
 
-    context "with a passed block" do
+    context "with an execute after update block" do
       before do
         write 'Vendorfile', "folder('its_recursive', '../../.git'){|path| puts 'THE PATH IS ' + path }"
         @output = 'THE PATH IS its_recursive'
       end
 
       it "runs the block after update" do
-        run.should include(@output)
+        vendorer.should include(@output)
       end
 
       it "does not run the block when not updating" do
-        run
-        run.should_not include(@output)
+        vendorer
+        vendorer.should_not include(@output)
+      end
+    end
+
+    context "with folder scoping" do
+      before do
+        write 'Vendorfile', "
+        folder 'public/javascripts' do
+          file 'jquery.js', 'http://code.jquery.com/jquery-latest.min.js'
+        end
+      "
+      end
+
+      it "can download a nested file" do
+        vendorer
+        read('public/javascripts/jquery.js').should include('jQuery')
+      end
+
+      it "can update a nested file" do
+        vendorer
+        write('public/javascripts/jquery.js','Foo')
+        vendorer 'update'
+        read('public/javascripts/jquery.js').should include('jQuery')
+      end
+
+      it "can update a whole folder" do
+        write 'Vendorfile', "
+        folder 'public/javascripts' do
+          file 'jquery.js', 'http://code.jquery.com/jquery-latest.min.js'
+        end
+        file 'xxx.js', 'http://code.jquery.com/jquery-latest.min.js'
+        "
+        vendorer
+        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')
+      end
+
+      it "can be nested multiple times" do
+        write 'Vendorfile', "
+        folder 'public' do
+          folder 'javascripts' do
+            file 'jquery.js', 'http://code.jquery.com/jquery-latest.min.js'
+          end
+        end
+        "
+        vendorer
+        read('public/javascripts/jquery.js').should include('jQuery')
+      end
+    end
+  end
+
+  describe 'rewrite' do
+    it "can rewrite a file to change stuff" do
+      write "Vendorfile", "
+      file 'public/javascripts/jquery.min.js', 'http://code.jquery.com/jquery-latest.min.js' do |path|
+        rewrite(path){|content| content.gsub('j','h') }
       end
+      "
+      vendorer
+      content = read('public/javascripts/jquery.min.js')[0..100]
+      content.should_not include('jQuery')
+      content.should include('hQuery')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendorer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 Z
+date: 2011-12-20 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: -442641517
+      hash: 138779027
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -442641517
+      hash: 138779027
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10