vagrant-orchestrate 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23910236a77b4ef2a42c5bc7fbe15f21083387c6
-  data.tar.gz: 4337fc38a9860cfabbbf8caa76379f04350b5870
+  metadata.gz: 68d822a29bada26add191f95e3a0dfe5f6c2584e
+  data.tar.gz: ae0e9cda8b0dc3d33873d61a22207b8677e8932b
 SHA512:
-  metadata.gz: dd6785a727f48143884d8d7455648a8f52f076ff8a703413872c17b55acb8d3936f9c890bd60cbf07e5b1b6f0fdc286365aebd5dec16c5887633531a47335939
-  data.tar.gz: bfedff81ef33fbd3ba404be46b9a342f485003f7ec36229f72036218370bd775359ddd5c88e77abb74943e5b5d2b34221d158ad0b4fc944f673f2b0e71f47e74
+  metadata.gz: 87198f484d3d02dea101ad2e3ed7e26dc2a4a9b534c1fa254e61b374094692f22b7f2a7e96fdcd946422ee6644030ed3b5943d5beb995b97ddc77711fd48d5ae
+  data.tar.gz: 0096cbc11660e2eb0895433a611b896243b65f7f9f82daa0381c7dbdc4ec63fc62c06dc58a67001d848af5db5159ea264f1eb24687ac3f231ac4037a0fa3d7c0

data/.gitignore

@@ -14,3 +14,4 @@
 mkmf.log
 
 /.vagrant/
+.DS_Store

data/lib/vagrant-orchestrate/command/init.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
               options[:shell_inline] = c
             end
 
-            o.on("--puppet", "Shorthand for --provisioner-with=puppet") do
+            o.on("--puppet", "Shorthand for '--provision-with puppet'") do
               options[:provisioners] << "puppet"
             end
 
@@ -107,10 +107,8 @@ module VagrantPlugins
               contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/Puppetfile"))
               write_file "Puppetfile", contents, options
               FileUtils.mkdir_p(File.join(@env.cwd, "modules"))
-              contents = "# This is a placeholder file to keep the modules directory around."
-              write_file(File.join(@env.cwd, "modules", ".PLACEHOLDER"), contents, options)
+              write_file(File.join(@env.cwd, "modules", ".gitignore"), "*", options)
               options[:plugins] << "vagrant-librarian-puppet"
-              @env.ui.info(I18n.t("vagrant_orchestrate.librarian_puppet.gitignore"), prefix: false)
             end
 
             options[:puppet_hiera] ||= true
@@ -151,7 +149,8 @@ module VagrantPlugins
                                              plugins: options[:plugins]
                                              )
           write_file("Vagrantfile", contents, options)
-
+          FileUtils.cp(Orchestrate.source_root.join("templates", "vagrant", "dummy.box"),
+                       File.join(@env.cwd, "dummy.box"))
           @env.ui.info(I18n.t("vagrant.commands.init.success"), prefix: false)
 
           # Success, exit status 0

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/locales/en.yml

@@ -1,7 +1,2 @@
 en:
   vagrant_orchestrate:
-    librarian_puppet:
-      gitignore: |-
-        It is recommended that you add the following lines to your .gitignore:
-          /modules/
-          !/modules/.PLACEHOLDER

data/spec/vagrant-orchestrate/command/init_spec.rb

@@ -102,13 +102,13 @@ describe VagrantPlugins::Orchestrate::Command::Init do
       let(:argv) { ["--puppet", "--puppet-librarian-puppet"] }
       it "is passed into the Vagrantfile" do
         subject.execute
-        expect(iso_env.vagrantfile.config.librarian_puppet.placeholder_filename).to eq(".PLACEHOLDER")
+        expect(iso_env.vagrantfile.config.librarian_puppet.placeholder_filename).to eq(".gitignore")
       end
 
       it "creates the modules directory and placeholder" do
         subject.execute
         expect(Dir.entries(iso_env.cwd)).to include("modules")
-        expect(Dir.entries(File.join(iso_env.cwd, "modules"))).to include(".PLACEHOLDER")
+        expect(Dir.entries(File.join(iso_env.cwd, "modules"))).to include(".gitignore")
       end
 
       it "creates the Puppetfile" do
@@ -249,4 +249,13 @@ describe VagrantPlugins::Orchestrate::Command::Init do
       end
     end
   end
+
+  context "box" do
+    describe "dummy.box" do
+      it "winds up in the target directory" do
+        subject.execute
+        expect(Dir.entries(iso_env.cwd)).to include("dummy.box")
+      end
+    end
+  end
 end

data/templates/vagrant/Vagrantfile.erb

@@ -17,7 +17,7 @@ Vagrant.configure("2") do |config|
   <% end -%>
   <% if provisioners.include? "puppet" -%>
   <% if puppet_librarian_puppet -%>
-  config.librarian_puppet.placeholder_filename = ".PLACEHOLDER"
+  config.librarian_puppet.placeholder_filename = ".gitignore"
   <% end -%>
   config.vm.provision "puppet" do |puppet|
     <% if puppet_librarian_puppet -%>
@@ -46,6 +46,7 @@ Vagrant.configure("2") do |config|
   managed_servers.each do |instance|
     config.vm.define "managed-#{instance}" do |box|
       box.vm.box = "tknerr/managed-server-dummy"
+      box.vm.box_url = "./dummy.box"
       box.vm.provider :managed do |provider|
         provider.server = instance
       end

data/vagrant-orchestrate.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop', '~> 0.28'
   # See Gemfile for additional development dependencies that were not available
   # on rubygems (or another gem source), but needed to be downloaded from git.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.28'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.28'
 description: 
 email:
 - cbaldauf@cimpress.com
@@ -80,6 +94,7 @@ files:
 - templates/puppet/hiera.yaml.erb
 - templates/puppet/hiera/common.yaml.erb
 - templates/vagrant/Vagrantfile.erb
+- templates/vagrant/dummy.box
 - vagrant-orchestrate.gemspec
 homepage: ''
 licenses: