rhc 1.25.3 → 1.26.9

data/spec/rhc/commands/setup_spec.rb

@@ -10,6 +10,7 @@ describe RHC::Commands::Setup do
   before{ described_class.send(:public, *described_class.protected_instance_methods) }
   before{ FakeFS::FileSystem.clear }
   before{ RHC::Config.stub(:home_dir).and_return('/home/mock_user') }
+  before{ RHC::Servers.any_instance.stub(:load) }
 
   describe '#run' do
     it{ expects_running('setup').should call(:run).on(instance).with(no_args) }

data/spec/rhc/servers_spec.rb

@@ -0,0 +1,191 @@
+require 'net/http'
+require 'spec_helper'
+require 'rhc/config'
+require 'rhc/servers'
+
+describe RHC::Servers do
+  before do
+    FakeFS.activate!
+    FakeFS::FileSystem.clear
+  end
+
+  after do
+    FakeFS.deactivate!
+  end
+
+  describe "servers class" do
+    subject do
+      RHC::Servers.new.tap do |s|
+        s.stub(:path).and_return('/home/mock_user/servers.yml')
+        s.stub(:load)
+        s.instance_variable_set(:@servers, [
+          RHC::Server.new(
+            'openshift.server.com',
+            :nickname => 'online',
+            :login => 'user1',
+            :use_authorization_tokens => true,
+            :insecure => false)
+        ])
+      end
+    end
+
+    context "when finding server" do
+      it "should find by nickname or hostname" do
+        subject.send(:exists?, 'online').should be_true
+        subject.send(:exists?, 'whatever').should be_false
+        subject.send(:hostname_exists?, 'online').should be_false
+        subject.send(:hostname_exists?, 'openshift.server.com').should be_true
+        subject.send(:nickname_exists?, 'online').should be_true
+        subject.send(:nickname_exists?, 'openshift.server.com').should be_false
+        subject.send(:exists?, 'online').hostname.should == 'openshift.server.com'
+        subject.send(:exists?, 'openshift.server.com').nickname.should == 'online'
+        subject.send(:exists?, 'online').insecure.should == false
+        subject.send(:exists?, 'online').use_authorization_tokens.should == true
+        subject.find('online').should be_true
+        subject.find('openshift.server.com').should be_true
+        expect { subject.find('whatever') }.to raise_exception(RHC::ServerNotConfiguredException)
+      end
+    end
+
+    context "when adding a new server" do
+      before{ subject.add('another.server.com', :nickname => 'another', :login => 'user2', :use_authorization_tokens => false, :insecure => true) }
+      it { subject.instance_variable_get(:@servers).length.should == 2 }
+      it { subject.find('another').should be_true }
+      it { subject.find('another.server.com').should be_true }
+      it { subject.find('another').login.should == 'user2' }
+      it { subject.find('another').insecure.should == true }
+      it { subject.find('another').use_authorization_tokens.should == false }
+    end
+
+    context "when suggesting a nickname for unknown server" do
+      before{ subject.add('another.server.com') }
+      it { subject.find('server1').should be_true }
+      it { subject.find('another.server.com').should be_true }
+      it { subject.find('another.server.com').nickname.should == 'server1' }
+    end
+
+    context "when suggesting a nickname for an openshift subdomain" do
+      before{ subject.add('some.openshift.redhat.com') }
+      it { subject.find('some').should be_true }
+      it { subject.find('some.openshift.redhat.com').should be_true }
+      it { subject.find('some.openshift.redhat.com').nickname.should == 'some' }
+    end
+
+    context "when adding a new server with port and http scheme" do
+      before{ subject.add('http://another.server.com:4000', :nickname => 'another', :login => 'user2') }
+      it { subject.instance_variable_get(:@servers).length.should == 2 }
+      it { subject.find('another').should be_true }
+      it { subject.find('http://another.server.com:4000').should be_true }
+      it { subject.find('another').login.should == 'user2' }
+      it { expect { subject.find('another.server.com').to raise_exception(RHC::ServerNotConfiguredException) } }
+      it { expect { subject.find('https://another.server.com:4000').to raise_exception(RHC::ServerNotConfiguredException) } }
+      it { expect { subject.find('http://another.server.com').to raise_exception(RHC::ServerNotConfiguredException) } }
+    end
+
+    context "when adding an existing server" do
+      it "should error accordingly" do
+        expect { subject.add('openshift.server.com') }.to raise_exception(RHC::ServerHostnameExistsException)
+        expect { subject.add('openshift.server.com', :nickname => 'another') }.to raise_exception(RHC::ServerHostnameExistsException)
+        expect { subject.add('third.server.com', :nickname => 'online') }.to raise_exception(RHC::ServerNicknameExistsException)
+      end
+    end
+
+    context "when updating an existing server" do
+      before{ subject.update('online', :hostname => 'openshift2.server.com', :nickname => 'online2', :login => 'user2', :use_authorization_tokens => false, :insecure => true) }
+      it { subject.list.length.should == 1 }
+      it { subject.find('online2').hostname.should == 'openshift2.server.com' }
+      it { subject.find('online2').nickname.should == 'online2' }
+      it { subject.find('online2').login.should == 'user2' }
+      it { subject.find('online2').insecure.should == true }
+      it { subject.find('online2').use_authorization_tokens.should == false }
+      it { expect { subject.find('online') }.to raise_exception(RHC::ServerNotConfiguredException) }
+    end
+
+    context "when adding or updating a server" do
+      before{ subject.add_or_update('openshift.server.com', :nickname => 'online2', :login => 'user2', :use_authorization_tokens => false, :insecure => true) }
+      it { subject.list.length.should == 1 }
+      it { subject.find('openshift.server.com').hostname.should == 'openshift.server.com' }
+      it { subject.find('openshift.server.com').nickname.should == 'online2' }
+      it { subject.find('openshift.server.com').login.should == 'user2' }
+      it { subject.find('openshift.server.com').insecure.should == true }
+      it { subject.find('openshift.server.com').use_authorization_tokens.should == false }
+      it { expect { subject.find('online') }.to raise_exception(RHC::ServerNotConfiguredException) }
+    end
+
+    context "when removing an existing server" do
+      before{ subject.remove('online') }
+      it { subject.list.length.should == 0 }
+      it { expect { subject.find('online') }.to raise_exception(RHC::ServerNotConfiguredException) }
+    end
+
+    context "when finding the default server" do
+      it "should take the first if no default defined" do
+        subject.default.nickname.should == 'online'
+        subject.default.hostname.should == 'openshift.server.com'
+      end
+    end
+
+    context "when finding the default server" do
+      before do
+        s = subject.add('another.server.com', :nickname => 'another', :login => 'user2', :use_authorization_tokens => false, :insecure => true)
+        s.default = true
+      end
+      it "should take the one marked as default" do
+        subject.default.nickname.should == 'another'
+        subject.default.hostname.should == 'another.server.com'
+      end
+    end
+
+    context "when sync from config" do
+      before do
+        c = RHC::Config.new
+        c.instance_variable_set(:@opts, RHC::Vendor::ParseConfig.new.tap do |v|
+          v.add('libra_server', 'openshift.server.com')
+          v.add('default_rhlogin', 'user3')
+        end)
+        c.stub(:has_configs_from_files?).and_return(true)
+        subject.sync_from_config(c) 
+      end
+      it { subject.list.length.should == 1 }
+      it { subject.default.hostname.should == 'openshift.server.com' }
+      it { subject.default.login.should == 'user3' }
+    end
+  end
+
+  describe "server class" do
+    subject do
+      RHC::Server.from_yaml_hash({
+        'hostname' => 'https://foo.com/bar', 
+        'login' => 'user@foo.com', 
+        'use_authorization_tokens' => 'true', 
+        'insecure' => 'false'
+      }) 
+    end
+
+    context "when creating from yaml hash" do
+      it { subject.hostname.should == 'foo.com' }
+      it { subject.nickname.should == nil }
+      it { subject.login.should == 'user@foo.com' }
+      it { subject.use_authorization_tokens.should be_true }
+      it { subject.insecure.should be_false }
+    end
+
+    context "when checking server attributes" do
+      it { subject.designation.should == 'foo.com' }
+      it { subject.default?.should be_false }
+      it { subject.to_yaml_hash.should == { 'hostname' => 'foo.com', 'login' => 'user@foo.com', 'use_authorization_tokens' => true, 'insecure' => false } }      
+      it { subject.to_config.should be_a(RHC::Vendor::ParseConfig) }
+      it { subject.to_config['default_rhlogin'].should == 'user@foo.com' }
+      it { subject.to_config['libra_server'].should == 'foo.com' }
+      it { subject.to_s.should == 'foo.com' }
+    end
+
+    context "when openshift online" do
+      let(:server){ RHC::Server.from_yaml_hash({'hostname' => 'https://openshift.redhat.com', 'nickname' => 'online'}) }
+      it { server.hostname.should == 'openshift.redhat.com' }
+      it { server.nickname.should == 'online' }
+      it { server.designation.should == 'online' }
+      it { server.to_s.should == 'online (openshift.redhat.com)' }
+    end
+  end
+end

