vagrant-berkshelf 2.0.0.rc2 → 2.0.0.rc3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +4 -1
- data/CHANGELOG.md +1 -0
- data/README.md +34 -2
- data/lib/berkshelf/vagrant.rb +0 -1
- data/lib/berkshelf/vagrant/action/clean.rb +0 -1
- data/lib/berkshelf/vagrant/action/configure_chef.rb +0 -1
- data/lib/berkshelf/vagrant/action/install.rb +0 -8
- data/lib/berkshelf/vagrant/action/load_shelf.rb +0 -1
- data/lib/berkshelf/vagrant/action/set_ui.rb +0 -1
- data/lib/berkshelf/vagrant/action/upload.rb +0 -1
- data/lib/berkshelf/vagrant/config.rb +0 -1
- data/lib/berkshelf/vagrant/env.rb +0 -2
- data/lib/berkshelf/vagrant/env_helpers.rb +0 -2
- data/lib/berkshelf/vagrant/errors.rb +0 -2
- data/lib/berkshelf/vagrant/version.rb +1 -1
- data/vagrant-berkshelf.gemspec +1 -1
- metadata +17 -17
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7f1d03368d1b7e132995ca9d6ec217e7fda0823f
|
|
4
|
+
data.tar.gz: 688cb8d235806f24ac5fbeb1339ba0d23af16df6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cddc36211abad1234fac6e9d77326f9834954a5d04423cab950d1cb9aecf9989807f6101343f4149ab6e0af21d3f780d68f2f73b25ed527c4570ed20ac3ba620
|
|
7
|
+
data.tar.gz: 95a18d0ce1fed48a003ab8d938223a0a752bd5d63c27e19544f9d06b0d40116f794aed699dfd4052a24d5fa29a976f27ee037f9410d7dc88d7cb4979c7662cd1
|
data/.travis.yml
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
language: ruby
|
|
2
2
|
rvm:
|
|
3
3
|
- 2.0.0
|
|
4
|
+
- 2.1.0
|
|
4
5
|
notifications:
|
|
5
6
|
irc:
|
|
6
7
|
channels:
|
|
7
8
|
- "irc.freenode.org#berkshelf"
|
|
8
9
|
skip_join: true
|
|
9
10
|
use_notice: true
|
|
10
|
-
bundler_args: --without doc guard
|
|
11
|
+
bundler_args: --without doc guard --jobs 7
|
|
12
|
+
before_install:
|
|
13
|
+
- sudo apt-get install -qq libgecode-dev
|
|
11
14
|
script: 'bundle exec thor spec:ci'
|
data/CHANGELOG.md
CHANGED
data/README.md
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# vagrant-berkshelf
|
|
2
|
+
|
|
2
3
|
[](http://badge.fury.io/rb/vagrant-berkshelf)
|
|
3
4
|
[](https://travis-ci.org/berkshelf/vagrant-berkshelf)
|
|
4
5
|
[](https://gemnasium.com/berkshelf/vagrant-berkshelf)
|
|
@@ -7,11 +8,41 @@ A Vagrant plugin to add Berkshelf integration to the Chef provisioners
|
|
|
7
8
|
|
|
8
9
|
## Installation
|
|
9
10
|
|
|
10
|
-
|
|
11
|
+
### Manually install Gecode (temporary)
|
|
12
|
+
|
|
13
|
+
The current release candidate of Vagrant Berkshelf requires you to have Gecode installed on your machine. In the future this process will be provided in an easy and automated fashion.
|
|
14
|
+
|
|
15
|
+
#### OSX
|
|
16
|
+
|
|
17
|
+
$ cd $( brew --prefix )
|
|
18
|
+
$ git checkout 3c5ca25 Library/Formula/gecode.rb
|
|
19
|
+
$ brew install gecode
|
|
20
|
+
|
|
21
|
+
#### Debian and Ubuntu
|
|
22
|
+
|
|
23
|
+
$ sudo apt-get install libgecode-dev
|
|
24
|
+
|
|
25
|
+
##### Source
|
|
26
|
+
|
|
27
|
+
$ curl -O http://www.gecode.org/download/gecode-3.7.3.tar.gz
|
|
28
|
+
$ tar zxvf gecode-3.7.3.tar.gz
|
|
29
|
+
$ ./configure --disable-doc-dot \
|
|
30
|
+
--disable-doc-search \
|
|
31
|
+
--disable-doc-tagfile \
|
|
32
|
+
--disable-doc-chm \
|
|
33
|
+
--disable-doc-docset \
|
|
34
|
+
--disable-qt \
|
|
35
|
+
--disable-examples
|
|
36
|
+
$ make
|
|
37
|
+
$ (sudo) make install
|
|
38
|
+
|
|
39
|
+
### Vagrant & Plugin Installation
|
|
40
|
+
|
|
41
|
+
Install Vagrant '>= 1.5.2' from the [Vagrant downloads page](http://www.vagrantup.com/downloads.html)
|
|
11
42
|
|
|
12
43
|
Install the Vagrant Berkshelf plugin
|
|
13
44
|
|
|
14
|
-
$ vagrant plugin install vagrant-berkshelf
|
|
45
|
+
$ vagrant plugin install vagrant-berkshelf --plugin-version 2.0.0.rc2
|
|
15
46
|
|
|
16
47
|
## Usage
|
|
17
48
|
|
|
@@ -26,6 +57,7 @@ Once the Vagrant Berkshelf plugin is installed it can be enabled in your Vagrant
|
|
|
26
57
|
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!
|
|
27
58
|
|
|
28
59
|
# Authors
|
|
60
|
+
|
|
29
61
|
- Jamie Winsor (<jamie@vialstudios.com>)
|
|
30
62
|
- Michael Ivey (<michael.ivey@riotgames.com>)
|
|
31
63
|
|
data/lib/berkshelf/vagrant.rb
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
module Berkshelf
|
|
2
2
|
module Vagrant
|
|
3
3
|
module Action
|
|
4
|
-
# @author Jamie Winsor <jamie@vialstudios.com>
|
|
5
4
|
class Install
|
|
6
5
|
include Berkshelf::Vagrant::EnvHelpers
|
|
7
6
|
|
|
@@ -59,13 +58,6 @@ module Berkshelf
|
|
|
59
58
|
unless vagrant_version_satisfies?(">= 1.5")
|
|
60
59
|
raise Berkshelf::VagrantWrapperError.new(RuntimeError.new("vagrant-berkshelf requires Vagrant 1.5 or later."))
|
|
61
60
|
end
|
|
62
|
-
|
|
63
|
-
unless vagrant_version_satisfies?(::Berkshelf::Vagrant::TESTED_REQUIREMENTS)
|
|
64
|
-
env[:berkshelf].ui.warn "This version of the Berkshelf plugin has not been fully tested on this version of Vagrant."
|
|
65
|
-
env[:berkshelf].ui.warn "You should check for a newer version of vagrant-berkshelf."
|
|
66
|
-
env[:berkshelf].ui.warn "If you encounter any errors with this version, please report them at https://github.com/berkshelf/vagrant-berkshelf/issues"
|
|
67
|
-
env[:berkshelf].ui.warn "You can also join the discussion in #berkshelf on Freenode."
|
|
68
|
-
end
|
|
69
61
|
end
|
|
70
62
|
|
|
71
63
|
def vagrant_version_satisfies?(requirements)
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
module Berkshelf
|
|
2
2
|
module Vagrant
|
|
3
|
-
# @author Jamie Winsor <jamie@vialstudios.com>
|
|
4
|
-
#
|
|
5
3
|
# A module of common helper functions that can be mixed into Berkshelf::Vagrant actions
|
|
6
4
|
module EnvHelpers
|
|
7
5
|
# A file to persist vagrant-berkshelf specific information in between
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
require 'vagrant/errors'
|
|
2
2
|
|
|
3
3
|
module Berkshelf
|
|
4
|
-
# @author Jamie Winsor <jamie@vialstudios.com>
|
|
5
|
-
#
|
|
6
4
|
# A wrapper for a BerkshelfError for Vagrant. All Berkshelf exceptions should be
|
|
7
5
|
# wrapped in this proxy object so they are properly handled when Vagrant encounters
|
|
8
6
|
# an exception.
|
data/vagrant-berkshelf.gemspec
CHANGED
|
@@ -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', '>= 3.0.0.
|
|
22
|
+
spec.add_dependency 'berkshelf', '>= 3.0.0.rc1'
|
|
23
23
|
|
|
24
24
|
spec.add_development_dependency 'spork', '~> 0.9'
|
|
25
25
|
spec.add_development_dependency 'rspec', '~> 2.13'
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vagrant-berkshelf
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.0.
|
|
4
|
+
version: 2.0.0.rc3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jamie Winsor
|
|
@@ -9,62 +9,62 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-04-
|
|
12
|
+
date: 2014-04-09 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: berkshelf
|
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
|
17
17
|
requirements:
|
|
18
|
-
- -
|
|
18
|
+
- - ">="
|
|
19
19
|
- !ruby/object:Gem::Version
|
|
20
|
-
version: 3.0.0.
|
|
20
|
+
version: 3.0.0.rc1
|
|
21
21
|
type: :runtime
|
|
22
22
|
prerelease: false
|
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
|
24
24
|
requirements:
|
|
25
|
-
- -
|
|
25
|
+
- - ">="
|
|
26
26
|
- !ruby/object:Gem::Version
|
|
27
|
-
version: 3.0.0.
|
|
27
|
+
version: 3.0.0.rc1
|
|
28
28
|
- !ruby/object:Gem::Dependency
|
|
29
29
|
name: spork
|
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
|
31
31
|
requirements:
|
|
32
|
-
- - ~>
|
|
32
|
+
- - "~>"
|
|
33
33
|
- !ruby/object:Gem::Version
|
|
34
34
|
version: '0.9'
|
|
35
35
|
type: :development
|
|
36
36
|
prerelease: false
|
|
37
37
|
version_requirements: !ruby/object:Gem::Requirement
|
|
38
38
|
requirements:
|
|
39
|
-
- - ~>
|
|
39
|
+
- - "~>"
|
|
40
40
|
- !ruby/object:Gem::Version
|
|
41
41
|
version: '0.9'
|
|
42
42
|
- !ruby/object:Gem::Dependency
|
|
43
43
|
name: rspec
|
|
44
44
|
requirement: !ruby/object:Gem::Requirement
|
|
45
45
|
requirements:
|
|
46
|
-
- - ~>
|
|
46
|
+
- - "~>"
|
|
47
47
|
- !ruby/object:Gem::Version
|
|
48
48
|
version: '2.13'
|
|
49
49
|
type: :development
|
|
50
50
|
prerelease: false
|
|
51
51
|
version_requirements: !ruby/object:Gem::Requirement
|
|
52
52
|
requirements:
|
|
53
|
-
- - ~>
|
|
53
|
+
- - "~>"
|
|
54
54
|
- !ruby/object:Gem::Version
|
|
55
55
|
version: '2.13'
|
|
56
56
|
- !ruby/object:Gem::Dependency
|
|
57
57
|
name: thor
|
|
58
58
|
requirement: !ruby/object:Gem::Requirement
|
|
59
59
|
requirements:
|
|
60
|
-
- - ~>
|
|
60
|
+
- - "~>"
|
|
61
61
|
- !ruby/object:Gem::Version
|
|
62
62
|
version: '0.18'
|
|
63
63
|
type: :development
|
|
64
64
|
prerelease: false
|
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
|
66
66
|
requirements:
|
|
67
|
-
- - ~>
|
|
67
|
+
- - "~>"
|
|
68
68
|
- !ruby/object:Gem::Version
|
|
69
69
|
version: '0.18'
|
|
70
70
|
description: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
|
|
@@ -75,8 +75,8 @@ executables: []
|
|
|
75
75
|
extensions: []
|
|
76
76
|
extra_rdoc_files: []
|
|
77
77
|
files:
|
|
78
|
-
- .gitignore
|
|
79
|
-
- .travis.yml
|
|
78
|
+
- ".gitignore"
|
|
79
|
+
- ".travis.yml"
|
|
80
80
|
- CHANGELOG.md
|
|
81
81
|
- CONTRIBUTING.md
|
|
82
82
|
- Gemfile
|
|
@@ -114,17 +114,17 @@ require_paths:
|
|
|
114
114
|
- lib
|
|
115
115
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
116
116
|
requirements:
|
|
117
|
-
- -
|
|
117
|
+
- - ">="
|
|
118
118
|
- !ruby/object:Gem::Version
|
|
119
119
|
version: 1.9.1
|
|
120
120
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
121
121
|
requirements:
|
|
122
|
-
- -
|
|
122
|
+
- - ">"
|
|
123
123
|
- !ruby/object:Gem::Version
|
|
124
124
|
version: 1.3.1
|
|
125
125
|
requirements: []
|
|
126
126
|
rubyforge_project:
|
|
127
|
-
rubygems_version: 2.
|
|
127
|
+
rubygems_version: 2.2.2
|
|
128
128
|
signing_key:
|
|
129
129
|
specification_version: 4
|
|
130
130
|
summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
|