rhc 1.9.6 → 1.10.7

data/spec/rhc/commands/tail_spec.rb

@@ -49,9 +49,10 @@ describe RHC::Commands::Tail do
     end
 
     context 'succeeds when a gear is specified' do
-      before (:each) {Net::SSH.should_receive(:start).with('fakesshurl.com', 'fakegearid') }
-      let(:arguments) { ['tail', 'mock-app-0', '--gear', 'fakegearid' ] }
+      before (:each) {Net::SSH.should_receive(:start).with('fakesshurl.com', 'fakegearid0') }
+      let(:arguments) { ['tail', 'mock-app-0', '--gear', 'fakegearid0' ] }
 
+      it { run_output.should_not =~ /Connecting to fakesshurl.com/ }
       it { expect { run }.to exit_with_code(0) }
     end
 
@@ -73,7 +74,7 @@ describe RHC::Commands::Tail do
       end
 
       it { expect { run }.to exit_with_code(1) }
-      it { run_output.should =~ /The server does not support per gear operations/ }
+      it { run_output.should =~ /The server does not support operations on individual gears./ }
     end
 
   end

data/spec/rhc/helpers_spec.rb

@@ -5,11 +5,12 @@ require 'rhc/cartridge_helpers'
 require 'rhc/git_helpers'
 require 'rhc/core_ext'
 require 'rhc/config'
+require 'rhc/rest/mock'
 require 'date'
 require 'resolv'
 require 'ostruct'
 
-class MockHelpers
+class AllRhcHelpers
   include RHC::Helpers
   include RHC::SSHHelpers
   include RHC::CartridgeHelpers
@@ -22,14 +23,12 @@ class MockHelpers
   end
 end
 
-describe RHC::Helpers do
+describe AllRhcHelpers do
   before do
     mock_terminal
     user_config
   end
 
-  subject{ MockHelpers.new }
-
   its(:openshift_server) { should == 'openshift.redhat.com' }
   its(:openshift_url) { should == 'https://openshift.redhat.com' }
 
@@ -96,6 +95,17 @@ describe RHC::Helpers do
     d.year.should == 2012
   end
 
+  describe "#human_size" do
+    it{ subject.human_size(nil).should == 'unknown' }
+    it{ subject.human_size(1).should == '1 B' }
+    it{ subject.human_size(500).should == '500 B' }
+    it{ subject.human_size(1000).should == '1 KB' }
+    it{ subject.human_size(500000).should == '500 KB' }
+    it{ subject.human_size(1000*1000).should == '1 MB' }
+    it{ subject.human_size(1000*1000*1000).should == '1 GB' }
+    it{ subject.human_size(1000*1000*1000*1000).should == '1 TB' }
+  end
+
   describe "#distance_of_time_in_words" do
     it{ subject.distance_of_time_in_words(0, 1).should == 'less than 1 minute' }
     it{ subject.distance_of_time_in_words(0, 60).should == '1 minute' }
@@ -263,7 +273,7 @@ describe RHC::Helpers do
         true
       end
 
-      it { capture{ subject.git_clone_repo("url", "repo").should be_true } }
+      it { capture{ subject.git_clone_repo("url", "repo").should == File.expand_path('repo') } }
       it { capture_all{ subject.git_clone_repo("url", "repo") }.should match("fake git clone") }
 
       context "does not succeed" do
@@ -310,6 +320,31 @@ describe RHC::Helpers do
       Net::SSH::KeyFactory.should_receive(:load_public_key).with('1').and_raise(StandardError.new("An error"))
       subject.fingerprint_for_local_key('1').should be_nil
     end
+
+    it "should handle a block in multi_ssh calls" do
+      expect_multi_ssh('foo', 'fakegearid0@fakesshurl.com' => 'bar')
+      subject.run_on_gears('foo', [RHC::Rest::Mock::MockRestGearGroup.new], :as => :gear){ |gear, data, group| data.should == 'bar'; 'test' }.should == ['test']
+    end
+
+    it "should handle a block in multi_ssh calls" do
+      expect_multi_ssh('foo', 'fakegearid0@fakesshurl.com' => 'bar')
+      capture{ subject.table_from_gears('foo', [RHC::Rest::Mock::MockRestGearGroup.new], :header => ['cart','col']) }.should match /cart.*col\n-+.*fakegearid0.*bar/m
+    end    
+
+    it "should handle a run_on_gears error for unrecognized type" do
+      expect_multi_ssh('foo', {})
+      expect{ subject.run_on_gears('foo', RHC::Rest::Mock::MockRestGearGroup.new.gears) }.to raise_error(RuntimeError)
+    end
+
+    it "should handle an error for unrecognized type" do
+      expect_multi_ssh('foo', {'fakegearid0@fakesshurl.com' => 'bar'}, true)
+      subject.run_on_gears('foo', [RHC::Rest::Mock::MockRestGearGroup.new])
+    end
+
+    it "should rescue load errors from ssh-multi" do
+      RHC::SSHHelpers::MultipleGearTask.any_instance.should_receive(:require).and_raise(LoadError)
+      expect{ RHC::SSHHelpers::MultipleGearTask.new(nil,nil,nil).send(:requires_ssh_multi!) }.to raise_error RHC::OperationNotSupportedException, /must install Net::SSH::Multi/
+    end
   end
 
   describe "#wrap" do
@@ -381,6 +416,36 @@ describe RHC::Helpers do
       end
     end
   end
+
+  context "cartridge helpers" do
+    before{ mock_terminal }
+
+    describe '#check_cartridges' do
+      let(:cartridges){ [] }
+      let(:find_cartridges){ [] }
+      context "with a generic object" do
+        it { expect{ subject.send(:check_cartridges, 'foo', :from => cartridges) }.to raise_error(RHC::CartridgeNotFoundException, 'There are no cartridges that match \'foo\'.') }
+      end
+    end
+
+    describe '#match_cart' do
+      context 'with a nil cart' do
+        let(:cart){ OpenStruct.new(:name => nil, :description => nil, :tags => nil) }
+        it{ subject.send(:match_cart, cart, 'foo').should be_false }
+      end
+      context 'with simple strings' do
+        let(:cart){ OpenStruct.new(:name => 'FOO-more_max any', :description => 'bar', :tags => [:baz]) }
+        it{ subject.send(:match_cart, cart, 'foo').should be_true }
+        it{ subject.send(:match_cart, cart, 'fo').should be_true }
+        it{ subject.send(:match_cart, cart, 'oo').should be_true }
+        it{ subject.send(:match_cart, cart, 'bar').should be_true }
+        it{ subject.send(:match_cart, cart, 'baz').should be_true }
+        it{ subject.send(:match_cart, cart, 'more max').should be_true }
+        it{ subject.send(:match_cart, cart, 'foo more max any').should be_true }
+        it{ subject.send(:match_cart, cart, 'foo_more max-any').should be_true }
+      end
+    end
+  end
 end
 
 describe RHC::Helpers::StringTee do
@@ -425,40 +490,3 @@ describe OpenURI do
     specify('https to http') { OpenURI.redirectable?(URI.parse('https://foo.com'), URI.parse('http://foo.com')).should be_false }
   end
 end
-
-describe RHC::CartridgeHelpers do
-  before(:each) do
-    mock_terminal
-  end
-
-  subject{ MockHelpers.new }
-
-  describe '#check_cartridges' do
-    let(:cartridges){ [] }
-    let(:find_cartridges){ [] }
-    context "with a generic object" do
-      it { expect{ subject.send(:check_cartridges, 'foo', :from => cartridges) }.to raise_error(RHC::CartridgeNotFoundException, 'There are no cartridges that match \'foo\'.') }
-    end
-  end
-  describe '#web_carts_only' do
-    it { expect{ subject.send(:web_carts_only).call([]) }.to raise_error(RHC::MultipleCartridgesException, /You must select only a single web/) }
-  end
-
-  describe '#match_cart' do
-    context 'with a nil cart' do
-      let(:cart){ OpenStruct.new(:name => nil, :description => nil, :tags => nil) }
-      it{ subject.send(:match_cart, cart, 'foo').should be_false }
-    end
-    context 'with simple strings' do
-      let(:cart){ OpenStruct.new(:name => 'FOO-more_max any', :description => 'bar', :tags => [:baz]) }
-      it{ subject.send(:match_cart, cart, 'foo').should be_true }
-      it{ subject.send(:match_cart, cart, 'fo').should be_true }
-      it{ subject.send(:match_cart, cart, 'oo').should be_true }
-      it{ subject.send(:match_cart, cart, 'bar').should be_true }
-      it{ subject.send(:match_cart, cart, 'baz').should be_true }
-      it{ subject.send(:match_cart, cart, 'more max').should be_true }
-      it{ subject.send(:match_cart, cart, 'foo more max any').should be_true }
-      it{ subject.send(:match_cart, cart, 'foo_more max-any').should be_true }
-    end
-  end
-end

data/spec/rhc/highline_extensions_spec.rb

@@ -143,10 +143,21 @@ describe HighLineExtension do
     subject.table([]).to_a.should == []
   end
 
-  it "should handle an empty table" do
+  it "should handle a nested empty table" do
     subject.table([[]]).to_a.should == []
   end
 
+  it "should normalize variables" do
+    subject.table([
+        ["a", 5],
+        [nil, ['a', 'b']],
+      ]).to_a.should == [
+        "a 5",
+        "  a",
+        "  b",
+      ]
+  end
+
   it "should wrap a table based on a max width" do
     subject.table([["abcd efgh", "1234 6789 a"]], :width => 9, :heading => 'Test').to_a.should == [
       'Test',
@@ -157,6 +168,17 @@ describe HighLineExtension do
     ]
   end
 
+  # FIXME: Ragged edges still left by the algorithm
+  # 104 total width, 1: 32/52, 2: 8/61, 113 total width
+  it "should handle when columns are evenly split" do
+    subject.table([
+      ["#{'a'*32} #{'b'*19}", "#{'c'*8} "*6+"d"*7]
+    ], :width => 104).to_a.should == [
+      "a"*32+" "+'b'*19+" "+Array.new(5, 'c'*8).join(' '),
+      ' '*53+"#{'c'*8} "+'d'*7
+    ]
+  end
+
   it "should allocate columns fairly in a table" do
     subject.table([["abcd", "12345 67890"]], :width => 10).to_a.should == [
       "abcd 12345",

data/spec/rhc/rest_client_spec.rb

@@ -13,27 +13,24 @@ module RHC
 
       it 'should set the proxy protocol if it is missing' do
         ENV['http_proxy'] = 'foo.bar.com:8081'
-        RHC::Rest::Client.new
-        ENV['http_proxy'].should == 'http://foo.bar.com:8081'
+        expect{ RHC::Rest::Client.new.send(:httpclient_for, {}) }.to raise_error(ArgumentError)
       end
 
       it 'should not alter the proxy protocol if it is present' do
         ENV['http_proxy'] = 'http://foo.bar.com:8081'
-        RHC::Rest::Client.new
-        ENV['http_proxy'].should == 'http://foo.bar.com:8081'
+        RHC::Rest::Client.new.send(:httpclient_for, {}).proxy.to_s.should == URI.parse(ENV['http_proxy']).to_s
       end
 
       it 'should not affect the proxy protocol if nil' do
         ENV['http_proxy'] = nil
-        RHC::Rest::Client.new
+        RHC::Rest::Client.new.send(:httpclient_for, {}).proxy.should be_nil
         ENV['http_proxy'].should be_nil
       end
 
       let(:endpoint){ mock_href }
-      let(:username){ nil }# mock_user }
-      let(:password){ nil }# mock_pass }
+      let(:username){ nil }
+      let(:password){ nil }
       let(:use_debug){ false }
-      #let(:spec_versions){ nil }
       let(:client) do
         respond_to?(:spec_versions) ?
           RHC::Rest::Client.new(endpoint, username, password, use_debug, spec_versions) :
@@ -284,7 +281,7 @@ module RHC
           context "when several messages are present" do
             before do
               stub_api_request(:get, 'broker/rest/cartridge', true).
-                with(:query => {:include => :status_messages}).
+                with(:query => {:include => 'status_messages'}).
                 to_return(:body => {
                   :type => 'cartridge',
                   :data => {

data/spec/rhc/rest_spec.rb

@@ -278,6 +278,24 @@ module RHC
           subject.send(:parse_response, json_response).should have_same_attributes_as(user_obj)
         end
       end
+
+      context "with result messages" do
+        let(:object) {{
+            :login => 'test_user',
+            :links => { :foo => 'bar' }
+          }}
+        let (:messages) {[
+            {:field => nil,      :severity => 'info',   :text => 'Nil field'},
+            {:field => 'result', :severity => 'info',   :text => 'Result field'},    # <  1.5 API
+            {:field => 'base',   :severity => 'result', :text => 'Result severity'}, # >= 1.5 API
+            {:field => 'base',   :severity => 'info',   :text => 'Non-result message' }
+          ]}
+
+        it "copies result messages to the object" do
+          json_response = { :type => 'user', :data => object, :messages => messages }.to_json
+          subject.send(:parse_response, json_response).messages.should == ['Nil field', 'Result field', 'Result severity']
+        end
+      end
     end
 
     describe "#new_request" do
@@ -372,8 +390,8 @@ module RHC
 
       context "with a GET request" do
         it "serializes payload as query parameters" do
-          stub_request(:get, mock_href).with(:query => {:test => 1, :bar => 2}).to_return(:status => 204)
-          subject.request(request.merge(:payload => {:test => '1', :bar => 2})).should be_nil
+          stub_request(:get, mock_href).with(:query => {:test => '1', :bar => '2'}).to_return(:status => 204)
+          subject.request(request.merge(:payload => {:test => '1', :bar => '2'})).should be_nil
         end
       end
       context "with a POST request" do
@@ -392,6 +410,27 @@ module RHC
         it{ response.should raise_error(RHC::Rest::TimeoutException, /Connection to server timed out. It is possible/) }
       end
 
+      context "with a receive timeout" do
+        before{ stub_request(:get, mock_href).to_raise(HTTPClient::ReceiveTimeoutError) }
+        it{ response.should raise_error{ |e| e.on_receive?.should be_true } }
+      end
+
+      context "with a send timeout" do
+        before{ stub_request(:get, mock_href).to_raise(HTTPClient::SendTimeoutError) }
+        it{ response.should raise_error{ |e| e.on_send?.should be_true } }
+      end
+
+      context "with a connect timeout" do
+        before{ stub_request(:get, mock_href).to_raise(HTTPClient::ConnectTimeoutError) }
+        it{ response.should raise_error{ |e| e.on_connect?.should be_true } }
+      end
+
+      context "with a reset server connection" do
+        before{ stub_request(:get, mock_href).to_raise(Errno::ECONNRESET.new('Lost Server Connection')) }
+        it{ response.should raise_error(RHC::Rest::ConnectionException, /The server has closed the connection unexpectedly \(Connection reset by peer - Lost Server Connection\)/) }
+      end
+
+
       context "with a broken server connection" do
         before{ stub_request(:get, mock_href).to_raise(EOFError.new('Lost Server Connection')) }
         it{ response.should raise_error(RHC::Rest::ConnectionException, 'Connection to server got interrupted: Lost Server Connection') }

data/spec/spec_helper.rb

@@ -254,6 +254,7 @@ module ClassSpecHelpers
   def mock_terminal
     @input = StringIO.new
     @output = StringIO.new
+    $stdout = @output
     $stderr = (@error = StringIO.new)
     $terminal = MockHighLineTerminal.new @input, @output
   end
@@ -339,6 +340,43 @@ module ClassSpecHelpers
       opts[:server].should == server if server
     end
   end
+
+  def expect_multi_ssh(command, hosts, check_error=false)
+    require 'net/ssh/multi'
+
+    session = mock('Multi::SSH::Session')
+    described_class.any_instance.stub(:requires_ssh_multi!)
+    channels = hosts.inject({}) do |h, (k,v)| 
+      c = stub(:properties => {}, :connection => stub(:properties => {}))
+      h[k] = c
+      h
+    end
+    session.should_receive(:use).exactly(hosts.count).times.with do |host, opts|
+      opts[:properties].should_not be_nil
+      opts[:properties][:gear].should_not be_nil
+      hosts.should have_key(host)
+      channels[host].connection.properties.merge!(opts[:properties])
+      true
+    end
+    session.stub(:_command).and_return(command)
+    session.stub(:_hosts).and_return(hosts)
+    session.stub(:_channels).and_return(channels)
+    session.instance_eval do
+      def exec(arg1, *args, &block)
+        arg1.should == _command
+        _hosts.to_a.sort{ |a,b| a[0] <=> b[0] }.each do |(k,v)|
+          block.call(_channels[k], :stdout, v)
+        end
+      end
+    end
+    session.should_receive(:loop) unless hosts.empty?
+    Net::SSH::Multi.should_receive(:start).and_yield(session).with do |opts|
+      opts.should have_key(:on_error)
+      capture_all{ opts[:on_error].call('test') }.should == "Unable to connect to gear test\n" if check_error
+      true
+    end
+    session
+  end  
 end
 
 module ExitCodeMatchers

metadata

@@ -1,498 +1,461 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rhc
-version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 6
-  version: 1.9.6
+version: !ruby/object:Gem::Version
+  version: 1.10.7
 platform: ruby
-authors: 
+authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 2
-        - 0
-        - 11
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.0.11
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.11
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: commander
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 6
-        - 11
+      - !ruby/object:Gem::Version
         version: 1.6.11
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.11
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
-    - - <=
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
-        version: 0.9.2.2
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 8
-        version: "1.8"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.12'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id013
-description: The client tools for the OpenShift platform that allow for application management.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: The client tools for the OpenShift platform that allow for application
+  management.
 email: dev@lists.openshift.redhat.com
-executables: 
+executables:
 - rhc
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/rhc/command_runner.rb
-- lib/rhc/version.rb
-- lib/rhc/cartridge_helpers.rb
-- lib/rhc/auth/basic.rb
-- lib/rhc/auth/token_store.rb
-- lib/rhc/auth/token.rb
-- lib/rhc/output_helpers.rb
-- lib/rhc/wizard.rb
-- lib/rhc/help_formatter.rb
-- lib/rhc/commands.rb
-- lib/rhc/context_helper.rb
-- lib/rhc/rest.rb
-- lib/rhc/ssh_helpers.rb
-- lib/rhc/helpers.rb
-- lib/rhc/coverage_helper.rb
-- lib/rhc/json.rb
-- lib/rhc/git_helpers.rb
-- lib/rhc/auth.rb
-- lib/rhc/exceptions.rb
-- lib/rhc/autocomplete.rb
-- lib/rhc/config.rb
-- lib/rhc/commands/setup.rb
-- lib/rhc/commands/account.rb
-- lib/rhc/commands/port_forward.rb
+files:
+- lib/rhc.rb
 - lib/rhc/commands/tail.rb
-- lib/rhc/commands/alias.rb
-- lib/rhc/commands/git_clone.rb
+- lib/rhc/commands/apps.rb
 - lib/rhc/commands/domain.rb
+- lib/rhc/commands/port_forward.rb
+- lib/rhc/commands/setup.rb
 - lib/rhc/commands/cartridge.rb
 - lib/rhc/commands/authorization.rb
+- lib/rhc/commands/threaddump.rb
+- lib/rhc/commands/alias.rb
 - lib/rhc/commands/sshkey.rb
-- lib/rhc/commands/snapshot.rb
-- lib/rhc/commands/server.rb
 - lib/rhc/commands/app.rb
 - lib/rhc/commands/logout.rb
-- lib/rhc/commands/apps.rb
-- lib/rhc/commands/threaddump.rb
+- lib/rhc/commands/server.rb
+- lib/rhc/commands/snapshot.rb
+- lib/rhc/commands/git_clone.rb
 - lib/rhc/commands/base.rb
-- lib/rhc/tar_gz.rb
-- lib/rhc/highline_extensions.rb
-- lib/rhc/cli.rb
-- lib/rhc/core_ext.rb
-- lib/rhc/vendor/parseconfig.rb
-- lib/rhc/vendor/zliby.rb
-- lib/rhc/vendor/okjson.rb
-- lib/rhc/vendor/sshkey.rb
-- lib/rhc/rest/user.rb
-- lib/rhc/rest/attributes.rb
-- lib/rhc/rest/api.rb
-- lib/rhc/rest/alias.rb
+- lib/rhc/commands/ssh.rb
+- lib/rhc/commands/account.rb
+- lib/rhc/rest.rb
 - lib/rhc/rest/domain.rb
-- lib/rhc/rest/key.rb
+- lib/rhc/rest/application.rb
 - lib/rhc/rest/cartridge.rb
 - lib/rhc/rest/authorization.rb
-- lib/rhc/rest/gear_group.rb
+- lib/rhc/rest/api.rb
+- lib/rhc/rest/alias.rb
+- lib/rhc/rest/key.rb
 - lib/rhc/rest/mock.rb
-- lib/rhc/rest/client.rb
-- lib/rhc/rest/application.rb
+- lib/rhc/rest/gear_group.rb
+- lib/rhc/rest/attributes.rb
+- lib/rhc/rest/user.rb
 - lib/rhc/rest/base.rb
-- lib/rhc.rb
+- lib/rhc/rest/client.rb
+- lib/rhc/json.rb
+- lib/rhc/context_helper.rb
+- lib/rhc/output_helpers.rb
+- lib/rhc/auth.rb
+- lib/rhc/coverage_helper.rb
+- lib/rhc/autocomplete.rb
+- lib/rhc/help_formatter.rb
+- lib/rhc/wizard.rb
+- lib/rhc/exceptions.rb
+- lib/rhc/vendor/okjson.rb
+- lib/rhc/vendor/sshkey.rb
+- lib/rhc/vendor/parseconfig.rb
+- lib/rhc/vendor/zliby.rb
+- lib/rhc/tar_gz.rb
+- lib/rhc/git_helpers.rb
+- lib/rhc/commands.rb
+- lib/rhc/auth/token_store.rb
+- lib/rhc/auth/basic.rb
+- lib/rhc/auth/token.rb
+- lib/rhc/helpers.rb
+- lib/rhc/highline_extensions.rb
+- lib/rhc/config.rb
+- lib/rhc/cartridge_helpers.rb
+- lib/rhc/ssh_helpers.rb
+- lib/rhc/core_ext.rb
+- lib/rhc/cli.rb
+- lib/rhc/command_runner.rb
+- lib/rhc/version.rb
 - lib/rhc/autocomplete_templates/bash.erb
-- lib/rhc/usage_templates/command_syntax_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/usage_templates/help.erb
+- lib/rhc/usage_templates/command_help.erb
+- lib/rhc/usage_templates/command_syntax_help.erb
 - conf/express.conf
 - autocomplete/rhc_bash
 - LICENSE
 - COPYRIGHT
 - README.md
 - Rakefile
-- spec/rest_spec_helper.rb
+- spec/spec_helper.rb
 - spec/wizard_spec_helper.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/auth_spec.rb
-- spec/rhc/rest_client_spec.rb
-- spec/rhc/assets/empty.txt
-- spec/rhc/assets/cert_key_rsa
-- spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/assets/targz_corrupted.tar.gz
-- spec/rhc/assets/cert.crt
-- spec/rhc/assets/foo.txt
-- spec/rhc/context_spec.rb
-- spec/rhc/highline_extensions_spec.rb
-- spec/rhc/command_spec.rb
-- spec/rhc/cli_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/tail_spec.rb
+- spec/rest_spec_helper.rb
+- spec/coverage_helper.rb
+- spec/rhc/commands/ssh_spec.rb
+- spec/rhc/commands/cartridge_spec.rb
+- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/commands/sshkey_spec.rb
 - spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/domain_spec.rb
-- spec/rhc/commands/sshkey_spec.rb
+- spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/threaddump_spec.rb
-- spec/rhc/commands/server_spec.rb
-- spec/rhc/commands/logout_spec.rb
 - spec/rhc/commands/alias_spec.rb
-- spec/rhc/commands/authorization_spec.rb
 - spec/rhc/commands/account_spec.rb
-- spec/rhc/commands/cartridge_spec.rb
-- spec/rhc/commands/snapshot_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/commands/tail_spec.rb
 - spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/snapshot_spec.rb
+- spec/rhc/commands/authorization_spec.rb
+- spec/rhc/commands/logout_spec.rb
+- spec/rhc/commands/domain_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/highline_extensions_spec.rb
 - spec/rhc/json_spec.rb
-- spec/rhc/wizard_spec.rb
+- spec/rhc/context_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/wizard_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/command_spec.rb
+- spec/rhc/auth_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/rest_client_spec.rb
+- spec/rhc/cli_spec.rb
+- spec/rhc/assets/cert_key_rsa
+- spec/rhc/assets/foo.txt
+- spec/rhc/assets/targz_sample.tar.gz
+- spec/rhc/assets/empty.txt
+- spec/rhc/assets/cert.crt
+- spec/rhc/assets/targz_corrupted.tar.gz
 - spec/keys/server.pem
-- spec/keys/example.pem
 - spec/keys/example_private.pem
-- features/application.feature
-- features/client.feature
-- features/step_definitions/application_steps.rb
-- features/step_definitions/client_steps.rb
-- features/step_definitions/cartridge_steps.rb
-- features/step_definitions/domain_steps.rb
-- features/step_definitions/sshkey_steps.rb
+- spec/keys/example.pem
+- features/scaled_application.feature
 - features/cartridge.feature
-- features/README.md
 - features/support/before_hooks.rb
-- features/support/key1.pub
+- features/support/assumptions.rb
 - features/support/key2.pub
+- features/support/key1.pub
 - features/support/key1
-- features/support/key2
-- features/support/assumptions.rb
-- features/support/platform_support.rb
 - features/support/key3.pub
 - features/support/env.rb
-- features/sshkey.feature
-- features/multiple_cartridge.feature
-- features/scaled_application.feature
-- features/verify.feature
-- features/geared_application.feature
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/api.rb
+- features/support/platform_support.rb
+- features/support/key2
+- features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/domain.rb
 - features/lib/rhc_helper/cartridge.rb
 - features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/api.rb
 - features/lib/rhc_helper/sshkey.rb
-- features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/persistable.rb
+- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/httpify.rb
 - features/lib/rhc_helper.rb
+- features/multiple_cartridge.feature
+- features/README.md
+- features/geared_application.feature
+- features/client.feature
+- features/verify.feature
 - features/domain.feature
+- features/sshkey.feature
+- features/application.feature
+- features/step_definitions/sshkey_steps.rb
+- features/step_definitions/application_steps.rb
+- features/step_definitions/client_steps.rb
+- features/step_definitions/cartridge_steps.rb
+- features/step_definitions/domain_steps.rb
 - bin/rhc
 homepage: https://github.com/openshift/rhc
 licenses: []
-
+metadata: {}
 post_install_message: |-
   ===========================================================================
-  
+
   If this is your first time installing the RHC tools, please run 'rhc setup'
-  
+
   ===========================================================================
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenShift Client Tools
-test_files: 
-- spec/rest_spec_helper.rb
+test_files:
+- spec/spec_helper.rb
 - spec/wizard_spec_helper.rb
-- spec/rhc/targz_spec.rb
-- spec/rhc/config_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/rest_spec.rb
-- spec/rhc/auth_spec.rb
-- spec/rhc/rest_client_spec.rb
-- spec/rhc/assets/empty.txt
-- spec/rhc/assets/cert_key_rsa
-- spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/assets/targz_corrupted.tar.gz
-- spec/rhc/assets/cert.crt
-- spec/rhc/assets/foo.txt
-- spec/rhc/context_spec.rb
-- spec/rhc/highline_extensions_spec.rb
-- spec/rhc/command_spec.rb
-- spec/rhc/cli_spec.rb
-- spec/rhc/commands/setup_spec.rb
-- spec/rhc/commands/tail_spec.rb
+- spec/rest_spec_helper.rb
+- spec/coverage_helper.rb
+- spec/rhc/commands/ssh_spec.rb
+- spec/rhc/commands/cartridge_spec.rb
+- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/commands/sshkey_spec.rb
 - spec/rhc/commands/port_forward_spec.rb
 - spec/rhc/commands/app_spec.rb
-- spec/rhc/commands/domain_spec.rb
-- spec/rhc/commands/sshkey_spec.rb
+- spec/rhc/commands/setup_spec.rb
 - spec/rhc/commands/threaddump_spec.rb
-- spec/rhc/commands/server_spec.rb
-- spec/rhc/commands/logout_spec.rb
 - spec/rhc/commands/alias_spec.rb
-- spec/rhc/commands/authorization_spec.rb
 - spec/rhc/commands/account_spec.rb
-- spec/rhc/commands/cartridge_spec.rb
-- spec/rhc/commands/snapshot_spec.rb
-- spec/rhc/commands/git_clone_spec.rb
+- spec/rhc/commands/tail_spec.rb
 - spec/rhc/commands/apps_spec.rb
+- spec/rhc/commands/snapshot_spec.rb
+- spec/rhc/commands/authorization_spec.rb
+- spec/rhc/commands/logout_spec.rb
+- spec/rhc/commands/domain_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/targz_spec.rb
+- spec/rhc/highline_extensions_spec.rb
 - spec/rhc/json_spec.rb
-- spec/rhc/wizard_spec.rb
+- spec/rhc/context_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/spec_helper.rb
-- spec/coverage_helper.rb
+- spec/rhc/helpers_spec.rb
+- spec/rhc/wizard_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/command_spec.rb
+- spec/rhc/auth_spec.rb
+- spec/rhc/config_spec.rb
+- spec/rhc/rest_client_spec.rb
+- spec/rhc/cli_spec.rb
+- spec/rhc/assets/cert_key_rsa
+- spec/rhc/assets/foo.txt
+- spec/rhc/assets/targz_sample.tar.gz
+- spec/rhc/assets/empty.txt
+- spec/rhc/assets/cert.crt
+- spec/rhc/assets/targz_corrupted.tar.gz
 - spec/keys/server.pem
-- spec/keys/example.pem
 - spec/keys/example_private.pem
-- features/application.feature
-- features/client.feature
-- features/step_definitions/application_steps.rb
-- features/step_definitions/client_steps.rb
-- features/step_definitions/cartridge_steps.rb
-- features/step_definitions/domain_steps.rb
-- features/step_definitions/sshkey_steps.rb
+- spec/keys/example.pem
+- features/scaled_application.feature
 - features/cartridge.feature
-- features/README.md
 - features/support/before_hooks.rb
-- features/support/key1.pub
+- features/support/assumptions.rb
 - features/support/key2.pub
+- features/support/key1.pub
 - features/support/key1
-- features/support/key2
-- features/support/assumptions.rb
-- features/support/platform_support.rb
 - features/support/key3.pub
 - features/support/env.rb
-- features/sshkey.feature
-- features/multiple_cartridge.feature
-- features/scaled_application.feature
-- features/verify.feature
-- features/geared_application.feature
-- features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/api.rb
+- features/support/platform_support.rb
+- features/support/key2
+- features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/domain.rb
 - features/lib/rhc_helper/cartridge.rb
 - features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/api.rb
 - features/lib/rhc_helper/sshkey.rb
-- features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/persistable.rb
+- features/lib/rhc_helper/runnable.rb
+- features/lib/rhc_helper/httpify.rb
 - features/lib/rhc_helper.rb
+- features/multiple_cartridge.feature
+- features/README.md
+- features/geared_application.feature
+- features/client.feature
+- features/verify.feature
 - features/domain.feature
+- features/sshkey.feature
+- features/application.feature
+- features/step_definitions/sshkey_steps.rb
+- features/step_definitions/application_steps.rb
+- features/step_definitions/client_steps.rb
+- features/step_definitions/cartridge_steps.rb
+- features/step_definitions/domain_steps.rb