rhc 1.2.7 → 1.3.8

data/spec/rhc/commands/setup_spec.rb

@@ -1,21 +1,23 @@
 require 'spec_helper'
-require 'rhc/wizard'
-require 'rhc/config'
+require 'rest_spec_helper'
 require 'rhc/commands/setup'
-require 'webmock/rspec'
 
 # just test the command runner as we already have extensive wizard tests
 describe RHC::Commands::Setup do
+  subject{ RHC::Commands::Setup }
+  let(:instance){ subject.new }
+  let!(:config){ base_config }
+  before{ described_class.send(:public, *described_class.protected_instance_methods) }
 
-  before(:each) { RHC::Config.set_defaults }
+  describe '#run' do
+    it{ expects_running('setup').should call(:run).on(instance).with(no_args) }
 
-  describe 'run' do
     let(:arguments) { ['setup', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
 
     before(:each) do
       @wizard = mock('wizard')
       @wizard.stub!(:run).and_return(true)
-      RHC::RerunWizard.stub!(:new) { @wizard }
+      RHC::RerunWizard.stub!(:new){ @wizard }
     end
 
     context 'when no issues' do
@@ -32,12 +34,29 @@ describe RHC::Commands::Setup do
     end
   end
 
+  it{ expects_running('setup').should call(:run).on(instance).with(no_args) }
+  it{ command_for('setup', '--clean').options.clean.should be_true }
+
+  it{ command_for('setup').options.server.should == 'openshift.redhat.com' }
+  it{ command_for('setup', '--server', 'foo.com').options.server.should == 'foo.com' }
+=begin  context 'when libra_server is set' do
+    before{ ENV.should_receive(:[]).any_number_of_times.with('LIBRA_SERVER').and_return('bar.com') }
+    it{ command_for('setup').config['libra_server'].should == 'bar.com' }
+    it{ command_for('setup').options.server.should == 'bar.com' }
+    it{ command_for('setup', '--server', 'foo.com').options.server.should == 'foo.com' }
+=end  end
+
+  context 'when --clean is used' do
+    let!(:config){ base_config{ |config, defaults| defaults.add 'libra_server', 'test.com' } }
+
+    it("should ignore a config value"){ command_for('setup', '--clean').options.server.should == 'openshift.redhat.com' }
+  end
+
   context 'when -d is passed' do
     let(:arguments) { ['setup', '-d', '-l', 'test@test.foo'] }
     # 'y' for the password prompt
     let(:input) { ['', 'y', '', ''] }
-
-    before(:each){ @rc = MockRestClient.new }
+    let!(:rest_client){ MockRestClient.new }
 
     it("succeeds"){ FakeFS{ expect { run input }.should exit_with_code 0 } }
     it("the output includes debug output") do
@@ -49,8 +68,7 @@ describe RHC::Commands::Setup do
     let(:arguments) { ['setup', '-l', 'test@test.foo'] }
     # 'y' for the password prompt
     let(:input) { ['', 'y', '', ''] }
-
-    before(:each){ @rc = MockRestClient.new }
+    let!(:rest_client){ MockRestClient.new }
 
     it("succeeds"){ FakeFS{ expect { run input }.should exit_with_code 0 } }
     it("sets the user name to the value given by the command line") do
@@ -66,7 +84,7 @@ describe RHC::Commands::Setup do
         @wizard.stub!(:run).and_return(true)
         expect { run }.should exit_with_code(0)
       end
-      it('should output usage') { run_output.should match("Easy to use wizard for getting started") }
+      it('should output usage') { run_output.should match("Connects to an OpenShift server to get you started. Will") }
     end
   end
 end

data/spec/rhc/commands/snapshot_spec.rb

@@ -2,15 +2,16 @@ require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc/commands/snapshot'
 require 'rhc/config'
+require 'rhc/tar_gz'
 
 describe RHC::Commands::Snapshot do
 
   APP_NAME = 'mockapp'
 
+  let!(:rest_client) { MockRestClient.new }
   before(:each) do
-    RHC::Config.set_defaults
-    @rc = MockRestClient.new
-    @app = @rc.add_domain("mockdomain").add_application APP_NAME, 'mock-1.0'
+    user_config
+    @app = rest_client.add_domain("mockdomain").add_application APP_NAME, 'mock-1.0'
     @ssh_uri = URI.parse @app.ssh_url
     filename = APP_NAME + '.tar.gz'
     FileUtils.cp(File.expand_path('../../assets/targz_sample.tar.gz', __FILE__), filename)

data/spec/rhc/commands/sshkey_spec.rb

@@ -4,57 +4,41 @@ require 'rhc/config'
 
 
 describe RHC::Commands::Sshkey do
-  before(:each) do
-    RHC::Config.set_defaults
-  end
-  
+  let!(:rest_client){ MockRestClient.new }
+  before{ user_config }
+
   describe 'list' do
-      
+
     context "when run with list command" do
-      
       let(:arguments) { %w[sshkey list --noprompt --config test.conf -l test@test.foo -p  password --trace] }
 
-      before(:each) do
-        @rc = MockRestClient.new
-      end
-
       it { expect { run }.should exit_with_code(0) }
-      it { run_output.should match("Name: mockkey") }
+      it { run_output.should match(/mockkey1 \(type: ssh-rsa\)/) }
     end
   end
-  
+
   describe 'show' do
-      
     context "when run with show command" do
-      
       let(:arguments) { %w[sshkey show mockkey1 --noprompt --config test.conf -l test@test.foo -p  password --trace] }
 
-      before(:each) do
-        @rc = MockRestClient.new
-      end
-
       it { expect { run }.should exit_with_code(0) }
-      it { run_output.should match("Name: mockkey1") }
+      it { run_output.should match(/mockkey1 \(type: ssh-rsa\)/) }
     end
   end
-  
+
   describe "add" do
     context "when adding a valid key" do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar id_rsa.pub] }
-    
-      before :each do
-        @rc = MockRestClient.new
-      end
-        
+
       it 'adds the key' do
         FakeFS do
-          keys = @rc.sshkeys
+          keys = rest_client.sshkeys
           num_keys = keys.length
           File.open('id_rsa.pub', 'w') do |f|
             f << 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
           end
           expect { run }.should exit_with_code(0)
-          @rc.sshkeys.length.should == num_keys + 1
+          rest_client.sshkeys.length.should == num_keys + 1
         end
       end
     end
@@ -62,20 +46,16 @@ describe RHC::Commands::Sshkey do
     context "when adding an invalid key" do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar id_rsa.pub] }
 
-      before :each do
-        @rc = MockRestClient.new
-      end
-
       it "fails to add the key" do
         FakeFS do
-          keys = @rc.sshkeys
+          keys = rest_client.sshkeys
           num_keys = keys.length
           File.open('id_rsa.pub', 'w') do |f|
             f << 'ssh-rsa AADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
           end
           expect { run }.should exit_with_code(128)
-          expect { run_output.should match("Name: mockkey") }
-          @rc.sshkeys.length.should == num_keys
+          expect { run_output.should match(/Name:.* mockkey/) }
+          rest_client.sshkeys.length.should == num_keys
         end
       end
     end
@@ -83,20 +63,16 @@ describe RHC::Commands::Sshkey do
     context "when adding an invalid key with --confirm" do
       let(:arguments) { %w[sshkey add --noprompt --confirm --config test.conf -l test@test.foo -p password foobar id_rsa.pub] }
 
-      before :each do
-        @rc = MockRestClient.new
-      end
-
       it "warns and then adds the key" do
         FakeFS do
-          keys = @rc.sshkeys
+          keys = rest_client.sshkeys
           num_keys = keys.length
           File.open('id_rsa.pub', 'w') do |f|
             f << 'ssh-rsa AADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
           end
           expect { run }.should exit_with_code(0)
           expect { run_output.should match("key you are uploading is not recognized") }
-          @rc.sshkeys.length.should == num_keys + 1
+          rest_client.sshkeys.length.should == num_keys + 1
         end
       end
     end
@@ -126,38 +102,30 @@ describe RHC::Commands::Sshkey do
         File.should_receive(:open).and_raise(Errno::EACCES)
         expect { run }.should exit_with_code(128)
       end
-      
+
     end
   end
-  
+
   describe "remove" do
     context "when removing an existing key" do
       let (:arguments) { %w[sshkey remove --noprompt --config test.conf -l test@test.foo -p password mockkey2] }
-      
-      before :each do
-        @rc = MockRestClient.new
-      end
-      
+
       it 'deletes the key' do
-        keys = @rc.sshkeys
+        keys = rest_client.sshkeys
         num_keys = keys.length
         expect {run}.should exit_with_code(0)
-        @rc.sshkeys.length.should == num_keys - 1
+        rest_client.sshkeys.length.should == num_keys - 1
       end
     end
 
     context "when removing a nonexistent key" do
       let (:arguments) { %w[sshkey remove --noprompt --config test.conf -l test@test.foo -p password no_match] }
-      
-      before :each do
-        @rc = MockRestClient.new
-        @keys = @rc.sshkeys
-      end
-      
+      before{ @keys = rest_client.sshkeys }
+
       it 'leaves keys untouched' do
         num_keys = @keys.length
         expect {run}.should exit_with_code(0)
-        @rc.sshkeys.length.should == num_keys
+        rest_client.sshkeys.length.should == num_keys
       end
     end
   end

data/spec/rhc/commands/tail_spec.rb

@@ -2,12 +2,14 @@ require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc/commands/tail'
 require 'rhc/config'
+
 describe RHC::Commands::Tail do
+  let!(:rest_client) { MockRestClient.new }
   before(:each) do
-    RHC::Config.set_defaults
-    @rc = MockRestClient.new
-    domain = @rc.add_domain("mock-domain-0")
+    user_config
+    domain = rest_client.add_domain("mock-domain-0")
     @app = domain.add_application("mock-app-0", "ruby-1.8.7")
+    @app.stub(:ssh_url).and_return("ssh://user@test.domain.com")
   end
 
   describe 'help' do
@@ -22,13 +24,28 @@ describe RHC::Commands::Tail do
   end
 
   describe 'tail' do
-    let(:arguments) { ['tail', 'mock-app-0', '--noprompt', '--trace', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
-    context 'tail is run on an unreachable domain' do
-      it { expect { run }.should raise_error(SocketError) }
-    end
-    context 'tail succeeds and exits on Interrupt' do
-      before (:each) { @app.stub(:tail) { raise Interrupt.new } }
+    let(:arguments) { ['tail', 'mock-app-0'] }
+
+    context 'when ssh connects' do
+      before (:each) {Net::SSH.should_receive(:start).with('test.domain.com', 'user') }
       it { expect { run }.should exit_with_code(0) }
     end
+
+    context 'is run on an unreachable domain' do
+      before (:each) {Net::SSH.should_receive(:start).and_raise(SocketError) }
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /The connection to test.domain.com failed: / }
+    end
+
+    context 'is refused' do
+      before (:each) {Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED) }
+      it { expect { run }.should exit_with_code(1) }
+      it { run_output.should =~ /The server test.domain.com refused a connection with user user/ }
+    end
+
+    context 'succeeds and exits on Interrupt' do
+      before (:each) { rest_client.stub(:find_domain) { raise Interrupt } }
+      it { expect { run }.should raise_error(Interrupt) }
+    end
   end
 end

data/spec/rhc/commands/threaddump_spec.rb

@@ -7,11 +7,12 @@ describe RHC::Commands::Threaddump do
   let(:domain_0_links) { mock_response_links(mock_domain_links('mock_domain_0')) }
   let(:domain_1_links) { mock_response_links(mock_domain_links('mock_domain_1')) }
   let(:app_0_links)    { mock_response_links(mock_app_links('mock_domain_0', 'mock_app_0')) }
+  let!(:rest_client){ MockRestClient.new }
+
   before(:each) do
-    RHC::Config.set_defaults
-    @rc = MockRestClient.new
-    @rc.add_domain("mock_domain_0").add_application("mock_app_0", "ruby-1.8.7")
-    stub_api_request(:any, client_links['LIST_DOMAINS']['relative']).with(:headers => {'Accept-Encoding'=>'gzip, deflate'}).
+    user_config
+    rest_client.add_domain("mock_domain_0").add_application("mock_app_0", "ruby-1.8.7")
+    stub_api_request(:any, client_links['LIST_DOMAINS']['relative']).
             to_return({ :body   => {
                           :type => 'domains',
                           :data =>
@@ -24,7 +25,7 @@ describe RHC::Commands::Threaddump do
                         }.to_json,
                         :status => 200
                       })
