vcloud-box-spinner 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.2.5 2013-09-16
+ - Use multi_json gem rather than json
+ - Allow use of fog's credentials file
+
 0.2.4 2013-09-05
 
  - Use fog 1.15.0 for Set-Cookie header fix.

data/README.md

@@ -18,6 +18,7 @@ You should be able to do `vcloud-box-spinner --help`
 
     e.g. vcloud-box-spinner -u username orgs/staging.json machines/frontend-1.json
 
+        -c, --credential=GROUP           fog credential group
         -u, --user=USERNAME              vCloud username
         -p, --password=PASSWORD          vCloud password
         -F, --ssh-config=FILENAME        SSH config file(s) to use (can be specified multiple times)
@@ -57,6 +58,11 @@ follows:
 
     vcloud-box-spinner -u username -p password org_config.json machine_config.json
 
+## Environment Variables
+
+  - `FOG_RC` specifies the fog credentials file if not `~/.fog`.
+  - `FOG_CREDENTIAL` specifies the credential group if not `default`.
+
 ## Hacking
 
 refer [here](/docs/hacking.md)

data/lib/provisioner/cli.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 require 'optparse'
 require 'provisioner/errors'
 require 'highline/import'
@@ -76,6 +76,10 @@ module Provisioner
         o.separator ""
         o.separator "[Available options]:"
 
+        o.on("-c", "--credential", "=GROUP", "fog credential group") do |v|
+          options[:credential] = v
+        end
+
         o.on("-u", "--user", "=USERNAME", "vCloud username") do |v|
           options[:user] = v
         end
@@ -91,14 +95,14 @@ module Provisioner
 
         options[:org_config] = {}
         o.on("-o", "--org-config", "=ORG-CONFIG-JSON",
-             "The organisation configuration json file path") do |v|
-          options[:org_config] = JSON.parse(File.read(v), :symbolize_names => true)
+             "The organisation configuration JSON file path") do |v|
+          options[:org_config] = MultiJson.load(File.read(v), :symbolize_names => true)
         end
 
         options[:machine_metadata] = {}
         o.on("-m", "--machine-config", "=METADATA",
-             "The machine configuration json file path") do |v|
-          options[:machine_metadata] = JSON.parse(File.read(v), :symbolize_names => true)
+             "The machine configuration JSON file path") do |v|
+          options[:machine_metadata] = MultiJson.load(File.read(v), :symbolize_names => true)
         end
 
         o.on('-s', '--setup-script', "=SETUP-SCRIPT", "path to setup script that should run after machine is brought up") do |v|
@@ -128,11 +132,7 @@ module Provisioner
 
         action = @args[0]
 
-        if options[:user].nil? then
-          options[:user] = ask("vCloud username: ")
-        end
-
-        if options[:password].nil? then
+        if options[:user] && options[:password].nil? then
           options[:password] = ask("vCloud password: ") { |q| q.echo = false }
         end
 

data/lib/provisioner/provisioner.rb

@@ -6,7 +6,6 @@ module Provisioner
     private :options=, :options
 
     def initialize options
-      options[:provider] = 'vcloud'
       options[:created_by] = ENV['USER']
       self.options = options
     end
@@ -42,17 +41,20 @@ module Provisioner
     private :delete
 
     def compute
-      @compute ||= Fog::Compute.new(
-        :provider           => options[:provider],
-        :vcloud_username    => "#{options[:user]}@#{options[:organisation]}",
-        :vcloud_password    => options[:password],
-        :vcloud_host        => options[:host],
+      opts = {
         :vcloud_default_vdc => options[:default_vdc],
         :connection_options => {
-          :ssl_verify_peer   => false,
           :omit_default_port => true
         }
-      )
+      }
+      if options[:user]
+        opts[:vcloud_username] = "#{options[:user]}@#{options[:organisation]}"
+        opts[:vcloud_password] = options[:password]
+      end
+      opts[:vcloud_host] = options[:host] if options[:host]
+
+      Fog.credential = options[:credential] if options[:credential]
+      @compute ||= Fog::Vcloud::Compute.new(opts)
     end
     private :compute
 
@@ -78,7 +80,7 @@ module Provisioner
     end
 
     def validate_options
-      unless options[:password] && options[:user] && options[:host]
+      unless (options[:password] && options[:user] && options[:host]) || options[:credential]
         logger.error "VCloud credentials missing"
         raise ConfigurationError, "VCloud credentials must be specified"
       end

data/lib/provisioner/version.rb

@@ -1,3 +1,3 @@
 module Provisioner
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/vcloud-box-spinner.gemspec

@@ -33,4 +33,5 @@ which enables you to be able to configure VMs with static IPs}
   s.add_runtime_dependency "parallel"
   s.add_runtime_dependency "highline"
   s.add_runtime_dependency "nokogiri", "~> 1.5.0"
+  s.add_runtime_dependency "multi_json"
 end

metadata

@@ -2,7 +2,7 @@
 name: vcloud-box-spinner
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Garima Singh
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-05 00:00:00 Z
+date: 2013-09-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -133,6 +133,17 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id012
 description: |-
   Create new VM and apply an opinionated set of commands to
   them, using vcloud API. The vcloud-box-spinner is a thin wrapper around fog,
@@ -189,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3432102660883927218
+      hash: 1125532872460758072
       segments: 
       - 0
       version: "0"
@@ -198,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3432102660883927218
+      hash: 1125532872460758072
       segments: 
       - 0
       version: "0"