vcloud-walker 3.2.3 → 3.3.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.3.0 (2014-08-08)
+
+Depend on vCloud Core version 0.7.0, which:
+
+  - Includes a new vcloud-login tool for fetching session tokens without the
+    need to store your password in a plaintext FOG_RC file.
+  - Deprecates 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.
+
 ## 3.2.3 (2014-07-14)
 
 Bugfixes:

data/README.md

@@ -52,41 +52,7 @@ networks and vdcs within an organization.
 
 ## Credentials
 
-vCloud Walker 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-walk organization
-
-  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/).
 
 ### Output
 

data/jenkins.sh

@@ -1,12 +1,5 @@
-#!/bin/bash -x
+#!/bin/bash
 set -e
 
-rm -f Gemfile.lock
-git clean -fdx
-
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-bundle exec rake
-
-RUBYOPT="-r ./tools/fog_credentials" bundle exec rake integration
-
+./jenkins_tests.sh
 bundle exec rake publish_gem

data/jenkins_tests.sh

@@ -0,0 +1,29 @@
+#!/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
+
+rm -f Gemfile.lock
+git clean -fdx
+
+bundle install --path "${HOME}/bundles/${JOB_NAME}"
+bundle exec rake
+
+# Never log token to STDOUT.
+set +x
+eval $(printenv API_PASSWORD | bundle exec vcloud-login)
+
+bundle exec rake integration

data/lib/vcloud/walker/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Walker
-    VERSION = '3.2.3'
+    VERSION = '3.3.0'
   end
 end

data/vcloud-walker.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'fog', '>= 1.21.0'
   s.add_runtime_dependency 'json', '~> 1.8.0'
-  s.add_runtime_dependency 'vcloud-core', '~> 0.6.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.7.0'
   s.add_development_dependency 'gem_publisher', '1.2.0'
   s.add_development_dependency 'json_spec', '~> 1.1.1'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-walker
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ files:
 - docs/examples/networks.json
 - docs/examples/vdcs.json
 - jenkins.sh
-- jenkins_integration_tests.sh
+- jenkins_tests.sh
 - lib/vcloud/walker.rb
 - lib/vcloud/walker/cli.rb
 - lib/vcloud/walker/fog_interface.rb
@@ -229,7 +229,6 @@ files:
 - spec/vcloud/walker/resource/vdcs_spec.rb
 - spec/vcloud/walker/resource/vm_spec.rb
 - spec/vcloud/walker_spec.rb
-- tools/fog_credentials.rb
 - vcloud-walker.gemspec
 homepage: https://github.com/gds-operations/vcloud-walker
 licenses:
@@ -252,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2006502224418708712
+      hash: -2616587424835710718
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/jenkins_integration_tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash -x
-set -e
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-
-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'],
-}