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

data/lib/vendorificator/vendor/tool.rb

@@ -5,7 +5,7 @@ require 'vendorificator/vendor'
 
 module Vendorificator
   class Vendor::Tool < Vendor
-    arg_reader :specs, :command
+    arg_reader :specs, :extras, :command
 
     def before_conjure!
       upstream_version # to cache the version in instance attribute,
@@ -14,31 +14,48 @@ module Vendorificator
     end
 
     def conjure!
-      specs.each do |spec|
-        src = File.join(environment.git.git_work_tree, spec)
-        if File.exist?(src)
-          FileUtils.install File.join(environment.git.git_work_tree, spec),
-                            File.join(git.git_work_tree, spec),
-                            verbose: true
-        end
-      end
       Dir.chdir(git.git_work_tree) do
+        git.checkout(
+          environment.current_branch, '--', specs_in_repo, extras_in_repo
+          ) unless specs_in_repo.empty? && extras_in_repo.empty?
+        git.rm({:cached => true}, extras_in_repo) unless extras_in_repo.empty?
         system self.command or raise RuntimeError, "Command failed"
-      end
-      super
-    end
-
-    def git_add_extra_paths
-      specs.inject(super) do |rv, path|
-        rv << path
+        super
       end
     end
 
     def upstream_version
       @upstream_version ||= git.capturing.
-        log({:n => 1, :pretty => 'format:%ad-%h', :date => 'short'}, *specs).
+        log({:n => 1, :pretty => 'format:%ad-%h', :date => 'short'}, specs_in_repo).
         strip
     end
+
+    private
+
+    def specs_in_repo
+      @spec_in_repo ||= select_by_glob_list(origin_files, specs)
+    end
+
+    def extras_in_repo
+      @extras_in_repo ||= select_by_glob_list(origin_files, extras)
+    end
+
+    def select_by_glob_list(haystack, needles)
+      return [] if !needles || needles.empty?
+      needles = Array(needles)
+      haystack.select do |straw|
+        needles.any? do |needle|
+          File.fnmatch(needle, straw, File::FNM_PATHNAME)
+        end
+      end
+    end
+
+    def origin_files
+      @origin_files ||= git.capturing.
+        ls_tree( {:r => true, :z => true, :name_only => true},
+                 environment.current_branch).
+        split("\0")
+    end
   end
 
   class Config
@@ -52,12 +69,12 @@ module Vendorificator
            &block
     end
 
-    def chef_berkshelf(&block)
-      tool 'cookbooks',
-           :path => 'cookbooks',
-           :specs => [ 'Berksfile', 'Berksfile.lock' ],
-           :command => 'berks install --path vendor/cookbooks',
-           &block
+    def chef_berkshelf(args={}, &block)
+      args[:path] ||= 'cookbooks'
+      args[:specs] ||= []
+      args[:specs] |= [ 'Berksfile', 'Berksfile.lock' ]
+      args[:command] = "berks install --path vendor/#{args[:path]}"
+      tool 'cookbooks', args, &block
     end
   end
 end

data/lib/vendorificator/version.rb

@@ -1,3 +1,3 @@
 module Vendorificator
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/vendorificator/config_spec.rb

@@ -67,5 +67,71 @@ module Vendorificator
         assert { config.metadata[:foo] == :bar }
       end
     end
+
+    describe '#overlay' do
+      let(:environment) do
+        env = Environment.new(Thor::Shell::Basic.new, :quiet,
+          'spec/vendorificator/fixtures/vendorfiles/overlay.rb'
+        )
+        env.load_vendorfile
+
+        env
+      end
+
+      it 'assigns an overlay instance to all segments in the block' do
+        overlay = environment.segments.first
+        assert { overlay.segments.size > 1 }
+        overlay.each_segment do |seg|
+          assert { seg.overlay != nil }
+        end
+      end
+
+      it 'assigns the same overlay instance to all segments in the block' do
+        overlay = environment.segments.first
+        assert { overlay.segments.size > 1 }
+        overlay.each_segment do |vendor|
+          assert { vendor.overlay == overlay }
+        end
+      end
+    end
+
+    describe 'fake_mode?' do
+      it 'returns false when config not set' do
+        MiniGit::Capturing.stubs(:git).with(:config, 'vendorificator.stub').raises(MiniGit::GitError)
+        assert { config.fake_mode? == false }
+      end
+
+      it 'returns true when set to any truish value' do
+        stub_fake_mode 'any_truish_value'
+        assert { config.fake_mode? == true }
+      end
+
+      it 'returns false when set to empty string' do
+        stub_fake_mode ''
+        assert { config.fake_mode? == false }
+      end
+
+      it 'returns false when set to false' do
+        stub_fake_mode 'false'
+        assert { config.fake_mode? == false }
+      end
+
+      it 'returns false when set to no' do
+        stub_fake_mode 'no'
+        assert { config.fake_mode? == false }
+      end
+
+      it 'returns false when set to 0' do
+        stub_fake_mode '0'
+        assert { config.fake_mode? == false }
+      end
+    end
+
+    private
+
+    def stub_fake_mode(value)
+      MiniGit::Capturing.stubs(:git).with(:config, 'vendorificator.stub').
+        returns(value)
+    end
   end
 end

