rhc 1.6.8 → 1.7.8

data/spec/rhc/rest_spec.rb

@@ -43,6 +43,7 @@ describe RHC::Rest::Domain do
 
     it{ domain.add_application('foo', :cartridges => ['bar']).should be_true }
     it{ expect{ domain.add_application('foo', :cartridges => ['bar', 'other']) }.to raise_error(RHC::Rest::MultipleCartridgeCreationNotSupported) }
+    it{ expect{ domain.add_application('foo', :initial_git_url => 'a_url') }.to raise_error(RHC::Rest::InitialGitUrlNotSupported) }
     it{ domain.add_application('foo', :cartridges => 'bar').should be_true }
     it{ domain.add_application('foo', :cartridge => 'bar').should be_true }
     it{ domain.add_application('foo', :cartridge => ['bar']).should be_true }
@@ -66,6 +67,15 @@ describe RHC::Rest::Domain do
       it{ domain.add_application('foo', :cartridges => cartridges).should be_true }
       it{ domain.add_application('foo', :cartridge => cartridges).should be_true }
     end
+
+    context "with a url" do
+      before do
+        stub_api_request(:post, 'broker/rest/domains/bar/applications', false).
+          with(:body => {:name => 'foo', :initial_git_url => 'a_url', :cartridges => []}.to_json).
+          to_return(:status => 201, :body => {:type => 'application', :data => {:id => '1'}}.to_json)
+      end
+      it{ domain.add_application('foo', :initial_git_url => 'a_url').should be_true }
+    end    
   end
 end
 

data/spec/rhc/wizard_spec.rb

@@ -53,7 +53,7 @@ describe RHC::Wizard do
         mock_config
         FileUtils.mkdir_p(RHC::Config.ssh_dir)
         File.open(RHC::Config.ssh_priv_key_file_path, 'w'){}
-        File.chmod(0666, RHC::Config.ssh_priv_key_file_path)
+        File.expect_mode(RHC::Config.ssh_priv_key_file_path, 0666)
         expect{ subject.send(:test_private_key_mode) }.to raise_error(StandardError)
       end
     end
@@ -97,13 +97,14 @@ describe RHC::Wizard do
     let(:password){ 'test pass' }
     let(:rest_client){ stub }
     let(:auth){ subject.send(:auth) }
+    let(:user_obj){ stub(:login => user) }
 
     subject{ described_class.new(config, options) }
 
     def expect_client_test(with_sessions=false)
       subject.should_receive(:new_client_for_options).ordered.and_return(rest_client)
       rest_client.should_receive(:api).ordered
-      rest_client.should_receive(:user).ordered.and_return(true)
+      rest_client.should_receive(:user).ordered.and_return(user_obj)
       rest_client.should_receive(:supports_sessions?).ordered.and_return(with_sessions)
     end
     def expect_raise_from_api(error)
@@ -114,6 +115,7 @@ describe RHC::Wizard do
     it "should prompt for user and password" do
       expect_client_test
       subject.send(:login_stage).should be_true
+      subject.send(:options).rhlogin.should == user
     end
 
     context "with token" do
@@ -181,6 +183,7 @@ describe RHC::Wizard do
         before{ RHC::Auth::TokenStore.should_receive(:new).any_number_of_times.and_return(store) }
 
         it "should not generate a token if the user does not request it" do
+          store.should_receive(:get).and_return(nil)
           subject.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
           subject.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(false)
 
@@ -189,6 +192,7 @@ describe RHC::Wizard do
         end
 
         it "should generate a token if the user requests it" do
+          store.should_receive(:get).and_return(nil)
           subject.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
           subject.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(true)
           subject.should_receive(:say).with(/Generating an authorization token for this client /).ordered
@@ -278,7 +282,7 @@ describe RHC::Wizard do
 
       context "when the user enters a domain and uploads a key" do
         before do
-          stub_create_default_key
+          stub_add_key
           stub_api_request(:post, 'broker/rest/domains', user_auth).
             with(:body => /(thisnamespaceistoobig|invalidnamespace)/).
             to_return({
@@ -340,6 +344,33 @@ describe RHC::Wizard do
         end
       end
 
+      context "when a multiple keys exist but is not the same" do
+        before{ setup_mock_ssh(true) }
+        before do 
+          stub_one_key('a_key')
+          stub_add_key_error('invalid```--', 'Invalid key name')
+          stub_add_key('another_key')
+        end
+        it "should give the user a name the key" do
+          should_greet_user
+          should_challenge_for(username, password)
+          should_write_config
+          should_not_create_an_ssh_keypair
+
+          input_line 'yes'
+          input_line 'invalid```--'
+          input_line 'another_key'
+          next_stage
+
+          last_output do |s|
+            s.should match(/a_key \(type: ssh-rsa\)/)
+            s.should match("Fingerprint: #{rsa_key_fingerprint_public}")
+            s.should match(" name |a_key|")
+            s.should match("Invalid key name")
+            s.should match("Uploading key 'another_key'")
+          end
+        end
+      end
       context "when the default key already exists on the server" do
         before{ setup_mock_ssh(true) }
         before{ stub_mock_ssh_keys }
@@ -362,7 +393,7 @@ describe RHC::Wizard do
         stub_api(:user => username)
         stub_user
         stub_no_keys
-        stub_create_default_key
+        stub_add_key
         stub_api_request(:post, 'broker/rest/domains', user_auth).
           with(:body => /(thisnamespaceistoobig|invalidnamespace)/).
           to_return({
@@ -414,7 +445,7 @@ describe RHC::Wizard do
 
       context "with no server keys" do
         before{ stub_no_keys }
-        before{ stub_create_default_key }
+        before{ stub_add_key }
 
         it "should generate and upload keys since the user does not have them" do
           input_line "yes"
@@ -451,44 +482,45 @@ describe RHC::Wizard do
       let(:wizard){ RerunWizardDriver.new }
 
       it "should cause ssh_key_upload? to catch NoMethodError and call the fallback to get the fingerprint" do
-        Net::SSH::KeyFactory.stub(:load_public_key) { raise NoMethodError }
-        @fallback_run = false
-        wizard.stub(:ssh_keygen_fallback) { @fallback_run = true }
-        key_data = wizard.get_mock_key_data
-        @rest_client.stub(:sshkeys) { key_data }
+        Net::SSH::KeyFactory.should_receive(:load_public_key).exactly(4).times.and_raise(NoMethodError)
+        wizard.should_receive(:ssh_keygen_fallback).exactly(4).times
+        wizard.should_receive(:ssh_keys).at_least(1).times.and_return(wizard.get_mock_key_data)
 
         wizard.send(:ssh_key_uploaded?)
-
-        @fallback_run.should be_true
       end
 
       it "should cause upload_ssh_key to catch NoMethodError and call the fallback to get the fingerprint" do
-        wizard.ssh_keys = wizard.get_mock_key_data
-        @fallback_run = false
-        wizard.stub(:ssh_keygen_fallback) do
-          @fallback_run = true
-          [OpenStruct.new( :name => 'default', :fingerprint => 'AA:BB:CC:DD:EE:FF', :type => 'ssh-rsa' )]
-        end
-        $?.stub(:exitstatus) { 255 }
-        Net::SSH::KeyFactory.stub(:load_public_key) { raise NoMethodError }
+        Net::SSH::KeyFactory.should_receive(:load_public_key).exactly(5).times.and_raise(NoMethodError)
+        wizard.stub(:ssh_keys).at_least(1).times.and_return(wizard.get_mock_key_data)
+        wizard.should_receive(:ssh_keygen_fallback).exactly(5).times.and_return(stub(:name => 'default', :fingerprint => 'AA:BB:CC:DD:EE:FF', :type => 'ssh-rsa' ))
 
-        wizard.send(:upload_ssh_key).should be_false
+        input_line 'y'
 
-        output = last_output
-        output.should match("Your ssh public key at .* is invalid or unreadable\.")
-        @fallback_run.should be_true
+        wizard.send(:upload_ssh_key_stage).should be_false
+
+        last_output.should match("Your ssh public key at .* is invalid or unreadable\.")
       end
 
       it "should cause upload_ssh_key to catch NotImplementedError and return false" do
-        wizard.ssh_keys = wizard.get_mock_key_data
-        Net::SSH::KeyFactory.stub(:load_public_key) { raise NotImplementedError }
+        Net::SSH::KeyFactory.should_receive(:load_public_key).exactly(5).times.and_raise(NoMethodError)
+        wizard.should_receive(:ssh_keys).at_least(1).times.and_return(wizard.get_mock_key_data)
+
+        input_line 'y'
 
-        wizard.send(:upload_ssh_key).should be_false
+        wizard.send(:upload_ssh_key_stage).should be_false
 
         output = last_output
         output.should match("Your ssh public key at .* is invalid or unreadable\.")
       end
 
+      it "should find a unique name" do
+        wizard.should_receive(:ssh_keys).at_least(1).times.and_return(wizard.get_mock_key_data)
+
+        wizard.send(:find_unique_key_name, 'cb490595').should == 'cb4905951'
+        wizard.send(:find_unique_key_name, 'default').should == 'default1'
+        wizard.send(:find_unique_key_name, 'abc').should == 'abc'
+      end
+
       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
         FakeFS.deactivate!
@@ -521,12 +553,11 @@ describe RHC::Wizard do
           key_name = 'default'
           key_data = wizard.get_mock_key_data
           wizard.ssh_keys = key_data
-          wizard.stub(:get_preferred_key_name) { key_name }
           wizard.stub(:ssh_key_triple_for_default_key) { pub_key.chomp.split }
           wizard.stub(:fingerprint_for_default_key) { "" } # this value is irrelevant
-          wizard.rest_client.stub(:find_key) { key_data.detect { |k| k.name == key_name } }
+          wizard.rest_client = stub('RestClient').tap{ |o| o.stub(:find_key) { key_data.detect { |k| k.name == key_name } } }
 
-          wizard.send(:upload_ssh_key)
+          wizard.send(:upload_ssh_key, key_name)
           output = last_output
           output.should match 'Updating'
         end
@@ -540,9 +571,9 @@ describe RHC::Wizard do
           wizard.ssh_keys = key_data
           wizard.stub(:ssh_key_triple_for_default_key) { pub_key.chomp.split }
           wizard.stub(:fingerprint_for_default_key) { "" } # this value is irrelevant
-          wizard.rest_client.stub(:add_key) { true }
+          wizard.rest_client = stub('RestClient').tap{ |o| o.stub(:add_key) { true } }
 
-          wizard.send(:upload_ssh_key)
+          wizard.send(:upload_ssh_key, "other")
           output = last_output
           # since the clashing key name is short, we expect to present
           # a key name with "1" attached to it.
@@ -689,3 +720,12 @@ EOF
     end
   end
 end
+
+describe RHC::DomainWizard do
+  context "with a rest client" do
+    let(:rest_client){ stub }
+    it{ described_class.new(nil, nil, rest_client).rest_client.should == rest_client }
+    it{ subject.stages == [:config_namespace_stage] }
+    it{ expect{ described_class.new(nil, nil, rest_client).send(:config_namespace, '') }.to call(:add_domain).on(rest_client).and_stop }
+  end
+end

data/spec/spec_helper.rb

@@ -75,6 +75,50 @@ end
 
 require 'rhc/cli'
 
+class MockHighLineTerminal < HighLineExtension
+  def self.use_color?
+    true
+  end
+
+  def initialize(input=StringIO.new, output=StringIO.new)
+    super
+    @last_read_pos = 0
+  end
+
+  ##
+  # read
+  #
+  # seeks to the last read in the IO stream and reads
+  # the data from that position so we don't repeat
+  # reads or get empty data due to writes moving
+  # the caret to the end of the stream
+  def read
+    @output.seek(@last_read_pos)
+    result = @output.read
+    @last_read_pos = @output.pos
+    result
+  end
+
+  ##
+  # write_line
+  #
+  # writes a line of data to the end of the
+  # input stream appending a newline so
+  # highline knows to stop processing and then
+  # resets the caret position to the last read
+  def write_line(str)
+    reset_pos = @input.pos
+    # seek end so we don't overwrite anything
+    @input.seek(0, IO::SEEK_END)
+    result = @input.write "#{str}\n"
+    @input.seek(reset_pos)
+    result
+  end
+  def close_write
+    @input.close_write
+  end
+end
+
 include WebMock::API
 
 def stderr
@@ -134,14 +178,14 @@ module CommandHelpers
   # let(:arguments){ [<arguments>] }
   #
 
-  def run_command
+  def run_command(args=arguments)
     mock_terminal
     input.each { |i| $terminal.write_line(i) } if respond_to?(:input)
     $terminal.close_write
-    run!(*arguments)
+    run!(*args)
   end
-  def command_output
-    run_command
+  def command_output(args=arguments)
+    run_command(args)
   rescue SystemExit => e
     "#{@output.string}\n#{$stderr.string}#{e}"
   else
@@ -178,7 +222,7 @@ module ClassSpecHelpers
     if obj
       Object.const_set(const_for, obj)
     else
-      "#{description}".split(" ").map{|word| word.capitalize}.join.gsub(/[^\w]/, '')
+      "#{example.full_description}".split(" ").map{|word| word.capitalize}.join.gsub(/[^\w]/, '')
     end
   end
 
@@ -206,51 +250,6 @@ module ClassSpecHelpers
     Commander::Runner.instance
   end
 
-  class MockHighLineTerminal < HighLine
-
-    def self.use_color?
-      true
-    end
-
-    def initialize(input, output)
-      super
-      @last_read_pos = 0
-    end
-
-    ##
-    # read
-    #
-    # seeks to the last read in the IO stream and reads
-    # the data from that position so we don't repeat
-    # reads or get empty data due to writes moving
-    # the caret to the end of the stream
-    def read
-      @output.seek(@last_read_pos)
-      result = @output.read
-      @last_read_pos = @output.pos
-      result
-    end
-
-    ##
-    # write_line
-    #
-    # writes a line of data to the end of the
-    # input stream appending a newline so
-    # highline knows to stop processing and then
-    # resets the caret position to the last read
-    def write_line(str)
-      reset_pos = @input.pos
-      # seek end so we don't overwrite anything
-      @input.seek(0, IO::SEEK_END)
-      result = @input.write "#{str}\n"
-      @input.seek(reset_pos)
-      result
-    end
-    def close_write
-      @input.close_write
-    end
-  end
-
   def mock_terminal
     @input = StringIO.new
     @output = StringIO.new
@@ -342,7 +341,7 @@ module ClassSpecHelpers
 end
 
 module ExitCodeMatchers
-  Spec::Matchers.define :exit_with_code do |code|
+  RSpec::Matchers.define :exit_with_code do |code|
     actual = nil
     match do |block|
       begin
@@ -366,20 +365,28 @@ module ExitCodeMatchers
 end
 
 module CommanderInvocationMatchers
-  Spec::Matchers.define :call do |method|
+  InvocationMatch = Class.new(RuntimeError)
+
+  RSpec::Matchers.define :call do |method|
     chain :on do |object|
       @object = object
     end
-    chain :with do |args|
+    chain :with do |*args|
       @args = args
     end
+    chain :and_stop do
+      @stop = true
+    end
 
     match do |block|
       e = @object.should_receive(method)
-      e.with(@args) if @args
+      e.and_raise(InvocationMatch) if @stop
+      e.with(*@args) if @args
       begin
         block.call
         true
+      rescue InvocationMatch => e
+        true
       rescue SystemExit => e
         false
       end
@@ -388,6 +395,29 @@ module CommanderInvocationMatchers
       "expect block to invoke '#{method}' on #{@object} with #{@args}"
     end
   end
+
+  RSpec::Matchers.define :not_call do |method|
+    chain :on do |object|
+      @object = object
+    end
+    chain :with do |*args|
+      @args = args
+    end
+
+    match do |block|
+      e = @object.should_not_receive(method)
+      e.with(*@args) if @args
+      begin
+        block.call
+        true
+      rescue SystemExit => e
+        false
+      end
+    end
+    description do
+      "expect block to invoke '#{method}' on #{@object} with #{@args}"
+    end
+  end  
 end
 
 module ColorMatchers
@@ -399,7 +429,7 @@ module ColorMatchers
     :clear => 0
   }
 
-  Spec::Matchers.define :be_colorized do |msg,color|
+  RSpec::Matchers.define :be_colorized do |msg,color|
     match do |actual|
       actual == colorized_message(msg,color)
     end
@@ -436,7 +466,7 @@ def mac?
   RbConfig::CONFIG['host_os'] =~ /^darwin/
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(ExitCodeMatchers)
   config.include(CommanderInvocationMatchers)
   config.include(ColorMatchers)