berkshelf 0.5.0.rc1 → 0.5.0.rc2

data/berkshelf.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
   s.version               = Berkshelf::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
-  s.add_runtime_dependency 'ridley',  '>= 0.0.3'
+  s.add_runtime_dependency 'ridley',  '>= 0.0.4'
   s.add_runtime_dependency 'solve',   '~> 0.2.1'
   s.add_runtime_dependency 'chef',    '~> 10.12.0'
   s.add_runtime_dependency 'minitar'
   s.add_runtime_dependency 'thor',    '~> 0.16.0'
-  s.add_runtime_dependency 'vagrant', '~> 1.0.3'
+  s.add_runtime_dependency 'vagrant', '~> 1.0.5'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'multi_json'
 

data/bin/berks

@@ -7,4 +7,7 @@ begin
 rescue Berkshelf::BerkshelfError => e
   Berkshelf.ui.error e
   exit e.status_code
+rescue Ridley::Errors::RidleyError => e
+  Berkshelf.ui.error "#{e.class} #{e}"
+  exit 47
 end

data/generator_files/Gemfile.erb

@@ -8,5 +8,5 @@ gem 'thor-foodcritic'
 gem 'thor-scmversion'
 <% end -%>
 <% if options[:vagrant] -%>
-gem 'vagrant', '~> 1.0.3'
+gem 'vagrant', '~> 1.0.5'
 <% end -%>

data/lib/berkshelf/vagrant.rb

@@ -18,6 +18,10 @@ module Berkshelf
     class << self
       # @param [Vagrant::Action::Environment] env
       def shelf_for(env)
+        unless env[:global_config].vm.host_name
+          return nil
+        end
+
         File.join(Berkshelf.berkshelf_path, "vagrant", env[:global_config].vm.host_name)
       end
 

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

@@ -11,7 +11,7 @@ module Berkshelf
         end
 
         def call(env)
-          if Berkshelf::Vagrant.chef_solo?(env[:global_config])
+          if Berkshelf::Vagrant.chef_solo?(env[:global_config]) && self.shelf
             Berkshelf.formatter.msg "cleaning Vagrant's shelf"
             FileUtils.remove_dir(self.shelf, fore: true)
           end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.5.0.rc1"
+  VERSION = "0.5.0.rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc1
+  version: 0.5.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement