vendorificator 0.5.git.v0.4.0.63.g8e9d54d → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTc4NGQ5NzBiMmUyNzA4MGI5MjJhNDNmMmVmMWM0Y2JlZjZkMjlmOQ==
+    YTEyYjlkYjZhZjk4ZjdmOTgzMDRmN2Y1NzZmMTg4YzQ2NTI4NDBiOQ==
   data.tar.gz: !binary |-
-    ZTJmMmY3NGJlZDUwMWQ1YWQ0NzFhZjczYmYyYjE3ZTc2ODc4NWU3Nw==
-!binary "U0hBNTEy":
+    ZjBhOWEzNzQ3NjZlODNkYjI1YjA4NmQ4ZTgyZWYyMjU4MjBjMjQxYQ==
+SHA512:
   metadata.gz: !binary |-
-    ODE3NmJhZTliZmMwMzk1NjQ3M2I5MjRmNjk1NzA1MDI5MWFkZDY0MGQ1MTQy
-    NjA3NTc2ZTNhOWFiZmRlMGFkMjA3ZDFjOTQ0ZTc0MDM0NWFjNjVkOTIzNTc2
-    ZjYyMTA1ODcyMTVmNzY4ODg3MGZhOWI4OWUwYTgwODliZDJkMmY=
+    OGRhOGEwNzExYmNkMWJmYzc4NTMzZjM2Nzc1OWY3ZWYyOTQ4NzUxYzJjMmM4
+    ODMwOWExOTQ3MGJkZjM1MWFiYjBiNzk5YWZmNTI5ZGQ1ZjY2Mzg1ZTJiNTA3
+    OTgzZDM3N2UxMTk5NTI5NGE1ZjIwYmRiOTk1N2IwZDE1Y2YwYWE=
   data.tar.gz: !binary |-
-    YzA5OGQ2NjgzYzY5NGY2MjZiZDRhMDNjNjFiNGY1Y2NhMGU4MTkyYTAyNGZh
-    ZjA0Y2I4OWRiNjkyNjI1N2Q4MTQwMzVjMmE1NmE3MTk2MTg2N2NkMGZkMzEx
-    Nzc4Nzc2YjNiZDA5OWVlZjY1NDM4Y2M3ZmVhZjY3N2ViNDIyOWE=
+    OTFhOGMwZjU4YzA4MzU2MmFkZjEwNTIwYWRkNDU4M2IyOWZlODNkOThkMmU0
+    MDk4M2EyNmM1NDAxMTlmYjE2NzIwYjNiNzk1YzQxZjM1ZTNhMGNkNWQ1NTMy
+    YzcwZWFmODc3ZmQwMWQyOWJlYjkxOTdjZmQwYTY2OGQ2OWViOTA=

data/.travis.yml

@@ -4,9 +4,9 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - jruby-head
-  - rbx-19mode
+  - rbx
 notifications:
   hipchat:
     secure: "bds8WNPnAmnj2ommhDk2JNclAY1Ei/bGeWONRhhKNv1zwrqMvZ7B6M5UapEZ\n6K8z70vFMrdIDEJjzuf+ATYS0BVWKnXCYaofiIfJ7V2hiBm7/xNZ15m2bIrM\nQFIMR/Lrkd+wFA0O8z6SaPjvdEgZC6im4zAAuRq7LpH3NTy6qaA="

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 0.5.0
+
+ - Added overlays
+ - Added fake mode
+ - Tools now check specs from repo rather than copy from original
+   work tree; added tool extras for files that shouldn't be committed
+   to vendor branch.
+ - Better error messages
+ - Improved CLI syntax, verbosity levels
+
 ## 0.4.0
 
  - Dropped support for Ruby 1.8.7

data/Gemfile

@@ -3,21 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in vendorificator.gemspec
 gemspec
 
-group :development do
-  git "git://github.com/sconover/wrong.git",
-      :ref => '0cbc35a07cb63f6f409bb85da6ad7d107bdab021' do
-    gem 'wrong'
-  end
-
-  git "git://github.com/cucumber/cucumber.git",
-      :ref => 'd7452d0a0b7998462e28d10f9d2733947984063d' do
-    gem 'cucumber'
-  end
+platforms :rbx do
+  gem 'racc'
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
 end
 
 group :development_workstation do
   gem "pry"
   gem "awesome_print"
-  gem "relish"
-  gem 'debugger'
+  gem 'debugger', :platforms => :mri
 end

data/README.md

@@ -1,6 +1,6 @@
 # Vendorificator
 
-> **THIS PROGRAM IS STILL IN BETA**, use on your own risk!
+> **THIS PROGRAM IS STILL IN BETA**, use at your own risk!
 
 ## About
 
@@ -254,6 +254,9 @@ Vendorificator. Takes the same arguments as `vendor`, plus:
  * `:command` -- command to run to download files
  * `:specs` -- files specifying what to download; these will be kept
    on the vendor branch together with downloaded dependencies
+ * `:extras` -- files that are needed for the tool to work, but which
+   won't be committed to the vendor branch together with specs and
+   dependencies
 
 Two convenience shortcuts are provided, `rubygems_bundler`, and
 `chef_berkshelf`. They take no arguments. Their definitions are
@@ -273,6 +276,29 @@ tool 'cookbooks', # <- chef_berkshelf
      :command => 'berks install --path vendor/cookbooks'
 ```
 
+#### overlay
+
+Overlays multiple modules in the same directory, instead of each of them being
+conjured in its own.
+
+```ruby
+overlay '/xyzzy' do
+  vendor 'foo', :version => '0.23' do |v|
+    File.open('README.foo', 'w') { |f| f.puts "Hello, foos!" }
+  end
+  vendor 'bar', :version => '0.42' do |v|
+    File.open('README.bar', 'w') { |f| f.puts "Hello, bars!" }
+  end
+end
+```
+
+### Fake Mode
+
+To develop a solution based on Vendorificator without having
+everything committed to a dozen of branches, tagged, and noted, set
+`vendorificator.stub` Git setting to `true`. Then, Vendorificator will
+work live in the main repo, and ignore the output directory in Git.
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -11,13 +11,6 @@ begin
 rescue LoadError
 end
 
-namespace :relish do
-  desc "Publish documentation to Relish"
-  task :push do
-    sh "relish push 3ofcoins/vendorificator"
-  end
-end
-
 task :info do
   sh 'which git'
   sh 'git --version'
@@ -29,9 +22,10 @@ begin
 
   desc 'Run Cucumber features'
   Cucumber::Rake::Task.new(:features) do |t|
-    t.fork = false
+    # t.fork = false
     t.cucumber_opts = %w{--format progress}
     t.cucumber_opts += %w{--tags ~@berkshelf} unless defined?(Berkshelf)
+    t.cucumber_opts += ENV['CUCUMBER_OPTS'].split if ENV['CUCUMBER_OPTS']
   end
 rescue LoadError
   desc 'Cucumber rake task not available'

data/features/chef_cookbook.feature

@@ -7,8 +7,8 @@ Scenario: A single cookbook, without dependencies
     """
   When I run vendor command "install"
   Then following has been conjured:
-    | Name      | cookbooks/apt |
-    | With file | metadata.rb   |
+    | Name      | cookbooks/apt        |
+    | With file | metadata.rb          |
 
 Scenario: Dependency hook
   Given a repository with following Vendorfile:
@@ -28,8 +28,8 @@ Scenario: Ignored dependency
     """
   When I run vendor command "install"
   Then following has been conjured:
-    | Name      | cookbooks/memcached |
-    | With file | metadata.rb         |
+    | Name      | cookbooks/memcached        |
+    | With file | metadata.rb                |
   And following has not been conjured:
     | Name      | cookbooks/runit |
     | With file | metadata.rb     |

data/features/download.feature

@@ -7,7 +7,7 @@ Scenario: just URL as name
     """
   When I run vendor command "install"
   Then following has been conjured:
-    | Name      | testrepo-0.1.tar.gz |
+    | Name      | testrepo-0.1.tar.gz        |
   And there's a git commit note including "ea207a" in "download_checksum"
   And there's a git commit note including "20480" in "download_filesize"
   And there's a git commit note including "test-assets.3ofcoins" in "download_url"

data/features/edgecases.feature

@@ -32,3 +32,18 @@ Scenario: module with a .gitignore file
     whatever
     """
   And git repository is clean
+
+Scenario: Git overlay in root directory
+  Given a repository with following Vendorfile:
+    """ruby
+    overlay '/' do
+      git "file://#{ENV['FIXTURES_DIR']}/git/testrepo"
+    end
+    """
+  When I run vendor command "install"
+  Then following has been conjured:
+    | Name      | testrepo                                 |
+    | Branch    | vendor/overlay/layer/testrepo            |
+    | Version   | 10e9ac58c77bc229d8c59a5b4eb7422916453148 |
+    | With file | test/alias.c                             |
+    | Path      | .                                        |

data/features/environment.feature

@@ -60,8 +60,9 @@ Scenario: Running tasks without Vendorfile where they don't need it
 Scenario: Running tasks without Vendorfile where they need it
   Given a directory named "foo"
   When I cd to "foo"
-  And I run vendor command "pull"
-  Then the last vendor output should match /Vendorfile not found/
+  And I try to run vendor command "pull"
+  Then it fails
+  And the last vendor output should match /Vendorfile not found/
 
 Scenario: Getting module list
   Given a repository with following Vendorfile:

data/features/fake_mode.feature

@@ -0,0 +1,15 @@
+Feature: Fake mode for development.
+
+Scenario: Conjuring a simple module in fake mode works.
+  Given a repository with following Vendorfile:
+    """ruby
+    vendor 'generated', :version => '0.23' do |v|
+      File.open('README', 'w') { |f| f.puts "Hello, World!" }
+    end
+    """
+  When I set the fake mode variable
+  And I run vendor command "install -v 1"
+  Then a file named "README" should exist
+  And tag "vendor/generated/0.23" does not exist
+  And branch "vendor/generated" does not exist
+

data/features/git.feature

@@ -49,10 +49,10 @@ Scenario: Vendorificating a certain tag from a git repo
     """
   When I run vendor command "install"
   Then following has been conjured:
-    | Name         | testrepo     |
-    | Version      | email-v0     |
-    | Without file | README.md    |
-    | With file    | test/alias.c |
+    | Name         | testrepo        |
+    | Version      | email-v0        |
+    | Without file | README.md       |
+    | With file    | test/alias.c    |
   And there's a git log message including "at revision f81247bde4ef7a1c7d280140cc0bcf0b8221a51f"
   And there's a git commit note including "f81247" in "git_revision"
 

data/features/overlay.feature

@@ -0,0 +1,99 @@
+Feature: Overlay usage
+
+Scenario: overlay with a single vendor
+  Given a repository with following Vendorfile:
+    """ruby
+    overlay '/foo' do
+      vendor 'generated', :version => '0.23' do |v|
+        File.open('README', 'w') { |f| f.puts "Hello, World!" }
+      end
+    end
+    """
+  When I run vendor command "install -v 1"
+  Then the following has been conjured:
+    | Name      | generated                          |
+    | Branch    | vendor/overlay/foo/layer/generated |
+    | Version   | 0.23                               |
+    | Path      | foo                                |
+    | With file | README                             |
+  And the file "foo/README" should contain "Hello, World!"
+  And branch "vendor/overlay/foo/layer/generated" exists
+  And branch "vendor/overlay/foo/merged" exists
+  And branch "vendor/generated" does not exist
+  And tag "vendor/overlay/foo/layer/generated/0.23" exists
+  And tag "vendor/generated/0.23" does not exist
+
+Scenario: Overlay in repository root
+  Given a repository with following Vendorfile:
+    """ruby
+    overlay '/' do
+      vendor 'generated', :version => '0.23' do |v|
+        File.open('README.foo', 'w') { |f| f.puts "Hello, World!" }
+      end
+    end
+    """
+  When I run vendor command "install -v 1"
+  Then the following has been conjured:
+    | Name      | generated                      |
+    | Branch    | vendor/overlay/layer/generated |
+    | Version   | 0.23                           |
+    | With file | README.foo                     |
+    | Path      | .                              |
+  And the file "README.foo" should contain "Hello, World!"
+  And branch "vendor/overlay/layer/generated" exists
+  And branch "vendor/generated" does not exist
+  And branch "vendor/overlay/merged" exists
+
+Scenario: overlay with multiple sources
+  Given a repository with following Vendorfile:
+    """ruby
+    overlay '/xyzzy' do
+      vendor 'foo', :version => '0.23' do |v|
+        File.open('README.foo', 'w') { |f| f.puts "Hello, World! -- foo" }
+      end
+      vendor 'bar', :version => '0.42' do |v|
+        File.open('README.bar', 'w') { |f| f.puts "Hello, World! -- bar" }
+      end
+    end
+    """
+  When I run vendor command "install -v 1"
+  Then the following has been conjured:
+    | Name      | foo                            |
+    | Branch    | vendor/overlay/xyzzy/layer/foo |
+    | Version   | 0.23                           |
+    | With file | README.foo                     |
+    | Path      | xyzzy                          |
+  And the following has been conjured:
+    | Name      | bar                            |
+    | Branch    | vendor/overlay/xyzzy/layer/bar |
+    | Version   | 0.42                           |
+    | With file | README.bar                     |
+    | Path      | xyzzy                          |
+  And the file "xyzzy/README.foo" should contain "Hello, World! -- foo"
+  And the file "xyzzy/README.bar" should contain "Hello, World! -- bar"
+  And branch "vendor/overlay/xyzzy/layer/foo" exists
+  And branch "vendor/overlay/xyzzy/layer/bar" exists
+  And branch "vendor/overlay/xyzzy/merged" exists
+  And branch "vendor/foo" does not exist
+  And branch "vendor/bar" does not exist
+
+Scenario: Overlay ID
+  Given a repository with following Vendorfile:
+    """ruby
+    overlay 'base', path: '/special_base_path' do
+      vendor 'generated', :version => '0.23' do |v|
+        File.open('README.foo', 'w') { |f| f.puts "Hello, World!" }
+      end
+    end
+    """
+  When I run vendor command "install -v 1"
+  Then the following has been conjured:
+    | Name      | generated                           |
+    | Branch    | vendor/overlay/base/layer/generated |
+    | Version   | 0.23                                |
+    | With file | README.foo                          |
+    | Path      | special_base_path                   |
+  And the file "special_base_path/README.foo" should contain "Hello, World!"
+  And branch "vendor/overlay/base/layer/generated" exists
+  And branch "vendor/overlay/base/merged" exists
+  And branch "vendor/generated" does not exist

data/features/step_definitions/basic.rb

@@ -30,6 +30,12 @@ Given /^a remote repository$/ do
   run_simple 'git remote add origin ../remote-repository'
 end
 
+When /^I set the fake mode variable$/ do
+  Dir.chdir(current_dir) do
+    MiniGit::Capturing.git :config, 'vendorificator.stub', 'true'
+  end
+end
+
 When /(?:I have following Gemfile|I change Gemfile to|following Gemfile):$/ do |gemfile_contents|
   write_file('Gemfile', gemfile_contents)
   run_simple(without_bundler('bundle'))
@@ -52,3 +58,19 @@ When /^I run vendor command "(.*)"$/ do |args|
     end
   end
 end
+
+Before do
+  @last_vendor_exception = nil
+end
+
+When /^I try to run vendor command "(.*)"$/ do |args|
+  begin
+    step "I run vendor command \"#{args}\""
+  rescue => exc
+    @last_vendor_exception = exc
+  end
+end
+
+Then 'it fails' do
+  assert { !!@last_vendor_exception }
+end

data/features/step_definitions/git.rb

@@ -62,3 +62,19 @@ end
 Then /^notes ref "(.*?)" exists in the remote repo$/ do |ref_name|
   assert { remote_git.note_refs.include?(ref_name) }
 end
+
+def branch_contains?(branch, path)
+  @branch_files ||= {}
+  @branch_files[branch] ||= git.capturing.
+    ls_tree( {:r => true, :z => true, :name_only => true}, branch).
+    split("\0")
+  @branch_files[branch].include?(path)
+end
+
+Then(/^the branch "(.*?)" should contain file "(.*?)"$/) do |branch, path|
+  assert { branch_contains?(branch, path) }
+end
+
+Then(/^the branch "(.*?)" should not contain file "(.*?)"$/) do |branch, path|
+  deny { branch_contains?(branch, path) }
+end

data/features/step_definitions/vendorificator.rb

@@ -1,5 +1,9 @@
 def vendor_path_for(mod, path)
-  File.join('vendor', mod['Path'] || mod['Name'], path)
+  if mod['Path']
+    File.join mod['Path'], path
+  else
+    File.join 'vendor', mod['Name'], path
+  end
 end
 
 Then /^(?:the )?following has( not)? been conjured:$/ do |not_p, table|
@@ -8,12 +12,13 @@ Then /^(?:the )?following has( not)? been conjured:$/ do |not_p, table|
   step "I'm on \"master\" branch"
 
   table.transpose.hashes.each do |mod|
-    step "branch \"vendor/#{mod['Name']}\" #{exists_p}"
+    branch = mod['Branch'] || "vendor/#{mod['Name']}"
+    step "branch \"#{branch}\" #{exists_p}"
 
     if mod['Version']
-      step "tag \"vendor/#{mod['Name']}/#{mod['Version']}\" #{exists_p}"
+      step "tag \"#{branch}/#{mod['Version']}\" #{exists_p}"
     else
-      step "tag matching /^vendor\\/#{Regexp.quote(mod['Name']).gsub('/', '\\/')}\\// #{exists_p}"
+      step "tag matching /^#{Regexp.quote(branch).gsub('/', '\\/')}\\// #{exists_p}"
     end
 
     if mod['With file']

data/features/support/aruba_ext.rb

@@ -1,5 +1,6 @@
 require 'shellwords'
 require 'stringio'
+require 'tee' if ENV['CUCUMBER_DEBUG']
 
 module Vendorificator
   module TestSupport
@@ -29,6 +30,7 @@ module Vendorificator
       def with_redirected_stdout(&block)
         redirect_stdout
         yield
+      ensure
         bring_back_stdout
       end
 
@@ -55,6 +57,8 @@ module Vendorificator
         @orig_stderr = $stderr
         $stdout = @mock_stdout = StringIO.new
         $stderr = @mock_stderr = StringIO.new
+        $stdout = Tee.new(STDOUT, @mock_stdout, :stdout => false) if ENV['CUCUMBER_DEBUG']
+        $stderr = Tee.new(STDERR, @mock_stderr, :stdout => false) if ENV['CUCUMBER_DEBUG']
       end
 
       def bring_back_stdout