berkshelf 2.0.14 → 2.0.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/berkshelf.gemspec +1 -1
- data/generator_files/Vagrantfile.erb +0 -3
- data/lib/berkshelf/downloader.rb +4 -0
- data/lib/berkshelf/version.rb +1 -1
- metadata +8 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1ff4a5766d16b96da07677a64a30460529722748
|
4
|
+
data.tar.gz: a16d469fec7f94974e990bb85ec66f4a2a9b2a80
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 708813255bb22b1d7d575600a937902da34ca79c6350006743d6dbd772cf4dd0052c0b297f7682bb22fb1873ef2d53716b65c918437e9f82eb079d26e5e49dd5
|
7
|
+
data.tar.gz: 9579bb00d7e14f7ffd68889554c015e2d862ed2c0ec4c31890a4c7bfb1a766b0923c8848777644036f92796e643fb7c2c68efddbdea9680953f44e009a8372b0
|
data/berkshelf.gemspec
CHANGED
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
|
|
39
39
|
s.add_dependency 'minitar', '~> 0.5.4'
|
40
40
|
s.add_dependency 'retryable', '~> 1.3.3'
|
41
41
|
s.add_dependency 'ridley', '~> 1.5.0'
|
42
|
-
s.add_dependency 'solve', '
|
42
|
+
s.add_dependency 'solve', '~> 0.8.2'
|
43
43
|
s.add_dependency 'thor', '~> 0.18.0'
|
44
44
|
s.add_dependency 'rbzip2', '~> 0.2.0'
|
45
45
|
s.add_dependency 'faraday', '~> 0.8.0' # lock tranisitive dependency of Ridley
|
@@ -62,9 +62,6 @@ Vagrant.configure("2") do |config|
|
|
62
62
|
# View the documentation for the provider you're using for more
|
63
63
|
# information on available options.
|
64
64
|
|
65
|
-
config.ssh.max_tries = 40
|
66
|
-
config.ssh.timeout = 120
|
67
|
-
|
68
65
|
# The path to the Berksfile to use with Vagrant Berkshelf
|
69
66
|
# config.berkshelf.berksfile_path = "./Berksfile"
|
70
67
|
|
data/lib/berkshelf/downloader.rb
CHANGED
@@ -77,6 +77,7 @@ module Berkshelf
|
|
77
77
|
|
78
78
|
return [cached, location]
|
79
79
|
rescue => e
|
80
|
+
raise if e.kind_of?(GitNotFound)
|
80
81
|
raise if e.kind_of?(CookbookValidationFailure)
|
81
82
|
Berkshelf.formatter.error "Failed to download '#{source.name}' from #{source.location}"
|
82
83
|
end
|
@@ -117,6 +118,9 @@ module Berkshelf
|
|
117
118
|
# the downloaded cached cookbook, or nil if one was not found
|
118
119
|
def download_location(source, location, raise_if_not_found = false)
|
119
120
|
location.download(storage_path)
|
121
|
+
rescue Berkshelf::GitNotFound
|
122
|
+
raise
|
123
|
+
nil
|
120
124
|
rescue Berkshelf::CookbookNotFound
|
121
125
|
raise if raise_if_not_found
|
122
126
|
nil
|
data/lib/berkshelf/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: berkshelf
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jamie Winsor
|
@@ -12,7 +12,7 @@ authors:
|
|
12
12
|
autorequire:
|
13
13
|
bindir: bin
|
14
14
|
cert_chain: []
|
15
|
-
date: 2014-
|
15
|
+
date: 2014-04-14 00:00:00.000000000 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
name: activesupport
|
@@ -144,16 +144,16 @@ dependencies:
|
|
144
144
|
name: solve
|
145
145
|
requirement: !ruby/object:Gem::Requirement
|
146
146
|
requirements:
|
147
|
-
- -
|
147
|
+
- - ~>
|
148
148
|
- !ruby/object:Gem::Version
|
149
|
-
version: 0.
|
149
|
+
version: 0.8.2
|
150
150
|
type: :runtime
|
151
151
|
prerelease: false
|
152
152
|
version_requirements: !ruby/object:Gem::Requirement
|
153
153
|
requirements:
|
154
|
-
- -
|
154
|
+
- - ~>
|
155
155
|
- !ruby/object:Gem::Version
|
156
|
-
version: 0.
|
156
|
+
version: 0.8.2
|
157
157
|
- !ruby/object:Gem::Dependency
|
158
158
|
name: thor
|
159
159
|
requirement: !ruby/object:Gem::Requirement
|
@@ -677,7 +677,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
677
677
|
version: 1.8.0
|
678
678
|
requirements: []
|
679
679
|
rubyforge_project:
|
680
|
-
rubygems_version: 2.0.
|
680
|
+
rubygems_version: 2.0.7
|
681
681
|
signing_key:
|
682
682
|
specification_version: 4
|
683
683
|
summary: Manages a Cookbook's, or an Application's, Cookbook dependencies
|
@@ -798,3 +798,4 @@ test_files:
|
|
798
798
|
- spec/unit/berkshelf/ui_spec.rb
|
799
799
|
- spec/unit/berkshelf_spec.rb
|
800
800
|
- spec/unit/chef/config_spec.rb
|
801
|
+
has_rdoc:
|