vendorificator 0.5.3 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWU4MzczODMxMGY1Y2NjZGQ1MWQxMWRhOWM3Y2VmZGQ5Y2NhNDZhOQ==
-  data.tar.gz: !binary |-
-    Yzc5ZWM0ZmQwMjI2YmRiYjRkZGJhN2U2ZDkyYTI3OTg4NzYyNzZjYg==
+SHA1:
+  metadata.gz: 8ffc895a9d38852ab78248d83caf1f8551f6d605
+  data.tar.gz: ea5398c3ad6c7eb2be54603c01d5ee9b5cf23992
 SHA512:
-  metadata.gz: !binary |-
-    NjMxNzIwYzRlY2M2NGFjMjZmNTZhOWU5Y2E0MTMyY2UzNzMyNmViNzdlOTFl
-    MWQwNTkxMjkzN2NlZDNiNjg5NmJiMTJkNDNiY2M4NzUyNDM3ODYwODUyNzA4
-    MTA5YTM1YmE0NmU1ZWVmZDNjMGI1MmIzZTIxOTYyNzczOWM3NDQ=
-  data.tar.gz: !binary |-
-    ZGRkNzQ3ZGI3ZDFmNGY4YTFmMGZiOTY3OGI1OGFkZWNkNWE1ZGNjMjZmNTQw
-    NThiZGZjNDEwOTMyNDVlNGExZTdjYWRhNjVmYmMzZGU4MjMzNjM4N2U3NjUx
-    MThlN2I0ZDdkMDY0MTIxMmQ1NjBlMzU3MDljMzdiOWRkNzAyN2U=
+  metadata.gz: 067d8f2c47caf0f5596378b9aa231febfec4fe1907454dc2a1f257c787f51f49b030718b23f1a04f4985fab5044bda30343ac4af70b816f38bd4ff0b0ae7ef65
+  data.tar.gz: c40b008a5c19afb24953f27ec0d3a355a39be539df8de5d9b7c909389447bbf60b25432453f5c5e39308cdaf8ee11e80bbaa178c1e9d30918e6daaf41b4c663a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 0.6.0
+
+ - Fixed output for many commands
+ - Support Berkshelf 3
+
 ## 0.5.3
 
  - Fixed `vendor pull` from a clone that haven't run vendor commands

data/Gemfile

@@ -11,5 +11,4 @@ end
 group :development_workstation do
   gem "pry"
   gem "awesome_print"
-  gem 'debugger', :platforms => :mri
 end

data/README.md

@@ -258,9 +258,9 @@ Vendorificator. Takes the same arguments as `vendor`, plus:
    won't be committed to the vendor branch together with specs and
    dependencies
 
-Two convenience shortcuts are provided, `rubygems_bundler`, and
-`chef_berkshelf`. They take no arguments. Their definitions are
-examples as well:
+Two convenience shortcuts are provided, `rubygems_bundler`,
+and `chef_berkshelf`. Their definitions are examples
+as well:
 
 ```ruby
 tool 'rubygems', # <- rubygems_bundler
@@ -273,9 +273,20 @@ tool 'rubygems', # <- rubygems_bundler
 tool 'cookbooks', # <- chef_berkshelf
      :path => 'cookbooks',
      :specs => [ 'Berksfile', 'Berksfile.lock' ],
-     :command => 'berks install --path vendor/cookbooks'
+     :command => 'berks vendor vendor/cookbooks'
 ```
 
+`rubygems_bundler` takes no arguments and it passes block to `tool`.
+
+`chef_berkshelf` takes following arguments:
+
+ - `:path` (default: `'cookbooks'`) -- path to save cookbooks
+ - `:specs` (array, always present: `Berksfile` and `Berksfile.lock`)
+   -- files treated as specs (you can specify `metadata.rb` files of your
+   local cookbooks to include their dependencies automatically)
+ - `:berks2` (default: false) -- if set to `true`, use command for
+   Berkshelf 2 (default is Berkshelf 3)
+
 #### overlay
 
 Overlays multiple modules in the same directory, instead of each of them being

data/features/environment.feature

@@ -73,7 +73,7 @@ Scenario: Getting module list
     """
   When I run vendor command "install"
   And I run vendor command "list"
-  Then the last vendor output should match /Module: generated, version: 0.23/
+  Then the last vendor output should match /generated \(0\.23\)/
 
 Scenario: Getting list of outdated modules
   Given a repository with following Vendorfile:

data/features/tool_shortcuts.feature

@@ -29,7 +29,7 @@ Scenario: chef_berkshelf
     """
   And a file named "Berksfile" with:
     """ruby
-    site :opscode
+    source 'https://api.berkshelf.com'
     cookbook 'build-essential'
     """
   And I successfully run `berks install`
@@ -37,8 +37,8 @@ Scenario: chef_berkshelf
   And I successfully run `git commit -m Berksfile`
   When I run vendor command "install"
   Then following has been conjured:
-    | Name         | cookbooks                   |
-    | With file    | build-essential/metadata.rb |
+    | Name      | cookbooks                     |
+    | With file | build-essential/metadata.json |
 
 @berkshelf
 Scenario: postprocessing tool
@@ -50,7 +50,7 @@ Scenario: postprocessing tool
     """
   And a file named "Berksfile" with:
     """ruby
-    site :opscode
+    source 'https://api.berkshelf.com'
     cookbook 'runit'
     """
   And I successfully run `berks install`
@@ -58,7 +58,7 @@ Scenario: postprocessing tool
   And I successfully run `git commit -m Berksfile`
   When I run vendor command "install"
   Then following has been conjured:
-    | Name         | cookbooks                   |
-    | With file    | build-essential/metadata.rb |
-    | With file    | yum/metadata.rb             |
-    | Without file | runit/metadata.rb           |
+    | Name         | cookbooks                     |
+    | With file    | build-essential/metadata.json |
+    | With file    | yum/metadata.json             |
+    | Without file | runit/metadata.json           |

data/lib/vendorificator/environment.rb

@@ -139,7 +139,7 @@ module Vendorificator
       load_vendorfile
 
       each_segment do |mod|
-        shell.say "Module: #{mod.name}, version: #{mod.version}"
+        say :default, "#{mod.name} (#{mod.version})"
       end
     end
 

data/lib/vendorificator/io_proxy.rb

@@ -1,40 +1,28 @@
 require 'stringio'
 
 module Vendorificator
-  class IOProxy < StringIO
+  class IOProxy
     attr_reader :shell
 
     def initialize(shell, verbosity = :default)
       @shell = shell
       @verbosity = verbosity
-
-      super()
-      capture_stdout
     end
 
     def puts(value, verb_level = :default)
       @orig_stdout.puts value if should_speak?(verb_level)
-      super
     end
 
     def say_status(verb_level, *args)
-      write args[0..1].join('  ' * @shell.padding)
       @shell.say_status(*args) if @shell && should_speak?(verb_level)
     end
 
     def say(verb_level, *args)
-      write args[0]
       @shell.say(*args) if @shell && should_speak?(verb_level)
     end
 
     private
 
-    def capture_stdout
-      @orig_stdout = $stdout
-
-      $stdout = self
-    end
-
     def should_speak?(level)
       levels = {:quiet => 1, :default => 2, :chatty => 3, :debug => 9}
       raise "Unknown verbosity level: #{level.inspect}" if levels[level].nil?

data/lib/vendorificator/vendor/tool.rb

@@ -73,7 +73,11 @@ module Vendorificator
       args[:path] ||= 'cookbooks'
       args[:specs] ||= []
       args[:specs] |= [ 'Berksfile', 'Berksfile.lock' ]
-      args[:command] = "berks install --path vendor/#{args[:path]}"
+      if args[:berks2]
+        args[:command] = "berks install --path vendor/#{args[:path]}"
+      else
+        args[:command] = "berks vendor vendor/#{args[:path]}"
+      end
       tool 'cookbooks', args, &block
     end
   end

data/lib/vendorificator/version.rb

@@ -1,3 +1,3 @@
 module Vendorificator
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,223 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: vendorificator
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Maciej Pasternacki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: minigit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wrong
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tee
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
 description: Vendor everything. Stay sane.
@@ -229,8 +229,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -388,17 +388,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Integrate third-party vendor modules into your git repository