vagrant-berkshelf 1.3.2 → 1.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +7 -0
  2. data/README.md +1 -1
  3. data/Thorfile +11 -3
  4. data/lib/berkshelf/vagrant.rb +3 -1
  5. data/lib/berkshelf/vagrant/action/clean.rb +1 -1
  6. data/lib/berkshelf/vagrant/action/configure_chef.rb +1 -1
  7. data/lib/berkshelf/vagrant/action/install.rb +1 -1
  8. data/lib/berkshelf/vagrant/action/load_shelf.rb +1 -1
  9. data/lib/berkshelf/vagrant/action/set_ui.rb +1 -1
  10. data/lib/berkshelf/vagrant/action/upload.rb +1 -1
  11. data/lib/berkshelf/vagrant/config.rb +2 -2
  12. data/lib/berkshelf/vagrant/env.rb +1 -1
  13. data/lib/berkshelf/vagrant/env_helpers.rb +1 -1
  14. data/lib/berkshelf/vagrant/errors.rb +1 -1
  15. data/lib/berkshelf/vagrant/plugin.rb +0 -2
  16. data/lib/berkshelf/vagrant/version.rb +1 -1
  17. data/vagrant-berkshelf.gemspec +2 -2
  18. metadata +18 -41
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 56f6c7d08d723e1ea20357d14c4a759c88625548
4
+ data.tar.gz: 046179642b63be3e25f5434e0e80b7f95d1d7ab0
5
+ SHA512:
6
+ metadata.gz: ef596079f6013ec4846acf79376a6e205b5a0aecb5b1cf74276520906dd5ff95c9b6c1a5c39d9fe6e25624dcabbc882f292752ef3b9f4a8f3f050527b221892e
7
+ data.tar.gz: c3a5afc355eeba95459e9cc3c3da59d5d3bf4bb3c5dd0168a050347ef893f9f3313d3fd7cdd1c0419a149f7223abb94624e03ca5b4ae93cbd1e58b53f0c9cdf4
data/README.md CHANGED
@@ -27,7 +27,7 @@ Once the Vagrant Berkshelf plugin is installed it can be enabled in your Vagrant
27
27
  The plugin will look in your current working directory for your `Berksfile` by default. Just ensure that your Berksfile exists and when you run `vagrant up`, `vagrant provision`, or `vagrant destroy` the Berkshelf integration will automatically kick in!
28
28
 
29
29
  # Authors
30
- - Jamie Winsor (<reset@riotgames.com>)
30
+ - Jamie Winsor (<jamie@vialstudios.com>)
31
31
  - Michael Ivey (<michael.ivey@riotgames.com>)
32
32
 
33
33
  Thank you to all of our [Contributors](https://github.com/RiotGames/vagrant-berkshelf/graphs/contributors), testers, and users.
data/Thorfile CHANGED
@@ -11,21 +11,29 @@ class Default < Thor
11
11
  include Thor::RakeCompat
12
12
  Bundler::GemHelper.install_tasks
13
13
 
14
- desc "build", "Build vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem into the pkg directory"
14
+ GEM_PKG = "vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem".freeze
15
+
16
+ desc "build", "Build #{GEM_PKG} into the pkg directory"
15
17
  def build
16
18
  Rake::Task["build"].execute
17
19
  end
18
20
 
19
- desc "release", "Create tag v#{Berkshelf::Vagrant::VERSION} and build and push vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem to Rubygems"
21
+ desc "release", "Create tag v#{Berkshelf::Vagrant::VERSION} and build and push #{GEM_PKG} to Rubygems"
20
22
  def release
21
23
  Rake::Task["release"].execute
22
24
  end
23
25
 
24
- desc "install", "Build and install vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem into system gems"
26
+ desc "install", "Build and install #{GEM_PKG} into system gems"
25
27
  def install
26
28
  Rake::Task["install"].execute
27
29
  end
28
30
 
31
+ desc "plug", "Install #{GEM_PKG} into vagrant"
32
+ def plug
33
+ build
34
+ run "vagrant plugin install pkg/#{GEM_PKG}"
35
+ end
36
+
29
37
  class Spec < Thor
30
38
  include Thor::Actions
31
39
 
data/lib/berkshelf/vagrant.rb CHANGED
@@ -13,13 +13,15 @@ require 'berkshelf/vagrant/version'
13
13
  require 'berkshelf/vagrant/errors'
14
14
 
15
15
  module Berkshelf
16
- # @author Jamie Winsor <reset@riotgames.com>
16
+ # @author Jamie Winsor <jamie@vialstudios.com>
17
17
  module Vagrant
18
18
  autoload :Action, 'berkshelf/vagrant/action'
19
19
  autoload :Config, 'berkshelf/vagrant/config'
20
20
  autoload :Env, 'berkshelf/vagrant/env'
21
21
  autoload :EnvHelpers, 'berkshelf/vagrant/env_helpers'
22
22
 
23
+ TESTED_CONSTRAINT = "~> 1.2.0"
24
+
23
25
  class << self
24
26
  # The path to where shelfs are created on the host machine to be mounted in
25
27
  # Vagrant guests
data/lib/berkshelf/vagrant/action/clean.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
3
  module Action
4
- # @author Jamie Winsor <reset@riotgames.com>
4
+ # @author Jamie Winsor <jamie@vialstudios.com>
5
5
  class Clean
6
6
  include Berkshelf::Vagrant::EnvHelpers
7
7
 
data/lib/berkshelf/vagrant/action/configure_chef.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
3
  module Action
4
- # @author Jamie Winsor <reset@riotgames.com>
4
+ # @author Jamie Winsor <jamie@vialstudios.com>
5
5
  class ConfigureChef
6
6
  include Berkshelf::Vagrant::EnvHelpers
7
7
 
data/lib/berkshelf/vagrant/action/install.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
3
  module Action
4
- # @author Jamie Winsor <reset@riotgames.com>
4
+ # @author Jamie Winsor <jamie@vialstudios.com>
5
5
  class Install
6
6
  include Berkshelf::Vagrant::EnvHelpers
7
7
 
data/lib/berkshelf/vagrant/action/load_shelf.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
3
  module Action
4
- # @author Jamie Winsor <reset@riotgames.com>
4
+ # @author Jamie Winsor <jamie@vialstudios.com>
5
5
  class LoadShelf
6
6
  include Berkshelf::Vagrant::EnvHelpers
7
7
 
data/lib/berkshelf/vagrant/action/set_ui.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
3
  module Action
4
- # @author Jamie Winsor <reset@riotgames.com>
4
+ # @author Jamie Winsor <jamie@vialstudios.com>
5
5
  class SetUI
6
6
  def initialize(app, env)
7
7
  @app = app
data/lib/berkshelf/vagrant/action/upload.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
3
  module Action
4
- # @author Jamie Winsor <reset@riotgames.com>
4
+ # @author Jamie Winsor <jamie@vialstudios.com>
5
5
  class Upload
6
6
  include Berkshelf::Vagrant::EnvHelpers
7
7
 
data/lib/berkshelf/vagrant/config.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
- # @author Jamie Winsor <reset@riotgames.com>
3
+ # @author Jamie Winsor <jamie@vialstudios.com>
4
4
  class Config < ::Vagrant.plugin("2", :config)
5
5
  # @return [String]
6
6
  # path to the Berksfile to use with Vagrant
@@ -66,7 +66,7 @@ module Berkshelf
66
66
  end
67
67
 
68
68
  unless File.exist?(machine.config.berkshelf.berksfile_path)
69
- errors << "No Berskfile was found at #{machine.config.berkshelf.berksfile_path}."
69
+ errors << "No Berksfile was found at #{machine.config.berkshelf.berksfile_path}."
70
70
  end
71
71
 
72
72
  if !except.empty? && !only.empty?
data/lib/berkshelf/vagrant/env.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
- # @author Jamie Winsor <reset@riotgames.com>
3
+ # @author Jamie Winsor <jamie@vialstudios.com>
4
4
  #
5
5
  # Environment data to build up and persist through the middleware chain
6
6
  class Env
data/lib/berkshelf/vagrant/env_helpers.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
- # @author Jamie Winsor <reset@riotgames.com>
3
+ # @author Jamie Winsor <jamie@vialstudios.com>
4
4
  #
5
5
  # A module of common helper functions that can be mixed into Berkshelf::Vagrant actions
6
6
  module EnvHelpers
data/lib/berkshelf/vagrant/errors.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'vagrant/errors'
2
2
 
3
3
  module Berkshelf
4
- # @author Jamie Winsor <reset@riotgames.com>
4
+ # @author Jamie Winsor <jamie@vialstudios.com>
5
5
  #
6
6
  # A wrapper for a BerkshelfError for Vagrant. All Berkshelf exceptions should be
7
7
  # wrapped in this proxy object so they are properly handled when Vagrant encounters
data/lib/berkshelf/vagrant/plugin.rb CHANGED
@@ -1,7 +1,5 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
- # @author Jamie Winsor <reset@riotgames.com>
4
- TESTED_CONSTRAINT="<= 1.2.1"
5
3
  class Plugin < ::Vagrant.plugin("2")
6
4
  class << self
7
5
  def provision(hook)
data/lib/berkshelf/vagrant/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Berkshelf
2
2
  module Vagrant
3
- VERSION = "1.3.2"
3
+ VERSION = "1.3.3"
4
4
  end
5
5
  end
data/vagrant-berkshelf.gemspec CHANGED
@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
7
7
  spec.name = 'vagrant-berkshelf'
8
8
  spec.version = Berkshelf::Vagrant::VERSION
9
9
  spec.authors = [ 'Jamie Winsor', 'Michael Ivey' ]
10
- spec.email = [ 'reset@riotgames.com', 'michael.ivey@riotgames.com' ]
10
+ spec.email = [ 'jamie@vialstudios.com', 'michael.ivey@riotgames.com' ]
11
11
  spec.description = %q{A Vagrant plugin to add Berkshelf integration to the Chef provisioners}
12
12
  spec.summary = spec.description
13
13
  spec.homepage = 'http://berkshelf.com'
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ['lib']
20
20
  spec.required_ruby_version = '>= 1.9.1'
21
21
 
22
- spec.add_dependency 'berkshelf', '~> 2.0.4'
22
+ spec.add_dependency 'berkshelf', '~> 2.0.7'
23
23
  # activesupport 3.2.13 contains an incompatible hard lock on i18n (= 0.6.1)
24
24
  spec.add_dependency 'activesupport', '>= 3.2.0', '< 3.2.13'
25
25
 
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-berkshelf
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.2
5
- prerelease:
4
+ version: 1.3.3
6
5
  platform: ruby
7
6
  authors:
8
7
  - Jamie Winsor
@@ -10,30 +9,27 @@ authors:
10
9
  autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2013-06-17 00:00:00.000000000 Z
12
+ date: 2013-07-12 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: berkshelf
17
16
  requirement: !ruby/object:Gem::Requirement
18
- none: false
19
17
  requirements:
20
18
  - - ~>
21
19
  - !ruby/object:Gem::Version
22
- version: 2.0.4
20
+ version: 2.0.7
23
21
  type: :runtime
24
22
  prerelease: false
25
23
  version_requirements: !ruby/object:Gem::Requirement
26
- none: false
27
24
  requirements:
28
25
  - - ~>
29
26
  - !ruby/object:Gem::Version
30
- version: 2.0.4
27
+ version: 2.0.7
31
28
  - !ruby/object:Gem::Dependency
32
29
  name: activesupport
33
30
  requirement: !ruby/object:Gem::Requirement
34
- none: false
35
31
  requirements:
36
- - - ! '>='
32
+ - - '>='
37
33
  - !ruby/object:Gem::Version
38
34
  version: 3.2.0
39
35
  - - <
@@ -42,9 +38,8 @@ dependencies:
42
38
  type: :runtime
43
39
  prerelease: false
44
40
  version_requirements: !ruby/object:Gem::Requirement
45
- none: false
46
41
  requirements:
47
- - - ! '>='
42
+ - - '>='
48
43
  - !ruby/object:Gem::Version
49
44
  version: 3.2.0
50
45
  - - <
@@ -53,7 +48,6 @@ dependencies:
53
48
  - !ruby/object:Gem::Dependency
54
49
  name: i18n
55
50
  requirement: !ruby/object:Gem::Requirement
56
- none: false
57
51
  requirements:
58
52
  - - ~>
59
53
  - !ruby/object:Gem::Version
@@ -61,7 +55,6 @@ dependencies:
61
55
  type: :runtime
62
56
  prerelease: false
63
57
  version_requirements: !ruby/object:Gem::Requirement
64
- none: false
65
58
  requirements:
66
59
  - - ~>
67
60
  - !ruby/object:Gem::Version
@@ -69,7 +62,6 @@ dependencies:
69
62
  - !ruby/object:Gem::Dependency
70
63
  name: net-ssh
71
64
  requirement: !ruby/object:Gem::Requirement
72
- none: false
73
65
  requirements:
74
66
  - - ~>
75
67
  - !ruby/object:Gem::Version
@@ -77,7 +69,6 @@ dependencies:
77
69
  type: :runtime
78
70
  prerelease: false
79
71
  version_requirements: !ruby/object:Gem::Requirement
80
- none: false
81
72
  requirements:
82
73
  - - ~>
83
74
  - !ruby/object:Gem::Version
@@ -85,7 +76,6 @@ dependencies:
85
76
  - !ruby/object:Gem::Dependency
86
77
  name: net-scp
87
78
  requirement: !ruby/object:Gem::Requirement
88
- none: false
89
79
  requirements:
90
80
  - - ~>
91
81
  - !ruby/object:Gem::Version
@@ -93,7 +83,6 @@ dependencies:
93
83
  type: :runtime
94
84
  prerelease: false
95
85
  version_requirements: !ruby/object:Gem::Requirement
96
- none: false
97
86
  requirements:
98
87
  - - ~>
99
88
  - !ruby/object:Gem::Version
@@ -101,7 +90,6 @@ dependencies:
101
90
  - !ruby/object:Gem::Dependency
102
91
  name: bundler
103
92
  requirement: !ruby/object:Gem::Requirement
104
- none: false
105
93
  requirements:
106
94
  - - ~>
107
95
  - !ruby/object:Gem::Version
@@ -109,7 +97,6 @@ dependencies:
109
97
  type: :development
110
98
  prerelease: false
111
99
  version_requirements: !ruby/object:Gem::Requirement
112
- none: false
113
100
  requirements:
114
101
  - - ~>
115
102
  - !ruby/object:Gem::Version
@@ -117,54 +104,48 @@ dependencies:
117
104
  - !ruby/object:Gem::Dependency
118
105
  name: spork
119
106
  requirement: !ruby/object:Gem::Requirement
120
- none: false
121
107
  requirements:
122
- - - ! '>='
108
+ - - '>='
123
109
  - !ruby/object:Gem::Version
124
110
  version: '0'
125
111
  type: :development
126
112
  prerelease: false
127
113
  version_requirements: !ruby/object:Gem::Requirement
128
- none: false
129
114
  requirements:
130
- - - ! '>='
115
+ - - '>='
131
116
  - !ruby/object:Gem::Version
132
117
  version: '0'
133
118
  - !ruby/object:Gem::Dependency
134
119
  name: rspec
135
120
  requirement: !ruby/object:Gem::Requirement
136
- none: false
137
121
  requirements:
138
- - - ! '>='
122
+ - - '>='
139
123
  - !ruby/object:Gem::Version
140
124
  version: '0'
141
125
  type: :development
142
126
  prerelease: false
143
127
  version_requirements: !ruby/object:Gem::Requirement
144
- none: false
145
128
  requirements:
146
- - - ! '>='
129
+ - - '>='
147
130
  - !ruby/object:Gem::Version
148
131
  version: '0'
149
132
  - !ruby/object:Gem::Dependency
150
133
  name: thor
151
134
  requirement: !ruby/object:Gem::Requirement
152
- none: false
153
135
  requirements:
154
- - - ! '>='
136
+ - - '>='
155
137
  - !ruby/object:Gem::Version
156
138
  version: '0'
157
139
  type: :development
158
140
  prerelease: false
159
141
  version_requirements: !ruby/object:Gem::Requirement
160
- none: false
161
142
  requirements:
162
- - - ! '>='
143
+ - - '>='
163
144
  - !ruby/object:Gem::Version
164
145
  version: '0'
165
146
  description: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
166
147
  email:
167
- - reset@riotgames.com
148
+ - jamie@vialstudios.com
168
149
  - michael.ivey@riotgames.com
169
150
  executables: []
170
151
  extensions: []
@@ -202,30 +183,26 @@ files:
202
183
  homepage: http://berkshelf.com
203
184
  licenses:
204
185
  - Apache 2.0
186
+ metadata: {}
205
187
  post_install_message:
206
188
  rdoc_options: []
207
189
  require_paths:
208
190
  - lib
209
191
  required_ruby_version: !ruby/object:Gem::Requirement
210
- none: false
211
192
  requirements:
212
- - - ! '>='
193
+ - - '>='
213
194
  - !ruby/object:Gem::Version
214
195
  version: 1.9.1
215
196
  required_rubygems_version: !ruby/object:Gem::Requirement
216
- none: false
217
197
  requirements:
218
- - - ! '>='
198
+ - - '>='
219
199
  - !ruby/object:Gem::Version
220
200
  version: '0'
221
- segments:
222
- - 0
223
- hash: -2561841672745040153
224
201
  requirements: []
225
202
  rubyforge_project:
226
- rubygems_version: 1.8.23
203
+ rubygems_version: 2.0.2
227
204
  signing_key:
228
- specification_version: 3
205
+ specification_version: 4
229
206
  summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
230
207
  test_files:
231
208
  - spec/spec_helper.rb