vagrant-orchestrate 0.0.2 → 0.0.3

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 23910236a77b4ef2a42c5bc7fbe15f21083387c6
4
- data.tar.gz: 4337fc38a9860cfabbbf8caa76379f04350b5870
3
+ metadata.gz: 68d822a29bada26add191f95e3a0dfe5f6c2584e
4
+ data.tar.gz: ae0e9cda8b0dc3d33873d61a22207b8677e8932b
5
5
  SHA512:
6
- metadata.gz: dd6785a727f48143884d8d7455648a8f52f076ff8a703413872c17b55acb8d3936f9c890bd60cbf07e5b1b6f0fdc286365aebd5dec16c5887633531a47335939
7
- data.tar.gz: bfedff81ef33fbd3ba404be46b9a342f485003f7ec36229f72036218370bd775359ddd5c88e77abb74943e5b5d2b34221d158ad0b4fc944f673f2b0e71f47e74
6
+ metadata.gz: 87198f484d3d02dea101ad2e3ed7e26dc2a4a9b534c1fa254e61b374094692f22b7f2a7e96fdcd946422ee6644030ed3b5943d5beb995b97ddc77711fd48d5ae
7
+ data.tar.gz: 0096cbc11660e2eb0895433a611b896243b65f7f9f82daa0381c7dbdc4ec63fc62c06dc58a67001d848af5db5159ea264f1eb24687ac3f231ac4037a0fa3d7c0
data/.gitignore CHANGED
@@ -14,3 +14,4 @@
14
14
  mkmf.log
15
15
 
16
16
  /.vagrant/
17
+ .DS_Store
@@ -48,7 +48,7 @@ module VagrantPlugins
48
48
  options[:shell_inline] = c
49
49
  end
50
50
 
51
- o.on("--puppet", "Shorthand for --provisioner-with=puppet") do
51
+ o.on("--puppet", "Shorthand for '--provision-with puppet'") do
52
52
  options[:provisioners] << "puppet"
53
53
  end
54
54
 
@@ -107,10 +107,8 @@ module VagrantPlugins
107
107
  contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/Puppetfile"))
108
108
  write_file "Puppetfile", contents, options
109
109
  FileUtils.mkdir_p(File.join(@env.cwd, "modules"))
110
- contents = "# This is a placeholder file to keep the modules directory around."
111
- write_file(File.join(@env.cwd, "modules", ".PLACEHOLDER"), contents, options)
110
+ write_file(File.join(@env.cwd, "modules", ".gitignore"), "*", options)
112
111
  options[:plugins] << "vagrant-librarian-puppet"
113
- @env.ui.info(I18n.t("vagrant_orchestrate.librarian_puppet.gitignore"), prefix: false)
114
112
  end
115
113
 
116
114
  options[:puppet_hiera] ||= true
@@ -151,7 +149,8 @@ module VagrantPlugins
151
149
  plugins: options[:plugins]
152
150
  )
153
151
  write_file("Vagrantfile", contents, options)
154
-
152
+ FileUtils.cp(Orchestrate.source_root.join("templates", "vagrant", "dummy.box"),
153
+ File.join(@env.cwd, "dummy.box"))
155
154
  @env.ui.info(I18n.t("vagrant.commands.init.success"), prefix: false)
156
155
 
157
156
  # Success, exit status 0
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Orchestrate
3
- VERSION = "0.0.2"
3
+ VERSION = "0.0.3"
4
4
  end
5
5
  end
data/locales/en.yml CHANGED
@@ -1,7 +1,2 @@
1
1
  en:
2
2
  vagrant_orchestrate:
3
- librarian_puppet:
4
- gitignore: |-
5
- It is recommended that you add the following lines to your .gitignore:
6
- /modules/
7
- !/modules/.PLACEHOLDER
@@ -102,13 +102,13 @@ describe VagrantPlugins::Orchestrate::Command::Init do
102
102
  let(:argv) { ["--puppet", "--puppet-librarian-puppet"] }
103
103
  it "is passed into the Vagrantfile" do
104
104
  subject.execute
105
- expect(iso_env.vagrantfile.config.librarian_puppet.placeholder_filename).to eq(".PLACEHOLDER")
105
+ expect(iso_env.vagrantfile.config.librarian_puppet.placeholder_filename).to eq(".gitignore")
106
106
  end
107
107
 
108
108
  it "creates the modules directory and placeholder" do
109
109
  subject.execute
110
110
  expect(Dir.entries(iso_env.cwd)).to include("modules")
111
- expect(Dir.entries(File.join(iso_env.cwd, "modules"))).to include(".PLACEHOLDER")
111
+ expect(Dir.entries(File.join(iso_env.cwd, "modules"))).to include(".gitignore")
112
112
  end
113
113
 
114
114
  it "creates the Puppetfile" do
@@ -249,4 +249,13 @@ describe VagrantPlugins::Orchestrate::Command::Init do
249
249
  end
250
250
  end
251
251
  end
252
+
253
+ context "box" do
254
+ describe "dummy.box" do
255
+ it "winds up in the target directory" do
256
+ subject.execute
257
+ expect(Dir.entries(iso_env.cwd)).to include("dummy.box")
258
+ end
259
+ end
260
+ end
252
261
  end
@@ -17,7 +17,7 @@ Vagrant.configure("2") do |config|
17
17
  <% end -%>
18
18
  <% if provisioners.include? "puppet" -%>
19
19
  <% if puppet_librarian_puppet -%>
20
- config.librarian_puppet.placeholder_filename = ".PLACEHOLDER"
20
+ config.librarian_puppet.placeholder_filename = ".gitignore"
21
21
  <% end -%>
22
22
  config.vm.provision "puppet" do |puppet|
23
23
  <% if puppet_librarian_puppet -%>
@@ -46,6 +46,7 @@ Vagrant.configure("2") do |config|
46
46
  managed_servers.each do |instance|
47
47
  config.vm.define "managed-#{instance}" do |box|
48
48
  box.vm.box = "tknerr/managed-server-dummy"
49
+ box.vm.box_url = "./dummy.box"
49
50
  box.vm.provider :managed do |provider|
50
51
  provider.server = instance
51
52
  end
Binary file
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
20
20
  spec.add_development_dependency 'bundler', '~> 1.6'
21
21
  spec.add_development_dependency 'rake', '~> 10.0'
22
22
  spec.add_development_dependency 'rspec'
23
+ spec.add_development_dependency 'rubocop', '~> 0.28'
23
24
  # See Gemfile for additional development dependencies that were not available
24
25
  # on rubygems (or another gem source), but needed to be downloaded from git.
25
26
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-orchestrate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christopher Baldauf
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-18 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: bundler
@@ -52,6 +52,20 @@ dependencies:
52
52
  - - '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: rubocop
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: '0.28'
62
+ type: :development
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ~>
67
+ - !ruby/object:Gem::Version
68
+ version: '0.28'
55
69
  description:
56
70
  email:
57
71
  - cbaldauf@cimpress.com
@@ -80,6 +94,7 @@ files:
80
94
  - templates/puppet/hiera.yaml.erb
81
95
  - templates/puppet/hiera/common.yaml.erb
82
96
  - templates/vagrant/Vagrantfile.erb
97
+ - templates/vagrant/dummy.box
83
98
  - vagrant-orchestrate.gemspec
84
99
  homepage: ''
85
100
  licenses: