berkshelf 1.1.4 → 1.1.5

data/Gemfile

@@ -3,6 +3,7 @@ source :rubygems
 gemspec
 
 group :development do
+  gem 'vagrant', '~> 1.0.6'
   gem 'coolline'
   gem 'guard', '>= 1.5.0'
   gem 'guard-cucumber'
@@ -43,4 +44,5 @@ group :test do
   gem 'thor'
   gem 'vcr'
   gem 'webmock'
+  gem 'moneta', '~> 0.6.0'
 end

data/berkshelf.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'yajl-ruby'
   s.add_dependency 'activesupport'
-  s.add_dependency 'chef', '>= 10.16.2', '<= 11.0.1'
+  # Must lock 10.16 because of Vagrant 1-0-stable JSON requirement
+  s.add_dependency 'chef', '= 10.16.2'
   s.add_dependency 'ridley', '~> 0.6.3'
   s.add_dependency 'chozo', '>= 0.2.3'
   s.add_dependency 'hashie'
@@ -37,5 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json', '>= 1.3.0'
   s.add_dependency 'solve', '>= 0.4.0.rc1'
   s.add_dependency 'thor', '~> 0.16.0'
-  s.add_dependency 'vagrant', '~> 1.0.5'
+
+  # Vagrant 1-0-stable compatability locks
+  s.add_dependency 'net-ssh-gateway', '= 1.1.0'
 end

data/lib/berkshelf/errors.rb

@@ -1,5 +1,3 @@
-require 'vagrant/errors'
-
 module Berkshelf
   class BerkshelfError < StandardError
     class << self
@@ -13,34 +11,6 @@ module Berkshelf
     alias_method :message, :to_s
   end
 
-  # A wrapper for a BerkshelfError for Vagrant. All Berkshelf exceptions should be
-  # wrapped in this proxy object so they are properly handled when Vagrant encounters
-  # an exception.
-  #
-  # @example wrapping an error encountered within the Vagrant plugin
-  #   rescue BerkshelfError => e
-  #     VagrantWrapperError.new(e)
-  #   end
-  class VagrantWrapperError < Vagrant::Errors::VagrantError
-    # @param [BerkshelfError]
-    attr_reader :original
-
-    # @param [BerkshelfError] original
-    def initialize(original)
-      @original = original
-    end
-
-    def to_s
-      "#{original.class}: #{original.to_s}"
-    end
-
-    private
-
-      def method_missing(fun, *args, &block)
-        original.send(fun, *args, &block)
-      end
-  end
-
   class InternalError < BerkshelfError; status_code(99); end
   class ArgumentError < InternalError; end
   class AbstractFunction < InternalError

data/lib/berkshelf/vagrant.rb

@@ -1,5 +1,6 @@
 require 'vagrant'
 require 'berkshelf'
+require 'berkshelf/vagrant/errors'
 
 module Berkshelf
   # @author Jamie Winsor <jamie@vialstudios.com>

data/lib/berkshelf/vagrant/errors.rb

@@ -0,0 +1,31 @@
+require 'vagrant/errors'
+
+module Berkshelf
+  # A wrapper for a BerkshelfError for Vagrant. All Berkshelf exceptions should be
+  # wrapped in this proxy object so they are properly handled when Vagrant encounters
+  # an exception.
+  #
+  # @example wrapping an error encountered within the Vagrant plugin
+  #   rescue BerkshelfError => e
+  #     VagrantWrapperError.new(e)
+  #   end
+  class VagrantWrapperError < Vagrant::Errors::VagrantError
+    # @param [BerkshelfError]
+    attr_reader :original
+
+    # @param [BerkshelfError] original
+    def initialize(original)
+      @original = original
+    end
+
+    def to_s
+      "#{original.class}: #{original.to_s}"
+    end
+
+    private
+
+      def method_missing(fun, *args, &block)
+        original.send(fun, *args, &block)
+      end
+  end
+end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/spec_helper.rb

@@ -95,4 +95,5 @@ end
 
 Spork.each_run do
   require 'berkshelf'
+  require 'berkshelf/vagrant'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -51,23 +51,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 10.16.2
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 11.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 10.16.2
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 11.0.1
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
@@ -181,21 +175,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
-  name: vagrant
+  name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
 - jamie@vialstudios.com
@@ -297,6 +291,7 @@ files:
 - lib/berkshelf/vagrant/action/upload.rb
 - lib/berkshelf/vagrant/action/validate.rb
 - lib/berkshelf/vagrant/config.rb
+- lib/berkshelf/vagrant/errors.rb
 - lib/berkshelf/vagrant/middleware.rb
 - lib/berkshelf/version.rb
 - lib/thor/monkies.rb
@@ -375,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1711275170103949154
+      hash: 3683158693546377587
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24