vagrant-orchestrate 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e347bb4479ef234155ae4528bf77d17980207a3
-  data.tar.gz: 5c5399041fe42ebb9c40d8cd36849ed750d28bf6
+  metadata.gz: 4a322cd2fbc31965a3e93c786488c259852f572d
+  data.tar.gz: 66abcb2ba9fc1d64f3ae2b95f16aca4732731cda
 SHA512:
-  metadata.gz: 4baa7ec4395f5bdb8fa480b6e363e3549192fc847f33f11ac124b8192c1f013e0136cbe73ed10701366ce1c42b5d8c012effc10067226f0417f9dc25c8005b82
-  data.tar.gz: 1d9a741d245122ae538cf2aca8346190778da500fd9986d475d01fb3683a0ae908a1f86e00c39195ac50852622342185f15cb158d54bef567f5a0eeedc363fe3
+  metadata.gz: 441488d5df3e5656441ee417a84caf4fa6db49d76eee4c5668287c713213ad2ed8dfb55511b83921560df54430ef68ae7bbceceafd6726015471b638a447e314
+  data.tar.gz: cd3e91eb5a6790a6baa39d3106850510aaea7f0af2b5fc856421524ac75073ad933fd1cc2d52224cb010b618097d16b8c7751481beef9fca7a5d69c1258fbbde

data/README.md

@@ -50,7 +50,7 @@ merge that feature into downstream environments to avoid conflicts.
 
 ## Contributing
 
-1. Fork it ( https://github.com/chrisbaldauf/vagrant-orchestrate/fork )
+1. Fork it ( https://github.com/Cimpress-MCP/vagrant-orchestrate/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Vagrantfile

@@ -0,0 +1,21 @@
+managed_servers = %w( )
+
+required_plugins = %w( vagrant-managed-servers )
+required_plugins.each do |plugin|
+  system "vagrant plugin install #{plugin}" unless Vagrant.has_plugin? plugin
+end
+Vagrant.configure("2") do |config|
+  config.ssh.username = "{{YOUR_SSH_USERNAME}}"
+  config.ssh.password = "poo"
+  config.ssh.private_key_path = "par"
+
+  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
+    end
+  end
+end

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

@@ -9,11 +9,9 @@ module VagrantPlugins
         include Vagrant::Util
 
         DEFAULT_SHELL_PATH = "{{YOUR_SCRIPT_PATH}}"
-        DEFAULT_SHELL_INLINE = "{{YOUR_SCRIPT_COMMAND}}"
         DEFAULT_WINRM_USERNAME = "{{YOUR_WINRM_USERNAME}}"
         DEFAULT_WINRM_PASSWORD = "{{YOUR_WINRM_PASSWORD}}"
         DEFAULT_SSH_USERNAME = "{{YOUR_SSH_USERNAME}}"
-        DEFAULT_SSH_PASSWORD = "{{YOUR_SSH_PASSWORD}}"
         DEFAULT_SSH_PRIVATE_KEY_PATH = "{{YOUR_SSH_PRIVATE_KEY_PATH}}"
         DEFAULT_PLUGINS = ["vagrant-managed-servers"]
 
@@ -27,7 +25,6 @@ module VagrantPlugins
           options[:puppet_librarian_puppet] = true
           options[:puppet_hiera] = true
 
-
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant orchestrate init [options]"
             o.separator ""
@@ -126,13 +123,11 @@ module VagrantPlugins
           end
 
           options[:shell_paths] ||= options[:shell_inline] ? [] : [DEFAULT_SHELL_PATH]
-          options[:shell_inline] ||= DEFAULT_SHELL_INLINE
           options[:winrm_username] ||= DEFAULT_WINRM_USERNAME
           options[:winrm_password] ||= DEFAULT_WINRM_PASSWORD
           options[:communicator] ||= "ssh"
           options[:ssh_username] ||= DEFAULT_SSH_USERNAME
-          options[:ssh_password] ||= DEFAULT_SSH_PASSWORD unless options[:ssh_private_key_path]
-          options[:ssh_private_key_path] ||= DEFAULT_SSH_PRIVATE_KEY_PATH
+          options[:ssh_private_key_path] ||= DEFAULT_SSH_PRIVATE_KEY_PATH unless options[:ssh_password]
 
           contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/vagrant/Vagrantfile"),
                                              provisioners: options[:provisioners],

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

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

@@ -44,6 +44,7 @@ describe VagrantPlugins::Orchestrate::Command::Init do
         subject.execute
         expect(iso_env.vagrantfile.config.vm.provisioners.first.type).to eq(:shell)
         expect(iso_env.vagrantfile.config.vm.provisioners.first.config.path).to eq(described_class::DEFAULT_SHELL_PATH)
+        expect(iso_env.vagrantfile.config.vm.provisioners.count).to eq(1)
       end
     end
 
@@ -181,7 +182,8 @@ describe VagrantPlugins::Orchestrate::Command::Init do
       it "has default username and password" do
         subject.execute
         expect(iso_env.vagrantfile.config.ssh.username).to eq(described_class::DEFAULT_SSH_USERNAME)
-        expect(iso_env.vagrantfile.config.ssh.password).to eq(described_class::DEFAULT_SSH_PASSWORD)
+        private_key_path = iso_env.vagrantfile.config.ssh.private_key_path.first
+        expect(private_key_path).to eq(described_class::DEFAULT_SSH_PRIVATE_KEY_PATH)
       end
     end
 
@@ -206,6 +208,7 @@ describe VagrantPlugins::Orchestrate::Command::Init do
       it "is passed through" do
         subject.execute
         expect(iso_env.vagrantfile.config.ssh.private_key_path.first).to eq("SSH_PRIVATE_KEY_PATH")
+        expect(iso_env.vagrantfile.config.ssh.password).to be_nil
       end
     end
   end

data/templates/vagrant/Vagrantfile.erb

@@ -33,7 +33,7 @@ Vagrant.configure("2") do |config|
   <% if ssh_password -%>
   config.ssh.password = "<%= ssh_password %>"
   <% end -%>
-  <% if !ssh_password -%>
+  <% if ssh_private_key_path -%>
   config.ssh.private_key_path = "<%= ssh_private_key_path %>"
   <% end -%>
   <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Vagrantfile
+- dummy.box
 - lib/vagrant-orchestrate.rb
 - lib/vagrant-orchestrate/command/init.rb
 - lib/vagrant-orchestrate/command/push.rb