vagrant-librarian-puppet 0.7.1 → 0.7.2

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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/README.md +3 -1
  4. data/lib/vagrant-librarian-puppet/action/librarian_puppet.rb +5 -1
  5. data/lib/vagrant-librarian-puppet/config.rb +15 -0
  6. data/lib/vagrant-librarian-puppet/version.rb +1 -1
  7. data/vagrant-librarian-puppet.gemspec +1 -1
  8. metadata +20 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 68600dd9ad15f90aecd126e5dcbd61ba5dbdcab0
4
- data.tar.gz: a2f4e5b2975da62f3e6b4903201f3b449bbe0a30
3
+ metadata.gz: bde3fa7da035c0b4c481472d343cd5f757037232
4
+ data.tar.gz: a34404374c91ece831bc7815a5356ca117db15a7
5
5
  SHA512:
6
- metadata.gz: 3dea9a3f8049ddee4711eb1d146298a9d01f03b7867014f64ff49a5df4a900f0e75bc4fd6a4cb65d9f09230e56bc841524e4ed3e1158060a4ca10f2df2895471
7
- data.tar.gz: f59a7c4e1768e0e6bea8cd773b4f2d97a9c9e738529303a4cc080c42f2f2b2b172a9c87366dbb822265cfdef588250d67ecf7c3d7f9e5ecaafc5786def75b546
6
+ metadata.gz: 6d61594228916ed66a848d24b7f13c96a980a5a67a0764a4e27c0c8239c5da92c684786dacb2a126e39e92bcd95245667c71ed84f82df087135e853c1504842d
7
+ data.tar.gz: 08659f9addc7f061bb9b53687be5ef2ec38790fe55f0422bd98787a4f912e16ffd9262c29353b52ef4c69f67a0bfdb4900c96062870803aaf78cf7588a972e50
data/Gemfile CHANGED
@@ -4,7 +4,7 @@ gemspec
4
4
 
5
5
  group :development do
6
6
  gem "vagrant", github: "mitchellh/vagrant"
7
- gem "debugger"
7
+ gem "byebug"
8
8
  end
9
9
 
10
10
  group :plugins do
data/README.md CHANGED
@@ -36,9 +36,11 @@ Vagrant.configure("2") do |config|
36
36
  config.librarian_puppet.puppetfile_dir = "puppet"
37
37
  # placeholder_filename defaults to .PLACEHOLDER
38
38
  config.librarian_puppet.placeholder_filename = ".MYPLACEHOLDER"
39
+ config.use_v1_api = '1' # Check https://github.com/rodjek/librarian-puppet#how-to-use
40
+ config.destruct = false # Check https://github.com/rodjek/librarian-puppet#how-to-use
39
41
 
40
42
  config.vm.provision :puppet do |puppet|
41
- puppet.modules = "puppet/modules"
43
+ puppet.module_path = "puppet/modules"
42
44
 
43
45
  ...
44
46
 
data/lib/vagrant-librarian-puppet/action/librarian_puppet.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'librarian/puppet'
2
2
  require 'librarian/action'
3
+ require "librarian/puppet/action/install"
3
4
 
4
5
  module VagrantPlugins
5
6
  module LibrarianPuppet
@@ -43,9 +44,12 @@ module VagrantPlugins
43
44
  environment = Librarian::Puppet::Environment.new({
44
45
  :project_path => File.join(env[:root_path], config.puppetfile_dir)
45
46
  })
47
+ environment.config_db.local['destructive'] = config.destructive.to_s
48
+ environment.config_db.local['use-v1-api'] = config.use_v1_api
49
+
46
50
  Librarian::Action::Ensure.new(environment).run
47
51
  Librarian::Action::Resolve.new(environment, config.resolve_options).run
48
- Librarian::Action::Install.new(environment).run
52
+ Librarian::Puppet::Action::Install.new(environment).run
49
53
 
50
54
  # Restore the original path
51
55
  ENV['PATH'] = original_path
data/lib/vagrant-librarian-puppet/config.rb CHANGED
@@ -2,12 +2,16 @@ module VagrantPlugins
2
2
  module LibrarianPuppet
3
3
  class Config < Vagrant.plugin(2, :config)
4
4
  attr_accessor :puppetfile_dir
5
+ attr_accessor :use_v1_api
6
+ attr_accessor :destructive
5
7
  attr_accessor :placeholder_filename
6
8
  attr_accessor :resolve_options
7
9
 
8
10
  def initialize
9
11
  @puppetfile_dir = UNSET_VALUE
10
12
  @placeholder_filename = UNSET_VALUE
13
+ @use_v1_api = UNSET_VALUE
14
+ @destructive = UNSET_VALUE
11
15
  @resolve_options = UNSET_VALUE
12
16
  end
13
17
 
@@ -15,6 +19,8 @@ module VagrantPlugins
15
19
  @puppetfile_dir = '.' if @puppetfile_dir == UNSET_VALUE
16
20
  @placeholder_filename = '.PLACEHOLDER' if @placeholder_filename == UNSET_VALUE
17
21
  @resolve_options = {} if @resolve_options == UNSET_VALUE
22
+ @use_v1_api = '1' if @use_v1_api == UNSET_VALUE
23
+ @destructive = true if @destructive == UNSET_VALUE
18
24
  end
19
25
 
20
26
  def validate(machine)
@@ -29,6 +35,15 @@ module VagrantPlugins
29
35
  @puppetfile_path ||= @puppetfile_dir ? File.join(@puppetfile_dir, 'Puppetfile') : 'Puppetfile'
30
36
  end
31
37
 
38
+ def use_v1_api
39
+ @use_v1_api ||= '1'
40
+ end
41
+
42
+ def destruct
43
+ @destruct ||= true
44
+ end
45
+
46
+
32
47
  end
33
48
  end
34
49
  end
data/lib/vagrant-librarian-puppet/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module LibrarianPuppet
3
- VERSION = "0.7.1"
3
+ VERSION = "0.7.2"
4
4
  end
5
5
  end
data/vagrant-librarian-puppet.gemspec CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ["lib"]
20
20
 
21
- spec.add_runtime_dependency "librarian-puppet", "~> 1.0.2"
21
+ spec.add_runtime_dependency "librarian-puppet", "~> 1.4.1"
22
22
  spec.add_runtime_dependency "librarian", "~> 0.1.2"
23
23
  spec.add_runtime_dependency "puppet", "~> 3.4.3"
24
24
  spec.add_development_dependency "bundler", "~> 1.3"
metadata CHANGED
@@ -1,97 +1,97 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-librarian-puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.1
4
+ version: 0.7.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Hahn
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-24 00:00:00.000000000 Z
11
+ date: 2015-01-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: librarian-puppet
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: 1.0.2
19
+ version: 1.4.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
- version: 1.0.2
26
+ version: 1.4.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: librarian
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.1.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.1.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: puppet
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
47
  version: 3.4.3
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ~>
53
53
  - !ruby/object:Gem::Version
54
54
  version: 3.4.3
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.3'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ~>
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.3'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  description: A Vagrant plugin to install Puppet modules using Librarian-Puppet.
@@ -101,7 +101,7 @@ executables: []
101
101
  extensions: []
102
102
  extra_rdoc_files: []
103
103
  files:
104
- - ".gitignore"
104
+ - .gitignore
105
105
  - Gemfile
106
106
  - LICENSE.txt
107
107
  - README.md
@@ -125,19 +125,18 @@ require_paths:
125
125
  - lib
126
126
  required_ruby_version: !ruby/object:Gem::Requirement
127
127
  requirements:
128
- - - ">="
128
+ - - '>='
129
129
  - !ruby/object:Gem::Version
130
130
  version: '0'
131
131
  required_rubygems_version: !ruby/object:Gem::Requirement
132
132
  requirements:
133
- - - ">="
133
+ - - '>='
134
134
  - !ruby/object:Gem::Version
135
135
  version: '0'
136
136
  requirements: []
137
137
  rubyforge_project:
138
- rubygems_version: 2.0.3
138
+ rubygems_version: 2.0.14
139
139
  signing_key:
140
140
  specification_version: 4
141
141
  summary: A Vagrant plugin to install Puppet modules using Librarian-Puppet.
142
142
  test_files: []
143
- has_rdoc: