rhc 1.27.4 → 1.28.5

data/spec/rhc/helpers_spec.rb

@@ -214,6 +214,20 @@ describe AllRhcHelpers do
     end
   end
 
+  context "with a missing client key file" do
+    context "on the command line" do
+      let(:arguments){ ['help', '--ssl-client-key-file=not_a_file'] }
+      it{ expect{ run }.to exit_with_code(1) }
+      it{ run_output.should match("The key 'not_a_file' cannot be loaded: No such") }
+    end
+    context "via the config" do
+      before{ base_config{ |c, d| d.add 'ssl_client_key_file', 'not_a_file' } }
+      let(:arguments){ ['help'] }
+      it{ expect{ run }.to exit_with_code(1) }
+      it{ run_output.should match("The key 'not_a_file' cannot be loaded: No such") }
+    end
+  end
+
   context 'with a valid --ssl-version' do
     let(:arguments){ ['help', '--ssl-version=sslv3'] }
 

data/spec/rhc/wizard_spec.rb

@@ -103,6 +103,17 @@ describe RHC::Wizard do
     end    
   end
 
+  describe "#core_auth" do
+    subject{ described_class.new(config, options) }
+
+    it "should use x509 if certificates are present" do
+      options.should_receive(:ssl_client_cert_file).and_return("a cert")
+      options.should_receive(:ssl_client_key_file).and_return("a key")
+      RHC::Auth::X509.should_receive(:new).exactly(1).times.with(options)
+      subject.send(:core_auth)
+    end
+  end
+
   describe "#login_stage" do
     let(:user){ 'test_user' }
     let(:password){ 'test pass' }
@@ -234,6 +245,23 @@ describe RHC::Wizard do
           options.token.should == token
         end
       end
+
+      context "when the user doesn't want to use tokens" do
+        let(:default_options){ {:rhlogin => user, :password => password, :server => server, :use_authorization_tokens => false, :create_token => false} }
+        before do
+          subject.should_receive(:new_client_for_options).ordered.and_return(rest_client)
+          rest_client.should_receive(:api).ordered
+          rest_client.should_receive(:user).ordered.and_return(user_obj)
+        end
+
+        it "should skip token generation" do
+          subject.should_receive(:say).with(/Skipping token generation/)
+          subject.should_receive(:agree).never
+
+          subject.send(:login_stage).should be_true
+          options.token.should be_nil
+        end
+      end
     end
   end
 
@@ -719,6 +747,9 @@ EOF
       def type=(type)
         @table[:type] = type
       end
+      def is_ssh?
+        type != 'krb5-principal'
+      end
     end
 
     def get_mock_key_data

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 115
+  hash: 109
   prerelease: 
   segments: 
   - 1
-  - 27
-  - 4
-  version: 1.27.4
+  - 28
+  - 5
+  version: 1.28.5
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-07-11 00:00:00 Z
+date: 2014-08-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -289,6 +289,7 @@ files:
 - lib/rhc/commands/ssh.rb
 - lib/rhc/commands/apps.rb
 - lib/rhc/commands/alias.rb
+- lib/rhc/commands/region.rb
 - lib/rhc/commands/authorization.rb
 - lib/rhc/commands/sshkey.rb
 - lib/rhc/commands/app.rb
@@ -320,6 +321,7 @@ files:
 - lib/rhc/rest/api.rb
 - lib/rhc/rest/client.rb
 - lib/rhc/rest/alias.rb
+- lib/rhc/rest/region.rb
 - lib/rhc/rest/authorization.rb
 - lib/rhc/rest/mock.rb
 - lib/rhc/rest/httpclient.rb
@@ -330,6 +332,7 @@ files:
 - lib/rhc/vendor/zliby.rb
 - lib/rhc/vendor/sshkey.rb
 - lib/rhc/auth/token.rb
+- lib/rhc/auth/x509.rb
 - lib/rhc/auth/basic.rb
 - lib/rhc/auth/token_store.rb
 - lib/rhc/helpers.rb
@@ -372,6 +375,7 @@ files:
 - spec/rhc/commands/app_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
 - spec/rhc/commands/ssh_spec.rb
+- spec/rhc/commands/region_spec.rb
 - spec/rhc/commands/tail_spec.rb
 - spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/alias_spec.rb
@@ -471,6 +475,7 @@ test_files:
 - spec/rhc/commands/app_spec.rb
 - spec/rhc/commands/snapshot_spec.rb
 - spec/rhc/commands/ssh_spec.rb
+- spec/rhc/commands/region_spec.rb
 - spec/rhc/commands/tail_spec.rb
 - spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/alias_spec.rb