vagrant-orchestrate 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f003fe2e9ff1f79c05fdb94187ca3f9957950a
-  data.tar.gz: dd89457152b3cb5240932e40f5163fc182e22887
+  metadata.gz: fc05a7ce791712848c4eabc6b1f2dac74818bc87
+  data.tar.gz: 3f54e38bd2bfb9f57b2f55b6a9fa8ddc2ab4fb39
 SHA512:
-  metadata.gz: cee9ce03f28e452395afbe716422ccfb87994655a38c333f62ae277a5edf08f6a1b54466c6daac37a0ebc00d2194cc29b04fe68d723d0927796b01c1617ff7d0
-  data.tar.gz: 4f669963f2a2b23a58fd4a2cc9bdd3df5094c0ba3d843d20fbb387ab82609316e0b525c110cc652e5324c9613b80959f1d6b47791c22744940050b24022f962f
+  metadata.gz: 286c92e818750020924142d1c5a7f6fde14d8848481c3b7cfe2a9189485548780a5962333be77fb2a58902131464f19716023f3ff2a90407dc8162006d82a7ea
+  data.tar.gz: 45ad7a0068ae502e3de3bc76934119b967b0120e81c3f6e2052884efa95ac55603fda57693c6c6865c1f100fde45d8154164cc397593eb4c6aab9de869fdba92

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

@@ -103,24 +103,27 @@ module VagrantPlugins
           return unless argv
 
           if options[:provisioners].include? "puppet"
+            FileUtils.mkdir_p(File.join(@env.cwd, "puppet"))
             if options[:puppet_librarian_puppet]
               contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/Puppetfile"))
-              write_file "Puppetfile", contents, options
-              FileUtils.mkdir_p(File.join(@env.cwd, "modules"))
-              write_file(File.join(@env.cwd, "modules", ".gitignore"), "*", options)
+              write_file File.join("puppet", "Puppetfile"), contents, options
+              FileUtils.mkdir_p(File.join(@env.cwd, "puppet", "modules"))
+              write_file(File.join(@env.cwd, "puppet", "modules", ".gitignore"), "*", options)
               options[:plugins] << "vagrant-librarian-puppet"
             end
 
             if options[:puppet_hiera]
               contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/hiera.yaml"))
-              write_file("hiera.yaml", contents, options)
-              FileUtils.mkdir_p(File.join(@env.cwd, "hiera"))
+              write_file(File.join("puppet", "hiera.yaml"), contents, options)
+              FileUtils.mkdir_p(File.join(@env.cwd, "puppet", "hieradata"))
               contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/puppet/hiera/common.yaml"))
-              write_file(File.join(@env.cwd, "hiera", "common.yaml"), contents, options)
+              write_file(File.join(@env.cwd, "puppet", "hieradata", "common.yaml"), contents, options)
             end
 
-            FileUtils.mkdir_p(File.join(@env.cwd, "manifests"))
-            write_file(File.join(@env.cwd, "manifests", "default.pp"), "# Your puppet code goes here", options)
+            FileUtils.mkdir_p(File.join(@env.cwd, "puppet", "manifests"))
+            write_file(File.join(@env.cwd, "puppet", "manifests", "default.pp"),
+                       "# Your puppet code goes here",
+                       options)
           end
 
           options[:shell_paths] ||= options[:shell_inline] ? [] : [DEFAULT_SHELL_PATH]

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

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

@@ -86,8 +86,9 @@ describe VagrantPlugins::Orchestrate::Command::Init do
 
       it "creates the default files" do
         subject.execute
-        expect(Dir.entries(iso_env.cwd)).to include("manifests")
-        expect(Dir.entries(File.join(iso_env.cwd, "manifests"))).to include("default.pp")
+        expect(Dir.entries(iso_env.cwd)).to include("puppet")
+        expect(Dir.entries(File.join(iso_env.cwd, "puppet"))).to include("manifests")
+        expect(Dir.entries(File.join(iso_env.cwd, "puppet", "manifests"))).to include("default.pp")
       end
     end
 
@@ -108,13 +109,13 @@ describe VagrantPlugins::Orchestrate::Command::Init do
 
       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(".gitignore")
+        expect(Dir.entries(File.join(iso_env.cwd, "puppet"))).to include("modules")
+        expect(Dir.entries(File.join(iso_env.cwd, "puppet", "modules"))).to include(".gitignore")
       end
 
       it "creates the Puppetfile" do
         subject.execute
-        expect(Dir.entries(iso_env.cwd)).to include("Puppetfile")
+        expect(Dir.entries(File.join(iso_env.cwd, "puppet"))).to include("Puppetfile")
       end
 
       it "contains the plugin" do
@@ -137,14 +138,26 @@ describe VagrantPlugins::Orchestrate::Command::Init do
       let(:argv) { ["--puppet", "--puppet-hiera"] }
       it "is passed into the Vagrantfile" do
         subject.execute
-        expect(iso_env.vagrantfile.config.vm.provisioners.first.config.hiera_config_path).to eq("hiera.yaml")
+        expect(iso_env.vagrantfile.config.vm.provisioners.first.config.hiera_config_path).to eq("puppet/hiera.yaml")
       end
 
       it "creates the file" do
         subject.execute
-        expect(Dir.entries(iso_env.cwd)).to include("hiera.yaml")
-        expect(Dir.entries(iso_env.cwd)).to include("hiera")
-        expect(Dir.entries(File.join(iso_env.cwd, "hiera"))).to include("common.yaml")
+        expect(Dir.entries(File.join(iso_env.cwd, "puppet"))).to include("hiera.yaml")
+        expect(Dir.entries(File.join(iso_env.cwd, "puppet"))).to include("hieradata")
+        expect(Dir.entries(File.join(iso_env.cwd, "puppet", "hieradata"))).to include("common.yaml")
+      end
+
+      describe "hiera.yaml" do
+        it "declares a datadir contains a common.yaml file" do
+          subject.execute
+          hiera_obj = YAML.load(File.read(File.join(iso_env.cwd, "puppet", "hiera.yaml")))
+          datadir = hiera_obj[:datadir]
+          expect(datadir).to start_with("/vagrant")
+          datadir_path = File.join(iso_env.cwd, datadir.sub("/vagrant/", ""))
+          expect(datadir_path).to satisfy { |path| Dir.exist?(path) }
+          expect(Dir.entries(datadir_path)).to include("common.yaml")
+        end
       end
     end
   end

data/templates/puppet/hiera.yaml.erb

@@ -7,4 +7,4 @@
 - "common"
 
 :yaml:
-:datadir: '/vagrant/hiera'
+:datadir: '/vagrant/puppet/hieradata'

data/templates/vagrant/Vagrantfile.erb

@@ -25,11 +25,12 @@ Vagrant.configure("2") do |config|
   <% end -%>
   config.vm.provision "puppet" do |puppet|
     <% if puppet_librarian_puppet -%>
-    puppet.module_path = 'modules'
+    puppet.module_path = 'puppet/modules'
     <% end -%>
     <% if puppet_hiera -%>
-    puppet.hiera_config_path = 'hiera.yaml'
+    puppet.hiera_config_path = 'puppet/hiera.yaml'
     <% end -%>
+    puppet.manifests_path = 'puppet/manifests'
   end
   <% end -%>
   <% if communicator == "ssh" -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler