vagrant-orchestrate 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fc2ef762f37e5306a47335865711960050d8b72
-  data.tar.gz: bb42f425ad3b8166dd940a6adcde5bfc2ca4a97a
+  metadata.gz: 819bc31d3db68968306ae9731bfb0c7d65dbb068
+  data.tar.gz: 36ed5193b32ddf55945b36ebc8c241a6e22e154a
 SHA512:
-  metadata.gz: ca299b93bf0b71ecc4d84d75238ac64fa7432b58792a646bab733764b9b338cdfb2262e57556e2c81f3faa189e12c98548a9b13b0801550b81d33e4a1171894e
-  data.tar.gz: 7a8dc4f6ab76d4e372ce923f2e1b14bae2c1c613628d9615d83a2c2c2819e574101a51e6bf15c246c1245869b61fed0537ed401ef39772c6ef9576ea43919dc9
+  metadata.gz: 508a675892462b3d0d6615966ba0574ccf749f11ae40fba8a6902ab81b6f10ec2cfec0b40a8fbf0233459af6c1dc6dd8354772f9b3ca314043e56e43006cf19f
+  data.tar.gz: 45002e7db4623f4f193b956d732eb6b7def0d19c3f7d4eaf907c76d269a0b697e5966cfd9fa5bf4b06392c7c0eb0277de57dfb161c0c56eb64d9d4a0e8284201

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+0.5.0 (April 22, 2015)
+
+  - Add guard_clean so that a push will fail if there are uncommitted files. Override with VAGRANT_ORCHESTRATE_NO_GUARD_CLEAN
+  - Push a status file including git remote url, ref, user, and date on a successful provision to /var/status/vagrant_orchestrate (c:\programdata\vagrant_orchestrate)
+  - Retrieve status using `vagrant orchestrate status`

data/README.md

@@ -14,7 +14,7 @@ Linux, and Mac**.
 ## Quick start
 
 ```
-$ vagrant orchestrate init --shell --shell-inline "echo Hello" \
+$ vagrant orchestrate init --shell --shell-inline "echo Hello!" \
   --servers myserver1.mydomain.com,myserver2.mydomain.com \
   --ssh-username USERNAME --ssh-private-key-path PATH
 $ vagrant orchestrate push
@@ -109,94 +109,24 @@ This works for Windows managed servers using WinRM as well
 
 #### Plugins
 
-This also supports a self-contained way to install plugins, just list them in the required_plugins section
+This also supports a portable way to install plugins, just list them in the required_plugins section
 
 ```ruby
 required_plugins = %w( vagrant-managed-servers vagrant-hostsupdater )
 ```
 
 #### Working with multiple environments
-It is a very common pattern in software development to have separate environments - e.g. dev, test, and prod.
-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 to know which the current environment is.
-
-```javascript
-# servers.json
-{
-  "environments": {
-    "dev": {
-      "servers": [
-        "dev.myapp.mydomain.com"
-      ]
-    },
-    "test": {
-      "servers": [
-        "test1.myapp.mydomain.com",
-        "test2.myapp.mydomain.com"
-      ]
-    },
-    "prod": {
-      "servers": [
-        "prod1.myapp.mydomain.com",
-        "prod2.myapp.mydomain.com",
-        "prod3.myapp.mydomain.com"
-      ]
-    }
-  }
-}
-```
 
-Add the following line to the top of your `Vagrantfile`
+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.
 
-```ruby
-managed_servers = VagrantPlugins::Orchestrate::Plugin.load_servers_for_branch
-```
+To initialize an environment aware Vagrantfile, use
 
-If you create git branches named `dev`, `test`, and `prod`, your vagrantfile will become environment aware and
-you'll only be able to see the servers appropriate for that environment.
+    $ vagrant orchestrate init --environments dev,test,prod
 
-```
-$ git branch
-* dev
-  test
-  prod
-$ vagrant status
-Current machine states:
-
-local                     not created (virtualbox)
-dev.myapp.mydomain.com    not created (managed)
-
-$ git checkout test
-Switched to branch 'test'
-$ vagrant status
-Current machine states:
-
-local                     not created (virtualbox)
-test1.myapp.mydomain.com  not created (managed)
-test2.myapp.mydomain.com  not created (managed)
-
-$ git checkout prod
-Switched to branch 'prod'
-$ vagrant status
-Current machine states:
-
-local                     not created (virtualbox)
-prod1.myapp.mydomain.com  not created (managed)
-prod2.myapp.mydomain.com  not created (managed)
-prod3.myapp.mydomain.com  not created (managed)
-```
+You'll need to create git branches with matching names and fill out the servers.json
+file in order for the Vagrantfile to be git branch aware.
 
-Any branch that doesn't have a matching environment in the servers.json file will
-not list any managed servers.
-
-```
-$ git checkout -b my_feature_branch
-Switched to a new branch 'my_feature_branch'
-$ vagrant status
-Current machine states:
-
-local                     not created (virtualbox)
-```
+Learn more about [environments](docs/environments.md)
 
 #### Credentials
 
@@ -206,13 +136,7 @@ by passing the `--credentials-prompt` flag to the `vagrant orchestrate init` com
 or add the following to your Vagrantfile.
 
 ```ruby
-Vagrant.configure("2") do |config|
-
-  ...
-
-  config.orchestrate.credentials do |creds|
-    creds.prompt = true
-  end
+  config.orchestrate.credentials.prompt = true
 ```
 
 The credentials config object can accept one additional parameter, `file_path`. Setting
@@ -227,36 +151,7 @@ will be checked.
 
 #### Puppet
 
-Experimental puppet templating support is available as well with the `--puppet` flag and associated options
-
-```ruby
-  required_plugins = %w( vagrant-managed-servers vagrant-librarian-puppet )
-
-  ...
-
-  config.librarian_puppet.placeholder_filename = ".gitignore"
-  config.vm.provision "puppet" do |puppet|
-    puppet.module_path = 'modules'
-    puppet.hiera_config_path = 'hiera.yaml'
-  end
-```
-
-The following files and folders will be placed in the puppet directory
-
-```
-Puppetfile
-Vagrantfile
-dummy.box
-hiera/
-  common.yaml
-hiera.yaml
-manifests/
-  default.pp
-modules/
-  .gitignore
-```
-
-For a full list of init options, run `vagrant orchestrate init --help`
+Experimental [puppet templating](docs/puppet.md) support is available as well with the `--puppet` flag and associated options
 
 ### Pushing changes
 Go ahead and push changes to your managed servers, in serial by default.
@@ -267,13 +162,27 @@ The push command is currently limited by convention to vagrant machines that use
 
 #### Deployment Strategy
 
-Vagrant Orchestrate supports several deployment [strategies](docs/strategy.md) including parallel, canary, and
-half and half.
+Vagrant Orchestrate supports several deployment [strategies](docs/strategy.md) including parallel, canary, and half and half.
 
 You can push changes to all of your servers in parallel with
 
     $ vagrant orchestrate push --strategy parallel
 
+### Status
+The `vagrant orchestrate status` command will reach out to each of the defined
+managed servers and print information about the last successful push from this
+repo, including date, ref, and user that performed the push.
+
+```
+$ vagrant orchestrate status
+Current managed server states:
+
+managed-1  2015-04-19 00:46:22 UTC  e983dddd8041c5db77494266328f1d266430f57d  cbaldauf
+managed-2  2015-04-19 00:46:22 UTC  e983dddd8041c5db77494266328f1d266430f57d  cbaldauf
+managed-3  Status unavailable.
+managed-4  2015-04-19 00:43:07 UTC  e983dddd8041c5db77494266328f1d266430f57d  cbaldauf
+```
+
 ## Filtering managed commands
 It can be easy to make mistakes such as rebooting production if you have managed long-lived servers as well as local VMs defined in your Vagrantfile. We add some protection with the `orchestrate.filter_managed_commands` configuration setting, which will cause up, provision, reload, and destroy commands to be ignored for servers with the managed provider.
 
@@ -281,14 +190,6 @@ It can be easy to make mistakes such as rebooting production if you have managed
   config.orchestrate.filter_managed_commands = true
 ```
 
-## Branching strategy
-
-If you have several environments (e.g. dev, test, prod), it is recommended to create
-a separate branch for each environment and put the appropriate servers into the
-managed_servers array at the top of the Vagrantfile for each. To move a change
-across branches, simply create a feature branch from your earliest branch and then
-merge that feature into downstream environments to avoid conflicts.
-
 ## Tips for Windows hosts
 
 * Need rsync? Install [OpenSSH](http://www.mls-software.com/opensshd.html) and then run this [script](https://github.com/joefitzgerald/packer-windows/blob/master/scripts/rsync.bat) to install rsync. Vagrant managed servers currently only works with cygwin based rsync implementations.
@@ -302,14 +203,13 @@ merge that feature into downstream environments to avoid conflicts.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
-## Development Tips
-
-You'll want Ruby v2.0.0* and bundler for developing changes.
-
-During the course of development you'll want to run the code you're working on,
-not the version of Vagrant Orchestrate you've installed. In order to accomplish
-this, run your vagrant orchestrate commands in the bundler environment.
+## Development Flow
 
-In your shell:
+Prerequisites:
+* Ruby 2.0 or greater
 
-    $ bundle exec vagrant orchestrate
+Flow:
+1. Develop your feature
+2. Test locally with `bundle exec vagrant orchestrate *`
+3. `bundle exec rake build`
+4. `bundle exec rake acceptance`, which will take a few minutes

data/Rakefile

@@ -10,13 +10,13 @@ task default: :build
 
 desc "Run acceptance tests with vagrant-spec"
 task :acceptance do
-  puts "Brining up target servers"
+  puts "Bringing up target servers and syncing with NTP"
   # Spinning up local servers here, which the managed provider will connect to
   # by IP. See the Vagrantfile in the root of the repo for more info.
   system("vagrant up /local/ --no-provision")
   # To ensure the ntp sync happens even if the servers are already up
   system("vagrant provision /local/")
-  system("bundle exec vagrant-spec test --components=orchestrate/push orchestrate/prompt")
+  system("bundle exec vagrant-spec test --components=orchestrate/push orchestrate/prompt orchestrate/status")
   puts "Destroying target servers"
   system("vagrant destroy -f /local/")
 end

data/Vagrantfile

@@ -1,6 +1,8 @@
 managed_servers = %w( 192.168.10.80 192.168.10.81 192.168.10.82 192.168.10.83)
 
 Vagrant.configure(2) do |config|
+  config.orchestrate.filter_managed_commands = true
+
   # These boxes are defined locally to enable acceptance testing. Spinning up
   # real boxes in the vagrant-spec environment was expensive because it ignored
   # the cache and didn't expose a facility to view the vagrant output as it ran.

data/acceptance/command/status_spec.rb

@@ -0,0 +1,35 @@
+require "vagrant-spec"
+require "vagrant-orchestrate/repo_status"
+
+describe "vagrant orchestrate status", component: "orchestrate/status" do
+  include_context "acceptance"
+
+  TEST_REF = "050bfd9c686b06c292a9614662b0ab1bbf652db3"
+  TEST_REMOTE_ORIGIN_URL = "http://github.com/Cimpress-MCP/vagrant-orchestrate.git"
+
+  before do
+    environment.skeleton("basic")
+  end
+
+  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/")
+    # 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.")
+  end
+
+  it "can push and retrieve status" do
+    # Because vagrant-spec executes in a clean tmp folder, it isn't a git repo,
+    # and the normal git commands don't work. We'll inject some test data using
+    # environment variables. See vagrant-orchestrate/repo_status.rb for impl.
+    ENV["VAGRANT_ORCHESTRATE_STATUS_TEST_REF"] = TEST_REF
+    ENV["VAGRANT_ORCHESTRATE_STATUS_TEST_REMOTE_ORIGIN_URL"] = TEST_REMOTE_ORIGIN_URL
+    execute("vagrant", "orchestrate", "push", "/managed-1/")
+    result = execute("vagrant", "orchestrate", "status", "/managed-1/")
+    status = VagrantPlugins::Orchestrate::RepoStatus.new
+    # Punting on date. Can always add it later if needed
+    expect(result.stdout).to include(status.ref)
+    expect(result.stdout).to include(status.user)
+  end
+end

data/docs/environments.md

@@ -0,0 +1,82 @@
+# Environments
+It is a very common pattern in software development to have separate environments - e.g. dev, test, and prod.
+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 to know which the current environment is.
+
+```javascript
+# servers.json
+{
+  "environments": {
+    "dev": {
+      "servers": [
+        "dev.myapp.mydomain.com"
+      ]
+    },
+    "test": {
+      "servers": [
+        "test1.myapp.mydomain.com",
+        "test2.myapp.mydomain.com"
+      ]
+    },
+    "prod": {
+      "servers": [
+        "prod1.myapp.mydomain.com",
+        "prod2.myapp.mydomain.com",
+        "prod3.myapp.mydomain.com"
+      ]
+    }
+  }
+}
+```
+
+Add the following line to the top of your `Vagrantfile`
+
+```ruby
+managed_servers = VagrantPlugins::Orchestrate::Plugin.load_servers_for_branch
+```
+
+If you create git branches named `dev`, `test`, and `prod`, your vagrantfile will become environment aware and
+you'll only be able to see the servers appropriate for that environment.
+
+```
+$ git branch
+* dev
+  test
+  prod
+$ vagrant status
+Current machine states:
+
+local                     not created (virtualbox)
+dev.myapp.mydomain.com    not created (managed)
+
+$ git checkout test
+Switched to branch 'test'
+$ vagrant status
+Current machine states:
+
+local                     not created (virtualbox)
+test1.myapp.mydomain.com  not created (managed)
+test2.myapp.mydomain.com  not created (managed)
+
+$ git checkout prod
+Switched to branch 'prod'
+$ vagrant status
+Current machine states:
+
+local                     not created (virtualbox)
+prod1.myapp.mydomain.com  not created (managed)
+prod2.myapp.mydomain.com  not created (managed)
+prod3.myapp.mydomain.com  not created (managed)
+```
+
+Any branch that doesn't have a matching environment in the servers.json file will
+not list any managed servers.
+
+```
+$ git checkout -b my_feature_branch
+Switched to a new branch 'my_feature_branch'
+$ vagrant status
+Current machine states:
+
+local                     not created (virtualbox)
+```

data/docs/puppet.md

@@ -0,0 +1,32 @@
+# Puppet
+
+Experimental [puppet templating](docs/puppet.md) support is available as well with the `--puppet` flag and associated options
+
+```ruby
+  required_plugins = %w( vagrant-managed-servers vagrant-librarian-puppet )
+
+  ...
+
+  config.librarian_puppet.placeholder_filename = ".gitignore"
+  config.vm.provision "puppet" do |puppet|
+    puppet.module_path = 'modules'
+    puppet.hiera_config_path = 'hiera.yaml'
+  end
+```
+
+The following files and folders will be placed in the puppet directory
+
+```
+Puppetfile
+Vagrantfile
+dummy.box
+hiera/
+  common.yaml
+hiera.yaml
+manifests/
+  default.pp
+modules/
+  .gitignore
+```
+
+For a full list of init options, run `vagrant orchestrate init --help`

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

@@ -0,0 +1,40 @@
+module VagrantPlugins
+  module Orchestrate
+    module Command
+      module CommandMixins
+        # Given an array of vagrant command line args (e.g. the result of calling
+        # parse_options), filter out unmanaged servers and provide the resulting list.
+        def filter_unmanaged(argv)
+          machines = []
+          with_target_vms(argv) do |machine|
+            if machine.provider_name.to_sym == :managed
+              machines << machine
+            else
+              @logger.debug("Skipping #{machine.name} because it doesn't use the :managed provider")
+            end
+          end
+
+          if machines.empty?
+            @env.ui.info("No servers with :managed provider found. Exiting.")
+          end
+
+          machines
+        end
+
+        # Delete a file in a way that works on windows
+        def super_delete(filepath)
+          # Thanks, Windows. http://alx.github.io/2009/01/27/ruby-wundows-unlink.html
+          10.times do
+            begin
+              File.delete(filepath)
+              break
+            rescue
+              @logger.warn("Unable to delete file #{filepath}")
+              sleep 0.05
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -142,7 +142,7 @@ module VagrantPlugins
                                              environments: options[:environments],
                                              plugins: options[:plugins],
                                              creds_prompt: options[:creds_prompt]
-                                             )
+                                            )
           write_file("Vagrantfile", contents, options)
           FileUtils.cp(Orchestrate.source_root.join("templates", "vagrant", "dummy.box"),
                        File.join(@env.cwd, "dummy.box"))

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

@@ -1,6 +1,9 @@
+require "English"
 require "optparse"
 require "vagrant"
 require "vagrant-orchestrate/action/setcredentials"
+require "vagrant-orchestrate/repo_status"
+require_relative "command_mixins"
 
 # Borrowed from http://stackoverflow.com/questions/12374645/splitting-an-array-into-equal-parts-in-ruby
 class Array
@@ -16,6 +19,7 @@ module VagrantPlugins
     module Command
       class Push < Vagrant.plugin("2", :command)
         include Vagrant::Util
+        include CommandMixins
 
         @logger = Log4r::Logger.new("vagrant_orchestrate::command::push")
 
@@ -44,19 +48,10 @@ module VagrantPlugins
           argv = parse_options(opts)
           return unless argv
 
-          machines = []
-          with_target_vms(argv) do |machine|
-            if machine.provider_name.to_sym == :managed
-              machines << machine
-            else
-              @logger.debug("Skipping #{machine.name} because it doesn't use the :managed provider")
-            end
-          end
+          guard_clean unless ENV["VAGRANT_ORCHESTRATE_NO_GUARD_CLEAN"]
 
-          if machines.empty?
-            @env.ui.info("No servers with :managed provider found. Skipping.")
-            return 0
-          end
+          machines = filter_unmanaged(argv)
+          return 0 if machines.empty?
 
           retrieve_creds(machines) if @env.vagrantfile.config.orchestrate.credentials
 
@@ -94,6 +89,7 @@ module VagrantPlugins
           return 1 unless result
           0
         end
+        # rubocop:enable Metrics/AbcSize, MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         def split(machines)
           groups = machines.in_groups(2)
@@ -103,6 +99,7 @@ module VagrantPlugins
           groups
         end
 
+        # rubocop:disable Metrics/AbcSize, MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def deploy(options, *groups)
           groups.select! { |g| g.size > 0 }
           groups.each_with_index do |machines, index|
@@ -115,6 +112,7 @@ module VagrantPlugins
             begin
               batchify(machines, :up, options)
               batchify(machines, :provision, options)
+              upload_status_all(machines)
               batchify(machines, :reload, options) if options[:reboot]
             ensure
               batchify(machines, :destroy, options)
@@ -159,12 +157,53 @@ module VagrantPlugins
               creds.apply_creds(machine, username, password)
             end
           else
-            @env.ui.warn <<-WARNING
-Vagrant-orchestrate could not gather credentials. \
-Continuing with default credentials."
-            WARNING
+            @env.ui.warn "Vagrant-orchestrate could not gather credentials. Continuing with default credentials."
           end
         end
+
+        def guard_clean
+          clean? && committed? || abort("ERROR!\nThere are files that need to be committed first.")
+        end
+
+        def clean?
+          `git diff --exit-code 2>&1`
+          $CHILD_STATUS == 0
+        end
+
+        def committed?
+          `git diff-index --quiet --cached HEAD 2>&1`
+          $CHILD_STATUS == 0
+        end
+
+        def upload_status_all(machines)
+          status = RepoStatus.new
+          source = File.join(@env.tmp_path, "vagrant_orchestrate_status")
+          File.write(source, status.to_json)
+          machines.each do |machine|
+            upload_status_one(source, status, machine)
+          end
+        ensure
+          super_delete(source) if File.exist?(source)
+        end
+
+        def upload_status_one(source, status, machine)
+          destination = status.remote_path(machine.config.vm.communicator)
+          parent_folder = File.split(destination)[0]
+          machine.communicate.wait_for_ready(5)
+          @logger.debug("Ensuring vagrant_orchestrate status directory exists")
+          machine.communicate.sudo("mkdir -p #{parent_folder}")
+          machine.communicate.sudo("chmod 777 #{parent_folder}")
+          @logger.debug("Uploading vagrant_orchestrate status file")
+          @logger.debug("  source: #{source}")
+          @logger.debug("  dest: #{destination}")
+          machine.communicate.upload(source, destination)
+          @logger.debug("Setting uploaded file world-writable")
+          machine.communicate.sudo("chmod 777 #{destination}")
+        rescue => ex
+          @logger.error(ex)
+          @env.ui.warn("An error occurred when trying to upload status to #{machine.name}. Continuing")
+          @env.ui.warn(ex.message)
+        end
       end
     end
   end

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

@@ -25,6 +25,11 @@ module VagrantPlugins
             require_relative "push"
             Push
           end
+
+          @subcommands.register(:status) do
+            require_relative "status"
+            Status
+          end
         end
 
         def execute
@@ -44,7 +49,6 @@ module VagrantPlugins
         end
 
         # Prints the help out for this command
-        # rubocop:disable Metrics/AbcSize
         def help
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant orchestrate <subcommand> [<args>]"
@@ -66,7 +70,6 @@ module VagrantPlugins
 
           @env.ui.info(opts.help, prefix: false)
         end
-        # rubocop:enable Metrics/AbcSize
       end
     end
   end

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

@@ -0,0 +1,69 @@
+require "json"
+require "optparse"
+require "vagrant"
+require "vagrant-orchestrate/repo_status"
+require_relative "command_mixins"
+
+module VagrantPlugins
+  module Orchestrate
+    module Command
+      class Status < Vagrant.plugin("2", :command)
+        include Vagrant::Util
+        include CommandMixins
+
+        @logger = Log4r::Logger.new("vagrant_orchestrate::command::status")
+
+        def execute
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant orchestrate status"
+            o.separator ""
+          end
+
+          argv = parse_options(opts)
+          return unless argv
+
+          machines = filter_unmanaged(argv)
+          return 0 if machines.empty?
+
+          print_status machines
+        end
+
+        def print_status(machines)
+          # There is some detail output fromt he communicator.download that I
+          # don't want to suppress, but I also don't want it to be interspersed
+          # with the actual status information. Let's buffer the status output.
+          output = []
+          @logger.debug("About to download machine status")
+          machines.each do |machine|
+            output << get_status(RepoStatus.new.remote_path(machine.config.vm.communicator), machine)
+          end
+          @env.ui.info("Current managed server states:")
+          @env.ui.info("")
+          output.each do |line|
+            @env.ui.info line
+          end
+        end
+
+        def get_status(remote, machine)
+          machine.communicate.wait_for_ready(5)
+          local = File.join(@env.tmp_path, "#{machine.name}_status")
+          @logger.debug("Downloading orchestrate status for #{machine.name}")
+          @logger.debug("  remote file: #{remote}")
+          @logger.debug("  local file: #{local}")
+          machine.communicate.download(remote, local)
+          content = File.read(local)
+          @logger.debug("File content:")
+          @logger.debug(content)
+          status = JSON.parse(content)
+          return machine.name.to_s + "   " + status["last_sync"] + "  " + status["ref"] + "  " + status["user"]
+        rescue => ex
+          @env.ui.warn("Error downloading status for #{machine.name}.")
+          @env.ui.warn(ex.message)
+          return machine.name.to_s + "   Status unavailable."
+        ensure
+          super_delete(local) if File.exist?(local)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-orchestrate/repo_status.rb

@@ -0,0 +1,61 @@
+require "json"
+
+module VagrantPlugins
+  module Orchestrate
+    class RepoStatus
+      attr_reader :last_sync
+
+      def initialize
+        @last_sync = Time.now.utc    # Managed servers could be in different timezones
+      end
+
+      def ref
+        # Env vars are here only for testing, since vagrant-spec is executed from
+        # a temp directory and can't use git to get repository information
+        @ref ||= ENV["VAGRANT_ORCHESTRATE_STATUS_TEST_REF"]
+        @ref ||= `git log --pretty=format:'%H' --abbrev-commit -1`
+        @ref
+      end
+
+      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
+      end
+
+      def repo
+        @repo ||= File.basename(remote_origin_url, ".git")
+        @repo
+      end
+
+      def user
+        user = ENV["USER"] || ENV["USERNAME"] || "unknown"
+        user = ENV["USERDOMAIN"] + "\\" + user if ENV["USERDOMAIN"]
+
+        @user ||= user
+        @user
+      end
+
+      def to_json
+        contents = {
+          repo: repo,
+          remote_url: remote_origin_url,
+          ref: ref,
+          user: user,
+          last_sync: last_sync
+        }
+        JSON.pretty_generate(contents)
+      end
+
+      # The path to where this should be stored on a remote machine, inclusive
+      # of the file name.
+      def remote_path(communicator)
+        if communicator == :winrm
+          File.join("c:", "programdata", "vagrant_orchestrate", repo)
+        else
+          File.join("/var", "state", "vagrant_orchestrate", repo)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.4.7"
+    VERSION = "0.5.0"
   end
 end

data/lib/vms.save

@@ -0,0 +1,24 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - .rspec
 - .rubocop.yml
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -84,22 +85,30 @@ files:
 - Vagrantfile
 - acceptance/command/prompt_spec.rb
 - acceptance/command/push_spec.rb
+- acceptance/command/status_spec.rb
 - acceptance/support-skeletons/basic/Vagrantfile
 - acceptance/support-skeletons/basic/dummy.box
 - acceptance/support-skeletons/prompt/Vagrantfile
 - acceptance/support-skeletons/prompt/dummy.box
+- docs/environments.md
+- docs/puppet.md
 - docs/strategy.md
 - dummy.box
 - lib/vagrant-orchestrate.rb
 - lib/vagrant-orchestrate/action/filtermanaged.rb
 - lib/vagrant-orchestrate/action/setcredentials.rb
+- lib/vagrant-orchestrate/command/command_mixins.rb
 - lib/vagrant-orchestrate/command/init.rb
 - lib/vagrant-orchestrate/command/push.rb
 - lib/vagrant-orchestrate/command/root.rb
+- lib/vagrant-orchestrate/command/status.rb
 - lib/vagrant-orchestrate/config.rb
 - 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