rhc 0.96.9 → 0.97.17

data/spec/rhc/config_spec.rb

@@ -276,16 +276,16 @@ describe RHC::Config do
       RHC::Vendor::ParseConfig.stub(:new) { raise Errno::EACCES.new("Fake can't read file") }
       RHC::Config.stub(:exit) { |code| code }
 
-      RHC::Config.check_cpath({"config" => "fake.conf"}).should == 253
+      expect { RHC::Config.check_cpath({"config" => "fake.conf"}) }.to raise_error(Errno::EACCES)
 
       # write out config file so it exists but is not readable
       ConfigHelper.write_out_config("fake.conf",
                                     "global.openshift.redhat.com",
                                     "global@redhat.com")
 
-      RHC::Config.read_config_files.should == 253
-      RHC::Config.set_local_config("fake.conf").should == 253
-      RHC::Config.set_opts_config("fake.conf").should == 253
+      expect { RHC::Config.read_config_files }.to raise_error(Errno::EACCES)
+      expect { RHC::Config.set_local_config("fake.conf") }.to raise_error(Errno::EACCES)
+      expect { RHC::Config.set_opts_config("fake.conf") }.to raise_error(Errno::EACCES)
     end
   end
 end

data/spec/rhc/helpers_spec.rb

@@ -13,7 +13,7 @@ describe RHC::Helpers do
     @tests = HelperTests.new()
   end
 
-  subject do 
+  subject do
     Class.new(Object) do
       include RHC::Helpers
 
@@ -154,12 +154,38 @@ describe RHC::Helpers do
     end
   end
 
+  context "Rest Client helper" do
+    before do
+      FakeFS.activate!
+      Rhc::Rest::Client.stub!(:new) { |openshift_rest_node, username, password, debug| @username = username; @password = password; nil}
+    end
+
+    it "should ask for username" do
+      $terminal.write_line("testuser@foo.bar")
+      $terminal.write_line("password")
+      @tests.rest_client
+      @username.should == "testuser@foo.bar"
+      @tests.config["default_rhlogin"].should == @username
+      @password.should == "password"
+    end
+
+    after do
+      FakeFS::FileSystem.clear
+      FakeFS.deactivate!
+    end
+  end
+
   class HelperTests
     include RHC::Helpers
     include RHC::SSHKeyHelpers
 
     def initialize
       @print_num = 0
+      @options = Commander::Command::Options.new
+    end
+
+    def config
+      @config ||= RHC::Config
     end
 
     def next_print_num

data/spec/rhc/rest_application_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc-rest/client'
+require 'base64'
 
 Spec::Runner.configure do |configuration|
   include(RestSpecHelper)
@@ -9,6 +10,11 @@ end
 module Rhc
   module Rest
     describe Application do
+      # make sure auth is set up for the Application object since we are not
+      # calling it from RHC::Rest::Client
+      credentials = Base64.encode64("#{mock_user}:#{mock_pass}")
+      @@headers["Authorization"] = "Basic #{credentials}"
+
       let (:app_links) { mock_response_links(mock_app_links('mock_domain','mock_app')) }
       let (:app_obj) {
         Rhc::Rest::Application.new({ 'domain_id'       => 'mock_domain',

data/spec/rhc/rest_client_spec.rb

@@ -145,14 +145,15 @@ module Rhc
                           :status => 200
                         })
           end
-          it "returns a list of domain objects for matching domain IDs" do
-            matches = @client.find_domain('mock_domain_0')
-            matches.length.should equal(1)
-            matches[0].class.should == Rhc::Rest::Domain
+          it "returns a domain object for matching domain IDs" do
+            match = nil
+            expect { match = @client.find_domain('mock_domain_0') }.should_not raise_error
+
+            match.id.should == 'mock_domain_0'
+            match.class.should == Rhc::Rest::Domain
           end
-          it "returns an empty list when no matching domain IDs can be found" do
-            matches = @client.find_domain('mock_domain_2')
-            matches.length.should equal(0)
+          it "raise an error when no matching domain IDs can be found" do
+            expect { @client.find_domain('mock_domain_2') }.should raise_error(RHC::DomainNotFoundException)
           end
         end
 
@@ -202,23 +203,22 @@ module Rhc
                           :status => 200
                         })
           end
-          it "returns a list of application objects for matching application IDs" do
-            matches = @client.find_application('mock_app')
-            matches.length.should equal(2)
-            (0..1).each do |idx|
-              matches[idx].class.should                              == Rhc::Rest::Application
-              matches[idx].instance_variable_get(:@name).should      == 'mock_app'
-              matches[idx].instance_variable_get(:@domain_id).should == "mock_domain_#{idx}"
-              matches[idx].instance_variable_get(:@links).should     ==
-                mock_response_links(mock_app_links("mock_domain_#{idx}",'mock_app'))
+          it "returns application objects for matching application IDs" do
+            domain = @client.domains[0]
+            domain.applications.each do |app|
+              match = domain.find_application(app.name)
+              match.class.should                              == Rhc::Rest::Application
+              match.instance_variable_get(:@name).should      == 'mock_app'
+              match.instance_variable_get(:@domain_id).should == "#{domain.id}"
+              match.instance_variable_get(:@links).should     ==
+                mock_response_links(mock_app_links("#{domain.id}",'mock_app'))
             end
           end
-          it "returns an empty list when no matching applications can be found" do
-            matches = @client.find_application('no_match')
-            matches.length.should equal(0)
+          it "Raises an excpetion when no matching applications can be found" do
+            expect { @client.domains[0].find_application('no_match') }.should raise_error(RHC::ApplicationNotFoundException)
           end
         end
-        
+
         context "#cartridges" do
           before(:each) do
             stub_api_request(:any, client_links['LIST_CARTRIDGES']['relative']).
@@ -294,7 +294,7 @@ module Rhc
             matches.length.should equal(0)
           end
         end
-        
+
         context "#user" do
           before(:each) do
             stub_api_request(:any, client_links['GET_USER']['relative']).
@@ -347,18 +347,18 @@ module Rhc
                         })
           end
           it "returns a list of key objects for matching keys" do
-            keys = @client.find_key('mock_key_0')
-            keys.length.should equal(1)
-            keys[0].class.should                            == Rhc::Rest::Key
-            keys[0].instance_variable_get(:@name).should    == 'mock_key_0'
-            keys[0].instance_variable_get(:@type).should    == 'mock_key_0_type'
-            keys[0].instance_variable_get(:@content).should == '123456789:0'
-            keys[0].instance_variable_get(:@links).should   ==
+            key = nil
+            expect { key = @client.find_key('mock_key_0') }.should_not raise_error
+
+            key.class.should                            == Rhc::Rest::Key
+            key.instance_variable_get(:@name).should    == 'mock_key_0'
+            key.instance_variable_get(:@type).should    == 'mock_key_0_type'
+            key.instance_variable_get(:@content).should == '123456789:0'
+            key.instance_variable_get(:@links).should   ==
               mock_response_links(mock_key_links('mock_key_0'))
           end
-          it "returns an empty list when no matching keys can be found" do
-            keys = @client.find_key('no_match')
-            keys.length.should equal(0)
+          it "raise an error when no matching keys can be found" do
+            expect { @client.find_key('no_match') }.should raise_error(RHC::KeyNotFoundException)
           end
         end
 
@@ -392,7 +392,7 @@ module Rhc
           let(:logout_method) { :logout }
           it_should_behave_like "a logout method"
         end
-        
+
         context "#close" do
           let(:logout_method) { :close }
           it_should_behave_like "a logout method"

data/spec/rhc/rest_spec.rb

@@ -283,7 +283,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ConnectionException, 'Connection to server timed out or got interrupted: Request Timeout')
+          lambda { subject.request(request) }.should raise_error(Rhc::Rest::TimeoutException, "Connection to server timed out. It is possible the operation finished without being able to report success. Use 'rhc domain show' or 'rhc app status' to check the status of your applications.")
         end
       end
 
@@ -296,7 +296,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ConnectionException, 'Connection to server timed out or got interrupted: Lost Server Connection')
+          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ConnectionException, 'Connection to server got interrupted: Lost Server Connection')
         end
       end
 

data/spec/rhc/wizard_spec.rb

@@ -195,6 +195,7 @@ describe RHC::Wizard do
 
   context "Repeat run of rhc setup with config set" do
     before(:all) do
+      RHC::Config.set_defaults
       @wizard = RerunWizardDriver.new
       @wizard.setup_mock_config
       @wizard.run_next_stage # we can skip testing the greeting
@@ -372,7 +373,7 @@ describe RHC::Wizard do
       @wizard.run_next_stage # we can skip testing the greeting
     end
 
-    it "should ask password input with default login (use a different one)" do
+    it "should ask password input with default login(use a different one)" do
       @wizard.stub_rhc_client_new
       @wizard.stub_user_info
       $terminal.write_line(@wizard.mock_user)
@@ -778,7 +779,7 @@ EOF
       end
 
       # reload config
-      RHC::Config.home_dir = '/home/mock_user'
+      @config.home_dir = '/home/mock_user'
     end
 
     def setup_mock_ssh(add_ssh_key=false)
@@ -881,13 +882,19 @@ EOF
 
       File.open(public_key_file, 'w') { |f| f.write pub_key }
     end
+
+    def config(local_conf_path)
+      conf = RHC::Config
+      conf.set_local_config(local_conf_path, false)
+      conf
+    end
   end
 
   class FirstRunWizardDriver < RHC::Wizard
     include WizardDriver
 
     def initialize
-      super '/home/mock_user/.openshift/express.conf'
+      super config('/home/mock_user/.openshift/express.conf')
     end
   end
 
@@ -895,7 +902,7 @@ EOF
     include WizardDriver
 
     def initialize
-      super '/home/mock_user/.openshift/express.conf'
+      super config('/home/mock_user/.openshift/express.conf')
     end
   end
 

data/spec/spec_helper.rb

@@ -44,10 +44,12 @@ module ClassSpecHelpers
     end
   end
   def new_command_runner *args, &block
-    Commander::Runner.instance_variable_set :"@singleton", Commander::Runner.new(args)
+    Commander::Runner.instance_variable_set :"@singleton", RHC::Commands::Runner.new(args)
     program :name, 'test'
     program :version, '1.2.3'
     program :description, 'something'
+    program :help_formatter, RHC::UsageHelpFormatter
+
     #create_test_command
     yield if block
     Commander::Runner.instance
@@ -58,12 +60,12 @@ module ClassSpecHelpers
   #
   def expects_running *args
     mock_terminal
-    r = new_command_runner args do
+    r = new_command_runner *args do
       instance #ensure instance is created before subject :new is mocked
       subject.should_receive(:new).any_number_of_times.and_return(instance)
-      RHC::Commands.to_commander 
+      RHC::Commands.to_commander
     end
-    lambda { r.run!; @output }
+    lambda { r.run! }
   end
 
   class MockHighLineTerminal < HighLine
@@ -153,11 +155,9 @@ module ExitCodeMatchers
     actual = nil
     match do |block|
       begin
-        block.call
+        actual = block.call
       rescue SystemExit => e
         actual = e.status
-      else
-        actual = 0
       end
       actual and actual == code
     end
@@ -170,8 +170,8 @@ module ExitCodeMatchers
     end
     description do
       "expect block to call exit(#{code})"
-    end    
-  end  
+    end
+  end
 end
 
 module CommanderInvocationMatchers

metadata

@@ -1,307 +1,297 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rhc
-version: !ruby/object:Gem::Version
-  version: 0.96.9
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 441
+  prerelease: false
+  segments: 
+  - 0
+  - 97
+  - 17
+  version: 0.97.17
 platform: ruby
-authors:
+authors: 
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-23 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: archive-tar-minitar
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: test-unit
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: commander
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '4.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: commander
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.6'
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.6'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.4'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: fakefs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: cucumber
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dnsruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: dnsruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: open4
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description: The client tools for the OpenShift platform that allow for application
-  management.
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id015
+description: The client tools for the OpenShift platform that allow for application management.
 email: dev@lists.openshift.redhat.com
-executables:
-- rhc-app
-- rhc-create-app
-- rhc-domain
+executables: 
 - rhc-tail-files
-- rhc-port-forward
+- rhc-sshkey
+- rhc-snapshot
+- rhc-chk
+- rhc-create-domain
+- rhc-ctl-app
+- rhc-domain-info
 - rhc-user-info
+- rhc-create-app
 - rhc
-- rhc-ctl-app
+- rhc-domain
 - rhc-ctl-domain
-- rhc-create-domain
-- rhc-snapshot
-- rhc-sshkey
-- rhc-domain-info
-- rhc-chk
+- rhc-app
+- rhc-port-forward
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/rhc-common.rb
-- lib/rhc/vendor/sshkey.rb
-- lib/rhc/vendor/okjson.rb
-- lib/rhc/vendor/parseconfig.rb
-- lib/rhc/vendor/zliby.rb
-- lib/rhc/helpers.rb
-- lib/rhc/config.rb
+
+files: 
+- lib/rhc-rest/client.rb
+- lib/rhc-rest/exceptions/exceptions.rb
+- lib/rhc-rest/domain.rb
+- lib/rhc-rest/user.rb
+- lib/rhc-rest/cartridge.rb
+- lib/rhc-rest/key.rb
+- lib/rhc-rest/application.rb
+- lib/rhc.rb
+- lib/rhc-rest.rb
+- lib/rhc/version.rb
 - lib/rhc/ssh_key_helpers.rb
 - lib/rhc/client.rb
-- lib/rhc/json.rb
-- lib/rhc/coverage_helper.rb
+- lib/rhc/exceptions.rb
+- lib/rhc/cli.rb
+- lib/rhc/wizard.rb
+- lib/rhc/targz.rb
 - lib/rhc/commands.rb
+- lib/rhc/json.rb
 - lib/rhc/help_formatter.rb
+- lib/rhc/core_ext.rb
+- lib/rhc/vendor/zliby.rb
+- lib/rhc/vendor/parseconfig.rb
+- lib/rhc/vendor/sshkey.rb
+- lib/rhc/vendor/okjson.rb
+- lib/rhc/commands/base.rb
 - lib/rhc/commands/setup.rb
+- lib/rhc/commands/domain.rb
 - lib/rhc/commands/server.rb
-- lib/rhc/commands/base.rb
-- lib/rhc/core_ext.rb
-- lib/rhc/version.rb
-- lib/rhc/cli.rb
-- lib/rhc/wizard.rb
-- lib/rhc/targz.rb
-- lib/rhc.rb
-- lib/rhc-rest.rb
-- lib/rhc-rest/user.rb
-- lib/rhc-rest/domain.rb
-- lib/rhc-rest/client.rb
-- lib/rhc-rest/application.rb
-- lib/rhc-rest/key.rb
-- lib/rhc-rest/cartridge.rb
-- lib/rhc-rest/exceptions/exceptions.rb
+- lib/rhc/helpers.rb
+- lib/rhc/config.rb
+- lib/rhc/coverage_helper.rb
+- lib/rhc-common.rb
+- lib/rhc/usage_templates/command_help.erb
+- lib/rhc/usage_templates/help.erb
 - conf/express.conf
 - LICENSE
 - COPYRIGHT
@@ -309,126 +299,138 @@ files:
 - Rakefile
 - test/support/testcase.rb
 - test/support/server.rb
+- test/unit/command_test.rb
 - test/sample-usage.rb
-- test/functional/test_credentials.rb
-- test/functional/application_test.rb
 - test/functional/domain_test.rb
+- test/functional/application_test.rb
+- test/functional/test_credentials.rb
 - test/test_helper.rb
-- test/unit/command_test.rb
-- spec/spec_helper.rb
-- spec/rest_spec_helper.rb
-- spec/coverage_helper.rb
+- spec/rhc/helpers_spec.rb
 - spec/rhc/config_spec.rb
 - spec/rhc/rest_client_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/wizard_spec.rb
-- spec/rhc/command_spec.rb
+- spec/rhc/targz_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/rhc/commands/server_spec.rb
+- spec/rhc/common_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/assets/foo.txt
+- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/targz_sample.tar.gz
+- spec/rhc/command_spec.rb
 - spec/rhc/commands/setup_spec.rb
-- spec/rhc/targz_spec.rb
+- spec/rhc/commands/domain_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/wizard_spec.rb
 - spec/rhc/cli_spec.rb
-- spec/rhc/rest_spec.rb
 - spec/rhc/json_spec.rb
-- spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/assets/targz_corrupted.tar.gz
-- spec/rhc/assets/foo.txt
-- spec/rhc/common_spec.rb
+- spec/rest_spec_helper.rb
+- spec/spec_helper.rb
+- spec/coverage_helper.rb
 - features/support/env.rb
-- features/lib/rhc_helper/domain.rb
+- features/step_definitions/client_steps.rb
+- features/step_definitions/application_steps.rb
+- features/step_definitions/cartridge_steps.rb
+- features/step_definitions/domain_steps.rb
+- features/verify.feature
+- features/lib/rhc_helper.rb
 - features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/loggable.rb
+- features/lib/rhc_helper/domain.rb
 - features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/runnable.rb
 - features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper.rb
-- features/verify.feature
-- features/step_definitions/domain_steps.rb
-- features/step_definitions/cartridge_steps.rb
-- features/step_definitions/application_steps.rb
-- features/step_definitions/client_steps.rb
+- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/runnable.rb
 - features/README.md
-- bin/rhc-app
-- bin/rhc-create-app
-- bin/rhc-domain
 - bin/rhc-tail-files
-- bin/rhc-port-forward
+- bin/rhc-sshkey
+- bin/rhc-snapshot
+- bin/rhc-chk
+- bin/rhc-create-domain
+- bin/rhc-ctl-app
+- bin/rhc-domain-info
 - bin/rhc-user-info
+- bin/rhc-create-app
 - bin/rhc
-- bin/rhc-ctl-app
+- bin/rhc-domain
 - bin/rhc-ctl-domain
-- bin/rhc-create-domain
-- bin/rhc-snapshot
-- bin/rhc-sshkey
-- bin/rhc-domain-info
-- bin/rhc-chk
+- bin/rhc-app
+- bin/rhc-port-forward
+has_rdoc: true
 homepage: https://github.com/openshift/rhc
 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 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: OpenShift Client Tools
-test_files:
+test_files: 
 - test/support/testcase.rb
 - test/support/server.rb
+- test/unit/command_test.rb
 - test/sample-usage.rb
-- test/functional/test_credentials.rb
-- test/functional/application_test.rb
 - test/functional/domain_test.rb
+- test/functional/application_test.rb
+- test/functional/test_credentials.rb
 - test/test_helper.rb
-- test/unit/command_test.rb
-- spec/spec_helper.rb
-- spec/rest_spec_helper.rb
-- spec/coverage_helper.rb
+- spec/rhc/helpers_spec.rb
 - spec/rhc/config_spec.rb
 - spec/rhc/rest_client_spec.rb
-- spec/rhc/helpers_spec.rb
-- spec/rhc/wizard_spec.rb
-- spec/rhc/command_spec.rb
+- spec/rhc/targz_spec.rb
 - spec/rhc/rest_application_spec.rb
-- spec/rhc/commands/server_spec.rb
+- spec/rhc/common_spec.rb
+- spec/rhc/rest_spec.rb
+- spec/rhc/assets/foo.txt
+- spec/rhc/assets/targz_corrupted.tar.gz
+- spec/rhc/assets/targz_sample.tar.gz
+- spec/rhc/command_spec.rb
 - spec/rhc/commands/setup_spec.rb
-- spec/rhc/targz_spec.rb
+- spec/rhc/commands/domain_spec.rb
+- spec/rhc/commands/server_spec.rb
+- spec/rhc/wizard_spec.rb
 - spec/rhc/cli_spec.rb
-- spec/rhc/rest_spec.rb
 - spec/rhc/json_spec.rb
-- spec/rhc/assets/targz_sample.tar.gz
-- spec/rhc/assets/targz_corrupted.tar.gz
-- spec/rhc/assets/foo.txt
-- spec/rhc/common_spec.rb
+- spec/rest_spec_helper.rb
+- spec/spec_helper.rb
+- spec/coverage_helper.rb
 - features/support/env.rb
-- features/lib/rhc_helper/domain.rb
+- features/step_definitions/client_steps.rb
+- features/step_definitions/application_steps.rb
+- features/step_definitions/cartridge_steps.rb
+- features/step_definitions/domain_steps.rb
+- features/verify.feature
+- features/lib/rhc_helper.rb
 - features/lib/rhc_helper/httpify.rb
-- features/lib/rhc_helper/loggable.rb
 - features/lib/rhc_helper/persistable.rb
-- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/loggable.rb
+- features/lib/rhc_helper/domain.rb
 - features/lib/rhc_helper/commandify.rb
-- features/lib/rhc_helper/runnable.rb
 - features/lib/rhc_helper/cartridge.rb
-- features/lib/rhc_helper.rb
-- features/verify.feature
-- features/step_definitions/domain_steps.rb
-- features/step_definitions/cartridge_steps.rb
-- features/step_definitions/application_steps.rb
-- features/step_definitions/client_steps.rb
+- features/lib/rhc_helper/app.rb
+- features/lib/rhc_helper/runnable.rb
 - features/README.md