vcloud-tools-tester 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,9 @@
+---
+language: ruby
+rvm:
+  - 1.9.3
+branches:
+  except:
+    - master
+notifications:
+  email: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.4 (2014-05-20)
+
+Features:
+
+  - add edge_gateway parameter
+  - add provider_network, provider_network_id, provider_network_ip parameters
+
 ## 0.0.3 (2014-05-09)
 
 Bugfixes:

data/lib/vcloud/tools/tester/test_parameters.rb

@@ -13,9 +13,13 @@ module Vcloud
           unless File.exist?(config_file)
             raise ArgumentError.new("Missing required file: #{config_file}")
           end
-          organization = ENV['FOG_CREDENTIAL']
+          organization = ENV.fetch('FOG_CREDENTIAL') do
+            raise "Must set FOG_CREDENTIAL envvar"
+          end
           all_config = YAML::load(File.open(config_file))
-          @input_config = all_config[organization]
+          @input_config = all_config.fetch(organization) do
+            raise "Invalid FOG_CREDENTIAL value '#{organization}'"
+          end
         end
 
         def vdc_1_name
@@ -70,6 +74,22 @@ module Vcloud
           @input_config["vdc_2_storage_profile_href"]
         end
 
+        def edge_gateway
+          @input_config["edge_gateway"]
+        end
+
+        def provider_network
+          @input_config["provider_network"]
+        end
+
+        def provider_network_id
+          @input_config["provider_network_id"]
+        end
+
+        def provider_network_ip
+          @input_config["provider_network_ip"]
+        end
+
       end
     end
   end

data/lib/vcloud/tools/tester/version.rb

@@ -1,7 +1,7 @@
 module Vcloud
   module Tools
     module Tester
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/spec/vcloud/tools/tester/test_parameters_spec.rb

@@ -11,28 +11,42 @@ module Vcloud::Tools::Tester
     context "loading config file" do
 
       it "loads input yaml when intialized" do
-        ENV['FOG_CREDENTIAL'] = 'test-organisation'
+        stub_const('ENV', {'FOG_CREDENTIAL' => 'test-organisation'})
         parameters = TestParameters.new("#{@data_dir}/test_config.yaml")
         test_vdc = parameters.vdc_1_name
         expect(test_vdc).to eq("test-vdc-name")
       end
 
       it "loads a different organization's yaml when env var changes" do
-        ENV['FOG_CREDENTIAL'] = 'other-organisation'
+        stub_const('ENV', {'FOG_CREDENTIAL' => 'other-organisation'})
         parameters = TestParameters.new("#{@data_dir}/test_config.yaml")
         test_vdc = parameters.vdc_1_name
         expect(test_vdc).to eq("other-vdc-name")
       end
 
       it "input yaml file can be changed" do
-        ENV['FOG_CREDENTIAL'] = 'minimal-organisation'
+        stub_const('ENV', {'FOG_CREDENTIAL' => 'minimal-organisation'})
         parameters = TestParameters.new("#{@data_dir}/test_minimal_config.yaml")
         test_vdc = parameters.vdc_1_name
         expect(test_vdc).to eq("minimal-vdc-name")
       end
 
+      it "gives a useful error when FOG_CREDENTIAL is unset" do
+        stub_const('ENV', {})
+        expect {
+          TestParameters.new("#{@data_dir}/test_minimal_config.yaml")
+        }.to raise_error(RuntimeError, /Must set FOG_CREDENTIAL envvar/)
+      end
+
+      it "gives a useful error when the FOG_CREDENTIAL is missing from the config" do
+        stub_const('ENV', {'FOG_CREDENTIAL' => 'bogus-fog-credential'})
+        expect {
+          TestParameters.new("#{@data_dir}/test_config.yaml")
+        }.to raise_error(RuntimeError, /Invalid FOG_CREDENTIAL value/)
+      end
+
       it "gives a useful error when there is no config file" do
-        ENV['FOG_CREDENTIAL'] = 'minimal-organisation'
+        stub_const('ENV', {'FOG_CREDENTIAL' => 'minimal-organisation'})
         expect {
           TestParameters.new("#{@data_dir}/non_existent_testing_config.yaml")
         }.to raise_error(ArgumentError, /Missing required file/)
@@ -88,9 +102,5 @@ module Vcloud::Tools::Tester
 
     end
 
-    after(:each) do
-      ENV.delete('FOG_CREDENTIAL')
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-tools-tester
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -83,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -112,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -670522783234644326
+      hash: -658210485675310826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -670522783234644326
+      hash: -658210485675310826
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23