vagrant-cloudstack 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8a5fb6d4705653f7d21a743fefd04d85835221b
-  data.tar.gz: 11f800be47556f82ee523d4f2b8d922ff43282f7
+  metadata.gz: 9369e8798fdd548b1f4a6de5a29d5e4507a08137
+  data.tar.gz: 38209b67315ca3b2b3b06b96bf5e5fed1b368642
 SHA512:
-  metadata.gz: aa716e9e7f67ecf57162a41b4bf22618059a5434fc6150c9774c3123a505b7cc99cfe24202e3a92bab295737120c265b0a42de0a6e221e4bd3ed70ac56ab9117
-  data.tar.gz: ac00112e1d8d52bbe1869e2357e306c33657095612b7db86362cefaaa8cae62e204313d4ca4274952d9d5f44efe8aa517b4866a34e70587af89fcc0db92d117a
+  metadata.gz: d54f3cc4bf1413a199945b84b4a0713023ca2a51323e0ad799eda47098529273d54ab647e3153fceed6507a1010ef5ec07d74b5f80844b60ded4aeda3b8bde38
+  data.tar.gz: 9624a75d8910020a7c30bc5d370d0ec9d3bf634ba70407f9bc78b336c34079f6fcd194be7a641309064d6e651b7663be103672e9419b8b4af22f65c8b05a8090

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p451
+2.0.0-p481

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.0 (May 13, 2014)
+
+* Bump the Ruby version to 2.0.0-p481
+* The API and secret keys can now be passed through environment
+  variables CLOUDSTACK_API_KEY and CLOUDSTACK_SECRET_KEY.
+
 # 0.5.0 (Apr 29, 2014)
 
 * Use latest version of upstream fog which contains some much needed

data/build_rpm.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=0.5.0
+VERSION=0.6.0
 mkdir -p /tmp/vagrant-cloudstack-build_rpm.$$/vagrant-cloudstack-$VERSION
 cp -r . /tmp/vagrant-cloudstack-build_rpm.$$/vagrant-cloudstack-$VERSION/
 tar -C /tmp/vagrant-cloudstack-build_rpm.$$/ -czf ~/rpmbuild/SOURCES/vagrant-cloudstack-$VERSION.tar.gz vagrant-cloudstack-$VERSION

data/lib/vagrant-cloudstack/config.rb

@@ -237,11 +237,10 @@ module VagrantPlugins
         # Scheme is 'http' by default
         @scheme = "http" if @scheme == UNSET_VALUE
 
-        # Api key must be nil, since we can't default that
-        @api_key = nil if @api_key == UNSET_VALUE
-
-        # Secret key must be nil, since we can't default that
-        @secret_key = nil if @secret_key == UNSET_VALUE
+        # Try to get access keys from environment variables, they will
+        # default to nil if the environment variables are not present
+        @api_key = ENV['CLOUDSTACK_API_KEY'] if @api_key == UNSET_VALUE
+        @secret_key = ENV['CLOUDSTACK_SECRET_KEY'] if @secret_key == UNSET_VALUE
 
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE

data/lib/vagrant-cloudstack/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cloudstack
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/spec/vagrant-cloudstack/config_spec.rb

@@ -43,6 +43,35 @@ describe VagrantPlugins::Cloudstack::Config do
     its("user_data")              { should be_nil }
   end
 
+  describe "getting credentials from environment" do
+    context "without CloudStack credential environment variables" do
+      subject do
+        instance.tap do |o|
+          o.finalize!
+        end
+      end
+
+      its("api_key")    { should be_nil }
+      its("secret_key") { should be_nil }
+    end
+
+    context "with CloudStack credential variables" do
+      before :each do
+        ENV.stub(:[]).with("CLOUDSTACK_API_KEY").and_return("api_key")
+        ENV.stub(:[]).with("CLOUDSTACK_SECRET_KEY").and_return("secret_key")
+      end
+
+      subject do
+        instance.tap do |o|
+          o.finalize!
+        end
+      end
+
+      its("api_key")    { should == "api_key" }
+      its("secret_key") { should == "secret_key" }
+    end
+  end
+
   describe "overriding defaults" do
     # I typically don't meta-program in tests, but this is a very
     # simple boilerplate test, so I cut corners here. It just sets

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog