vagrant-berkshelf 1.3.7 → 1.4.0.dev1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1066521ec6181be56b05a4262d6abb11399406c
-  data.tar.gz: 79cb14d052022423b27ec8c5d0efeafd5fc3795e
+  metadata.gz: ab72184e8817a778c14479ba0240b7428e6ca499
+  data.tar.gz: 014174b38d6b5bcbed17974029eaf14a117aa033
 SHA512:
-  metadata.gz: 1e3aa1aa1a2aa4a79de72166e81382e79c7590bf503e21871d87f38bc9a23e24cf6681c21635a7829e8438b713a63da39411ac4172c83740dded8d7dee667599
-  data.tar.gz: ecff6e68824b0d48fbb46a4318796a366b258fd05950fa692ac99b876ab3a3c4fe5af4e445c485e5d8e57f7d56f2409a1ef01fae3dfe98b245e0b5c8c30fab87
+  metadata.gz: 931caa0414264ce23e463c696d5dc6a54a53bae4385f65c6347632437d71510b30adf23dc7580c48df75300b011a26bbdb0469d8dfcefda97efc1598275b2d85
+  data.tar.gz: 3ce49237284d8f3c84de4191b4432da3c25d3dfd2fe2d85e2021c187f1ffa06db6559acdf65ae78dbdb0d0efbf045cf4b0294d36eb1b4924e631fbba1a44a90c

data/.travis.yml

@@ -8,4 +8,5 @@ notifications:
       - "irc.freenode.org#berkshelf"
     skip_join: true
     use_notice: true
+bundler_args: --without doc guard
 script: 'bundle exec thor spec:ci'

data/CHANGELOG.md

@@ -1,13 +1,7 @@
-# 1.3.5
-
-* Relax constraint on SSH to fix Vagrant 1.4 support
-
 # 1.3.4
-
 - Fix undefined constant error when provisioning with Vagrant AWS
 
 # 1.2.0
-
 - Rename to vagrant-berkshelf
 - Trigger the plugin also on `vagrant reload`
 - Check Vagrant version to see if it's supported
@@ -16,15 +10,12 @@
 - Respect --no-provision flag
 
 # 1.1.2
-
 - Support Vagrant 1.2
 - Plugin defaults to enabled, if Berksfile exists.
 
 # 1.1.0
-
 - Plugin defaults to disabled. Set 'config.berkshelf.enabled = true' in Vagrant config
 
 # 1.0.0
-
 - Separated Berkshelf Vagrant plugin into it's own gem (this one)
 - Support Vagrant 1.1.x

data/Gemfile

@@ -3,15 +3,18 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant', github: "mitchellh/vagrant"
+  gem 'vagrant', github: 'mitchellh/vagrant'
+end
+
+group :guard do
   gem 'coolline'
+  gem 'fuubar'
   gem 'guard', '>= 1.5.0'
   gem 'guard-rspec'
   gem 'guard-spork'
   gem 'guard-yard'
   gem 'redcarpet'
   gem 'yard'
-  gem 'fuubar'
 
   require 'rbconfig'
 

data/Thorfile

@@ -4,15 +4,14 @@ $:.push File.expand_path("../lib", __FILE__)
 require 'bundler'
 require 'bundler/setup'
 require 'thor/rake_compat'
-
 require 'berkshelf/vagrant'
 
-class Default < Thor
+GEM_PKG = "vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem".freeze
+
+class Gem < Thor
   include Thor::RakeCompat
   Bundler::GemHelper.install_tasks
 
-  GEM_PKG = "vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem".freeze
-
   desc "build", "Build #{GEM_PKG} into the pkg directory"
   def build
     Rake::Task["build"].execute
@@ -27,6 +26,11 @@ class Default < Thor
   def install
     Rake::Task["install"].execute
   end
+end
+
+class Spec < Thor
+  include Thor::Actions
+  default_task :unit
 
   desc "plug", "Install #{GEM_PKG} into vagrant"
   def plug
@@ -34,29 +38,22 @@ class Default < Thor
     run "vagrant plugin install pkg/#{GEM_PKG}"
   end
 
-  class Spec < Thor
-    include Thor::Actions
-
-    namespace :spec
-    default_task :unit
-
-    desc "ci", "Run all possible tests on Travis-CI"
-    def ci
-      ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
-      invoke(:unit)
-    end
+  desc "ci", "Run all possible tests on Travis-CI"
+  def ci
+    ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
+    invoke(:unit)
+  end
 
-    desc "unit", "Run unit tests"
-    def unit
-      unless run_unit
-        exit 1
-      end
+  desc "unit", "Run unit tests"
+  def unit
+    unless run_unit
+      exit 1
     end
+  end
 
-    no_tasks do
-      def run_unit(*flags)
-        run "rspec --color --format=documentation #{flags.join(' ')} spec"
-      end
+  no_tasks do
+    def run_unit(*flags)
+      run "rspec --color --format=documentation #{flags.join(' ')} spec"
     end
   end
 end

data/lib/berkshelf/vagrant.rb

@@ -4,21 +4,21 @@ rescue LoadError
   raise 'The Vagrant Berkshelf plugin must be run within Vagrant.'
 end
 
+require 'berkshelf'
 require 'fileutils'
 require 'json'
 require 'tmpdir'
 
-require 'berkshelf'
-require 'berkshelf/vagrant/version'
-require 'berkshelf/vagrant/errors'
+require_relative 'vagrant/errors'
+require_relative 'vagrant/version'
 
 module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>
   module Vagrant
-    autoload :Action, 'berkshelf/vagrant/action'
-    autoload :Config, 'berkshelf/vagrant/config'
-    autoload :Env, 'berkshelf/vagrant/env'
-    autoload :EnvHelpers, 'berkshelf/vagrant/env_helpers'
+    require_relative 'vagrant/action'
+    require_relative 'vagrant/config'
+    require_relative 'vagrant/env'
+    require_relative 'vagrant/env_helpers'
 
     TESTED_CONSTRAINT = "~> 1.2.0"
 
@@ -53,4 +53,4 @@ module Berkshelf
   end
 end
 
-require 'berkshelf/vagrant/plugin'
+require_relative 'vagrant/plugin'

data/lib/berkshelf/vagrant/action.rb

@@ -1,12 +1,15 @@
 module Berkshelf
   module Vagrant
     module Action
-      autoload :Clean, 'berkshelf/vagrant/action/clean'
-      autoload :ConfigureChef, 'berkshelf/vagrant/action/configure_chef'
-      autoload :Install, 'berkshelf/vagrant/action/install'
-      autoload :LoadShelf, 'berkshelf/vagrant/action/load_shelf'
-      autoload :SetUI, 'berkshelf/vagrant/action/set_ui'
-      autoload :Upload, 'berkshelf/vagrant/action/upload'
+      require_relative 'env'
+      require_relative 'env_helpers'
+
+      require_relative 'action/clean'
+      require_relative 'action/configure_chef'
+      require_relative 'action/install'
+      require_relative 'action/load_shelf'
+      require_relative 'action/set_ui'
+      require_relative 'action/upload'
 
       class << self
         # Return the Berkshelf install middleware stack. When placed in the action chain

data/lib/berkshelf/vagrant/action/install.rb

@@ -40,10 +40,10 @@ module Berkshelf
           def install(env)
             check_vagrant_version(env)
             env[:berkshelf].ui.info "Updating Vagrant's berkshelf: '#{env[:berkshelf].shelf}'"
-            opts = {
-              path: env[:berkshelf].shelf
-            }.merge(env[:global_config].berkshelf.to_hash).symbolize_keys!
-            env[:berkshelf].berksfile.install(opts)
+            FileUtils.rm_rf(env[:berkshelf].shelf)
+
+            opts = env[:machine].config.berkshelf.to_hash.symbolize_keys
+            env[:berkshelf].berksfile.vendor(env[:berkshelf].shelf, opts)
           end
 
           def warn_disabled_but_berksfile_exists(env)

data/lib/berkshelf/vagrant/action/load_shelf.rb

@@ -15,9 +15,9 @@ module Berkshelf
           end
 
           # Make sure that Berkshelf itself uses distinct directories for each vagrant run.
-          ENV['BERKSHELF_PATH'] = File.join(Berkshelf.berkshelf_path, env[:machine].name.to_s) unless ENV['BERKSHELF_PATH']
+          ENV['BERKSHELF_PATH'] ||= File.join(Berkshelf.berkshelf_path, env[:machine].name.to_s)
 
-          shelf = load_shelf env
+          shelf = load_shelf(env)
 
           if shelf.nil?
             shelf = cache_shelf(Berkshelf::Vagrant.mkshelf(env[:machine].name), env)

data/lib/berkshelf/vagrant/env.rb

@@ -15,9 +15,9 @@ module Berkshelf
 
       def initialize
         if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new("1.2")
-          @ui     = ::Vagrant::UI::Colored.new.scope('Berkshelf')
+          @ui = ::Vagrant::UI::Colored.new.scope('Berkshelf')
         else
-          @ui     = ::Vagrant::UI::Colored.new('Berkshelf')
+          @ui = ::Vagrant::UI::Colored.new('Berkshelf')
         end
         @config = Berkshelf::Config.instance
       end

data/lib/berkshelf/vagrant/env_helpers.rb

@@ -48,7 +48,7 @@ module Berkshelf
       #
       # @return [Boolean]
       def berkshelf_enabled?(env)
-        env[:global_config].berkshelf.enabled
+        env[:machine].config.berkshelf.enabled
       end
 
       # Determine if --no-provision was specified

data/lib/berkshelf/vagrant/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module Vagrant
-    VERSION = "1.3.7"
+    VERSION = "1.4.0.dev1"
   end
 end

data/vagrant-berkshelf.gemspec

@@ -19,15 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 1.9.1'
 
-  spec.add_dependency 'berkshelf', '~> 2.0.7'
+  spec.add_dependency 'berkshelf', '>= 3.0.0.beta3'
 
-  # Explicit locks to ensure we activate the proper gem versions for Vagrant
-  spec.add_dependency 'i18n', '~> 0.6.0'
-  spec.add_dependency 'net-ssh', '>= 2.6.6', '< 2.8.0'
-  spec.add_dependency 'net-scp', '~> 1.1.0'
-
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'spork'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'thor'
+  spec.add_development_dependency 'spork', '~> 0.9'
+  spec.add_development_dependency 'rspec', '~> 2.13'
+  spec.add_development_dependency 'thor',  '~> 0.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.0.dev1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,126 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.7
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.6
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.6
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.0.0.beta3
 - !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: spork
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: spork
-  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'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 description: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 email:
 - jamie@vialstudios.com
@@ -181,12 +119,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners