vagrant-orchestrate 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b84f5db56bf4767530fe1403673e231e82fd16
-  data.tar.gz: 00b853143e5e3bf505b5837b7b1b6915fd5a304c
+  metadata.gz: cc6337e73b1299cc2a5ddfbd7bc634f910c22613
+  data.tar.gz: c40465611605716c68d8e0a7f547a8471ffe85ea
 SHA512:
-  metadata.gz: 77a0d874b43a58ffbc7191cee88e52ce1c4cafaa972b853e93af2381863e5fc5132e958005befddc8d7136a688ac98cccd63aae7e53c8edee1934e7389b87e9f
-  data.tar.gz: af691174d2a81c8fe780ecfb16433e1126d625bbfc10cc1e75c37ea44c43ae7d0c35964b454a75c14fe74dfb6ed43a195f19f4820313a23415bbfa261aaea97b
+  metadata.gz: 3b72416ac1cb3ed860aedf7ecb872df81d57942ad8e5ec90b4802e5e6a4b6e0801fff9c1e0eb573b64ebb816822d504d3285d46aeecd5916c86e603aed3f70d5
+  data.tar.gz: 4ebd44c1049d983ac78d56458f61d30d4bfbe86f6447a3486c9de35765ef633222e25e4a64164d7b3493cd0a3bf5d152a4be3a07632a32f53a000d51e28869b1

data/.rubocop.yml

@@ -1,7 +1,3 @@
-AllCops:
-  Exclude:
-    - '*.gemspec'
-
 Metrics/LineLength:
   Max: 120
 
@@ -22,3 +18,6 @@ Style/FileName:
 
 Metrics/AbcSize:
   Max: 100
+
+RegexpLiteral:
+  MaxSlashes: 0

data/.vagrantplugins

@@ -0,0 +1,22 @@
+required_plugins = {}
+# Example usage:
+# required_plugins["plugin-name"] = { version: "1.2.3", source: "https://rubygems.org" }
+required_plugins["vagrant-orchestrate"] = {}
+required_plugins["vagrant-managed-servers"] = {}
+
+needs_restart = false
+required_plugins.each do |plugin, options|
+  version = options[:version]
+
+  unless Vagrant.has_plugin?(plugin, version)
+    command = "vagrant plugin install #{plugin}"
+    command += " --plugin-version #{version}" if version
+    command += " --plugin-source #{options[:source]}" if options[:source]
+    system command
+    needs_restart = true
+  end
+end
+
+if needs_restart
+  exec "vagrant #{ARGV.join' '}"
+end

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+0.6.3 (May 26th, 2015)
+
+  - Extract the `required_plugins` definition and installation logic from the
+  `Vagrantfile` to a new `.vagrantplugins` file per https://github.com/mitchellh/vagrant/issues/4347
+  - Change required_plugins from array to hash[plugin-name] = {options}. This allows specifying specific versions of plugins to be installed as well as alternate gem sources, which is useful for internally hosted gems.
+  - Fall back to the Vagrant environment's `root_path` if the working directory is
+  not a git repo. Fixes [#34](https://github.com/Cimpress-MCP/vagrant-orchestrate/issues/34)
+
 0.6.2 (May 25th, 2015)
 
   - Change the implementation of the `RepoStatus.repo` method from relying on a

data/README.md

@@ -56,10 +56,6 @@ Which produces a simple default Vagrantfile that can push to managed servers:
 ```ruby
 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|
   # This disables up, provision, reload, and destroy for managed servers. Use
   # `vagrant orchestrate push` to communicate with managed servers.
@@ -111,12 +107,26 @@ This works for Windows managed servers using WinRM as well
 
 #### Plugins
 
-This also supports a portable and repeatable way to install plugins, just list them in the required_plugins section
+This also supports a portable and repeatable way to install plugins, just list them in the .vagrantplugins file.
+`version` and `source` are the supported values in the options hash, but neither is required.
 
 ```ruby
-required_plugins = %w( vagrant-managed-servers vagrant-hostsupdater )
+required_plugins = {}
+required_plugins["vagrant-orchestrate"] = {}
+required_plugins["vagrant-managed-servers"] = { version: "0.7.0" }
 ```
 
+If you are executing in a shared environment, like a build slave, you can create your own
+own plugin install directory by setting the `VAGRANT_HOME` variable to something relative
+to the current directory.
+
+    $ VAGRANT_HOME=./.vagrant.d vagrant orchestrate push
+
+or
+
+    > SET VAGRANT_HOME=./.vagrant.d
+    > vagrant orchestrate push
+
 #### Working with multiple environments
 
 Vagrant Orchestrate offers a way to manage multiple environments using a combination of a single servers.json file and the name of the current git branch as an indicator of the current environment.

data/acceptance/command/status_spec.rb

@@ -6,7 +6,7 @@ describe "vagrant orchestrate status", component: "orchestrate/status" do
 
   TEST_REF = "050bfd9c686b06c292a9614662b0ab1bbf652db3"
   TEST_REMOTE_ORIGIN_URL = "http://github.com/Cimpress-MCP/vagrant-orchestrate.git"
-  TEST_REPO = "/users/cbaldauf/dev/vagrant-orchestrate"
+  TEST_REPO = "vagrant-orchestrate"
 
   before do
     environment.skeleton("basic")
@@ -14,7 +14,8 @@ describe "vagrant orchestrate status", component: "orchestrate/status" do
 
   it "handles no status file gracefully" do
     # Make sure we're starting from a clean slate, rspec order isn't guaranteed.
-    execute("vagrant", "ssh", "-c", "\"rm -rf /var/state/vagrant_orchestrate\" managed-1")
+    execute("vagrant", "up", "managed-1")
+    execute("vagrant", "ssh", "-c", "\"sudo rm -rf /var/state/vagrant_orchestrate\"", "managed-1")
     # All commands are executed against a single machine to reduce variability
     result = execute("vagrant", "orchestrate", "status", "/managed-1/")
     expect(result.stdout).to include("Status unavailable.")
@@ -30,7 +31,7 @@ describe "vagrant orchestrate status", component: "orchestrate/status" do
     ENV["VAGRANT_ORCHESTRATE_NO_GUARD_CLEAN"] = "true"
     execute("vagrant", "orchestrate", "push", "/managed-1/")
     result = execute("vagrant", "orchestrate", "status", "/managed-1/")
-    status = VagrantPlugins::Orchestrate::RepoStatus.new
+    status = VagrantPlugins::Orchestrate::RepoStatus.new(TEST_REPO)
     # Punting on date. Can always add it later if needed
     expect(result.stdout).to include(status.ref)
     expect(result.stdout).to include(status.user)

data/lib/vagrant-managed-servers/action/download_status.rb

@@ -18,6 +18,7 @@ module VagrantPlugins
         def download_status(machine, local, remote, ui)
           machine.communicate.wait_for_ready(5)
           @logger.debug("Downloading orchestrate status for #{machine.name}")
+          ui.info("Downloading orchestrate status from #{remote}")
           @logger.debug("  remote file: #{remote}")
           @logger.debug("  local file: #{local}")
           machine.communicate.download(remote, local)

data/lib/vagrant-managed-servers/action/upload_status.rb

@@ -23,7 +23,7 @@ module VagrantPlugins
           @logger.debug("Ensuring vagrant_orchestrate status directory exists")
           machine.communicate.sudo("mkdir -p #{parent_folder}")
           machine.communicate.sudo("chmod 777 #{parent_folder}")
-          ui.info("Uploading vagrant orchestrate status")
+          ui.info("Uploading vagrant orchestrate status to #{destination}")
           @logger.debug("Uploading vagrant_orchestrate status")
           @logger.debug("  source: #{source}")
           @logger.debug("  dest: #{destination}")

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

@@ -126,34 +126,39 @@ module VagrantPlugins
           options[:ssh_username] ||= DEFAULT_SSH_USERNAME
           options[:ssh_private_key_path] ||= DEFAULT_SSH_PRIVATE_KEY_PATH unless options[:ssh_password]
 
+          write_vagrant_files(options)
+          @env.ui.info(I18n.t("vagrant.commands.init.success"), prefix: false)
+
+          # Success, exit status 0
+          0
+        end
+        # rubocop:enable Metrics/AbcSize, MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+        private
+
+        def write_vagrant_files(options)
           contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/vagrant/Vagrantfile"),
-                                             provisioners: options[:provisioners],
-                                             shell_paths: options[:shell_paths],
+                                             provisioners: options[:provisioners], shell_paths: options[:shell_paths],
                                              shell_inline: options[:shell_inline],
                                              puppet_librarian_puppet: options[:puppet_librarian_puppet],
-                                             puppet_hiera: options[:puppet_hiera],
-                                             communicator: options[:communicator],
+                                             puppet_hiera: options[:puppet_hiera], communicator: options[:communicator],
                                              winrm_username: options[:winrm_username],
                                              winrm_password: options[:winrm_password],
-                                             ssh_username: options[:ssh_username],
-                                             ssh_password: options[:ssh_password],
+                                             ssh_username: options[:ssh_username], ssh_password: options[:ssh_password],
                                              ssh_private_key_path: options[:ssh_private_key_path],
                                              servers: options[:servers],
-                                             environments: options[:environments],
-                                             plugins: options[:plugins],
-                                             creds_prompt: options[:creds_prompt]
+                                             environments: options[:environments], creds_prompt: options[:creds_prompt]
                                             )
           write_file("Vagrantfile", contents, options)
+
+          contents = TemplateRenderer.render(Orchestrate.source_root.join("templates/vagrant/.vagrantplugins"),
+                                             plugins: options[:plugins]
+                                            )
+          write_file(".vagrantplugins", 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
-          0
         end
-        # rubocop:enable Metrics/AbcSize, MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-        private
 
         def init_puppet(options)
           return unless options[:provisioners].include? "puppet"

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

@@ -64,7 +64,7 @@ module VagrantPlugins
 
           # Write the status file to disk so that it can be used as part of the
           # push action.
-          status = RepoStatus.new
+          status = RepoStatus.new(@env.root_path)
           status.write(@env.tmp_path)
           options[:status] = status
 

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

@@ -41,14 +41,14 @@ module VagrantPlugins
           local_files = []
           @env.batch(parallel) do |batch|
             machines.each do |machine|
-              options[:remote_file_path] = RepoStatus.new.remote_path(machine.config.vm.communicator)
+              status = RepoStatus.new(@env.root_path)
+              options[:remote_file_path] = status.remote_path(machine.config.vm.communicator)
               options[:local_file_path] = File.join(@env.tmp_path, "#{machine.name}_status")
               local_files << options[:local_file_path]
               batch.action(machine, :download_status, options)
             end
           end
-          @env.ui.info("Current managed server states:")
-          @env.ui.info("")
+          @env.ui.info("Current managed server states:\n")
           @env.ui.info(ENV["VAGRANT_ORCHESTRATE_STATUS"].split("\n").sort.join("\n"))
         ensure
           local_files.each do |local|

data/lib/vagrant-orchestrate/repo_status.rb

@@ -3,12 +3,14 @@ require "json"
 module VagrantPlugins
   module Orchestrate
     class RepoStatus
-      attr_reader :last_sync
+      attr_reader :last_sync, :root_path
       attr_accessor :local_path
 
-      def initialize
+      def initialize(root_path)
         @last_sync = Time.now.utc    # Managed servers could be in different timezones
         @local_path = nil
+        # The fully qualified path to the root of the repo
+        @root_path = root_path
       end
 
       def ref
@@ -21,13 +23,15 @@ module VagrantPlugins
 
       def remote_origin_url
         @remote_origin_url ||= ENV["VAGRANT_ORCHESTRATE_STATUS_TEST_REMOTE_ORIGIN_URL"]
-        @remote_origin_url ||= `git config --get remote.origin.url`.chomp
+        @remote_origin_url ||= `git config --get remote.origin.url 2>#{File::NULL}`.chomp
         @remote_origin_url
       end
 
       def repo
         @repo ||= ENV["VAGRANT_ORCHESTRATE_STATUS_TEST_REPO"]
-        @repo ||= File.basename(`git rev-parse --show-toplevel`.chomp)
+        @repo ||= File.basename(`git rev-parse --show-toplevel 2>#{File::NULL}`.chomp)
+        # This might not be a git repo, and that should still be supported.
+        @repo = File.basename(root_path) if @repo.nil? || @repo.empty?
         @repo
       end
 

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

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

@@ -119,8 +119,8 @@ describe VagrantPlugins::Orchestrate::Command::Init do
 
       it "contains the plugin" do
         subject.execute
-        vagrantfile = File.readlines(File.join(iso_env.cwd, "Vagrantfile")).join
-        expect(vagrantfile).to include("vagrant-librarian-puppet")
+        pluginsfile = File.readlines(File.join(iso_env.cwd, ".vagrantplugins")).join
+        expect(pluginsfile).to include("vagrant-librarian-puppet")
       end
 
       describe "negative" do
@@ -186,8 +186,8 @@ describe VagrantPlugins::Orchestrate::Command::Init do
       let(:argv) { ["--winrm"] }
       it "includes the vagrant-winrm-s plugin"do
         subject.execute
-        vagrantfile = File.readlines(File.join(iso_env.cwd, "Vagrantfile")).join
-        expect(vagrantfile).to include("vagrant-winrm-s")
+        pluginsfile = File.readlines(File.join(iso_env.cwd, ".vagrantplugins")).join
+        expect(pluginsfile).to include("vagrant-winrm-s")
       end
     end
 
@@ -246,12 +246,14 @@ describe VagrantPlugins::Orchestrate::Command::Init do
 
   context "plugins" do
     describe "default" do
-      it "has default plugins in vagrantfile" do
+      it "has default plugins in .vagrantplugins" do
         subject.execute
         # Since the plugin stuff isn't part of the actual Vagrantfile spec, we'll
         # just peek at the text of the file
-        vagrantfile = File.readlines(File.join(iso_env.cwd, "Vagrantfile")).join
-        expect(vagrantfile).to include("required_plugins = %w( #{described_class::DEFAULT_PLUGINS.join(' ')} )")
+        pluginsfile = File.readlines(File.join(iso_env.cwd, ".vagrantplugins")).join
+        described_class::DEFAULT_PLUGINS.each do |plugin|
+          expect(pluginsfile).to include("required_plugins[\"#{plugin}\"]")
+        end
       end
     end
 
@@ -259,9 +261,9 @@ describe VagrantPlugins::Orchestrate::Command::Init do
       let(:argv) { ["--plugins", "plugin1,plugin2"] }
       it "are required" do
         subject.execute
-        expected = "required_plugins = %w( #{described_class::DEFAULT_PLUGINS.join(' ')} plugin1 plugin2 )"
-        vagrantfile = File.readlines(File.join(iso_env.cwd, "Vagrantfile")).join
-        expect(vagrantfile).to include(expected)
+        pluginsfile = File.readlines(File.join(iso_env.cwd, ".vagrantplugins")).join
+        expect(pluginsfile).to include("required_plugins[\"plugin1\"]")
+        expect(pluginsfile).to include("required_plugins[\"plugin2\"]")
       end
     end
   end

data/templates/vagrant/.vagrantplugins.erb

@@ -0,0 +1,23 @@
+required_plugins = {}
+# Example usage:
+# required_plugins["plugin-name"] = { version: "1.2.3", source: "https://rubygems.org" }
+<% plugins.each do |p| -%>
+required_plugins["<%= p %>"] = {}
+<% end -%>
+
+needs_restart = false
+required_plugins.each do |plugin, options|
+  version = options[:version]
+
+  unless Vagrant.has_plugin?(plugin, version)
+    command = "vagrant plugin install #{plugin}"
+    command += " --plugin-version #{version}" if version
+    command += " --plugin-source #{options[:source]}" if options[:source]
+    system command
+    needs_restart = true
+  end
+end
+
+if needs_restart
+  exec "vagrant #{ARGV.join' '}"
+end

data/templates/vagrant/Vagrantfile.erb

@@ -4,12 +4,6 @@ managed_servers = VagrantPlugins::Orchestrate::Plugin.load_servers_for_branch
 managed_servers = %w( <% servers.each do |s| -%><%= s %> <% end -%>)
 <% end -%>
 
-<% if plugins.any? -%>
-required_plugins = %w( <% plugins.each do |p| -%><%= p %> <% end -%>)
-required_plugins.each do |plugin|
-  system "vagrant plugin install #{plugin}" unless Vagrant.has_plugin? plugin
-end
-<% end %>
 Vagrant.configure("2") do |config|
   # This disables up, provision, reload, and destroy for managed servers. Use
   # `vagrant orchestrate push` to communicate with managed servers.

data/vagrant-orchestrate.gemspec

@@ -1,26 +1,26 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vagrant-orchestrate/version'
+require "vagrant-orchestrate/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'vagrant-orchestrate'
+  spec.name          = "vagrant-orchestrate"
   spec.version       = VagrantPlugins::Orchestrate::VERSION
-  spec.authors       = ['Christopher Baldauf']
-  spec.email         = ['cbaldauf@cimpress.com']
-  spec.summary       = 'Vagrant plugin to orchestrate the deployment of managed servers.'
-  spec.homepage      = 'https://github.com/Cimpress-MCP/vagrant-orchestrate'
-  spec.license       = 'Apache 2.0'
+  spec.authors       = ["Christopher Baldauf"]
+  spec.email         = ["cbaldauf@cimpress.com"]
+  spec.summary       = "Vagrant plugin to orchestrate the deployment of managed servers."
+  spec.homepage      = "https://github.com/Cimpress-MCP/vagrant-orchestrate"
+  spec.license       = "Apache 2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  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'
+  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.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - .rspec
 - .rubocop.yml
 - .travis.yml
+- .vagrantplugins
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -112,9 +113,7 @@ files:
 - lib/vagrant-orchestrate/plugin.rb
 - lib/vagrant-orchestrate/repo_status.rb
 - lib/vagrant-orchestrate/version.rb
-- lib/vms.save
 - locales/en.yml
-- mytestfile
 - spec/spec_helper.rb
 - spec/vagrant-orchestrate/command/init_spec.rb
 - spec/vagrant-orchestrate/command/root_spec.rb
@@ -122,6 +121,7 @@ files:
 - templates/puppet/Puppetfile.erb
 - templates/puppet/hiera.yaml.erb
 - templates/puppet/hiera/common.yaml.erb
+- templates/vagrant/.vagrantplugins.erb
 - templates/vagrant/Vagrantfile.erb
 - templates/vagrant/dummy.box
 - vagrant-orchestrate.gemspec

data/lib/vms.save

@@ -1,24 +0,0 @@
-# R&D work that may be used in a future version, but can be ignored for now.
-module ManagedServers
-  module Action
-    include Vagrant::Action::Builtin
-    def self.action_push
-      Vagrant::Action::Builder.new.tap do |b|
-        b.use HandleBox
-        b.use ConfigValidate
-        b.use WarnNetworks
-        b.use Call, IsLinked do |env, b2|
-          if env[:result]
-            b2.use MessageAlreadyLinked
-            next
-          end
-
-          b2.use LinkServer
-        end
-        b.use Provision
-        b.use SyncFolders
-        b.use UnlinkServer
-      end
-    end
-  end
-end