berkshelf 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e52bf99ab83485dbf6a146715598c65e87be9f
-  data.tar.gz: 52422a0e9b000b2b0859d2061ea8dab038d266e8
+  metadata.gz: 1ff4a5766d16b96da07677a64a30460529722748
+  data.tar.gz: a16d469fec7f94974e990bb85ec66f4a2a9b2a80
 SHA512:
-  metadata.gz: 5f8a56671024af1c5015c0436e3b85e503dde1d542d036ff96a76a6acfb385657744786891b48c1b61130e003ce1babbbb64af1e2a382f001adbf06e753073e0
-  data.tar.gz: daa8720298464b606992fc3e690b15c345fd78aaa60f5a5f4d6ba5176f4e602c01bafd04f373c6705464befba679fe3c01233c6aac5ed5ec57b47639663ba142
+  metadata.gz: 708813255bb22b1d7d575600a937902da34ca79c6350006743d6dbd772cf4dd0052c0b297f7682bb22fb1873ef2d53716b65c918437e9f82eb079d26e5e49dd5
+  data.tar.gz: 9579bb00d7e14f7ffd68889554c015e2d862ed2c0ec4c31890a4c7bfb1a766b0923c8848777644036f92796e643fb7c2c68efddbdea9680953f44e009a8372b0

data/berkshelf.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'minitar',           '~> 0.5.4'
   s.add_dependency 'retryable',         '~> 1.3.3'
   s.add_dependency 'ridley',            '~> 1.5.0'
-  s.add_dependency 'solve',             '>= 0.5.0'
+  s.add_dependency 'solve',             '~> 0.8.2'
   s.add_dependency 'thor',              '~> 0.18.0'
   s.add_dependency 'rbzip2',            '~> 0.2.0'
   s.add_dependency 'faraday',           '~> 0.8.0' # lock tranisitive dependency of Ridley

data/generator_files/Vagrantfile.erb

@@ -62,9 +62,6 @@ Vagrant.configure("2") do |config|
   # View the documentation for the provider you're using for more
   # information on available options.
 
-  config.ssh.max_tries = 40
-  config.ssh.timeout   = 120
-
   # The path to the Berksfile to use with Vagrant Berkshelf
   # config.berkshelf.berksfile_path = "./Berksfile"
 

data/lib/berkshelf/downloader.rb

@@ -77,6 +77,7 @@ module Berkshelf
 
           return [cached, location]
         rescue => e
+          raise if e.kind_of?(GitNotFound)
           raise if e.kind_of?(CookbookValidationFailure)
           Berkshelf.formatter.error "Failed to download '#{source.name}' from #{source.location}"
         end
@@ -117,6 +118,9 @@ module Berkshelf
       #   the downloaded cached cookbook, or nil if one was not found
       def download_location(source, location, raise_if_not_found = false)
         location.download(storage_path)
+      rescue Berkshelf::GitNotFound
+        raise
+        nil
       rescue Berkshelf::CookbookNotFound
         raise if raise_if_not_found
         nil

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "2.0.14"
+  VERSION = "2.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -144,16 +144,16 @@ dependencies:
   name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -677,7 +677,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
@@ -798,3 +798,4 @@ test_files:
 - spec/unit/berkshelf/ui_spec.rb
 - spec/unit/berkshelf_spec.rb
 - spec/unit/chef/config_spec.rb
+has_rdoc: