rhc 1.5.13 → 1.6.8

data/spec/rhc/helpers_spec.rb

@@ -239,7 +239,7 @@ describe RHC::Helpers do
   end
 
   describe "#get_properties" do
-    it{ tests.send(:get_properties, stub(:plan_id => 'freeshift'), :plan_id).should == [[:plan_id, 'FreeShift']] }
+    it{ tests.send(:get_properties, stub(:plan_id => 'free'), :plan_id).should == [[:plan_id, 'Free']] }
     context "when an error is raised" do
       subject{ stub.tap{ |s| s.should_receive(:foo).and_raise(::Exception) } }
       it{ tests.send(:get_properties, subject, :foo).should == [[:foo, '<error>']] }
@@ -369,7 +369,6 @@ describe RHC::Helpers do
 
     it "should catch exceptions from fingerprint failures" do
       Net::SSH::KeyFactory.should_receive(:load_public_key).with('1').and_raise(StandardError.new("An error"))
-      subject.should_receive(:error).with('An error')
       subject.fingerprint_for_local_key('1').should be_nil
     end
   end

data/spec/rhc/rest_client_spec.rb

@@ -22,13 +22,34 @@ module RHC
   module Rest
     describe Client do
 
+      it 'should set the proxy protocol if it is missing' do
+        ENV['http_proxy'] = 'foo.bar.com:8081'
+        load 'rhc/rest/client.rb'
+
+        ENV['http_proxy'].should == 'http://foo.bar.com:8081'
+      end
+
+      it 'should not alter the proxy protocol if it is present' do
+        ENV['http_proxy'] = 'http://foo.bar.com:8081'
+        load 'rhc/rest/client.rb'
+
+        ENV['http_proxy'].should == 'http://foo.bar.com:8081'
+      end
+
+      it 'should not affect the proxy protocol if nil' do
+        ENV['http_proxy'] = nil
+        load 'rhc/rest/client.rb'
+
+        ENV['http_proxy'].should be_nil
+      end
+
       let(:endpoint){ mock_href }
       let(:username){ nil }# mock_user }
       let(:password){ nil }# mock_pass }
       let(:use_debug){ false }
       #let(:spec_versions){ nil }
-      let(:client) do 
-        respond_to?(:spec_versions) ? 
+      let(:client) do
+        respond_to?(:spec_versions) ?
           RHC::Rest::Client.new(endpoint, username, password, use_debug, spec_versions) :
           RHC::Rest::Client.new(endpoint, username, password, use_debug)
       end
@@ -262,7 +283,7 @@ module RHC
         end
 
         describe RHC::Rest::Cartridge do
-          subject do 
+          subject do
             described_class.new({
               :name => 'foo',
               :links => mock_response_links([
@@ -270,7 +291,7 @@ module RHC
               ])}, client)
           end
           context "when several messages are present" do
-            before do 
+            before do
               stub_api_request(:get, 'broker/rest/cartridge', true).
                 with(:query => {:include => :status_messages}).
                 to_return(:body => {
@@ -308,7 +329,7 @@ module RHC
                           :status => 200
                         })
           end
-          it "returns a list of existing cartridges" do 
+          it "returns a list of existing cartridges" do
             carts = client.cartridges
             carts.length.should equal(2)
             (0..1).each do |idx|

data/spec/rhc/wizard_spec.rb

@@ -38,6 +38,27 @@ describe RHC::Wizard do
     its(:has_configuration?){ should be_true }
   end
 
+  describe "#setup_test_stage" do
+    subject{ described_class.new(config, options) }
+    it "should rescue problems" do
+      subject.should_receive(:all_test_methods).and_return([:_test])
+      subject.should_receive(:_test).and_raise(StandardError.new("An error message"))
+      capture{ subject.send(:setup_test_stage) }.should match "An error message"
+    end
+  end
+
+  describe "#test_private_key_mode" do
+    it "should raise when the file is in the wrong mode" do
+      FakeFS do
+        mock_config
+        FileUtils.mkdir_p(RHC::Config.ssh_dir)
+        File.open(RHC::Config.ssh_priv_key_file_path, 'w'){}
+        File.chmod(0666, RHC::Config.ssh_priv_key_file_path)
+        expect{ subject.send(:test_private_key_mode) }.to raise_error(StandardError)
+      end
+    end
+  end
+
   describe "#test_ssh_connectivity" do
     subject{ described_class.new(config, options) }
     let(:app) do
@@ -310,6 +331,7 @@ describe RHC::Wizard do
           input_line 'yes'
           input_line 'a'
           next_stage
+
           last_output do |s|
             s.should match(/a \(type: ssh-rsa\)/)
             s.should match("Fingerprint: #{rsa_key_fingerprint_public}")

data/spec/spec_helper.rb

@@ -55,6 +55,24 @@ class FakeFS::File
   end
 end
 
+IO.instance_eval{ alias :read_orig :read }
+
+module FakeFS
+  class << self
+    alias_method :activate_orig, :activate!
+    alias_method :deactivate_orig, :deactivate!
+
+    def activate!
+      IO.instance_eval{ def self.read(path); FakeFS::File.read(path); end }
+      activate_orig
+    end
+    def deactivate!
+      IO.instance_eval{ alias :read :read_orig }
+      deactivate_orig
+    end
+  end
+end
+
 require 'rhc/cli'
 
 include WebMock::API
@@ -189,6 +207,11 @@ module ClassSpecHelpers
   end
 
   class MockHighLineTerminal < HighLine
+
+    def self.use_color?
+      true
+    end
+
     def initialize(input, output)
       super
       @last_read_pos = 0
@@ -363,8 +386,8 @@ module CommanderInvocationMatchers
     end
     description do
       "expect block to invoke '#{method}' on #{@object} with #{@args}"
-    end    
-  end  
+    end
+  end
 end
 
 module ColorMatchers

data/spec/wizard_spec_helper.rb

@@ -61,7 +61,7 @@ module WizardStepsHelper
     input_line 'yes'
 
     next_stage.should_not be_nil
-
+    
     last_output do |s|
       s.should match('Since you do not have any keys associated')
       s.should match(/Fingerprint\: (?:[a-f0-9]{2}\:){15}/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhc
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -233,146 +233,151 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/rhc/cartridge_helpers.rb
+- lib/rhc/exceptions.rb
+- lib/rhc/rest/user.rb
+- lib/rhc/rest/application.rb
+- lib/rhc/rest/base.rb
+- lib/rhc/rest/mock.rb
+- lib/rhc/rest/authorization.rb
+- lib/rhc/rest/domain.rb
+- lib/rhc/rest/gear_group.rb
+- lib/rhc/rest/key.rb
+- lib/rhc/rest/api.rb
+- lib/rhc/rest/attributes.rb
+- lib/rhc/rest/client.rb
+- lib/rhc/rest/cartridge.rb
+- lib/rhc/rest/alias.rb
+- lib/rhc/auth.rb
+- lib/rhc/version.rb
+- lib/rhc/output_helpers.rb
 - lib/rhc/core_ext.rb
-- lib/rhc/help_formatter.rb
-- lib/rhc/vendor/zliby.rb
-- lib/rhc/vendor/sshkey.rb
-- lib/rhc/vendor/parseconfig.rb
-- lib/rhc/vendor/okjson.rb
+- lib/rhc/autocomplete.rb
+- lib/rhc/coverage_helper.rb
+- lib/rhc/config.rb
+- lib/rhc/json.rb
+- lib/rhc/commands.rb
+- lib/rhc/commands/server.rb
+- lib/rhc/commands/base.rb
+- lib/rhc/commands/authorization.rb
+- lib/rhc/commands/domain.rb
 - lib/rhc/commands/apps.rb
-- lib/rhc/commands/port_forward.rb
 - lib/rhc/commands/threaddump.rb
-- lib/rhc/commands/sshkey.rb
-- lib/rhc/commands/setup.rb
-- lib/rhc/commands/snapshot.rb
 - lib/rhc/commands/account.rb
+- lib/rhc/commands/snapshot.rb
 - lib/rhc/commands/git_clone.rb
-- lib/rhc/commands/domain.rb
-- lib/rhc/commands/alias.rb
-- lib/rhc/commands/server.rb
+- lib/rhc/commands/port_forward.rb
+- lib/rhc/commands/cartridge.rb
+- lib/rhc/commands/setup.rb
 - lib/rhc/commands/app.rb
-- lib/rhc/commands/base.rb
-- lib/rhc/commands/authorization.rb
 - lib/rhc/commands/tail.rb
-- lib/rhc/commands/cartridge.rb
-- lib/rhc/helpers.rb
-- lib/rhc/auth/basic.rb
-- lib/rhc/auth/token_store.rb
-- lib/rhc/auth/token.rb
-- lib/rhc/exceptions.rb
-- lib/rhc/context_helper.rb
-- lib/rhc/commands.rb
-- lib/rhc/config.rb
+- lib/rhc/commands/sshkey.rb
+- lib/rhc/commands/alias.rb
+- lib/rhc/vendor/zliby.rb
+- lib/rhc/vendor/okjson.rb
+- lib/rhc/vendor/parseconfig.rb
+- lib/rhc/vendor/sshkey.rb
+- lib/rhc/tar_gz.rb
+- lib/rhc/command_runner.rb
+- lib/rhc/ssh_helpers.rb
 - lib/rhc/git_helpers.rb
-- lib/rhc/coverage_helper.rb
-- lib/rhc/json.rb
-- lib/rhc/version.rb
-- lib/rhc/autocomplete.rb
-- lib/rhc/auth.rb
 - lib/rhc/wizard.rb
 - lib/rhc/cli.rb
-- lib/rhc/output_helpers.rb
-- lib/rhc/tar_gz.rb
+- lib/rhc/auth/basic.rb
+- lib/rhc/auth/token.rb
+- lib/rhc/auth/token_store.rb
+- lib/rhc/context_helper.rb
+- lib/rhc/help_formatter.rb
 - lib/rhc/rest.rb
-- lib/rhc/command_runner.rb
-- lib/rhc/cartridge_helpers.rb
-- lib/rhc/ssh_helpers.rb
-- lib/rhc/rest/key.rb
-- lib/rhc/rest/mock.rb
-- lib/rhc/rest/api.rb
-- lib/rhc/rest/attributes.rb
-- lib/rhc/rest/application.rb
-- lib/rhc/rest/client.rb
-- lib/rhc/rest/domain.rb
-- lib/rhc/rest/user.rb
-- lib/rhc/rest/base.rb
-- lib/rhc/rest/authorization.rb
-- lib/rhc/rest/cartridge.rb
-- lib/rhc/rest/gear_group.rb
+- lib/rhc/helpers.rb
 - lib/rhc.rb
-- lib/rhc/usage_templates/options_help.erb
 - lib/rhc/usage_templates/command_syntax_help.erb
-- lib/rhc/usage_templates/command_help.erb
-- lib/rhc/usage_templates/missing_help.erb
 - lib/rhc/usage_templates/help.erb
+- lib/rhc/usage_templates/missing_help.erb
+- lib/rhc/usage_templates/command_help.erb
+- lib/rhc/usage_templates/options_help.erb
 - lib/rhc/autocomplete_templates/rhc.erb
 - conf/express.conf
 - LICENSE
 - COPYRIGHT
 - README.md
 - Rakefile
+- spec/spec_helper.rb
+- spec/coverage_helper.rb
+- spec/rhc/json_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/rest_client_spec.rb
 - spec/rhc/wizard_spec.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/commands/setup_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/cli_spec.rb
 - spec/rhc/commands/tail_spec.rb
-- spec/rhc/commands/alias_spec.rb
-- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/domain_spec.rb
+- spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/app_spec.rb
+- spec/rhc/commands/setup_spec.rb
+- spec/rhc/commands/port_forward_spec.rb
+- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
+- spec/rhc/commands/alias_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
-- spec/rhc/commands/server_spec.rb
-- spec/rhc/commands/authorization_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/threaddump_spec.rb
-- spec/rhc/commands/apps_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/auth_spec.rb
-- spec/rhc/json_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/context_spec.rb
+- spec/rhc/commands/authorization_spec.rb
 - spec/rhc/assets/foo.txt
+- spec/rhc/assets/cert.crt
 - spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/empty.txt
 - spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/rest_client_spec.rb
-- spec/rhc/cli_spec.rb
-- spec/rhc/rest_application_spec.rb
+- spec/rhc/assets/cert_key_rsa
 - spec/rhc/command_spec.rb
-- spec/spec.opts
-- spec/rest_spec_helper.rb
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
+- spec/rhc/rest_application_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/context_spec.rb
+- spec/rhc/auth_spec.rb
 - spec/wizard_spec_helper.rb
-- spec/keys/example_private.pem
-- spec/keys/server.pem
 - spec/keys/example.pem
-- features/client.feature
+- spec/keys/server.pem
+- spec/keys/example_private.pem
+- spec/rest_spec_helper.rb
+- spec/spec.opts
+- features/multiple_cartridge.feature
+- features/domain.feature
 - features/verify.feature
-- features/README.md
-- features/geared_application.feature
-- features/support/before_hooks.rb
+- features/cartridge.feature
+- features/client.feature
+- features/support/env.rb
 - features/support/key2.pub
-- features/support/assumptions.rb
-- features/support/key1.pub
 - features/support/key1
-- features/support/env.rb
+- features/support/key1.pub
+- features/support/platform_support.rb
+- features/support/before_hooks.rb
 - features/support/key3.pub
 - features/support/key2
-- features/lib/rhc_helper/sshkey.rb
-- features/lib/rhc_helper/api.rb
-- features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/loggable.rb
-- features/lib/rhc_helper/domain.rb
-- features/lib/rhc_helper/runnable.rb
-- features/lib/rhc_helper/app.rb
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper.rb
+- features/support/assumptions.rb
+- features/application.feature
 - features/sshkey.feature
-- features/domain.feature
-- features/cartridge.feature
+- features/geared_application.feature
 - features/scaled_application.feature
 - features/step_definitions/cartridge_steps.rb
-- features/step_definitions/sshkey_steps.rb
 - features/step_definitions/application_steps.rb
 - features/step_definitions/client_steps.rb
 - features/step_definitions/domain_steps.rb
-- features/application.feature
-- features/multiple_cartridge.feature
+- features/step_definitions/sshkey_steps.rb
+- features/lib/rhc_helper.rb
+- features/lib/rhc_helper/httpify.rb
+- features/lib/rhc_helper/domain.rb
+- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/loggable.rb
+- features/lib/rhc_helper/commandify.rb
+- features/lib/rhc_helper/api.rb
+- features/lib/rhc_helper/cartridge.rb
+- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/persistable.rb
+- features/lib/rhc_helper/sshkey.rb
+- features/README.md
 - bin/rhc
 homepage: https://github.com/openshift/rhc
 licenses: []
@@ -405,75 +410,79 @@ signing_key:
 specification_version: 3
 summary: OpenShift Client Tools
 test_files:
+- spec/spec_helper.rb
+- spec/coverage_helper.rb
+- spec/rhc/json_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/rest_client_spec.rb
 - spec/rhc/wizard_spec.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/commands/setup_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/cli_spec.rb
 - spec/rhc/commands/tail_spec.rb
-- spec/rhc/commands/alias_spec.rb
-- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/domain_spec.rb
+- spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/commands/server_spec.rb
 - spec/rhc/commands/app_spec.rb
+- spec/rhc/commands/setup_spec.rb
+- spec/rhc/commands/port_forward_spec.rb
+- spec/rhc/commands/account_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
+- spec/rhc/commands/alias_spec.rb
 - spec/rhc/commands/cartridge_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
-- spec/rhc/commands/server_spec.rb
-- spec/rhc/commands/authorization_spec.rb
-- spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/threaddump_spec.rb
-- spec/rhc/commands/apps_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
-- spec/rhc/auth_spec.rb
-- spec/rhc/json_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/context_spec.rb
+- spec/rhc/commands/authorization_spec.rb
 - spec/rhc/assets/foo.txt
+- spec/rhc/assets/cert.crt
 - spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/empty.txt
 - spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/rest_client_spec.rb
-- spec/rhc/cli_spec.rb
-- spec/rhc/rest_application_spec.rb
+- spec/rhc/assets/cert_key_rsa
 - spec/rhc/command_spec.rb
-- spec/spec.opts
-- spec/rest_spec_helper.rb
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
+- spec/rhc/rest_application_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/context_spec.rb
+- spec/rhc/auth_spec.rb
 - spec/wizard_spec_helper.rb
-- spec/keys/example_private.pem
-- spec/keys/server.pem
 - spec/keys/example.pem
-- features/client.feature
+- spec/keys/server.pem
+- spec/keys/example_private.pem
+- spec/rest_spec_helper.rb
+- spec/spec.opts
+- features/multiple_cartridge.feature
+- features/domain.feature
 - features/verify.feature
-- features/README.md
-- features/geared_application.feature
-- features/support/before_hooks.rb
+- features/cartridge.feature
+- features/client.feature
+- features/support/env.rb
 - features/support/key2.pub
-- features/support/assumptions.rb
-- features/support/key1.pub
 - features/support/key1
-- features/support/env.rb
+- features/support/key1.pub
+- features/support/platform_support.rb
+- features/support/before_hooks.rb
 - features/support/key3.pub
 - features/support/key2
-- features/lib/rhc_helper/sshkey.rb
-- features/lib/rhc_helper/api.rb
-- features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/loggable.rb
-- features/lib/rhc_helper/domain.rb
-- features/lib/rhc_helper/runnable.rb
-- features/lib/rhc_helper/app.rb
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper.rb
+- features/support/assumptions.rb
+- features/application.feature
 - features/sshkey.feature
-- features/domain.feature
-- features/cartridge.feature
+- features/geared_application.feature
 - features/scaled_application.feature
 - features/step_definitions/cartridge_steps.rb
-- features/step_definitions/sshkey_steps.rb
 - features/step_definitions/application_steps.rb
 - features/step_definitions/client_steps.rb
 - features/step_definitions/domain_steps.rb
-- features/application.feature
-- features/multiple_cartridge.feature
+- features/step_definitions/sshkey_steps.rb
+- features/lib/rhc_helper.rb
+- features/lib/rhc_helper/httpify.rb
+- features/lib/rhc_helper/domain.rb
+- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/loggable.rb
+- features/lib/rhc_helper/commandify.rb
+- features/lib/rhc_helper/api.rb
+- features/lib/rhc_helper/cartridge.rb
+- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/persistable.rb
+- features/lib/rhc_helper/sshkey.rb
+- features/README.md