vagrant-opsworks 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d8b6a859f8150e1fa384775dd7b4af81501976
-  data.tar.gz: 08ed2fbe9ff4fc1b114e2e07dbc8bda5c959d66c
+  metadata.gz: 4af4ae9f814eda1ea1a652f5fe209414d519c3d2
+  data.tar.gz: 28b0733838b7f059d2007d50d329096a3f14a135
 SHA512:
-  metadata.gz: 0360cace45964369f487b820bf2a61bb06ce1adfe45010e844208f5a521fa89d358f3f9a9a0db2a327824009bdb8e6cb7206f2ba977aa4720a49f863f43b5430
-  data.tar.gz: 25b2f4b1aea38ccfd084558a85a0f1b43730d9de1dcb066c37f4f8d1aeb4488ecab6329787a6de3950fedcd4042ebab666dde8ba28ba990b43186e1f3a5f3c16
+  metadata.gz: d948e96e8983fd8262fc974008088fd1a8314b845f15c272df671594eb8bf09823011143134a18c47509d9720579c07605672e3d45f09d0c3503c1e474857908
+  data.tar.gz: 177bad8cd3d3ee6be48e43a0069efc9cbdd283dd9d4c1c3af29b2d484d63092532e210015b4a5a859472839ce3df89f3ec7f0f3fe76fd57d8d89a7f8813dd6a8

data/Gemfile

@@ -5,7 +5,7 @@ gem 'vagrant', github: 'mitchellh/vagrant', ref: ENV.fetch('VAGRANT_VERSION', 'v
 
 group :plugins do
   gemspec :path => '.'
-  gem 'vagrant-berkshelf', github: 'berkshelf/vagrant-berkshelf', ref: ENV.fetch('BERKSHELF_VERSION', 'v3.0.1')
+  gem 'vagrant-berkshelf', github: 'berkshelf/vagrant-berkshelf', ref: ENV.fetch('BERKSHELF_VERSION', 'v4.0.1')
 end
 
 group :testing do

data/Thorfile

@@ -2,6 +2,7 @@
 $:.push File.expand_path('../lib', __FILE__)
 
 require 'bundler'
+require 'i18n'
 require 'bundler/setup'
 require 'thor/rake_compat'
 require 'vagrant-opsworks'

data/integration/Gemfile

@@ -7,5 +7,5 @@ end
 
 group :plugins do
   gem 'vagrant-opsworks', path: '../'
-  gem 'vagrant-berkshelf', github: 'berkshelf/vagrant-berkshelf', tag: 'v3.0.1'
+  gem 'vagrant-berkshelf', github: 'berkshelf/vagrant-berkshelf', tag: 'v4.0.1'
 end

data/lib/berkshelf-monkey-patch.rb

@@ -1,23 +1,25 @@
-require 'berkshelf/vagrant'
-require 'berkshelf/vagrant/action'
+require 'vagrant-berkshelf/action/base'
 
-module Berkshelf
-  module Vagrant
+module VagrantPlugins
+  module Berkshelf
     module Action
       require 'vagrant-opsworks/action'
       include VagrantPlugins::OpsWorks::Action
 
-      class << self
-        alias_method :old_setup, :setup
-      end
+      class Base
+        class << self
+          alias_method :old_setup, :setup
+        end
 
-      def self.setup
-        @setup ||= old_setup.tap do |b|
-          b.use ::Vagrant::Action::Builtin::EnvSet, opsworks: VagrantPlugins::OpsWorks::Env.new
-          b.use VagrantPlugins::OpsWorks::Action::SetupEnvironment
-          b.use VagrantPlugins::OpsWorks::Action::CheckoutCookbooks
-          b.use VagrantPlugins::OpsWorks::Action::MergeCookbooks
-          b.use VagrantPlugins::OpsWorks::Action::ConfigureChef
+        def self.setup
+          Vagrant::Action::Builder.new.tap do |b|
+            b.use old_setup
+            b.use ::Vagrant::Action::Builtin::EnvSet, opsworks: VagrantPlugins::OpsWorks::Env.new
+            b.use VagrantPlugins::OpsWorks::Action::SetupEnvironment
+            b.use VagrantPlugins::OpsWorks::Action::CheckoutCookbooks
+            b.use VagrantPlugins::OpsWorks::Action::MergeCookbooks
+            b.use VagrantPlugins::OpsWorks::Action::ConfigureChef
+          end
         end
       end
 

data/lib/vagrant-opsworks.rb

@@ -1,3 +1,4 @@
+require 'vagrant'
 require 'berkshelf-monkey-patch'
 
 I18n.load_path << File.expand_path('../../locales/en.yml', __FILE__)

data/lib/vagrant-opsworks/plugin.rb

@@ -8,8 +8,6 @@ module VagrantPlugins
 
       class << self
         def provision(hook)
-          require 'berkshelf/vagrant/env_helpers'
-          require 'berkshelf/vagrant/action/configure_chef'
           hook.prepend(VagrantPlugins::OpsWorks::Action.configure_berks)
 
           hook.before(::Vagrant::Action::Builtin::ConfigValidate, VagrantPlugins::OpsWorks::Action.setup)

data/lib/vagrant-opsworks/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpsWorks
-    VERSION = '0.2.3'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-opsworks
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - Steve Buzonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk