vagrant-orchestrate 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819bc31d3db68968306ae9731bfb0c7d65dbb068
-  data.tar.gz: 36ed5193b32ddf55945b36ebc8c241a6e22e154a
+  metadata.gz: 997cea86aee854008a850c48c1593a03d1d543fd
+  data.tar.gz: b3779aab0db5c26a0e9490aa21ac9015f0f0b6d4
 SHA512:
-  metadata.gz: 508a675892462b3d0d6615966ba0574ccf749f11ae40fba8a6902ab81b6f10ec2cfec0b40a8fbf0233459af6c1dc6dd8354772f9b3ca314043e56e43006cf19f
-  data.tar.gz: 45002e7db4623f4f193b956d732eb6b7def0d19c3f7d4eaf907c76d269a0b697e5966cfd9fa5bf4b06392c7c0eb0277de57dfb161c0c56eb64d9d4a0e8284201
+  metadata.gz: 5ad720a6e0e8f172b4f01507764537eb52f4fdec5f7d72308a799870809d65bedd69b831ec2d7b3813735549c517e4af910a15f8fd9a6bc616706fa8c2293e0a
+  data.tar.gz: 005dd4b6c151cd3c09b9cc688f59f9137b2d0c7832ddd54d5afc5f8b48bd4556a06801e9e96189c683cb3d496ad42ff1e5aea03d50c3098150af7ce9cc27bbc4

data/.travis.yml

@@ -1,6 +1,10 @@
+sudo: false
 language: ruby
+before_install:
+  - gem uninstall bundler --all --executables
+  - gem install bundler --version '< 1.7.0'
 rvm:
-- 2.0.0
+  - 2.0.0
 deploy:
   provider: rubygems
   gem: vagrant-orchestrate

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.5.1 (April 27th, 2015)
+
+  - Also short circuit a push operation with an error message if there are untracked files.
+
 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

data/README.md

@@ -6,17 +6,19 @@
 ![](http://i.imgur.com/71yAw5v.gif)
 
 This is a Vagrant 1.6+ plugin that allows orchestrated deployments
-to already provisioned (non-elastic) servers on top of the excellent vagrant-managed-servers plugin.
-It features a powerful templating `init` command and is designed from the
-ground up to be cross-platform, with first class support for **Windows,
+to already provisioned (non-elastic) servers on top of the excellent [vagrant-managed-servers](http://github.com/tknerr/vagrant-managed-servers) plugin.
+It features a powerful templating `init` command, support for multiple environments, several deployment strategies 
+and is designed from the ground up to be cross-platform, with first class support for **Windows,
 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
+$ ls
+Vagrantfile	  dummy.box
 $ vagrant orchestrate push
 ==> managed-myserver1.mydomain.com: Linking vagrant with managed server myserver1.mydomain.com
 ==> managed-myserver1.mydomain.com:  -- Server: myserver1.mydomain.com
@@ -36,7 +38,7 @@ $ vagrant orchestrate push
 ==> managed-myserver2.mydomain.com:  -- Server: myserver2.mydomain.com
 ```
 
-This also works for Windows with the `--winrm --winrm-username --wirnm-password` parameters, but currently must be initiated from a Windows host.
+This also works for Windows with the `--winrm --winrm-username USERNAME --wirnm-password PASSWORD` parameters, but currently must be initiated from a Windows host.
 
 ## Usage
 
@@ -123,10 +125,10 @@ To initialize an environment aware Vagrantfile, use
 
     $ vagrant orchestrate init --environments dev,test,prod
 
-You'll need to create git branches with matching names and fill out the servers.json
+You'll need to create git branches with matching names and enter data into the the servers.json
 file in order for the Vagrantfile to be git branch aware.
 
-Learn more about [environments](docs/environments.md)
+Learn more about [environments](docs/environments.md).
 
 #### Credentials
 
@@ -158,7 +160,14 @@ Go ahead and push changes to your managed servers, in serial by default.
 
     $ vagrant orchestrate push
 
-The push command is currently limited by convention to vagrant machines that use the `:managed` provider. So if you have other, local machines defined in the Vagrantfile, `vagrant orchestrate push` will not operate on those.
+The push command is currently limited to vagrant machines that use the `:managed` provider. So if you have other, local machines defined in the Vagrantfile, `vagrant orchestrate push` will not operate on those.
+
+### Filtering managed commands
+It can be easy to make mistakes such as rebooting a production server 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. This can be disabled by setting the variable to false in the Vagrantfile.
+
+```ruby
+  config.orchestrate.filter_managed_commands = true
+```
 
 #### Deployment Strategy
 
@@ -183,13 +192,6 @@ 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.
-
-```ruby
-  config.orchestrate.filter_managed_commands = true
-```
-
 ## 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.
@@ -210,6 +212,6 @@ Prerequisites:
 
 Flow:
 1. Develop your feature
-2. Test locally with `bundle exec vagrant orchestrate *`
+2. Run locally with `bundle exec vagrant orchestrate [init|push|status]`
 3. `bundle exec rake build`
 4. `bundle exec rake acceptance`, which will take a few minutes

data/Rakefile

@@ -16,6 +16,7 @@ task :acceptance do
   system("vagrant up /local/ --no-provision")
   # To ensure the ntp sync happens even if the servers are already up
   system("vagrant provision /local/")
+  ENV["VAGRANT_ORCHESTRATE_NO_GUARD_CLEAN"] = "true"
   system("bundle exec vagrant-spec test --components=orchestrate/push orchestrate/prompt orchestrate/status")
   puts "Destroying target servers"
   system("vagrant destroy -f /local/")

data/acceptance/command/status_spec.rb

@@ -13,7 +13,7 @@ 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", "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.")
@@ -25,6 +25,7 @@ describe "vagrant orchestrate status", component: "orchestrate/status" do
     # 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
+    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

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

@@ -162,17 +162,8 @@ module VagrantPlugins
         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
+          message = "ERROR!\nThere are files that need to be committed first."
+          RepoStatus.clean? && RepoStatus.committed? && !RepoStatus.untracked? || abort(message)
         end
 
         def upload_status_all(machines)

data/lib/vagrant-orchestrate/repo_status.rb

@@ -56,6 +56,23 @@ module VagrantPlugins
           File.join("/var", "state", "vagrant_orchestrate", repo)
         end
       end
+
+      def self.clean?
+        `git diff --exit-code 2>&1`
+        $CHILD_STATUS == 0
+      end
+
+      def self.committed?
+        `git diff-index --quiet --cached HEAD 2>&1`
+        $CHILD_STATUS == 0
+      end
+
+      # Return whether there are any untracked files in the git repo
+      def self.untracked?
+        output = `git ls-files --other --exclude-standard --directory --no-empty-directory 2>&1`
+        # This command lists untracked files. There are untracked files if the ouput is not empty.
+        !output.empty?
+      end
     end
   end
 end

data/lib/vagrant-orchestrate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler