vendorificator 0.3.0 → 0.4.0

data/lib/vendorificator/version.rb

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

data/lib/vendorificator.rb

@@ -5,9 +5,11 @@ require "vendorificator/version"
 require 'vendorificator/config'
 require 'vendorificator/environment'
 require 'vendorificator/errors'
+require 'vendorificator/commit'
 
 require 'vendorificator/vendor'
 require 'vendorificator/vendor/download'
 require 'vendorificator/vendor/archive'
 require 'vendorificator/vendor/git'
 require 'vendorificator/vendor/chef_cookbook'
+require 'vendorificator/vendor/tool'

data/spec/spec_helper.rb

@@ -2,18 +2,24 @@ require 'rubygems'
 require 'bundler/setup'
 Bundler.setup
 
-require 'minitest/spec'
 require 'minitest/autorun'
 require 'vcr'
 require 'mocha/setup'
 require 'wrong'
-require 'wrong/adapters/minitest'
 
-begin
-  require 'minitest/ansi'
-rescue LoadError                # that's fine, we'll live without it
-else
-  MiniTest::ANSI.use! if STDOUT.tty?
+module Vendorificator
+  module Spec
+    module Helpers
+      module Wrong
+        include ::Wrong::Assert
+        include ::Wrong::Helpers
+
+        def increment_assertion_count
+          self.assertions += 1
+        end
+      end
+    end
+  end
 end
 
 if ENV['COVERAGE']
@@ -35,8 +41,12 @@ VCR.configure do |config|
 end
 
 class MiniTest::Spec
+  include Vendorificator::Spec::Helpers::Wrong
+
   before do
-    Vendorificator::Environment.any_instance.stubs(:git).returns(stub)
+    _git = stub
+    _git.stubs(:capturing).returns(stub)
+    Vendorificator::Environment.any_instance.stubs(:git).returns(_git)
   end
 
   def conf

data/spec/vendorificator/config_spec.rb

@@ -60,5 +60,12 @@ module Vendorificator
         assert { includes_method? config, :remotes }
       end
     end
+
+    describe 'metadata' do
+      it 'can be set by user' do
+        config.annotate :foo, :bar
+        assert { config.metadata[:foo] == :bar }
+      end
+    end
   end
 end

data/spec/vendorificator/environment_spec.rb

@@ -77,5 +77,26 @@ module Vendorificator
       end
     end
 
+    describe '#metadata_snapshot' do
+      before do
+        environment.git.capturing.stubs(:rev_parse).with({:abbrev_ref => true}, 'HEAD').returns("current_branch\n")
+        environment.git.capturing.stubs(:rev_parse).with('HEAD').returns("123456\n")
+        environment.git.capturing.stubs(:describe).returns("git description\n")
+        @metadata = environment.metadata_snapshot
+      end
+
+      it 'contains vendorificator version information' do
+        assert { @metadata.keys.include? :vendorificator_version }
+      end
+
+      it 'contains current branch information' do
+        assert { @metadata[:current_branch] == 'current_branch' }
+        assert { @metadata[:current_sha] == '123456' }
+      end
+
+      it 'contains git describe information' do
+        assert { @metadata[:git_describe] == 'git description' }
+      end
+    end
   end
 end

data/spec/vendorificator/vendor/git_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Vendorificator
+  describe Vendor::Git do
+
+    describe '#metadata' do
+      before do
+        @vendor = Vendor::Git.new(basic_environment,
+          'git://github.com/mpasternacki/nagios.git'
+        )
+        @vendor.stubs(:version).returns('0.23')
+      end
+
+      let(:metadata) { @vendor.metadata }
+
+      it 'contains the repository url' do
+        assert { metadata[:parsed_args][:repository] =~ /mpasternacki\/nagios\.git/ }
+      end
+    end
+
+  end
+end
+

data/spec/vendorificator/vendor_spec.rb

@@ -54,6 +54,35 @@ module Vendorificator
       end
     end
 
+    describe '#metadata' do
+      before do
+        @vendor = Vendor.new(basic_environment, 'name_test',
+          :category => 'cat_test', :test_arg => 'test_value'
+        )
+        @vendor.stubs(:version).returns('0.23')
+      end
+
+      it 'contains the module version' do
+        assert { @vendor.metadata[:module_version] == '0.23' }
+      end
+
+      it 'contains the category' do
+        assert { @vendor.metadata[:module_category] == 'cat_test' }
+      end
+
+      it 'contains the name' do
+        assert { @vendor.metadata[:module_name] == 'name_test' }
+      end
+
+      it 'contains the parsed arguments' do
+        assert { @vendor.metadata[:parsed_args].keys.include? :test_arg }
+      end
+
+      it 'contains the unparsed arguments' do
+        assert { @vendor.metadata[:unparsed_args].keys.include? :category }
+      end
+    end
+
     describe '#initialize' do
       it 'adds hooks when you pass a module option' do
         vendor = Vendor.new(basic_environment, 'test', {:hooks => Hooks::FooHook})
@@ -65,6 +94,45 @@ module Vendorificator
         assert { includes_method? vendor, :foo_hooked_method }
       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
+      end
+
+      let(:environment) do
+        Environment.new do
+          vendor :nginx, :category => :cookbooks
+          vendor :nginx_simplecgi, :category => :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
   end
 
   module Hooks

data/vendorificator.gemspec

@@ -1,6 +1,9 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/vendorificator/version', __FILE__)
 
+is_jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+is_1_9_plus = defined?(RUBY_VERSION) && RUBY_VERSION.to_f >= 1.9
+
 Gem::Specification.new do |gem|
   gem.authors       = ["Maciej Pasternacki"]
   gem.email         = ["maciej@pasternacki.net"]
@@ -18,14 +21,17 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'escape'
   gem.add_dependency 'thor', '>= 0.18.1'
   gem.add_dependency 'minigit', '>= 0.0.3'
+  gem.add_dependency 'awesome_print'
 
   gem.add_development_dependency 'aruba', '0.5.1'
-  gem.add_development_dependency 'cucumber'
-  gem.add_development_dependency 'mocha'
-  gem.add_development_dependency 'chef', '>= 10.16.0' unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  gem.add_development_dependency 'cucumber', '~> 2.0'
+  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 'rake'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'minitest', '~> 5.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendorificator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.16.0
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +235,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 description: Vendor everything. Stay sane.
 email:
 - maciej@pasternacki.net
@@ -225,6 +273,7 @@ files:
 - examples/Vendorfile
 - features/chef_cookbook.feature
 - features/deprecated.feature
+- features/download.feature
 - features/edgecases.feature
 - features/environment.feature
 - features/fixtures/git/testrepo/HEAD
@@ -248,6 +297,25 @@ files:
 - features/fixtures/git/testrepo/refs/heads/.sentinel
 - features/fixtures/git/testrepo/refs/tags/.sentinel
 - features/fixtures/git/testrepo/refs/tags/email-v0
+- features/fixtures/rubygems/.gitignore
+- features/fixtures/rubygems/Marshal.4.8
+- features/fixtures/rubygems/Marshal.4.8.Z
+- features/fixtures/rubygems/Rakefile
+- features/fixtures/rubygems/gems/first-0.gem
+- features/fixtures/rubygems/gems/hello-0.0.1.gem
+- features/fixtures/rubygems/gems/second-0.gem
+- features/fixtures/rubygems/latest_specs.4.8
+- features/fixtures/rubygems/latest_specs.4.8.gz
+- features/fixtures/rubygems/prerelease_specs.4.8
+- features/fixtures/rubygems/prerelease_specs.4.8.gz
+- features/fixtures/rubygems/quick/Marshal.4.8/first-0.gemspec.rz
+- features/fixtures/rubygems/quick/Marshal.4.8/hello-0.0.1.gemspec.rz
+- features/fixtures/rubygems/quick/Marshal.4.8/second-0.gemspec.rz
+- features/fixtures/rubygems/specs.4.8
+- features/fixtures/rubygems/specs.4.8.gz
+- features/fixtures/rubygems/src/README.md
+- features/fixtures/rubygems/src/first.gemspec
+- features/fixtures/rubygems/src/second.gemspec
 - features/fixtures/vcr/vendorificator.yml
 - features/git.feature
 - features/needed.feature
@@ -263,9 +331,12 @@ files:
 - features/support/transform_pattern.rb
 - features/tarball.feature
 - features/tarball_edit.feature
+- features/tool.feature
+- features/tool_shortcuts.feature
 - features/vendor.feature
 - lib/vendorificator.rb
 - lib/vendorificator/cli.rb
+- lib/vendorificator/commit.rb
 - lib/vendorificator/config.rb
 - lib/vendorificator/environment.rb
 - lib/vendorificator/errors.rb
@@ -275,6 +346,7 @@ files:
 - lib/vendorificator/vendor/chef_cookbook.rb
 - lib/vendorificator/vendor/download.rb
 - lib/vendorificator/vendor/git.rb
+- lib/vendorificator/vendor/tool.rb
 - lib/vendorificator/version.rb
 - spec/smoke_spec.rb
 - spec/spec_helper.rb
@@ -283,6 +355,7 @@ files:
 - 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
 - vendorificator.gemspec
 homepage: https://github.com/3ofcoins/vendorificator/
@@ -297,12 +370,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -228954601075819929
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -228954601075819929
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -312,6 +391,7 @@ summary: Integrate third-party vendor modules into your git repository
 test_files:
 - features/chef_cookbook.feature
 - features/deprecated.feature
+- features/download.feature
 - features/edgecases.feature
 - features/environment.feature
 - features/fixtures/git/testrepo/HEAD
@@ -335,6 +415,25 @@ test_files:
 - features/fixtures/git/testrepo/refs/heads/.sentinel
 - features/fixtures/git/testrepo/refs/tags/.sentinel
 - features/fixtures/git/testrepo/refs/tags/email-v0
+- features/fixtures/rubygems/.gitignore
+- features/fixtures/rubygems/Marshal.4.8
+- features/fixtures/rubygems/Marshal.4.8.Z
+- features/fixtures/rubygems/Rakefile
+- features/fixtures/rubygems/gems/first-0.gem
+- features/fixtures/rubygems/gems/hello-0.0.1.gem
+- features/fixtures/rubygems/gems/second-0.gem
+- features/fixtures/rubygems/latest_specs.4.8
+- features/fixtures/rubygems/latest_specs.4.8.gz
+- features/fixtures/rubygems/prerelease_specs.4.8
+- features/fixtures/rubygems/prerelease_specs.4.8.gz
+- features/fixtures/rubygems/quick/Marshal.4.8/first-0.gemspec.rz
+- features/fixtures/rubygems/quick/Marshal.4.8/hello-0.0.1.gemspec.rz
+- features/fixtures/rubygems/quick/Marshal.4.8/second-0.gemspec.rz
+- features/fixtures/rubygems/specs.4.8
+- features/fixtures/rubygems/specs.4.8.gz
+- features/fixtures/rubygems/src/README.md
+- features/fixtures/rubygems/src/first.gemspec
+- features/fixtures/rubygems/src/second.gemspec
 - features/fixtures/vcr/vendorificator.yml
 - features/git.feature
 - features/needed.feature
@@ -350,6 +449,8 @@ test_files:
 - features/support/transform_pattern.rb
 - features/tarball.feature
 - features/tarball_edit.feature
+- features/tool.feature
+- features/tool_shortcuts.feature
 - features/vendor.feature
 - spec/smoke_spec.rb
 - spec/spec_helper.rb
@@ -358,5 +459,5 @@ test_files:
 - 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
-has_rdoc: