vendorificator 0.1.0 → 0.1.1

data/.gitignore

@@ -17,3 +17,4 @@ test/tmp
 test/version_tmp
 tmp
 /.rbx
+/log

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+bundler_args: --without development_workstation
 rvm:
   - 1.8.7
   - 1.9.2

data/Gemfile

@@ -4,7 +4,15 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "rake"
+  gem "ZenTest", "4.8.3"
+  git "git://github.com/mpasternacki/wrong.git",
+      :ref => 'ad025241e5772373264d1bf62168e2bf3780ccf9' do
+    gem 'wrong'
+  end
+  gem 'minitest-ansi'
+end
+
+group :development_workstation do
   gem "pry"
   gem "awesome_print"
   gem "relish"

data/README.md

@@ -40,6 +40,9 @@ subcommands.
 Run `vendor` to see list of subcommands. Run `vendor help _command_`
 to get detailed description of a command.
 
+There is a lightning talk presentation/demo slide deck online at
+https://speakerdeck.com/mpasternacki/vendorificator
+
 ### Commands
 
 Most important commands are listed here; use `vendor help` for more

data/Rakefile

@@ -4,6 +4,7 @@ require "bundler"
 Bundler.setup
 
 require "bundler/gem_tasks"
+require 'rake/testtask'
 
 namespace :relish do
   desc "Publish documentation to Relish"
@@ -16,9 +17,8 @@ begin
   require 'cucumber'
   require 'cucumber/rake/task'
 
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "--format pretty --verbose"
-  end
+  desc 'Run Cucumber features'
+  Cucumber::Rake::Task.new(:features)
 rescue LoadError
   desc 'Cucumber rake task not available'
   task :features do
@@ -26,4 +26,10 @@ rescue LoadError
   end
 end
 
-task :default => :features
+desc "Run Minitest specs"
+Rake::TestTask.new :spec do |task|
+  task.libs << 'spec'
+  task.test_files = FileList['spec/**/*_spec.rb']
+end
+
+task :default => [:spec, :features]

data/cucumber.yml

@@ -0,0 +1,2 @@
+---
+default: --format progress

data/features/support/world_runs.rb

@@ -39,11 +39,14 @@ module Vendorificator
       end
 
       def command_succeeded(print_failed=true)
-        command.error!
-        true
-      rescue Mixlib::ShellOut::ShellCommandFailed
-        print_command_result if print_failed
-        false
+        begin
+          command.error!
+        rescue Mixlib::ShellOut::ShellCommandFailed
+          print_command_result if print_failed
+          false
+        else
+          true
+        end
       end
 
       def command_stdout

data/lib/vendorificator/cli.rb

@@ -33,8 +33,10 @@ module Vendorificator
     end
 
     desc :sync, "Download new or updated vendor files"
+    method_option :update, :type => :boolean, :default => false
     def sync
       ensure_clean_repo!
+      conf[:use_upstream_version] = options[:update]
       Vendorificator::Config.each_module(*modules) do |mod|
         say_status :module, mod.name
         begin
@@ -47,8 +49,10 @@ module Vendorificator
     end
 
     desc "status", "List known vendor modules and their status"
+    method_option :update, :type => :boolean, :default => false
     def status
       say_status 'WARNING', 'Git repository is not clean', :red unless repo.clean?
+      conf[:use_upstream_version] = options[:update]
       Vendorificator::Config.each_module(*modules) do |mod|
         status_line = mod.to_s
 
@@ -136,7 +140,7 @@ EOF
       binding.pry
     end
 
-    def self.start
+    def self.start(*args)
       # Make --git-options always quoted
       if i = ARGV.index('--git-options')
         ARGV[i+1,0] = '--'
@@ -145,15 +149,15 @@ EOF
       if ENV['FIXTURES_DIR']
         require 'vcr'
         VCR.configure do |c|
-          c.cassette_library_dir = File.join(ENV['FIXTURES_DIR'], 'vcr_cassettes')
+          c.cassette_library_dir = File.join(ENV['FIXTURES_DIR'], 'vcr')
           c.default_cassette_options = { :record => :new_episodes }
-          c.hook_into :fakeweb
+          c.hook_into :webmock
         end
         VCR.use_cassette(ENV['VCR_CASSETTE'] || 'vendorificator') do
-          super
+          super(*args)
         end
       else
-        super
+        super(*args)
       end
     end
 

data/lib/vendorificator/vendor.rb

@@ -40,7 +40,7 @@ module Vendorificator
     end
 
     def initialize(name, args={}, &block)
-      @category = args.delete(:category)
+      @category = args.delete(:category) if args.key?(:category)
 
       @name = name
       @args = args
@@ -53,7 +53,11 @@ module Vendorificator
     end
 
     def category
-      @category || self.class.category
+      if instance_variable_defined?(:@category)
+        @category
+      else
+        self.class.category
+      end
     end
 
     def branch_name
@@ -115,7 +119,7 @@ module Vendorificator
     end
 
     def version
-      @args[:version] || merged_version || upstream_version
+      @args[:version] || (!conf[:use_upstream_version] && merged_version) || upstream_version
     end
 
     def upstream_version

data/lib/vendorificator/version.rb

@@ -1,3 +1,3 @@
 module Vendorificator
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/smoke_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+module Vendorificator
+  describe VERSION do
+    it 'is equal to itself' do
+      assert { VERSION == Vendorificator::VERSION }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,56 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.setup
+
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'vcr'
+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?
+end
+
+require 'vendorificator'
+
+VCR.configure do |config|
+  config.cassette_library_dir = 'features/fixtures/vcr'
+  config.default_cassette_options = { :record => :new_episodes }
+  config.hook_into :webmock
+end
+
+Vendorificator::Config[:root_dir] = Pathname.new(__FILE__).dirname
+
+class MiniTest::Spec
+  def conf
+    Vendorificator::Config
+  end
+
+  before :each do
+    @saved_configuration = Marshal.load(Marshal.dump(conf.configuration))
+    @saved_methods = conf.methods
+  end
+
+  after :each do
+    # Remove all new methods defined on Configuration over the run
+    conf[:methods_to_remove!] = conf.methods - @saved_methods
+
+    class << conf
+      Vendorificator::Config[:methods_to_remove!].each do |method_to_remove|
+        remove_method method_to_remove
+      end
+    end
+    assert { conf.methods.sort == @saved_methods.sort }
+
+    # Restore saved configuration
+    conf.configuration = @saved_configuration
+  end
+
+  def vendorfile(&block)
+    Vendorificator::Config.instance_eval &block
+  end
+end

data/spec/vendorificator/vendor_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+module Vendorificator
+  class Vendor::Categorized < Vendor
+    @category = :test
+  end
+
+  class Vendor::Custom < Vendor
+    @method_name = :whatever
+  end
+
+  describe Vendor do
+    describe '.category' do
+      it 'defaults to nil' do
+        assert { Vendor.category == nil }
+      end
+
+      it 'can be overridden in a subclass' do
+        assert { Vendor::Categorized.category == :test }
+      end
+    end
+
+    describe '.install!' do
+      it "creates a method inside Vendorificator::Config" do
+        deny { conf.respond_to?(:categorized) }
+
+        Vendor::Categorized.install!
+        assert { conf.respond_to?(:categorized) }
+      end
+
+      it "uses @method_name for method's name if set" do
+        deny { conf.respond_to?(:custom) }
+        deny { conf.respond_to?(:whatever) }
+
+        Vendor::Custom.install!
+        deny   { conf.respond_to?(:custom) }
+        assert { conf.respond_to?(:whatever) }
+      end
+    end
+
+    describe '#category' do
+      it 'defaults to class attribute' do
+        assert { Vendor.new('test').category == nil }
+        assert { Vendor::Categorized.new('test').category == :test }
+      end
+
+      it 'can be overriden by option' do
+        assert { Vendor.new('test', :category => :foo).category == :foo }
+        assert { Vendor::Categorized.new('test', :category => :foo).category == :foo }
+      end
+
+      it 'can be reset to nil by option' do
+        assert { Vendor::Categorized.new('test', :category => nil).category == nil }
+      end
+
+      it 'is inserted into paths and other names' do
+        uncategorized = Vendor.new('test')
+        categorized   = Vendor.new('test', :category => :cat)
+
+        deny { uncategorized.branch_name.include? 'cat' }
+        assert { categorized.branch_name.include? 'cat' }
+
+        deny { uncategorized.path.include? 'cat' }
+        assert { categorized.path.include? 'cat' }
+
+        deny { uncategorized.tag_name.include? 'cat' }
+        assert { categorized.tag_name.include? 'cat' }
+      end
+    end
+  end
+end

data/vendorificator.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mixlib-shellout'
   gem.add_development_dependency 'chef', '>= 10.16.0'
   gem.add_development_dependency 'vcr'
-  gem.add_development_dependency 'fakeweb'
-  gem.add_development_dependency 'wrong'
+  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'wrong', '>= 0.7.0'
+  gem.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendorificator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -156,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -173,6 +173,22 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wrong
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,6 +220,7 @@ files:
 - Rakefile
 - bin/vendor
 - bin/vendorify
+- cucumber.yml
 - examples/Vendorfile
 - features/chef_cookbook.feature
 - features/deprecated.feature
@@ -226,7 +243,7 @@ files:
 - features/fixtures/git/testrepo/packed-refs
 - features/fixtures/git/testrepo/refs/heads/.sentinel
 - features/fixtures/git/testrepo/refs/tags/.sentinel
-- features/fixtures/vcr_cassettes/vendorificator.yml
+- features/fixtures/vcr/vendorificator.yml
 - features/git.feature
 - features/needed.feature
 - features/smoke.feature
@@ -251,6 +268,9 @@ files:
 - lib/vendorificator/vendor/chef_cookbook.rb
 - lib/vendorificator/vendor/git.rb
 - lib/vendorificator/version.rb
+- spec/smoke_spec.rb
+- spec/spec_helper.rb
+- spec/vendorificator/vendor_spec.rb
 - vendorificator.gemspec
 homepage: https://github.com/3ofcoins/vendorificator/
 licenses: []
@@ -266,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4082258902042132214
+      hash: 1910323854215610577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -275,10 +295,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4082258902042132214
+      hash: 1910323854215610577
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Integrate third-party vendor modules into your git repository
@@ -304,7 +324,7 @@ test_files:
 - features/fixtures/git/testrepo/packed-refs
 - features/fixtures/git/testrepo/refs/heads/.sentinel
 - features/fixtures/git/testrepo/refs/tags/.sentinel
-- features/fixtures/vcr_cassettes/vendorificator.yml
+- features/fixtures/vcr/vendorificator.yml
 - features/git.feature
 - features/needed.feature
 - features/smoke.feature
@@ -319,3 +339,6 @@ test_files:
 - features/tarball.feature
 - features/tarball_edit.feature
 - features/vendor.feature
+- spec/smoke_spec.rb
+- spec/spec_helper.rb
+- spec/vendorificator/vendor_spec.rb