data/spec/vendorificator/environment_spec.rb

@@ -57,7 +57,7 @@ module Vendorificator
       end
 
       it "creates a branch if it doesn't exist" do
-        environment.vendor_instances << stub(
+        environment.segments << stub(
           :branch_name => 'vendor/test', :head => nil,
           :compute_dependencies! => nil
         )
@@ -68,8 +68,8 @@ module Vendorificator
       end
 
       it "handles fast forwardable branches" do
-        environment.vendor_instances << stub(
-          :branch_name => 'vendor/test', :head => '123456', :in_branch => true,
+        environment.segments << stub(
+          :branch_name => 'vendor/test', :head => '123456', :fast_forward => true,
           :name => 'test', :compute_dependencies! => nil
         )
         environment.expects(:fast_forwardable?).returns(true)
@@ -108,16 +108,16 @@ module Vendorificator
       end
     end
 
-    describe '#vendor_instances' do
+    describe '#segments' do
       let(:environment){ Environment.new Thor::Shell::Basic.new, :default, nil }
 
       it 'is initialized on a new environment' do
-        assert { environment.vendor_instances == [] }
+        assert { environment.segments == [] }
       end
 
       it 'allows to add/read instances' do
-        environment.vendor_instances << :foo
-        assert { environment.vendor_instances == [:foo] }
+        environment.segments << :foo
+        assert { environment.segments == [:foo] }
       end
     end
 

data/spec/vendorificator/fixtures/vendorfiles/overlay.rb

@@ -0,0 +1,4 @@
+overlay '/some_subdir' do
+  vendor 'name', :option => 'value'
+  vendor 'other_name', :option => 'other_value'
+end

data/spec/vendorificator/segment/vendor_spec.rb

@@ -0,0 +1,19 @@
+require_relative '../../spec_helper'
+
+module Vendorificator
+  describe Segment::Vendor do
+    describe '#initialize' do
+      let(:segment){ Segment::Vendor.new(overlay: 'test', vendor: 'vendor') }
+
+      it 'assigns overlay' do
+        assert { segment.overlay == 'test' }
+      end
+
+      it 'assigns vendor' do
+        assert { segment.vendor == 'vendor' }
+      end
+    end
+  end
+end
+
+

data/spec/vendorificator/segment_spec.rb

@@ -0,0 +1,106 @@
+require_relative '../spec_helper'
+
+module Vendorificator
+  describe Segment do
+    describe '#work_dir' do
+      it 'includes vendor group' do
+        env = basic_environment
+        env.stubs(:relative_root_dir)
+        env.git.stubs(:git_work_tree)
+        categorized = Vendor.new(env, 'test', group: 'group').segment
+        uncategorized = Vendor.new(env, 'test').segment
+
+        assert { categorized.work_dir.include? 'group' }
+        deny { uncategorized.work_dir.include? 'group' }
+      end
+    end
+
+    describe '#branch_name' do
+      it 'includes vendor group' do
+        uncategorized = Vendor.new(basic_environment, 'test').segment
+        categorized = Vendor.new(basic_environment, 'test', group: 'group').segment
+
+        deny { uncategorized.branch_name.include? 'group' }
+        assert { categorized.branch_name.include? 'group' }
+      end
+    end
+
+    describe '#pushable_refs' do
+      let(:environment) do
+        Environment.new(Thor::Shell::Basic.new) do
+          vendor :nginx, :group => :cookbooks
+          vendor :nginx_simplecgi, :group => :cookbooks
+        end
+      end
+
+      before do
+        environment.git.capturing.stubs(:show_ref).returns <<EOF
+a2745fdf2d7e51f139f9417c5ca045b389fa939f refs/heads/master
+127eb134185e2bf34c79321819b81f8464392d45 refs/heads/vendor/cookbooks/nginx
+0448bfa569d3d94dcb3e485c8da60fdb33d365f6 refs/heads/vendor/cookbooks/nginx_simplecgi
+a2745fdf2d7e51f139f9417c5ca045b389fa939f refs/remotes/origin/master
+127eb134185e2bf34c79321819b81f8464392d45 refs/remotes/origin/vendor/cookbooks/nginx
+0448bfa569d3d94dcb3e485c8da60fdb33d365f6 refs/remotes/origin/vendor/cookbooks/nginx_simplecgi
+e4646a83e6d24322958e1d7a2ed922dae034accd refs/tags/vendor/cookbooks/nginx/1.2.0
+fa0293b914420f59f8eb4c347fb628dcb953aad3 refs/tags/vendor/cookbooks/nginx/1.3.0
+680dee5e56a0d49ba2ae299bb82189b6f2660c9b refs/tags/vendor/cookbooks/nginx_simplecgi/0.1.0
+EOF
+        environment.load_vendorfile
+      end
+
+      it 'includes all own refs' do
+        refs = environment['nginx'].pushable_refs
+        assert { refs.include? 'refs/heads/vendor/cookbooks/nginx' }
+        assert { refs.include? 'refs/tags/vendor/cookbooks/nginx/1.2.0' }
+        assert { refs.include? 'refs/tags/vendor/cookbooks/nginx/1.3.0' }
+
+        refs = environment['nginx_simplecgi'].pushable_refs
+        assert { refs.include? 'refs/heads/vendor/cookbooks/nginx_simplecgi' }
+        assert { refs.include? 'refs/tags/vendor/cookbooks/nginx_simplecgi/0.1.0' }
+      end
+
+      it "doesn't include other modules' refs" do
+        refs = environment['nginx'].pushable_refs
+        deny { refs.include? 'refs/tags/vendor/cookbooks/nginx_simplecgi/0.1.0' }
+      end
+    end
+
+    describe '#included_in_list?' do
+      let(:segment) do
+        Vendor.new(basic_environment, 'test_name', :group => 'test_group').segment
+      end
+
+      it 'finds a module by name' do
+        assert { segment.included_in_list?(['test_name']) }
+      end
+
+      it 'finds a module by qualified name' do
+        assert { segment.included_in_list?(['test_group/test_name']) }
+      end
+
+      it 'finds a module by path' do
+        segment.stubs(:work_dir).returns('./vendor/test_group/test_name')
+
+        assert { segment.included_in_list?(['./vendor/test_group/test_name']) }
+      end
+
+      it 'finds a module by merge commit' do
+        segment.stubs(:merged_base).returns('foobar')
+        segment.stubs(:work_dir).returns('abc/def')
+
+        assert { segment.included_in_list?(['foobar']) }
+      end
+
+      it 'finds a module by branch name' do
+        segment.stubs(:merged_base).returns('abcdef')
+        segment.stubs(:work_dir).returns('abc/def')
+        segment.stubs(:branch_name).returns('foo/bar')
+
+        assert { segment.included_in_list?(['foo/bar']) }
+      end
+
+    end
+
+  end
+end
+

data/spec/vendorificator/vendor_spec.rb

@@ -37,22 +37,6 @@ module Vendorificator
         assert { Vendor::Categorized.new(basic_environment, 'test', :group => nil).group == nil }
       end
 
-      it 'is inserted into paths and other names' do
-        uncategorized = Vendor.new(basic_environment, 'test')
-        categorized   = Vendor.new(basic_environment, 'test', :group => :cat)
-
-        deny { uncategorized.branch_name.include? 'cat' }
-        assert { categorized.branch_name.include? 'cat' }
-
-        deny { uncategorized.path.include? 'cat' }
-        assert { categorized.path.include? 'cat' }
-
-        uncategorized.stubs(:version).returns(:foo)
-        categorized.stubs(:version).returns(:foo)
-        deny { uncategorized.tag_name.include? 'cat' }
-        assert { categorized.tag_name.include? 'cat' }
-      end
-
       it 'accepts a deprecated :category option' do
         vendor = Vendor.new(basic_environment, 'test', :category => 'foo')
 
@@ -101,79 +85,6 @@ module Vendorificator
       end
     end
 
-    describe '#pushable_refs' do
-      before do
-        environment.git.capturing.stubs(:show_ref).returns <<EOF
-a2745fdf2d7e51f139f9417c5ca045b389fa939f refs/heads/master
-127eb134185e2bf34c79321819b81f8464392d45 refs/heads/vendor/cookbooks/nginx
-0448bfa569d3d94dcb3e485c8da60fdb33d365f6 refs/heads/vendor/cookbooks/nginx_simplecgi
-a2745fdf2d7e51f139f9417c5ca045b389fa939f refs/remotes/origin/master
-127eb134185e2bf34c79321819b81f8464392d45 refs/remotes/origin/vendor/cookbooks/nginx
-0448bfa569d3d94dcb3e485c8da60fdb33d365f6 refs/remotes/origin/vendor/cookbooks/nginx_simplecgi
-e4646a83e6d24322958e1d7a2ed922dae034accd refs/tags/vendor/cookbooks/nginx/1.2.0
-fa0293b914420f59f8eb4c347fb628dcb953aad3 refs/tags/vendor/cookbooks/nginx/1.3.0
-680dee5e56a0d49ba2ae299bb82189b6f2660c9b refs/tags/vendor/cookbooks/nginx_simplecgi/0.1.0
-EOF
-        environment.load_vendorfile
-      end
-
-      let(:environment) do
-        Environment.new(Thor::Shell::Basic.new) do
-          vendor :nginx, :group => :cookbooks
-          vendor :nginx_simplecgi, :group => :cookbooks
-        end
-      end
-
-      it 'includes all own refs' do
-        refs = environment['nginx'].pushable_refs
-        assert { refs.include? 'refs/heads/vendor/cookbooks/nginx' }
-        assert { refs.include? 'refs/tags/vendor/cookbooks/nginx/1.2.0' }
-        assert { refs.include? 'refs/tags/vendor/cookbooks/nginx/1.3.0' }
-
-        refs = environment['nginx_simplecgi'].pushable_refs
-        assert { refs.include? 'refs/heads/vendor/cookbooks/nginx_simplecgi' }
-        assert { refs.include? 'refs/tags/vendor/cookbooks/nginx_simplecgi/0.1.0' }
-      end
-
-      it "doesn't include other modules' refs" do
-        refs = environment['nginx'].pushable_refs
-        deny { refs.include? 'refs/tags/vendor/cookbooks/nginx_simplecgi/0.1.0' }
-      end
-    end
-
-    describe '#included_in_list?' do
-      let(:vendor) { Vendor.new(basic_environment, 'test_name', :group => 'test_group') }
-
-      it 'finds a module by name' do
-        assert { vendor.included_in_list?(['test_name']) }
-      end
-
-      it 'finds a module by qualified name' do
-        assert { vendor.included_in_list?(['test_group/test_name']) }
-      end
-
-      it 'finds a module by path' do
-        vendor.stubs(:work_dir).returns('./vendor/test_group/test_name')
-
-        assert { vendor.included_in_list?(['./vendor/test_group/test_name']) }
-      end
-
-      it 'finds a module by merge commit' do
-        vendor.stubs(:merged).returns('foobar')
-        vendor.stubs(:work_dir).returns('abc/def')
-
-        assert { vendor.included_in_list?(['foobar']) }
-      end
-
-      it 'finds a module by branch name' do
-        vendor.stubs(:merged).returns('abcdef')
-        vendor.stubs(:work_dir).returns('abc/def')
-
-        vendor.stubs(:branch_name).returns('foo/bar')
-        assert { vendor.included_in_list?(['foo/bar']) }
-      end
-
-    end
   end
 
   module Hooks

data/vendorificator.gemspec

@@ -29,15 +29,15 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'minigit', '>= 0.0.3'
   gem.add_dependency 'awesome_print'
 
-  gem.add_development_dependency 'aruba', '0.5.3'
-  gem.add_development_dependency 'cucumber', '~> 2.0'
+  gem.add_development_dependency 'aruba', '~> 0.5.3'
+  gem.add_development_dependency 'cucumber', '~> 1.3.10'
   gem.add_development_dependency 'mocha', '>= 0.14.0'
-  gem.add_development_dependency 'chef', '>= 10.16.0' unless is_jruby
   gem.add_development_dependency 'berkshelf' unless is_jruby || !is_1_9_plus
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'webmock'
-  gem.add_development_dependency 'wrong', '>= 0.7.0'
+  gem.add_development_dependency 'wrong', '~> 0.7'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'minitest', '~> 5.0.0'
+  gem.add_development_dependency 'tee', '~> 1.0'
+  gem.add_development_dependency 'minitest', '~> 5.2'
 end