vendorificator 0.5.git.v0.4.0.17.g26d50d8 → 0.5.git.v0.4.0.60.g9c35209

data/spec/vendorificator/environment_spec.rb

@@ -2,10 +2,16 @@ require 'spec_helper'
 
 module Vendorificator
   describe Environment do
+    let(:environment) do
+      Environment.new Thor::Shell::Basic.new, :quiet, nil do
+        vendor 'name', :option => 'value'
+        vendor 'other_name', :option => 'other_value'
+      end
+    end
+
     before do
-      MiniGit.any_instance.stubs(:fetch)
+      environment.git.capturing.stubs(:remote).returns("origin\n")
     end
-    let(:environment){ Environment.new 'spec/vendorificator/fixtures/vendorfiles/vendor.rb' }
 
     describe '#clean' do
       it 'returns false for dirty repo' do
@@ -41,31 +47,69 @@ module Vendorificator
     end
 
     describe '#pull' do
+      let(:environment){ Environment.new(Thor::Shell::Basic.new, :quiet, nil){} }
+
+      before do
+        environment.git.expects(:fetch).with('origin')
+        environment.git.expects(:fetch).with({:tags => true}, 'origin')
+        @git_fetch_notes = environment.git.expects(:fetch).with('origin', 'refs/notes/vendor:refs/notes/vendor')
+        environment.git.capturing.stubs(:show_ref).returns("602315 refs/remotes/origin/vendor/test\n")
+      end
+
       it "creates a branch if it doesn't exist" do
-        Environment.any_instance.unstub(:git)
-        environment.git.capturing.stubs(:show_ref).
-          returns("602315 refs/remotes/origin/vendor/test")
-        environment.vendor_instances = [ stub(:branch_name => 'vendor/test', :head => nil)]
+        environment.vendor_instances << stub(
+          :branch_name => 'vendor/test', :head => nil,
+          :compute_dependencies! => nil
+        )
 
         environment.git.expects(:branch).with({:track => true}, 'vendor/test', '602315')
+
         environment.pull('origin')
       end
 
       it "handles fast forwardable branches" do
-        Environment.any_instance.unstub(:git)
-        environment.git.capturing.stubs(:show_ref).
-          returns("602315 refs/remotes/origin/vendor/test")
-        environment.vendor_instances = [stub(
-          :branch_name => 'vendor/test', :head => '123456', :in_branch => true, :name => 'test'
-        )]
-
+        environment.vendor_instances << stub(
+          :branch_name => 'vendor/test', :head => '123456', :in_branch => true,
+          :name => 'test', :compute_dependencies! => nil
+        )
         environment.expects(:fast_forwardable?).returns(true)
+
         environment.pull('origin')
       end
+
+      it "handles git error on fetching empty notes" do
+        @git_fetch_notes.raises(MiniGit::GitError)
+
+        environment.pull('origin')
+      end
+    end
+
+    describe '#push' do
+      let(:environment){ Environment.new(Thor::Shell::Basic.new, :quiet, nil){} }
+
+      it "handles git error on pushing empty notes" do
+        environment.stubs(:ensure_clean!)
+
+        environment.git.capturing.expects(:rev_parse).with({:quiet => true, :verify => true}, 'refs/notes/vendor').raises(MiniGit::GitError)
+        environment.git.expects(:push).with('origin', [])
+        environment.git.stubs(:push).with('origin', :tags => true)
+
+        environment.push(:remote => 'origin')
+      end
+
+      it "pushes note when they exist" do
+        environment.stubs(:ensure_clean!)
+
+        environment.git.capturing.expects(:rev_parse).with({:quiet => true, :verify => true}, 'refs/notes/vendor').returns('abcdef')
+        environment.git.expects(:push).with('origin', ['refs/notes/vendor'])
+        environment.git.stubs(:push).with('origin', :tags => true)
+
+        environment.push(:remote => 'origin')
+      end
     end
 
     describe '#vendor_instances' do
-      let(:environment){ Environment.new 'spec/vendorificator/fixtures/vendorfiles/empty_vendor.rb' }
+      let(:environment){ Environment.new Thor::Shell::Basic.new, :default, nil }
 
       it 'is initialized on a new environment' do
         assert { environment.vendor_instances == [] }
@@ -98,5 +142,6 @@ module Vendorificator
         assert { @metadata[:git_describe] == 'git description' }
       end
     end
+
   end
 end

data/spec/vendorificator/vendor_spec.rb

@@ -1,10 +1,10 @@
 # Note that due to git operations involved, most of the Vendor class is tested
 # with cucumber features instead.
-require 'spec_helper'
+require_relative '../spec_helper'
 
 module Vendorificator
   class Vendor::Categorized < Vendor
-    @category = :test
+    @group = :test
   end
 
   class Vendor::Custom < Vendor
@@ -12,34 +12,34 @@ module Vendorificator
   end
 
   describe Vendor do
-    describe '.category' do
+    describe '.group' do
       it 'defaults to nil' do
-        assert { Vendor.category == nil }
+        assert { Vendor.group == nil }
       end
 
       it 'can be overridden in a subclass' do
-        assert { Vendor::Categorized.category == :test }
+        assert { Vendor::Categorized.group == :test }
       end
     end
 
-    describe '#category' do
+    describe '#group' do
       it 'defaults to class attribute' do
-        assert { Vendor.new(basic_environment, 'test').category == nil }
-        assert { Vendor::Categorized.new(basic_environment, 'test').category == :test }
+        assert { Vendor.new(basic_environment, 'test').group == nil }
+        assert { Vendor::Categorized.new(basic_environment, 'test').group == :test }
       end
 
       it 'can be overriden by option' do
-        assert { Vendor.new(basic_environment, 'test', :category => :foo).category == :foo }
-        assert { Vendor::Categorized.new(basic_environment, 'test', :category => :foo).category == :foo }
+        assert { Vendor.new(basic_environment, 'test', :group => :foo).group == :foo }
+        assert { Vendor::Categorized.new(basic_environment, 'test', :group => :foo).group == :foo }
       end
 
       it 'can be reset to nil by option' do
-        assert { Vendor::Categorized.new(basic_environment, 'test', :category => nil).category == nil }
+        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', :category => :cat)
+        categorized   = Vendor.new(basic_environment, 'test', :group => :cat)
 
         deny { uncategorized.branch_name.include? 'cat' }
         assert { categorized.branch_name.include? 'cat' }
@@ -52,12 +52,18 @@ module Vendorificator
         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')
+
+        assert { vendor.group == 'foo' }
+      end
     end
 
     describe '#metadata' do
       before do
         @vendor = Vendor.new(basic_environment, 'name_test',
-          :category => 'cat_test', :test_arg => 'test_value'
+          :group => 'cat_test', :test_arg => 'test_value'
         )
         @vendor.stubs(:version).returns('0.23')
       end
@@ -66,8 +72,8 @@ module Vendorificator
         assert { @vendor.metadata[:module_version] == '0.23' }
       end
 
-      it 'contains the category' do
-        assert { @vendor.metadata[:module_category] == 'cat_test' }
+      it 'contains the group' do
+        assert { @vendor.metadata[:module_group] == 'cat_test' }
       end
 
       it 'contains the name' do
@@ -79,7 +85,7 @@ module Vendorificator
       end
 
       it 'contains the unparsed arguments' do
-        assert { @vendor.metadata[:unparsed_args].keys.include? :category }
+        assert { @vendor.metadata[:unparsed_args].keys.include? :group }
       end
     end
 
@@ -108,30 +114,65 @@ 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 do
-          vendor :nginx, :category => :cookbooks
-          vendor :nginx_simplecgi, :category => :cookbooks
+        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' }
+        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' }
+        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' }
+        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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vendorificator
 version: !ruby/object:Gem::Version
-  version: 0.5.git.v0.4.0.17.g26d50d8
+  version: 0.5.git.v0.4.0.60.g9c35209
 platform: ruby
 authors:
 - Maciej Pasternacki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -310,6 +310,7 @@ files:
 - lib/vendorificator/environment.rb
 - lib/vendorificator/errors.rb
 - lib/vendorificator/hooks/chef_cookbook.rb
+- lib/vendorificator/io_proxy.rb
 - lib/vendorificator/vendor.rb
 - lib/vendorificator/vendor/archive.rb
 - lib/vendorificator/vendor/chef_cookbook.rb
@@ -321,8 +322,6 @@ files:
 - spec/spec_helper.rb
 - spec/vendorificator/config_spec.rb
 - spec/vendorificator/environment_spec.rb
-- spec/vendorificator/fixtures/vendorfiles/empty_vendor.rb
-- spec/vendorificator/fixtures/vendorfiles/vendor.rb
 - spec/vendorificator/vendor/chef_cookbook_spec.rb
 - spec/vendorificator/vendor/git_spec.rb
 - spec/vendorificator/vendor_spec.rb
@@ -418,8 +417,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/vendorificator/config_spec.rb
 - spec/vendorificator/environment_spec.rb
-- spec/vendorificator/fixtures/vendorfiles/empty_vendor.rb
-- spec/vendorificator/fixtures/vendorfiles/vendor.rb
 - spec/vendorificator/vendor/chef_cookbook_spec.rb
 - spec/vendorificator/vendor/git_spec.rb
 - spec/vendorificator/vendor_spec.rb

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

@@ -1 +0,0 @@
-# Empty vendor file, just for stubbing purposes.

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

@@ -1,15 +0,0 @@
-# Just an example config
-
-vendor 'name', :option => 'value' do
-  # here in the block you code what needs to be done
-  # to get ("conjure") the module. You're already in
-  # the right directory, branch, etc, and what you add to the
-  # current directory will be committed and tagged.
-end
-
-vendor 'other_name', :option => 'other_value' do
-  # here in the block you code what needs to be done
-  # to get ("conjure") the module. You're already in
-  # the right directory, branch, etc, and what you add to the
-  # current directory will be committed and tagged.
-end