vcloud-net_launcher 0.4.0 → 0.5.0

data/.gitignore

@@ -1,3 +1,4 @@
 /Gemfile.lock
 /coverage/
 spec/integration/vcloud_tools_testing_config.yaml
+.yardoc/

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.5.0 (2014-08-08)
+
+This release bumps the dependency to vCloud Core 0.9.0:
+
+  - New vcloud-login tool for fetching session tokens without the need to
+    store your password in a plaintext FOG_RC file.
+  - Deprecate the use of :vcloud_director_password in a plaintext FOG_RC
+    file. A warning will be printed to STDERR at load time. Please use
+    vcloud-login instead.
+  - This gem no longer directly references fog, instead using vCloud Core's
+    API for its interaction with the vCloud API.
+
 ## 0.4.0 (2014-07-25)
 
   - Remove the command line option to enable fog mocking.

data/README.md

@@ -24,40 +24,7 @@ The form to run the command is
 
 ## Credentials
 
-vCloud Net Launcher is based around [fog](http://fog.io/). To use it you'll need to give it
-credentials that allow it to talk to a vCloud Director environment.
-
-1. Create a '.fog' file in your home directory.
-
-  For example:
-
-      test_credentials:
-        vcloud_director_host: 'host.api.example.com'
-        vcloud_director_username: 'username@org_name'
-        vcloud_director_password: ''
-
-2. Obtain a session token. First, curl the API:
-
-        curl -D- -d '' \
-            -H 'Accept: application/*+xml;version=5.1' -u '<username>@<org_name>' \
-            https://<host.api.example.com>/api/sessions
-
-  This will prompt for your password.
-
-  From the headers returned, the value of the `x-vcloud-authorization` header is your
-  session token, and this will be valid for 30 minutes idle - any activity will extend
-  its life by another 30 minutes.
-
-3. Specify your credentials and session token at the beginning of the command. For example:
-
-        FOG_CREDENTIAL=test_credentials \
-            FOG_VCLOUD_TOKEN=AAAABBBBBCCCCCCDDDDDDEEEEEEFFFFF= \
-            vcloud-net-launch
-
-  You may find it easier to export one or both of the values as environment variables.
-
-  **NB** It is also possible to sidestep the need for the session token by saving your
-  password in the fog file. This is **not recommended**.
+Please see the [vcloud-tools usage documentation](http://gds-operations.github.io/vcloud-tools/usage/).
 
 ##Supports
 

data/jenkins.sh

@@ -1,15 +1,5 @@
-#!/bin/bash -x
+#!/bin/bash
 set -e
 
-git clean -ffdx
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-bundle exec rake
-
-# Obtain the integration test parameters
-git clone git@github.gds:gds/vcloud-tools-testing-config.git
-mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
-rm -rf vcloud-tools-testing-config
-
-RUBYOPT="-r ./tools/fog_credentials" bundle exec rake integration
-
+./jenkins_tests.sh
 bundle exec rake publish_gem

data/jenkins_tests.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -eu
+
+function cleanup {
+  rm $FOG_RC
+}
+
+# Override default of ~/.fog and delete afterwards.
+export FOG_RC=$(mktemp /tmp/vcloud_fog_rc.XXXXXXXXXX)
+trap cleanup EXIT
+
+cat <<EOF >${FOG_RC}
+${FOG_CREDENTIAL}:
+  vcloud_director_host: '${API_HOST}'
+  vcloud_director_username: '${API_USERNAME}'
+  vcloud_director_password: ''
+EOF
+
+git clean -ffdx
+bundle install --path "${HOME}/bundles/${JOB_NAME}"
+bundle exec rake
+
+# Obtain the integration test parameters
+git clone git@github.gds:gds/vcloud-tools-testing-config.git
+mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
+rm -rf vcloud-tools-testing-config
+
+# Never log token to STDOUT.
+set +x
+eval $(printenv API_PASSWORD | bundle exec vcloud-login)
+
+bundle exec rake integration

data/lib/vcloud/net_launcher/net_launch.rb

@@ -1,5 +1,3 @@
-require 'fog'
-
 module Vcloud
   module NetLauncher
     class NetLaunch

data/lib/vcloud/net_launcher/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module NetLauncher
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/vcloud/net_launcher.rb

@@ -8,7 +8,6 @@ require 'pp'
 
 require 'vcloud/net_launcher/version'
 
-require 'vcloud/fog'
 require 'vcloud/core'
 
 require 'vcloud/net_launcher/cli'

data/spec/integration/net_launcher/net_launch_spec.rb

@@ -40,9 +40,9 @@ module Vcloud
         after(:each) do
           unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_VAPP']
             File.delete @minimum_data_yaml
-            fog_interface = Vcloud::Fog::ServiceInterface.new
+            api_interface = Vcloud::Core::ApiInterface.new
             provisioned_network_id = @found_networks[0][:href].split('/').last
-            expect(fog_interface.delete_network(provisioned_network_id)).to be(true)
+            expect(api_interface.delete_network(provisioned_network_id)).to be(true)
           end
         end
 

data/spec/integration/net_launcher/org_vdc_network_spec.rb

@@ -69,7 +69,7 @@ describe Vcloud::Core::OrgVdcNetwork do
 
     after(:all) do
       unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_ORG_VDC_NETWORK']
-        Vcloud::Fog::ServiceInterface.new.delete_network(@net.id) if @net
+        Vcloud::Core::ApiInterface.new.delete_network(@net.id) if @net
       end
     end
 
@@ -140,7 +140,7 @@ describe Vcloud::Core::OrgVdcNetwork do
 
     after(:all) do
       unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_ORG_VDC_NETWORK']
-        Vcloud::Fog::ServiceInterface.new.delete_network(@net.id) if @net
+        Vcloud::Core::ApiInterface.new.delete_network(@net.id) if @net
       end
     end
 

data/vcloud-net_launcher.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency 'vcloud-core', '~> 0.6.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.9.0'
   s.add_development_dependency 'gem_publisher', '1.2.0'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-net_launcher
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcloud-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ files:
 - bin/vcloud-net-launch
 - examples/vcloud-net-launch/example-config.yaml
 - jenkins.sh
-- jenkins_integration_tests.sh
+- jenkins_tests.sh
 - lib/vcloud/net_launcher.rb
 - lib/vcloud/net_launcher/cli.rb
 - lib/vcloud/net_launcher/net_launch.rb
@@ -175,7 +175,6 @@ files:
 - spec/vcloud/net_launcher/cli_spec.rb
 - spec/vcloud/net_launcher/net_launch_schema_spec.rb
 - spec/vcloud/net_launcher/net_launch_spec.rb
-- tools/fog_credentials.rb
 - vcloud-net_launcher.gemspec
 homepage: http://github.com/gds-operations/vcloud-net_launcher
 licenses:
@@ -198,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 792051475262227984
+      hash: 2206298197213467124
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/jenkins_integration_tests.sh

@@ -1,12 +0,0 @@
-#!/bin/bash -x
-set -e
-
-git clean -ffdx
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-
-# Obtain the integration test parameters
-git clone git@github.gds:gds/vcloud-tools-testing-config.git
-mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
-rm -rf vcloud-tools-testing-config
-
-RUBYOPT="-r ./tools/fog_credentials" bundle exec rake integration

data/tools/fog_credentials.rb

@@ -1,17 +0,0 @@
-# Initialiser for getting vCloud credentials into Fog from Jenkins build
-# parameters, without needing to write them to disk. To be used with:
-#
-#     RUBYOPT="-r ./tools/fog_credentials" bundle exec integration
-#
-# Replace with FOG_VCLOUD_TOKEN support when we have a tool:
-#
-#     https://www.pivotaltracker.com/story/show/68989754
-#
-require 'bundler/setup'
-require 'fog'
-
-Fog.credentials = {
-  :vcloud_director_host     => ENV['API_HOST'],
-  :vcloud_director_username => ENV['API_USERNAME'],
-  :vcloud_director_password => ENV['API_PASSWORD'],
-}