vendorer 0.1.1 → 0.1.2

data/Gemfile.lock

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

data/Readme.md

@@ -1,7 +1,7 @@
-Vendorer keeps your vendor files up to date.
+Vendorer
 
- - updateable AND documented dependencies
- - copy-paste-free
+ - documented dependencies
+ - automatic updates
  - no unwanted/accidental updates
 
 Install
@@ -12,10 +12,10 @@ Install curl and git, then:
 
 Usage
 =====
-Add a Vendorfile to your project root:
+Add a `Vendorfile` to your project root:
 
-    file 'public/javascripts/jquery.min.js' => 'http://code.jquery.com/jquery-latest.min.js'
-    folder 'vendor/plugins/parallel_tests' => 'https://github.com/grosser/parallel_tests.git'
+    file 'public/javascripts/jquery.min.js', 'http://code.jquery.com/jquery-latest.min.js'
+    folder 'vendor/plugins/parallel_tests', 'https://github.com/grosser/parallel_tests.git'
 
 Call `vendorer`
 
@@ -30,6 +30,8 @@ TODO
 ====
  - git branch/commit support
  - `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
+ - block support `folder(....){|folder| `rm -rf "#{folder}/.gitignore"` }`
 
 Author
 ======

data/lib/vendorer/version.rb

@@ -1,3 +1,3 @@
 class Vendorer
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/vendorer.rb

@@ -6,23 +6,19 @@ class Vendorer
 
   private
 
-  def file(options)
-    options.each do |file, url|
-      update_or_not file do
-        run "mkdir -p #{File.dirname(file)}"
-        run "curl '#{url}' -o #{file}"
-        raise "Downloaded empty file" unless File.exist?(file)
-      end
+  def file(path, url)
+    update_or_not path do
+      run "mkdir -p #{File.dirname(path)}"
+      run "curl '#{url}' -o #{path}"
+      raise "Downloaded empty file" unless File.exist?(path)
     end
   end
 
-  def folder(options)
-    options.each do |path, url|
-      update_or_not path do
-        run "mkdir -p #{File.dirname(path)}"
-        run "git clone '#{url}' #{path}"
-        run "rm -rf #{path}/.git"
-      end
+  def folder(path, url)
+    update_or_not path do
+      run "mkdir -p #{File.dirname(path)}"
+      run "git clone '#{url}' #{path}"
+      run "rm -rf #{path}/.git"
     end
   end
 

data/spec/vendorer_spec.rb

@@ -59,7 +59,7 @@ describe Vendorer do
   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'"
+        write 'Vendorfile', "file 'public/javascripts/jquery.min.js', 'http://code.jquery.com/jquery-latest.min.js'"
         run
       end
 
@@ -82,8 +82,8 @@ describe Vendorer do
 
       it "can update a single file" do
         write 'Vendorfile', "
-          file 'public/javascripts/jquery.min.js' => 'http://code.jquery.com/jquery-latest.min.js'
-          file 'public/javascripts/jquery.js' => 'http://code.jquery.com/jquery-latest.js'
+          file 'public/javascripts/jquery.min.js', 'http://code.jquery.com/jquery-latest.min.js'
+          file 'public/javascripts/jquery.js', 'http://code.jquery.com/jquery-latest.js'
         "
         run
         read('public/javascripts/jquery.js').should include('jQuery')
@@ -98,29 +98,31 @@ describe Vendorer do
     end
 
     it "fails with a nice message" do
-      write 'Vendorfile', "file 'xxx.js' => 'http://NOTFOUND'"
+      write 'Vendorfile', "file 'xxx.js', 'http://NOTFOUND'"
       result = run '', :raise => true
-      result.should include('Downloaded empty file')
+      # different errors on travis / local
+      raise result unless result.include?("resolve host 'NOTFOUND'") or result.include?('Downloaded empty file')
     end
   end
 
   describe '.folder' do
     it "can download via hash syntax" do
-      write 'Vendorfile', "folder 'vendor/plugins/parallel_tests' => 'https://github.com/grosser/parallel_tests.git'"
+      write 'Vendorfile', "folder 'vendor/plugins/parallel_tests', 'https://github.com/grosser/parallel_tests.git'"
       run
       ls('vendor/plugins').should == ["parallel_tests"]
       read('vendor/plugins/parallel_tests/Gemfile').should include('parallel')
     end
 
     it "reports errors" do
-      write 'Vendorfile', "folder 'vendor/plugins/parallel_tests' => 'https://blob'"
+      write 'Vendorfile', "folder 'vendor/plugins/parallel_tests', 'https://blob'"
       output = run '', :raise => true
-      output.should include('Connection refused')
+      # 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'"
+        write 'Vendorfile', "folder 'its_recursive', '../../.git'"
         run
       end
 
@@ -147,8 +149,8 @@ describe Vendorer do
 
       it "can update a single file" do
         write 'Vendorfile', "
-          folder 'its_recursive' => '../../.git'
-          folder 'its_really_recursive' => '../../.git'
+          folder 'its_recursive', '../../.git'
+          folder 'its_really_recursive', '../../.git'
         "
         run
         write('its_recursive/Gemfile', 'Foo')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vendorer
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-12 00:00:00 -08:00
+date: 2011-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: []