vmc 0.3.12.beta.1 → 0.3.12

data/lib/cli/runner.rb

@@ -410,8 +410,7 @@ class VMC::Cli::Runner
 
   def run
 
-    trap('TERM') { print "\nInterrupted\n"; exit(false)}
-    trap('INT')  { print "\nInterrupted\n"; exit(false)}
+    trap('TERM') { print "\nTerminated\n"; exit(false)}
 
     parse_options!
 
@@ -467,6 +466,9 @@ class VMC::Cli::Runner
     puts e.message.red
     puts e.backtrace
     @exit_status = false
+  rescue Interrupt => e
+    say("\nInterrupted".red)
+    @exit_status = false
   rescue => e
     puts e.message.red
     puts e.backtrace

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.12.beta.1'
+    VERSION = '0.3.12'
   end
 end

data/lib/vmc/client.rb

@@ -381,7 +381,8 @@ class VMC::Client
   end
 
   def perform_http_request(req)
-    RestClient.proxy = URI.parse(req[:url]).find_proxy()
+    proxy_uri = URI.parse(req[:url]).find_proxy()
+    RestClient.proxy = proxy_uri.to_s if proxy_uri
 
     # Setup tracing if needed
     unless trace.nil?
@@ -395,9 +396,17 @@ class VMC::Client
         puts '>>>'
         puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
         puts "REQUEST: #{req[:method]} #{req[:url]}"
-        puts "RESPONSE_HEADERS: #{response.headers}"
+        puts "RESPONSE_HEADERS:"
+        response.headers.each do |key, value|
+            puts "    #{key} : #{value}"
+        end
         puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
-        puts "RESPONSE: [#{response.code}] #{response.body}"
+        puts "RESPONSE: [#{response.code}]"
+        begin
+            puts JSON.pretty_generate(JSON.parse(response.body))
+        rescue
+            puts "#{response.body}"
+        end
         puts '<<<'
       end
     end

data/spec/unit/cli_opts_spec.rb

@@ -32,16 +32,11 @@ describe 'VMC::Cli::Runner' do
     cli.options[:bind].should == 'bar'
   end
 
-  it 'should parse instance and instances correctly into numbers' do
+  it 'should parse instances and instance into a number and string' do
     args = "--instances 1 --instance 2"
     cli = VMC::Cli::Runner.new(args.split).parse_options!
     cli.options[:instances].should == 1
-    cli.options[:instance].should == 2
-  end
-
-  it 'should complain if instance arg is not a number' do
-    args = "--instance foo"
-    expect { VMC::Cli::Runner.new(args.split).parse_options! }.to raise_error
+    cli.options[:instance].should == "2"
   end
 
   it 'should parse url, mem, path correctly' do

data/spec/unit/client_spec.rb

@@ -11,6 +11,13 @@ describe 'VMC::Client' do
     @auth_token = spec_asset('sample_token.txt')
   end
 
+  before(:each) do
+    # make sure these get cleared so we don't have tests pass that shouldn't
+    RestClient.proxy = nil
+    ENV['http_proxy'] = nil
+    ENV['https_proxy'] = nil
+  end
+
   it 'should report its version' do
     VMC::Client.version.should =~ /\d.\d.\d/
   end
@@ -275,14 +282,24 @@ describe 'VMC::Client' do
   end
 
   it 'should set a proxy if one is set' do
+    target = "http://nonlocal.domain.com"
+    info_path = "#{target}#{VMC::INFO_PATH}"
+    stub_request(:get, info_path).to_return(File.new(spec_asset('info_return.txt')))
+    proxy = 'http://proxy.vmware.com:3128'
+    ENV['http_proxy'] = proxy
+    client = VMC::Client.new(target)
+    info = client.info
+    RestClient.proxy.should == proxy
+  end
+
+  it 'should not set a proxy when accessing localhost' do
     info_path = "#{@local_target}#{VMC::INFO_PATH}"
     stub_request(:get, info_path).to_return(File.new(spec_asset('info_return.txt')))
     proxy = 'http://proxy.vmware.com:3128'
     ENV['http_proxy'] = proxy
     client = VMC::Client.new(@local_target)
     info = client.info
-    RestClient.proxy.should == proxy
-    ENV['http_proxy'] = nil
+    RestClient.proxy.should == nil
   end
 
   it 'should use a secure proxy over a normal proxy if one is set' do
@@ -295,20 +312,19 @@ describe 'VMC::Client' do
     client = VMC::Client.new(@target)
     info = client.info
     RestClient.proxy.should == secure_proxy
-    ENV['http_proxy'] = ENV['https_proxy'] = nil
   end
 
   it 'should not use a secure proxy for non-secure site' do
-    info_path = "#{@local_target}#{VMC::INFO_PATH}"
+    target = "http://nonlocal.domain.com"
+    info_path = "#{target}#{VMC::INFO_PATH}"
     stub_request(:get, info_path).to_return(File.new(spec_asset('info_return.txt')))
     proxy = 'http://proxy.vmware.com:3128'
     secure_proxy = 'http://secure-proxy.vmware.com:3128'
     ENV['http_proxy'] = proxy
     ENV['https_proxy'] = secure_proxy
-    client = VMC::Client.new(@local_target)
+    client = VMC::Client.new(target)
     info = client.info
     RestClient.proxy.should == proxy
-    ENV['http_proxy'] = ENV['https_proxy'] = nil
   end
 
   # WebMock.allow_net_connect!

metadata

@@ -1,119 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vmc
-version: !ruby/object:Gem::Version 
-  prerelease: 7
-  version: 0.3.12.beta.1
+version: !ruby/object:Gem::Version
+  version: 0.3.12
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-02 00:00:00 -07:00
+date: 2011-07-12 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160775700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyzip2
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160775700
+- !ruby/object:Gem::Dependency
+  name: rubyzip2
+  requirement: &2160775200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160775200
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &2160774680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160774680
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2160774120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: terminal-table
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2160774120
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: &2160773380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2160773380
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160772980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2160772980
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2160772400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2160772400
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2160771840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
-  version_requirements: *id008
-description: Client library and CLI that provides access to the VMware Cloud Application Platform.
+  prerelease: false
+  version_requirements: *2160771840
+description: Client library and CLI that provides access to the VMware Cloud Application
+  Platform.
 email: support@vmware.com
-executables: 
+executables:
 - vmc
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -161,30 +160,27 @@ files:
 has_rdoc: true
 homepage: http://vmware.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Client library and CLI that provides access to the VMware Cloud Application Platform.
+summary: Client library and CLI that provides access to the VMware Cloud Application
+  Platform.
 test_files: []
-