data/spec/rhc/wizard_spec.rb

@@ -3,6 +3,7 @@ require 'rest_spec_helper'
 require 'rhc/wizard'
 require 'rhc/vendor/parseconfig'
 require 'rhc/config'
+require 'rhc/servers'
 require 'ostruct'
 require 'rest_spec_helper'
 require 'wizard_spec_helper'
@@ -15,10 +16,12 @@ describe RHC::Wizard do
 
   def mock_config
     RHC::Config.stub(:home_dir).and_return('/home/mock_user')
+    RHC::Servers.stub(:home_dir).and_return('/home/mock_user')
   end
 
   let(:options){ (o = Commander::Command::Options.new).default(default_options); o }
   let(:config){ RHC::Config.new.tap{ |c| c.stub(:home_dir).and_return('/home/mock_user') } }
+  let(:servers){ RHC::Servers.new.tap{|c| c.stub(:home_dir).and_return('/home/mock_user') } }
   let(:default_options){ {} }
 
   describe "#finalize_stage" do
@@ -254,8 +257,8 @@ describe RHC::Wizard do
     #after{ FileUtils.rm_rf(@tmpdir) if @tmpdir }
     let(:home_dir){ '/home/mock_user' }#@tmpdir = Dir.mktmpdir }
     let(:config){ RHC::Config.new.tap{ |c| c.stub(:home_dir).and_return(home_dir) } }
-
     let(:options){ (o = Commander::Command::Options.new).default(default_options); o }
+    let(:servers){ RHC::Servers.new.tap{|c| c.stub(:home_dir).and_return(home_dir) } }
     let(:default_options){ {:server => mock_uri} }
     let(:username){ mock_user }
     let(:password){ 'password' }
@@ -282,6 +285,7 @@ describe RHC::Wizard do
 
       it "should execute the minimal path" do
         should_greet_user
+        should_configure_server(mock_uri)
         should_challenge_for(username, password)
         should_write_config
         should_create_an_ssh_keypair
@@ -297,6 +301,7 @@ describe RHC::Wizard do
         before{ subject.stub(:windows?).and_return(true) }
         it "should display windows info" do
           should_greet_user
+          should_configure_server(mock_uri)
           should_challenge_for(username, password)
           should_write_config
           should_create_an_ssh_keypair
@@ -320,6 +325,7 @@ describe RHC::Wizard do
         end
         it "should create the domain" do
           should_greet_user
+          should_configure_server(mock_uri)
           should_challenge_for(username, password)
           should_write_config
           should_create_an_ssh_keypair
@@ -335,6 +341,7 @@ describe RHC::Wizard do
         before{ stub_api_request(:get, 'broker/rest/user', :user => username, :password => 'invalid').to_return(:status => 401).times(1).to_return(simple_user(username)) }
         it "should prompt them again" do
           should_greet_user
+          should_configure_server(mock_uri)
 
           input_line username
           input_line 'invalid'
@@ -353,6 +360,7 @@ describe RHC::Wizard do
         before{ stub_one_key('a'); stub_update_key('a') }
         it "should prompt for the new key" do
           should_greet_user
+          should_configure_server(mock_uri)
           should_challenge_for(username, password)
           should_write_config
           should_create_an_ssh_keypair
@@ -378,6 +386,7 @@ describe RHC::Wizard do
         end
         it "should give the user a name the key" do
           should_greet_user
+          should_configure_server(mock_uri)
           should_challenge_for(username, password)
           should_write_config
           should_not_create_an_ssh_keypair
@@ -402,6 +411,7 @@ describe RHC::Wizard do
 
         it "should prompt for the new key" do
           should_greet_user
+          should_configure_server(mock_uri)
           should_challenge_for(username, password)
           should_write_config
           should_not_create_an_ssh_keypair
@@ -434,6 +444,7 @@ describe RHC::Wizard do
 
       it "should skip steps that have already been completed" do
         should_greet_user
+        should_configure_server(mock_uri)
         should_challenge_for(nil, password)
         should_write_config
         should_create_an_ssh_keypair
@@ -451,6 +462,7 @@ describe RHC::Wizard do
 
         it "should overwrite the config" do
           should_greet_user
+          should_configure_server(mock_uri)
           should_challenge_for(nil, password)
           should_overwrite_config
         end
@@ -548,6 +560,7 @@ describe RHC::Wizard do
 
       it "should match ssh key fallback fingerprint to net::ssh fingerprint" do
         # we need to write to a live file system so ssh-keygen can find it
+        RHC::Servers.any_instance.stub(:save!)
         FakeFS.deactivate!
         Dir.mktmpdir do |dir|
           setup_mock_ssh_keys(dir)
@@ -614,7 +627,7 @@ describe RHC::Wizard do
     attr_accessor :mock_user, :rest_client
     def initialize(*args)
       if args.empty?
-        args = [RHC::Config.new, Commander::Command::Options.new]
+        args = [RHC::Config.new, Commander::Command::Options.new, RHC::Servers.new]
         args[1].default(args[0].to_options)
       end
       super *args
@@ -746,6 +759,10 @@ EOF
   end
 end
 
+  class ServerWizardDriver < RHC::Wizard
+    include WizardDriver
+  end
+
 describe RHC::DomainWizard do
   context "with a rest client" do
     let(:rest_client){ double }

data/spec/spec_helper.rb

@@ -366,6 +366,7 @@ module ClassSpecHelpers
   def base_config(&block)
     config = RHC::Config.new
     config.stub(:load_config_files)
+    config.stub(:load_servers)
     defaults = config.instance_variable_get(:@defaults)
     yield config, defaults if block_given?
     RHC::Config.stub(:default).and_return(config)
@@ -390,6 +391,25 @@ module ClassSpecHelpers
     end
   end
 
+  def local_config
+    user = respond_to?(:local_config_username) ? self.local_config_username : 'test_user'
+    password = respond_to?(:local_config_password) ? self.local_config_password : 'test pass'
+    server = respond_to?(:local_config_server) ? self.local_config_server : nil
+
+    c = base_config
+
+    local_config = RHC::Vendor::ParseConfig.new
+    local_config.add('default_rhlogin', user) if user
+    local_config.add('password', password) if password
+    local_config.add('libra_server', server) if server
+    
+    c.instance_variable_set(:@local_config, local_config)
+    opts = c.to_options
+    opts[:rhlogin].should == user
+    opts[:password].should == password
+    opts[:server].should == server if server
+  end
+
   def expect_multi_ssh(command, hosts, check_error=false)
     require 'net/ssh/multi'
 

data/spec/wizard_spec_helper.rb

@@ -9,6 +9,19 @@ module WizardStepsHelper
     end
   end
 
+  def should_configure_server(server=nil)
+    server = 'openshift.redhat.com' if server.nil?
+    input_line server
+    next_stage.should_not be_nil
+
+    last_output do |s|
+      s.should match(/If you have your own OpenShift server, you can specify it now/)
+      s.should match(/Just hit enter to use: #{server}/)
+      s.should match(/Enter server address: |#{server}|/)
+      s.should match(/You can add more servers later using 'rhc server'/)
+    end
+  end
+
   def should_challenge_for(username, password)
     input_line username.to_s if username
     input_line password.to_s if password
@@ -34,10 +47,20 @@ module WizardStepsHelper
     last_output.should match("Saving configuration to #{current_config_path}")
 
     File.readable?(current_config_path).should be true
-    RHC::Vendor::ParseConfig.new(current_config_path).tap do |cp|
-      cp["default_rhlogin"].should == username
-      cp["libra_server"].should == mock_uri
-      cp["use_authorization_tokens"].should == 'false'
+
+    if present
+      RHC::Vendor::ParseConfig.new(current_config_path)["libra_server"].should == mock_uri
+      RHC::Servers.new.tap do |s|
+        s.list.length.should == 2
+        s.list.last.login.should == username
+        s.list.last.use_authorization_tokens.should be false
+      end
+    else
+      RHC::Vendor::ParseConfig.new(current_config_path).tap do |cp|
+        cp["default_rhlogin"].should == username
+        cp["libra_server"].should == mock_uri
+        cp["use_authorization_tokens"].should == 'false'
+      end
     end
   end
 
@@ -317,7 +340,7 @@ EOF
 default_rhlogin='a_different_user'
 
 # Server API
-libra_server = 'a_different_server.com'
+libra_server = 'a-different-server.com'
 EOF
     end
     path

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 109
   prerelease: 
   segments: 
   - 1
-  - 25
-  - 3
-  version: 1.25.3
+  - 26
+  - 9
+  version: 1.26.9
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-09 00:00:00 Z
+date: 2014-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -270,6 +270,7 @@ files:
 - lib/rhc/rest.rb
 - lib/rhc/autocomplete.rb
 - lib/rhc/git_helpers.rb
+- lib/rhc/servers.rb
 - lib/rhc/command_runner.rb
 - lib/rhc/context_helper.rb
 - lib/rhc/config.rb
@@ -302,6 +303,7 @@ files:
 - lib/rhc/commands.rb
 - lib/rhc/ssh_helpers.rb
 - lib/rhc/output_helpers.rb
+- lib/rhc/server_helpers.rb
 - lib/rhc/coverage_helper.rb
 - lib/rhc/help_formatter.rb
 - lib/rhc/rest/team.rb
@@ -359,6 +361,7 @@ files:
 - spec/rhc/rest_spec.rb
 - spec/rhc/targz_spec.rb
 - spec/rhc/wizard_spec.rb
+- spec/rhc/servers_spec.rb
 - spec/rhc/rest_client_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
 - spec/rhc/commands/apps_spec.rb
@@ -396,6 +399,7 @@ files:
 - spec/rhc/helpers_spec.rb
 - spec/rhc/rest_application_spec.rb
 - spec/rhc/command_spec.rb
+- features/server_feature.rb
 - features/members_feature.rb
 - features/assets/deploy.tar.gz
 - features/deployments_feature.rb
@@ -456,6 +460,7 @@ test_files:
 - spec/rhc/rest_spec.rb
 - spec/rhc/targz_spec.rb
 - spec/rhc/wizard_spec.rb
+- spec/rhc/servers_spec.rb
 - spec/rhc/rest_client_spec.rb
 - spec/rhc/commands/sshkey_spec.rb
 - spec/rhc/commands/apps_spec.rb
@@ -493,6 +498,7 @@ test_files:
 - spec/rhc/helpers_spec.rb
 - spec/rhc/rest_application_spec.rb
 - spec/rhc/command_spec.rb
+- features/server_feature.rb
 - features/members_feature.rb
 - features/assets/deploy.tar.gz
 - features/deployments_feature.rb