-    stub_api_request(:any, domain_0_links['LIST_APPLICATIONS']['relative']).with(:headers => {'Accept-Encoding'=>'gzip, deflate'}).
+    stub_api_request(:any, domain_0_links['LIST_APPLICATIONS']['relative']).
             to_return({ :body   => {
                     :type => 'applications',
                     :data =>
@@ -39,7 +40,7 @@ describe RHC::Commands::Threaddump do
                   }.to_json,
                   :status => 200
                 })
-    stub_api_request(:any, app_0_links['THREAD_DUMP']['relative']).with(:body => {:event => 'thread-dump'}, :headers => {'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'17', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+    stub_api_request(:post, app_0_links['THREAD_DUMP']['relative'], false).
             to_return({ :body   => {
                           :type => 'application',
                           :data =>
@@ -69,13 +70,13 @@ describe RHC::Commands::Threaddump do
   end
 
   describe 'threaddump' do
-    let(:arguments) { ['threaddump', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password', 'mock_app_0'] }
-    context 'with no issues' do
-      it { expect { run }.should exit_with_code(0) }
-    end
+    let(:arguments) { ['threaddump', 'mock_app_0'] }
+    it { expect { run }.should exit_with_code(0) }
+    it { run_output.should =~ /Application test thread dump complete/ }
   end
+
   describe 'threaddump no args' do
-    let(:arguments) { ['threaddump', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+    let(:arguments) { ['threaddump'] }
     context 'args not supplied' do
       it { expect { run }.should exit_with_code(1) }
     end

data/spec/rhc/config_spec.rb

@@ -3,10 +3,12 @@ require 'rhc/config'
 require 'net/http'
 
 describe RHC::Config do
+  subject{ RHC::Config }
   before(:all) do
     ENV['LIBRA_SERVER'] = nil
     ENV['http_proxy'] = nil
     mock_terminal
+    RHC::Config.stub(:home_dir).and_return('/home/mock_user')
     FakeFS.activate!
     FakeFS::FileSystem.clear
   end
@@ -16,195 +18,240 @@ describe RHC::Config do
   end
 
   describe "class" do
-    subject{ RHC::Config }
-    it("should raise when foo is invoked") { expect{ RHC::Config.method_missing(:foo) }.to raise_error(NoMethodError) }
-    it("should invoke a method on default") { RHC::Config.username.should be RHC::Config.default.username }
+    it("should raise when foo is invoked") { expect{ subject.method_missing(:foo) }.to raise_error(NoMethodError) }
+    it("should invoke a method on default") { subject.username.should be subject.default.username }
   end
 
-  context "Config default values with no files" do
-    before(:each) do
-      RHC::Config.initialize
+  let(:values){ {} }
+
+  describe "#use_config" do
+    subject{ RHC::Config.new.tap{ |c| c.stub(:load_config_files) } }
+
+    context "when an exception is raised" do
+      before{ subject.should_receive(:set_opts_config).with(File.expand_path('foo')).and_raise(Errno::EISDIR.new('foo')) }
+      it("should wrap the error"){ expect{ subject.use_config('foo') }.to raise_error(ArgumentError, /Unable to read configuration file.*foo/) }
+    end
+  end
+
+  describe "#to_options" do
+    subject do
+      RHC::Config.new.tap do |c|
+        c.stub(:home_dir).and_return('/home/mock_user')
+        c.stub(:load_config_files)
+        c.instance_variable_set(:@opts, values)
+        c.instance_variable_set(:@defaults, nil)
+      end
+    end
+
+    context "with an non true value for insecure" do
+      let(:values){ {'insecure' => 'untruth'} }
+      its(:to_options){ should == {:insecure => 'untruth'} }
     end
 
-    it "should not have any configs" do
-      RHC::Config.has_global_config?.should be_false
-      RHC::Config.has_local_config?.should be_false
-      RHC::Config.has_opts_config?.should be_false
+    context "with an invalid timeout" do
+      let(:values){ {'timeout' => 'a'} }
+      its(:to_options){ should == {:timeout => 'a'} }
     end
 
+    context "with standard values" do
+      let(:values) do 
+        {
+          'insecure' => 'true',
+          'default_rhlogin' => 'user',
+          'libra_server' => 'test.com',
+          'password' => 'pass',
+          'ssl_client_cert_file' => 'file1',
+          'ssl_ca_file' => 'file2',
+          'timeout' => '1',
+        }
+      end
+      its(:to_options){ should == {:insecure => 'true', :timeout => '1', :ssl_ca_file => 'file2', :ssl_client_cert_file => 'file1', :rhlogin => 'user', :password => 'pass', :server => 'test.com'} }
+    end
+  end
+
+  context "Config default values with no files" do
+    before{ subject.initialize }
+
+    its(:has_global_config?){ should be_false }
+    its(:has_local_config?){ should be_false }
+    its(:has_opts_config?){ should be_false }
+
     it "should return openshift.redhat.com for the server" do
-      RHC::Config['libra_server'].should == "openshift.redhat.com"
-      RHC::Config.default_rhlogin.should be_nil
-      RHC::Config.config_user("default@redhat.com")
-      RHC::Config.default_rhlogin.should == "default@redhat.com"
+      subject['libra_server'].should == "openshift.redhat.com"
     end
   end
 
   context "Config values with /etc/openshift/express.conf" do
     it "should have only a global config" do
       ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com", "global@redhat.com")
-      RHC::Config.initialize
-      RHC::Config.has_global_config?.should be_true
-      RHC::Config.has_local_config?.should be_false
-      RHC::Config.has_opts_config?.should be_false
+      subject.initialize
+      subject.has_global_config?.should be_true
+      subject.has_local_config?.should be_false
+      subject.has_opts_config?.should be_false
     end
 
     it "should get values from the global config" do
       ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
                                                                      "global@redhat.com",
                                                                      {"random_value" => 12})
-      RHC::Config.initialize
+      subject.initialize
 
-      RHC::Config['libra_server'].should == "global.openshift.redhat.com"
-      RHC::Config.default_rhlogin.should == "global@redhat.com"
-      RHC::Config['random_value'].should == "12"
-      RHC::Config['non_value'].should be_nil
+      subject['libra_server'].should == "global.openshift.redhat.com"
+      subject.default_rhlogin.should == "global@redhat.com"
+      subject['random_value'].should == "12"
+      subject['non_value'].should be_nil
 
     end
 
     it "should have libra_server fallback to the default if not set in config" do
       ConfigHelper.write_out_config(ConfigHelper.global_config_path, nil,
                                                                      "global@redhat.com")
-      RHC::Config.initialize
+      subject.initialize
 
-      RHC::Config['libra_server'].should == "openshift.redhat.com"
-      RHC::Config.default_rhlogin.should == "global@redhat.com"
+      subject['libra_server'].should == "openshift.redhat.com"
+      subject.default_rhlogin.should == "global@redhat.com"
     end
   end
 
-  context "Config values with ~/.openshift/express.conf" do
-    it "should have global and local config" do
-      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
-                                                                     "global@redhat.com")
-      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
-                                              "local.openshift.redhat.com","local@redhat.com")
-      RHC::Config.initialize
-      RHC::Config.home_dir = ConfigHelper.home_dir
-
-      RHC::Config.home_conf_path.should == File.join(ConfigHelper.home_dir, '.openshift')
-      RHC::Config.local_config_path.should == File.join(ConfigHelper.home_dir, '.openshift', 'express.conf')
-      RHC::Config.has_global_config?.should be_true
-      RHC::Config.has_local_config?.should be_true
-      RHC::Config.has_opts_config?.should be_false
-    end
+  context "With a mock home dir" do
 
-    it "should get values from local config" do
-      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
-                                                                     "global@redhat.com",
-                                                                     {"random_value" => "12"})
-      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
-                                              "local.openshift.redhat.com",
-                                              "local@redhat.com",
-                                              {"random_value" => 11})
-      RHC::Config.initialize
-      RHC::Config.home_dir = ConfigHelper.home_dir
-
-      RHC::Config['libra_server'].should == "local.openshift.redhat.com"
-      RHC::Config.default_rhlogin.should == "local@redhat.com"
-      RHC::Config['random_value'].should == "11"
-      RHC::Config['non_value'].should be_nil
+    def stub_config
+      config = RHC::Config.new
+      RHC::Config.instance_variable_set(:@default, config)
+      config.stub(:home_dir).and_return(ConfigHelper.home_dir)
+      RHC::Config.stub(:new).and_return(config)
+      RHC::Config.default.should == config
+      config.read_config_files
     end
 
-    it "should fallback to the default or global if not set in config" do
-      ConfigHelper.write_out_config(ConfigHelper.global_config_path, nil,
-                                                                     "global@redhat.com")
-      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
-                                              nil,
-                                              nil,
-                                              {"random_value" => 11})
-      RHC::Config.initialize
-      RHC::Config.home_dir = ConfigHelper.home_dir
-
-      RHC::Config['libra_server'].should == "openshift.redhat.com"
-      RHC::Config.default_rhlogin.should == "global@redhat.com"
-      RHC::Config['random_value'].should == "11"
-    end
+    context "Config values with ~/.openshift/express.conf" do
+      it "should have global and local config" do
+        ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                       "global@redhat.com")
+        ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                                "local.openshift.redhat.com","local@redhat.com")
+        stub_config
+
+        subject.home_conf_path.should == File.join(ConfigHelper.home_dir, '.openshift')
+        subject.local_config_path.should == File.join(ConfigHelper.home_dir, '.openshift', 'express.conf')
+        subject.has_global_config?.should be_true
+        subject.has_local_config?.should be_true
+        subject.has_opts_config?.should be_false
+      end
 
-  end
+      it "should get values from local config" do
+        ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                       "global@redhat.com",
+                                                                       {"random_value" => "12"})
+        ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                                "local.openshift.redhat.com",
+                                                "local@redhat.com",
+                                                {"random_value" => 11})
+        stub_config
+
+        subject['libra_server'].should == "local.openshift.redhat.com"
+        subject.default_rhlogin.should == "local@redhat.com"
+        subject['random_value'].should == "11"
+        subject['non_value'].should be_nil
+      end
 
-  context "Config values with LIBRA_SERVER ENV set" do
-    it "should get values from local config" do
-      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
-                                                                     "global@redhat.com",
-                                                                     {"random_value" => "12"})
-      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
-                                              "local.openshift.redhat.com",
-                                              "local@redhat.com",
-                                              {"random_value" => 11})
-      ENV['LIBRA_SERVER'] = "env.openshift.redhat.com"
-      RHC::Config.initialize
-      RHC::Config.set_local_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'))
-
-      RHC::Config['libra_server'].should == "env.openshift.redhat.com"
-      RHC::Config.default_rhlogin.should == "local@redhat.com"
-      RHC::Config['random_value'].should == "11"
-      RHC::Config['non_value'].should be_nil
+      it "should fallback to the default or global if not set in config" do
+        ConfigHelper.write_out_config(ConfigHelper.global_config_path, nil,
+                                                                       "global@redhat.com")
+        ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                                nil,
+                                                nil,
+                                                {"random_value" => 11})
+        stub_config
+
+        subject['libra_server'].should == "openshift.redhat.com"
+        subject.default_rhlogin.should == "global@redhat.com"
+        subject['random_value'].should == "11"
+      end
     end
-  end
 
-  context "Config values with options set" do
-    it "should have global and local config" do
-      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
-                                                                     "global@redhat.com")
-      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
-                                              "local.openshift.redhat.com","local@redhat.com")
-      ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
-                                    "opts.openshift.redhat.com",
-                                    "opts@redhat.com")
-      RHC::Config.initialize
-      RHC::Config.home_dir = ConfigHelper.home_dir
-      RHC::Config.check_cpath({"config" => ConfigHelper.opts_config_path,
-                               "random_val" => "ok"})
-
-      RHC::Config.has_global_config?.should be_true
-      RHC::Config.has_local_config?.should be_true
-      RHC::Config.has_opts_config?.should be_true
+    context "Config values with LIBRA_SERVER ENV set" do
+      it "should get values from local config" do
+        ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                       "global@redhat.com",
+                                                                       {"random_value" => "12"})
+        ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                                "local.openshift.redhat.com",
+                                                "local@redhat.com",
+                                                {"random_value" => 11})
+        ENV['LIBRA_SERVER'] = "env.openshift.redhat.com"
+
+        stub_config
+        subject.set_local_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'))
+
+        subject['libra_server'].should == "env.openshift.redhat.com"
+        subject.default_rhlogin.should == "local@redhat.com"
+        subject['random_value'].should == "11"
+        subject['non_value'].should be_nil
+      end
     end
 
-    it "should get values from local config" do
-      ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
-                                                                     "global@redhat.com",
-                                                                     {"random_value" => "12"})
-      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
-                                              "local.openshift.redhat.com",
-                                              "local@redhat.com",
-                                              {"random_value" => 11})
-      ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
-                                    "opts.openshift.redhat.com",
-                                    "opts@redhat.com",
-                                    {"random_value" => 10})
-      RHC::Config.initialize
-      RHC::Config.home_dir = ConfigHelper.home_dir
-      RHC::Config.check_cpath({"config" => ConfigHelper.opts_config_path,
-                               "random_val" => "ok"})
-
-      RHC::Config['libra_server'].should == "opts.openshift.redhat.com"
-      RHC::Config.default_rhlogin.should == "opts@redhat.com"
-      RHC::Config['random_value'].should == "10"
-      RHC::Config['non_value'].should be_nil
-    end
+    context "Config values with options set" do
+      it "should have global and local config" do
+        ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                       "global@redhat.com")
+        ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                                "local.openshift.redhat.com","local@redhat.com")
+        ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
+                                      "opts.openshift.redhat.com",
+                                      "opts@redhat.com")
+        stub_config
+        subject.check_cpath({"config" => ConfigHelper.opts_config_path,
+                                 "random_val" => "ok"})
+
+        subject.has_global_config?.should be_true
+        subject.has_local_config?.should be_true
+        subject.has_opts_config?.should be_true
+      end
 
-    it "should fallback to the default or global or local if not set in config" do
-      ConfigHelper.write_out_config(ConfigHelper.global_config_path, nil,
-                                                                     "global@redhat.com")
-      ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
-                                              nil,
-                                              nil,
-                                              {"random_value" => 11,
-                                               "local_value" => "local"})
-      ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
-                                    nil,
-                                    nil,
-                                    {"random_value" => 10})
-      RHC::Config.initialize
-      RHC::Config.home_dir = ConfigHelper.home_dir
-      RHC::Config.check_cpath({"config" => ConfigHelper.opts_config_path,
-                               "random_val" => "ok"})
-
-      RHC::Config['libra_server'].should == "openshift.redhat.com"
-      RHC::Config.default_rhlogin.should == "global@redhat.com"
-      RHC::Config['random_value'].should == "10"
-      RHC::Config['local_value'].should == "local"
+      it "should get values from local config" do
+        ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com",
+                                                                       "global@redhat.com",
+                                                                       {"random_value" => "12"})
+        ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                                "local.openshift.redhat.com",
+                                                "local@redhat.com",
+                                                {"random_value" => 11})
+        ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
+                                      "opts.openshift.redhat.com",
+                                      "opts@redhat.com",
+                                      {"random_value" => 10})
+        stub_config
+        subject.check_cpath({"config" => ConfigHelper.opts_config_path,
+                                 "random_val" => "ok"})
+
+        subject['libra_server'].should == "opts.openshift.redhat.com"
+        subject.default_rhlogin.should == "opts@redhat.com"
+        subject['random_value'].should == "10"
+        subject['non_value'].should be_nil
+      end
+
+      it "should fallback to the default or global or local if not set in config" do
+        ConfigHelper.write_out_config(ConfigHelper.global_config_path, nil,
+                                                                       "global@redhat.com")
+        ConfigHelper.write_out_config(File.join(ConfigHelper.home_dir,'.openshift', 'express.conf'),
+                                                nil,
+                                                nil,
+                                                {"random_value" => 11,
+                                                 "local_value" => "local"})
+        ConfigHelper.write_out_config(ConfigHelper.opts_config_path,
+                                      nil,
+                                      nil,
+                                      {"random_value" => 10})
+        stub_config
+        subject.check_cpath({"config" => ConfigHelper.opts_config_path,
+                                 "random_val" => "ok"})
+
+        subject['libra_server'].should == "openshift.redhat.com"
+        subject.default_rhlogin.should == "global@redhat.com"
+        subject['random_value'].should == "10"
+        subject['local_value'].should == "local"
+      end
     end
   end
 
@@ -222,7 +269,7 @@ describe RHC::Config do
                                     nil,
                                     nil,
                                     {"debug" => "true"})
-      RHC::Config.initialize
+      subject.initialize
       ConfigHelper.check_legacy_debug({}).should == "true"
     end
 
@@ -231,7 +278,7 @@ describe RHC::Config do
                                     nil,
                                     nil,
                                     {"debug" => "false"})
-      RHC::Config.initialize
+      subject.initialize
       ConfigHelper.check_legacy_debug({}).should be_false
     end
 
@@ -240,7 +287,7 @@ describe RHC::Config do
                                     nil,
                                     nil,
                                     {"debug" => "true"})
-      RHC::Config.initialize
+      subject.initialize
       ConfigHelper.check_legacy_debug({"debug" => false}).should be_true
     end
 
@@ -249,21 +296,21 @@ describe RHC::Config do
                                     nil,
                                     nil,
                                     {"debug" => "false"})
-      RHC::Config.initialize
+      subject.initialize
       ConfigHelper.check_legacy_debug({"debug" => true}).should be_true
     end
   end
 
   context "Proxy ENV variable parsing" do
     before do
-      RHC::Config.initialize
+      subject.initialize
       ['http_proxy','HTTP_PROXY'].each do |var|
         ENV[var] = nil
       end
     end
 
     it "should return a direct http connection" do
-      RHC::Config.using_proxy?.should_not == true
+      subject.using_proxy?.should_not == true
     end
 
     ['http_proxy','HTTP_PROXY'].each do |var|
@@ -272,12 +319,12 @@ describe RHC::Config do
         # returns a generic class so we check to make sure it is not a
         # Net::HTTP class and rely on simplecov to make sure the proxy
         # code path was run
-        RHC::Config.using_proxy?.should == true
+        subject.using_proxy?.should == true
       end
     end
 
     context "it should have the correct values" do
-      let(:vars){ RHC::Config.proxy_vars }
+      let(:vars){ subject.proxy_vars }
       before do
         ENV['http_proxy'] = "my_user:my_pass@fakeproxy.foo:8080"
       end
@@ -300,20 +347,20 @@ describe RHC::Config do
       ConfigHelper.write_out_config(ConfigHelper.global_config_path,
                                     "global.openshift.redhat.com",
                                     "global@redhat.com")
-      RHC::Config.initialize
+      subject.initialize
       RHC::Vendor::ParseConfig.stub(:new) { raise Errno::EACCES.new("Fake can't read file") }
-      RHC::Config.stub(:exit) { |code| code }
+      subject.stub(:exit) { |code| code }
 
-      expect { RHC::Config.check_cpath({"config" => "fake.conf"}) }.to raise_error(Errno::EACCES)
+      expect { subject.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")
 
-      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)
+      expect { subject.read_config_files }.to raise_error(Errno::EACCES)
+      expect { subject.set_local_config("fake.conf") }.to raise_error(Errno::EACCES)
+      expect { subject.set_opts_config("fake.conf") }.to raise_error(Errno::EACCES)
     end
   end
 end
@@ -338,7 +385,7 @@ class ConfigHelper
   def self.check_legacy_debug(opts)
     # this simulates how the old rhc code checked for debug
     # in the future this should all be filtered through the Config module
-    # and an app should just have to use RHC::Config.debug?
+    # and an app should just have to use subject.debug?
     debug = RHC::Config['debug'] == 'false' ? nil : RHC::Config['debug']
     debug = true if opts.has_key? 'debug'
     debug