vagrant-librarian-puppet 0.3.0 → 0.3.1

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 ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 847bf22adf723d1e621ada21c6244257526a7050
4
+ data.tar.gz: 5f512f03bff4f8a4546fbf5482cc6c7e9b0cedd5
5
+ SHA512:
6
+ metadata.gz: 9d8b1ef4f87dfe9f76ad4e0fcd055e5a6f57a17e52649243d772a5e13789d2cca94ea6a8924db4035925df303cd98eb07e987edcc8a85d4336dec98078f1816f
7
+ data.tar.gz: 8f10c48fbceca8a8d3788cd6af534228bd092fe8f6e73b3600c9d0dd641fa661ce461eedbac70e9dc6618975ad253674799a4ca45c43fdfa4dfc552cb4c97148
data/Vagrantfile CHANGED
@@ -9,6 +9,7 @@ Vagrant.configure('2') do |config|
9
9
  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
10
10
 
11
11
  config.librarian_puppet.puppetfile_dir = 'puppet'
12
+ config.librarian_puppet.resolve_options = { :force => true }
12
13
 
13
14
  config.vm.provision :puppet do |puppet|
14
15
  puppet.manifests_path = 'manifests'
@@ -44,7 +44,7 @@ module VagrantPlugins
44
44
  :project_path => File.join(env[:root_path], config.puppetfile_dir)
45
45
  })
46
46
  Librarian::Action::Ensure.new(environment).run
47
- Librarian::Action::Resolve.new(environment).run
47
+ Librarian::Action::Resolve.new(environment, config.resolve_options).run
48
48
  Librarian::Action::Install.new(environment).run
49
49
 
50
50
  # Restore the original path
@@ -3,15 +3,26 @@ module VagrantPlugins
3
3
  class Config < Vagrant.plugin(2, :config)
4
4
  attr_accessor :puppetfile_dir
5
5
  attr_accessor :placeholder_filename
6
+ attr_accessor :resolve_options
6
7
 
7
8
  def initialize
8
9
  @puppetfile_dir = UNSET_VALUE
9
10
  @placeholder_filename = UNSET_VALUE
11
+ @resolve_options = UNSET_VALUE
10
12
  end
11
13
 
12
14
  def finalize!
13
15
  @puppetfile_dir = '.' if @puppetfile_dir == UNSET_VALUE
14
16
  @placeholder_filename = '.PLACEHOLDER' if @placeholder_filename == UNSET_VALUE
17
+ @resolve_options = {} if @resolve_options == UNSET_VALUE
18
+ end
19
+
20
+ def validate(machine)
21
+ errors = []
22
+ if not @resolve_options.kind_of?(Hash)
23
+ errors << '`resolve_options` must be a hash'
24
+ end
25
+ return { 'vagrant-librarian-puppet' => errors }
15
26
  end
16
27
 
17
28
  def puppetfile_path
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module LibrarianPuppet
3
- VERSION = "0.3.0"
3
+ VERSION = "0.3.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,68 +1,60 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-librarian-puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
5
- prerelease:
4
+ version: 0.3.1
6
5
  platform: ruby
7
6
  authors:
8
7
  - Michael Hahn
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-10-19 00:00:00.000000000 Z
11
+ date: 2014-01-05 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: librarian-puppet
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ! '>='
17
+ - - '>='
20
18
  - !ruby/object:Gem::Version
21
19
  version: '0'
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ! '>='
24
+ - - '>='
28
25
  - !ruby/object:Gem::Version
29
26
  version: '0'
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: librarian
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - '>='
36
32
  - !ruby/object:Gem::Version
37
33
  version: '0'
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - '>='
44
39
  - !ruby/object:Gem::Version
45
40
  version: '0'
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: puppet
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ! '>='
45
+ - - '>='
52
46
  - !ruby/object:Gem::Version
53
47
  version: '0'
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ! '>='
52
+ - - '>='
60
53
  - !ruby/object:Gem::Version
61
54
  version: '0'
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: bundler
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - ~>
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :development
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - ~>
76
67
  - !ruby/object:Gem::Version
@@ -78,33 +69,29 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: rake
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
- - - ! '>='
73
+ - - '>='
84
74
  - !ruby/object:Gem::Version
85
75
  version: '0'
86
76
  type: :development
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
- - - ! '>='
80
+ - - '>='
92
81
  - !ruby/object:Gem::Version
93
82
  version: '0'
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: rspec
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
- - - ! '>='
87
+ - - '>='
100
88
  - !ruby/object:Gem::Version
101
89
  version: '0'
102
90
  type: :development
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
- - - ! '>='
94
+ - - '>='
108
95
  - !ruby/object:Gem::Version
109
96
  version: '0'
110
97
  description: A Vagrant plugin to install Puppet modules using Librarian-Puppet.
@@ -131,26 +118,26 @@ files:
131
118
  homepage: https://github.com/mhahn/vagrant-librarian-puppet
132
119
  licenses:
133
120
  - MIT
121
+ metadata: {}
134
122
  post_install_message:
135
123
  rdoc_options: []
136
124
  require_paths:
137
125
  - lib
138
126
  required_ruby_version: !ruby/object:Gem::Requirement
139
- none: false
140
127
  requirements:
141
- - - ! '>='
128
+ - - '>='
142
129
  - !ruby/object:Gem::Version
143
130
  version: '0'
144
131
  required_rubygems_version: !ruby/object:Gem::Requirement
145
- none: false
146
132
  requirements:
147
- - - ! '>='
133
+ - - '>='
148
134
  - !ruby/object:Gem::Version
149
135
  version: '0'
150
136
  requirements: []
151
137
  rubyforge_project:
152
- rubygems_version: 1.8.23
138
+ rubygems_version: 2.0.3
153
139
  signing_key:
154
- specification_version: 3
140
+ specification_version: 4
155
141
  summary: A Vagrant plugin to install Puppet modules using Librarian-Puppet.
156
142
  test_files: []
143
+ has_rdoc: