vendorer 0.1.9 → 0.1.10

data/Gemfile.lock

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

data/lib/vendorer/version.rb

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

data/lib/vendorer.rb

@@ -7,7 +7,7 @@ class Vendorer
   end
 
   def parse(content)
-    eval(content)
+    eval(content, nil, 'Vendorfile', 1)
   end
 
   def file(path, url)
@@ -82,6 +82,6 @@ class Vendorer
   end
 
   def complete_path(path)
-    (@sub_path + [path]).join('/')
+    File.join(@sub_path + [path])
   end
 end

data/spec/vendorer_spec.rb

@@ -186,6 +186,14 @@ describe Vendorer do
       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"]
+      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')
@@ -303,6 +311,13 @@ describe Vendorer do
         vendorer
         read('public/javascripts/jquery.js').should include('jQuery')
       end
+
+      it "can handle trailing slash" do
+        write 'Vendorfile', read('Vendorfile').sub("javascripts' do", "javascripts/' do")
+        output = vendorer
+        read('public/javascripts/jquery.js').should include('jQuery')
+        output.should_not include('//')
+      end
     end
 
     context "submodules" do
@@ -381,6 +396,12 @@ describe Vendorer do
       v.parse '$test = self'
       $test.should == v
     end
+
+    it "fails with a nice backtrace" do
+      write 'Vendorfile', "\n\nfile 'XXX'\n\n"
+      output = vendorer '', :raise => true
+      output.should include("from Vendorfile:3:in `parse")
+    end
   end
 
   describe "#init" do
@@ -389,29 +410,35 @@ describe Vendorer do
       read("Vendorfile").should include("folder")
     end
 
-    it "creates a Vendorfile via ruby" do
-      Vendorer.new('init').init
-      read("Vendorfile").should include("folder")
-    end
+    context "from ruby" do
+      before do
+        Dir.chdir '../../' if RUBY_VERSION < '1.9'
+      end
 
-    it "created Vendorfile contains commented out examples" do
-      Vendorer.new('init').init
-      read("Vendorfile").split("\n").each{|l| l.should =~ /^(#|\s*$)/ }
-    end
+      it "creates a Vendorfile via ruby" do
+        Vendorer.new('init').init
+        read("Vendorfile").should include("folder")
+      end
 
-    it "created Vendorfile contains many examples" do
-      Vendorer.new('init').init
-      read("Vendorfile").should include("folder 'vendor/")
-      read("Vendorfile").should include("file 'vendor/")
-      read("Vendorfile").should include("rewrite(path)")
-    end
+      it "created Vendorfile contains commented out examples" do
+        Vendorer.new('init').init
+        read("Vendorfile").split("\n").each{|l| l.should =~ /^(#|\s*$)/ }
+      end
 
-    it "created Vendorfile does not contain other instructions" do
-      Vendorer.new('init').init
-      read("Vendorfile").should_not include("vendorer init")
-      read("Vendorfile").should_not include("Gemfile")
-      read("Vendorfile").should_not include("gem install")
-      read("Vendorfile").should_not include("```")
+      it "created Vendorfile contains many examples" do
+        Vendorer.new('init').init
+        read("Vendorfile").should include("folder 'vendor/")
+        read("Vendorfile").should include("file 'vendor/")
+        read("Vendorfile").should include("rewrite(path)")
+      end
+
+      it "created Vendorfile does not contain other instructions" do
+        Vendorer.new('init').init
+        read("Vendorfile").should_not include("vendorer init")
+        read("Vendorfile").should_not include("Gemfile")
+        read("Vendorfile").should_not include("gem install")
+        read("Vendorfile").should_not include("```")
+      end
     end
   end
 end

metadata

@@ -1,23 +1,32 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vendorer
-version: !ruby/object:Gem::Version
-  version: 0.1.9
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 10
+  version: 0.1.10
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+
+date: 2012-02-28 00:00:00 Z
 dependencies: []
+
 description: 
 email: michael@grosser.it
-executables:
+executables: 
 - vendorer
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -30,34 +39,37 @@ 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -844902927
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -844902927
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Keep your vendor files up to date
 test_files: []
+