vagrant-orchestrate 0.0.3 → 0.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 68d822a29bada26add191f95e3a0dfe5f6c2584e
4
- data.tar.gz: ae0e9cda8b0dc3d33873d61a22207b8677e8932b
3
+ metadata.gz: 0e347bb4479ef234155ae4528bf77d17980207a3
4
+ data.tar.gz: 5c5399041fe42ebb9c40d8cd36849ed750d28bf6
5
5
  SHA512:
6
- metadata.gz: 87198f484d3d02dea101ad2e3ed7e26dc2a4a9b534c1fa254e61b374094692f22b7f2a7e96fdcd946422ee6644030ed3b5943d5beb995b97ddc77711fd48d5ae
7
- data.tar.gz: 0096cbc11660e2eb0895433a611b896243b65f7f9f82daa0381c7dbdc4ec63fc62c06dc58a67001d848af5db5159ea264f1eb24687ac3f231ac4037a0fa3d7c0
6
+ metadata.gz: 4baa7ec4395f5bdb8fa480b6e363e3549192fc847f33f11ac124b8192c1f013e0136cbe73ed10701366ce1c42b5d8c012effc10067226f0417f9dc25c8005b82
7
+ data.tar.gz: 1d9a741d245122ae538cf2aca8346190778da500fd9986d475d01fb3683a0ae908a1f86e00c39195ac50852622342185f15cb158d54bef567f5a0eeedc363fe3
@@ -24,6 +24,9 @@ module VagrantPlugins
24
24
  options[:provisioners] = []
25
25
  options[:servers] = []
26
26
  options[:plugins] = DEFAULT_PLUGINS
27
+ options[:puppet_librarian_puppet] = true
28
+ options[:puppet_hiera] = true
29
+
27
30
 
28
31
  opts = OptionParser.new do |o|
29
32
  o.banner = "Usage: vagrant orchestrate init [options]"
@@ -52,11 +55,11 @@ module VagrantPlugins
52
55
  options[:provisioners] << "puppet"
53
56
  end
54
57
 
55
- o.on("--puppet-hiera", "Include templates for hiera. Only with --puppet") do |p|
58
+ o.on("--[no-]puppet-hiera", "Include templates for hiera. Only with --puppet") do |p|
56
59
  options[:puppet_hiera] = p
57
60
  end
58
61
 
59
- o.on("--puppet-librarian-puppet",
62
+ o.on("--[no-]puppet-librarian-puppet",
60
63
  "Include a Puppetfile and the vagrant-librarian-puppet plugin. Only with --puppet") do |p|
61
64
  options[:puppet_librarian_puppet] = p
62
65
  end
@@ -102,7 +105,6 @@ module VagrantPlugins
102
105
  return unless argv
103
106
 
104
107
  if options[:provisioners].include? "puppet"
105
- options[:puppet_librarian_puppet] ||= true
106
108
  if options[:puppet_librarian_puppet]
107
109
  contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/Puppetfile"))
108
110
  write_file "Puppetfile", contents, options
@@ -111,7 +113,6 @@ module VagrantPlugins
111
113
  options[:plugins] << "vagrant-librarian-puppet"
112
114
  end
113
115
 
114
- options[:puppet_hiera] ||= true
115
116
  if options[:puppet_hiera]
116
117
  contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/hiera.yaml"))
117
118
  write_file("hiera.yaml", contents, options)
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Orchestrate
3
- VERSION = "0.0.3"
3
+ VERSION = "0.0.4"
4
4
  end
5
5
  end
@@ -122,11 +122,12 @@ describe VagrantPlugins::Orchestrate::Command::Init do
122
122
  expect(vagrantfile).to include("vagrant-librarian-puppet")
123
123
  end
124
124
 
125
- describe "ui" do
126
- let(:ui_class) { Vagrant::UI::Basic }
127
- it "displays a .gitignore message" do
128
- output = capture_stdout { subject.execute }
129
- expect(output).to include(".gitignore")
125
+ describe "negative" do
126
+ let(:argv) { ["--puppet", "--no-puppet-librarian-puppet"] }
127
+ it "shouldn't be included" do
128
+ subject.execute
129
+ # This should be the default, as long as the plugin is installed
130
+ expect(iso_env.vagrantfile.config.librarian_puppet.placeholder_filename).to eq(".PLACEHOLDER")
130
131
  end
131
132
  end
132
133
  end
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
9
9
  spec.authors = ['Christopher Baldauf']
10
10
  spec.email = ['cbaldauf@cimpress.com']
11
11
  spec.summary = 'Vagrant plugin to orchestrate the deployment of managed servers.'
12
- spec.homepage = ''
12
+ spec.homepage = 'https://github.com/Cimpress-MCP/vagrant-orchestrate'
13
13
  spec.license = 'Apache 2.0'
14
14
 
15
15
  spec.files = `git ls-files -z`.split("\x0")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-orchestrate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christopher Baldauf
@@ -96,7 +96,7 @@ files:
96
96
  - templates/vagrant/Vagrantfile.erb
97
97
  - templates/vagrant/dummy.box
98
98
  - vagrant-orchestrate.gemspec
99
- homepage: ''
99
+ homepage: https://github.com/Cimpress-MCP/vagrant-orchestrate
100
100
  licenses:
101
101
  - Apache 2.0
102
102
  metadata: {}