vagrant-orchestrate 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8bd501392dfda5915b4bbc00a06d46a27dd08c9
-  data.tar.gz: 0280f99653f43635042074898fd54ddbf428231c
+  metadata.gz: e792cb68c033c004720ce8142c97148c62d3d3b3
+  data.tar.gz: f923b195cde3ae62356f3acd78419f829859cb03
 SHA512:
-  metadata.gz: e411ded7b83942b15f621d0c9ac97ef170b0a0748fafc294e591268a7eb8ce8bd76ccde29b79593223103440d5f8334c5567730091c2381b0ba65b1c44ff8201
-  data.tar.gz: 6dd06ba49cd7ce2b4ae961edc2f9cf267f51c9fb4f5ba31d219daab4dd99af92b0527e712c75619d7eebb3cf099e80edecb5b8ca149a6d4ed33551aa16a954f7
+  metadata.gz: a4a923bbb339a50c8660a98b47e0622890f6a5857514ad93e262d0de7215cc6edda47a11b0732aea3499aca8160044b19081e4b5feeb456be80e10cbdd016ee4
+  data.tar.gz: cc35054d935113db19f082744ac4a2d4eb720765ddcb55bde0dd098d021b1d2e98d3d7931a70750b9f50d48d7290b4e1b3117297e59a7243c90e10f99bc96d11

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.5.3 (May 13th, 2015)
+
+  - Fix a bug where the VAGRANT_ORCHESTRATE_USERNAME and VAGRANT_ORCHESTRATE_PASSWORD
+  environment variable overrides weren't being read properly. The bug was repro'd
+  on a Windows environment.
+
 0.5.2 (May 8th, 2015)
 
   - Add the `--no-provision` option to the `orchestrate push` command. Useful for

data/lib/vagrant-orchestrate/action/setcredentials.rb

@@ -6,8 +6,14 @@ module VagrantPlugins
           return unless config_creds
 
           # Use environment variable overrides, or else what was provided in the config file
-          config_creds.username = ENV["VAGRANT_ORCHESTRATE_USERNAME"] || config_creds.username
-          config_creds.password = ENV["VAGRANT_ORCHESTRATE_PASSWORD"] || config_creds.password
+          if ENV["VAGRANT_ORCHESTRATE_USERNAME"]
+            ui.info("Using VAGRANT_ORCHESTRATE_USERNAME environment variable override")
+            config_creds.username = ENV["VAGRANT_ORCHESTRATE_USERNAME"].dup
+          end
+          if ENV["VAGRANT_ORCHESTRATE_PASSWORD"]
+            ui.info("Using VAGRANT_ORCHESTRATE_PASSWORD environment variable override")
+            config_creds.password = ENV["VAGRANT_ORCHESTRATE_PASSWORD"].dup
+          end
 
           # Use credentials file to any username or password that is still undiscovered
           check_creds_file(config_creds, ui) unless config_creds.username && config_creds.password

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

@@ -162,7 +162,7 @@ module VagrantPlugins
               creds.apply_creds(machine, username, password)
             end
           else
-            @env.ui.warn "Vagrant-orchestrate could not gather credentials. Continuing with default credentials."
+            @env.ui.warn "Vagrant-orchestrate did find any credentials. Continuing with default credentials."
           end
         end
 

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler