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

data/features/support/env.rb

@@ -7,8 +7,11 @@ require 'wrong'
 
 require 'vendorificator/cli'
 
+MiniGit.debug = true if ENV['CUCUMBER_DEBUG']
+
 ENV['GIT_AUTHOR_NAME'] = ENV['GIT_COMMITTER_NAME'] = 'Vendorificator Cucumber'
 ENV['GIT_AUTHOR_EMAIL'] = ENV['GIT_COMMITTER_EMAIL'] = 'nonexistent@example.com'
+ENV['THOR_DEBUG'] = '1'
 
 World(Wrong)
 

data/features/tarball.feature

@@ -62,5 +62,5 @@ Scenario: Tarball without a root directory
     """
   When I run vendor command "install"
   Then following has been conjured:
-    | Name      | testrepo     |
-    | With file | test/alias.c |
+    | Name      | testrepo        |
+    | With file | test/alias.c    |

data/features/tarball_edit.feature

@@ -10,6 +10,6 @@ Scenario:
     """
   When I run vendor command "install"
   Then following has been conjured:
-    | Name         | testrepo       |
-    | With file    | test/alias.c   |
-    | Without file | test/archive.c |
+    | Name         | testrepo        |
+    | With file    | test/alias.c    |
+    | Without file | test/archive.c  |

data/features/tool.feature

@@ -23,7 +23,7 @@ Scenario: Use Gem bundler to download rubygems, and Vendorificator to vendor the
   When I run vendor command "install"
   Then following has been conjured:
     | Name         | bundler         |
-    | Path         | cache           |
+    | Path         | vendor/cache    |
     | With file    | hello-0.0.1.gem |
     | Without file | first-0.gem     |
 
@@ -36,7 +36,7 @@ Scenario: Bundler correctly downloads and caches dependencies
   When I run vendor command "install"
   Then following has been conjured:
     | Name         | bundler         |
-    | Path         | cache           |
+    | Path         | vendor/cache    |
     | Without file | hello-0.0.1.gem |
     | With file    | first-0.gem     |
     | With file    | second-0.gem    |
@@ -50,7 +50,7 @@ Scenario: directory contents are completely replaced on re-vendoring
   When I run vendor command "install"
   Then following has been conjured:
     | Name         | bundler         |
-    | Path         | cache           |
+    | Path         | vendor/cache    |
     | With file    | hello-0.0.1.gem |
     | Without file | first-0.gem     |
   When I change Gemfile to:
@@ -58,10 +58,12 @@ Scenario: directory contents are completely replaced on re-vendoring
     source "file://#{ENV['FIXTURES_DIR']}/rubygems"
     gem "first"
     """
+  And I run `git commit -a -m bump`
   And I run vendor command "install"
   Then following has been conjured:
     | Name         | bundler         |
-    | Path         | cache           |
+    | Path         | vendor/cache    |
     | Without file | hello-0.0.1.gem |
     | With file    | first-0.gem     |
     | With file    | second-0.gem    |
+

data/features/tool_shortcuts.feature

@@ -17,7 +17,7 @@ Scenario: rubygems_bundler
   When I run vendor command "install"
   Then following has been conjured:
     | Name         | rubygems        |
-    | Path         | cache           |
+    | Path         | vendor/cache    |
     | With file    | hello-0.0.1.gem |
     | Without file | first-0.gem     |
 
@@ -38,14 +38,14 @@ Scenario: chef_berkshelf
   When I run vendor command "install"
   Then following has been conjured:
     | Name         | cookbooks                   |
-    | With file    | build-essential/metadata.rb  |
+    | With file    | build-essential/metadata.rb |
 
 @berkshelf
 Scenario: postprocessing tool
   Given a repository with following Vendorfile:
     """ruby
     chef_berkshelf do
-      FileUtils::rm_rf 'runit'
+      FileUtils::rm_rf 'vendor/cookbooks/runit'
     end
     """
   And a file named "Berksfile" with:

data/features/tool_specs.feature

@@ -0,0 +1,62 @@
+Feature: tool's specs can be specified in a flexible way
+
+Scenario Outline:
+  Given a repository with following Vendorfile:
+    """ruby
+    tool 'find', :specs => <specs>,
+         :command => "mkdir -p vendor/find ; find . -type f -not -name found -a -not -path './.git/*' > vendor/find/found"
+    """
+  Given an empty file named "<file1>"
+  Given an empty file named "<file2>"
+  Given an empty file named "<file3>"
+  Given I run `git add .`
+  Given I run `git commit -m add`
+  Given an empty file named "untracked.txt"
+  When I run vendor command "install"
+  Then following has been conjured:
+    | Name      | find        |
+    | Path      | vendor/find |
+    | With file | found       |
+  And the file "vendor/find/found" should match <matches>
+  And the file "vendor/find/found" should not match <doesnt_match>
+
+  Examples:
+    | specs              | file1   | file2       | file3           | matches    | doesnt_match     |
+    | '*.txt'            | foo.txt | bar.txt     | baz.py          | /foo\.txt/ | /baz\.py/        |
+    | '*.txt'            | foo.txt | bar.txt     | baz.py          | /bar\.txt/ | /baz\.py/        |
+    | '*.txt'            | foo.txt | bar.txt     | baz.py          | /bar\.txt/ | /untracked\.txt/ |
+    | ['*.txt', '*.py' ] | foo.txt | bar.py      | baz.rb          | /foo\.txt/ | /baz\.rb/        |
+    | ['*.txt', '*.py' ] | foo.txt | bar.py      | baz.rb          | /bar\.py/  | /baz\.rb/        |
+    | '**/*.txt'         | foo.txt | foo/bar.txt | foo/bar/baz.txt | /foo\.txt/ | /xxx/            |
+    | '**/*.txt'         | foo.txt | foo/bar.txt | foo/bar/baz.txt | /bar\.txt/ | /xxx/            |
+    | '**/*.txt'         | foo.txt | foo/bar.txt | foo/bar/baz.txt | /baz\.txt/ | /xxx/            |
+
+Scenario: tool can be provided with extras that are not committed to segment
+  Given a repository with following Vendorfile:
+    """ruby
+    tool 'find',
+         :specs => '*.spec',
+         :extras => '*.txt',
+         :command => "mkdir -p vendor/find ; find . -type f -not -name found -a -not -path './.git/*' > vendor/find/found"
+    """
+  Given an empty file named "foo.spec"
+  And an empty file named "bar.txt"
+  And an empty file named "baz.py"
+  Given I run `git add .`
+  And I run `git commit -m add`
+  Given an empty file named "untracked.txt"
+  And an empty file named "untracked.spec"
+  When I run vendor command "install"
+  Then following has been conjured:
+    | Name      | find        |
+    | Path      | vendor/find |
+    | With file | found       |
+  And the file "vendor/find/found" should contain "foo.spec"
+  And the file "vendor/find/found" should contain "bar.txt"
+  And the file "vendor/find/found" should not contain "baz.py"
+  And the file "vendor/find/found" should not contain "untracked.txt"
+  And the file "vendor/find/found" should not contain "untracked.spec"
+  And the branch "vendor/find" should contain file "foo.spec"
+  And the branch "vendor/find" should not contain file "bar.txt"
+  And the branch "vendor/find" should not contain file "untracked.txt"
+  And the branch "vendor/find" should not contain file "untracked.spec"

data/features/vendor.feature

@@ -11,9 +11,10 @@ Scenario:
     """
   When I run vendor command "install -v 1"
   Then the following has been conjured:
-    | Name      | generated |
-    | Version   | 0.23      |
-    | With file | README    |
+    | Name      | generated        |
+    | Version   | 0.23             |
+    | With file | README           |
   And the file "vendor/generated/VERSION" should contain "0.23"
   And there's a git commit note including "bar" in "foo"
   And there's a git commit note including "by Przemo" in "module_annotations"
+  And tag "vendor/generated/0.23" exists

data/lib/vendorificator.rb

@@ -1,5 +1,6 @@
-# Require everything except the CLI.
+require 'minigit'
 
+# Require everything except the CLI.
 require "vendorificator/version"
 
 require 'vendorificator/config'
@@ -7,6 +8,7 @@ require 'vendorificator/environment'
 require 'vendorificator/errors'
 require 'vendorificator/commit'
 require 'vendorificator/io_proxy'
+require 'vendorificator/overlay'
 
 require 'vendorificator/vendor'
 require 'vendorificator/vendor/download'
@@ -14,3 +16,7 @@ require 'vendorificator/vendor/archive'
 require 'vendorificator/vendor/git'
 require 'vendorificator/vendor/chef_cookbook'
 require 'vendorificator/vendor/tool'
+
+require 'vendorificator/segment'
+require 'vendorificator/segment/vendor'
+require 'vendorificator/segment/overlay'

data/lib/vendorificator/cli.rb

@@ -15,7 +15,7 @@ require 'vendorificator'
 module Vendorificator
   class CLI < Thor
     VERBOSITY_LEVELS = {1 => :quiet, 2 => :default, 3 => :chatty, 9 => :debug}
-    attr_reader :environment
+    attr_reader :environment, :verbosity
 
     check_unknown_options! :except => [:git, :diff, :log]
     stop_on_unknown_option! :git, :diff, :log
@@ -33,7 +33,7 @@ module Vendorificator
       super
       parse_options
 
-      if self.options[:debug]
+      if verbosity >= 9
         MiniGit.debug = true
       end
 
@@ -44,7 +44,7 @@ module Vendorificator
 
       @environment = Vendorificator::Environment.new(
         shell,
-        VERBOSITY_LEVELS[self.options[:verbose]] || :default,
+        VERBOSITY_LEVELS[verbosity] || :default,
         self.options[:file]
       )
 
@@ -60,7 +60,7 @@ module Vendorificator
     method_option :update, :type => :boolean, :default => false
     def sync
       say_status 'DEPRECATED', 'Using vendor sync is deprecated and will be removed in future versions. Use vendor install or vendor update instead.', :yellow
-      environment.sync options.merge(:modules => modules)
+      environment.sync options.merge(:segments => modules)
     rescue DirtyRepoError
       fail! 'Repository is not clean.'
     rescue MissingVendorfileError
@@ -69,14 +69,14 @@ module Vendorificator
 
     desc :install, "Download and install new or updated vendor files"
     def install(*modules)
-      environment.sync options.merge(:modules => modules)
+      environment.sync options.merge(:segments => modules)
     rescue DirtyRepoError
       fail! 'Repository is not clean.'
     end
 
     desc :update, "Update installed vendor files"
     def update(*modules)
-      environment.sync options.merge(:modules => modules, :update => true)
+      environment.sync options.merge(:segments => modules, :update => true)
     rescue DirtyRepoError
       fail! 'Repository is not clean.'
     end
@@ -90,7 +90,7 @@ module Vendorificator
       say_status 'DEPRECATED', 'Using vendor status is deprecated and will be removed in future versions', :yellow
       say_status 'WARNING', 'Git repository is not clean', :red unless environment.clean?
 
-      environment.each_vendor_instance(*modules) do |mod|
+      environment.each_segment(*modules) do |mod|
         status_line = mod.to_s
 
         updatable = mod.updatable?
@@ -163,7 +163,7 @@ module Vendorificator
 EOF
     def git(command, *args)
       modules, git_options = split_git_options(args)
-      environment.each_vendor_instance(*modules) do |mod|
+      environment.each_segment(*modules) do |mod|
         unless mod.merged
           say_status 'unmerged', mod.to_s, :red
           next
@@ -232,9 +232,10 @@ EOF
         exit
       end
 
-      if options[:verbose] && (!VERBOSITY_LEVELS.keys.include? options[:verbose])
-        fail! "Unknown verbosity level: #{options[:verbose].inspect}"
-      end
+      # figure out verbosity
+      @verbosity = self.options[:verbose].to_i
+      @verbosity = 2 if @verbosity.zero?
+      @verbosity = VERBOSITY_LEVELS.keys.select { |i| i < verbosity }.max unless VERBOSITY_LEVELS[@verbosity]
     end
 
     def split_git_options(args)

data/lib/vendorificator/config.rb

@@ -3,7 +3,7 @@ require 'pathname'
 module Vendorificator
   class Config
     attr_accessor :environment
-    attr_reader :metadata
+    attr_reader :metadata, :overlay_instance
 
     @defaults = {}
     @modules = {}
@@ -34,6 +34,7 @@ module Vendorificator
     end
 
     def initialize(params = {})
+      @fake_mode = check_fake_mode
       @configuration = self.class.defaults.merge(params)
       @metadata = {}
     end
@@ -80,8 +81,38 @@ module Vendorificator
       end
     end
 
+    def overlay(name, options = {}, &block)
+      @overlay_instance = Segment::Overlay.new(
+        environment: environment, overlay_opts: options.merge(name: name)
+      )
+      environment.segments << @overlay_instance
+      yield
+    ensure
+      @overlay_instance = nil
+    end
+
+    # Public: Returns information whether we work in the fake mode.
+    #
+    # Returns true/false.
+    def fake_mode?
+      @fake_mode
+    end
+
     option :basedir, 'vendor'
     option :branch_prefix, 'vendor'
     option :remotes, %w(origin)
+
+    private
+
+    # Private: Check if we should work in the fake mode.
+    #
+    # Returns true/false.
+    def check_fake_mode
+      setting = MiniGit::Capturing.git(:config, 'vendorificator.stub').strip
+      ['', 'false', '0', 'no'].include?(setting) ? false : true
+    rescue MiniGit::GitError
+      false
+    end
+
   end
 end

data/lib/vendorificator/environment.rb

@@ -1,15 +1,14 @@
 require 'pathname'
-require 'minigit'
 require 'awesome_print'
 require 'vendorificator/config'
 
 module Vendorificator
   class Environment
     attr_reader :config
-    attr_accessor :vendor_instances, :io
+    attr_accessor :segments, :io
 
     def initialize(shell, verbosity = :default, vendorfile = nil, &block)
-      @vendor_instances = []
+      @segments = []
       @io = IOProxy.new(shell, verbosity)
       @vendorfile = find_vendorfile(vendorfile)
       @vendor_block = block
@@ -87,7 +86,7 @@ module Vendorificator
         map { |sha, name| name =~ ref_rx ? [$', sha] : nil }.
         compact ]
 
-      each_vendor_instance do |mod|
+      each_segment do |mod|
         ours = mod.head
         theirs = remote_branches[mod.branch_name]
         if theirs
@@ -98,7 +97,7 @@ module Vendorificator
             say_status :default, 'unchanged', mod.branch_name
           elsif fast_forwardable?(theirs, ours)
             say_status :default, 'updated', mod.name, :yellow
-            mod.in_branch { git.merge({:ff_only => true}, theirs) } unless options[:dry_run]
+            mod.fast_forward theirs unless options[:dry_run]
           elsif fast_forwardable?(ours, theirs)
             say_status :default, 'older', mod.branch_name
           else
@@ -119,7 +118,7 @@ module Vendorificator
     def info(mod_name, options = {})
       load_vendorfile
 
-      if vendor = find_vendor_instance_by_name(mod_name)
+      if vendor = find_module_by_name(mod_name)
         say :default, "Module name: #{vendor.name}\n"
         say :default, "Module group: #{vendor.group}\n"
         say :default, "Module merged version: #{vendor.merged_version}\n"
@@ -132,25 +131,25 @@ module Vendorificator
       end
     end
 
-    # Public: Displays info about current modules.
+    # Public: Displays info about current segments.
     #
     # Returns nothing.
     def list
       load_vendorfile
 
-      each_vendor_instance do |mod|
+      each_segment do |mod|
         shell.say "Module: #{mod.name}, version: #{mod.version}"
       end
     end
 
-    # Public: Displays info about outdated modules.
+    # Public: Displays info about outdated segments.
     #
     # Returns nothing.
     def outdated
       load_vendorfile
 
       outdated = []
-      each_vendor_instance do |mod|
+      each_segment do |mod|
         outdated << mod if [:unpulled, :unmerged, :outdated].include? mod.status
       end
 
@@ -168,7 +167,7 @@ module Vendorificator
       ensure_clean!
 
       pushable = []
-      each_vendor_instance { |mod| pushable += mod.pushable_refs }
+      each_segment { |mod| pushable += mod.pushable_refs }
 
       pushable << 'refs/notes/vendor' if has_notes?
 
@@ -178,7 +177,7 @@ module Vendorificator
       end
     end
 
-    # Public: Runs all the vendor modules.
+    # Public: Runs all the vendor segments.
     #
     # options - The Hash of options.
     #
@@ -190,28 +189,25 @@ module Vendorificator
       config[:use_upstream_version] = options[:update]
       metadata = metadata_snapshot
 
-      each_vendor_instance(*options[:modules]) do |mod|
-        say_status :default, :module, mod.name
-        indent do
-          mod.run!(:metadata => metadata)
-        end
+      each_segment(*options[:segments]) do |mod|
+        mod.run!(:metadata => metadata)
       end
     end
 
     # Public: Goes through all the Vendor instances and runs the block
     #
-    # modules - An Array of vendor modules to yield the block for.
+    # segments - An Array of vendor segments to yield the block for.
     #
     # Returns nothing.
-    def each_vendor_instance(*modules)
-      # We don't use @vendor_instances.each here, because Vendor#run! is
+    def each_segment(*segments)
+      # We don't use @segments.each here, because Vendor#run! is
       # explicitly allowed to append to instantiate new dependencies, and #each
       # fails to catch up on some Ruby implementations.
       i = 0
       while true
-        break if i >= @vendor_instances.length
-        mod = @vendor_instances[i]
-        yield mod if modules.empty? || mod.included_in_list?(modules)
+        break if i >= @segments.length
+        mod = @segments[i]
+        yield mod if segments.empty? || mod.included_in_list?(segments)
         i += 1
       end
     end
@@ -247,7 +243,7 @@ module Vendorificator
 
     # Public: Returns module with given name
     def [](name)
-      vendor_instances.find { |v| v.name == name }
+      segments.find { |v| v.name == name }
     end
 
     # Public: Loads the vendorfile.
@@ -263,7 +259,7 @@ module Vendorificator
       end
       @config.instance_eval(&@vendor_block) if @vendor_block
 
-      each_vendor_instance{ |mod| mod.compute_dependencies! }
+      each_segment{ |mod| mod.compute_dependencies! }
 
       @vendorfile_loaded = true
     end
@@ -282,8 +278,8 @@ module Vendorificator
     # mod_name - The String containing the module id.
     #
     # Returns Vendor instance.
-    def find_vendor_instance_by_name(mod_name)
-      each_vendor_instance(mod_name) do |mod|
+    def find_module_by_name(mod_name)
+      each_segment(mod_name) do |mod|
         return mod
       end
       nil