rhc 1.8.9 → 1.9.6

data/bin/rhc

@@ -12,6 +12,8 @@ def get_args
 end
 
 begin
+  Signal.trap("PIPE", "EXIT") if Signal.list["PIPE"]
+  
   retcode = begin
     require 'rhc/cli'
     RHC::CLI.set_terminal

data/lib/rhc.rb

@@ -1,5 +1,4 @@
 # require 'rhc/version' #FIXME gem should know version
-# FIXME Remove rubygems from requirements, ensure library is correct
 
 # Only require external gem dependencies here
 require 'logger'

data/lib/rhc/command_runner.rb

@@ -22,6 +22,15 @@ module RHC
       false
     end
 
+    def options_parse_debug
+      if @args.include?("-d") or @args.include?("--debug")
+        @args.delete "-d"
+        @args.delete "--debug"
+        return true
+      end
+      false
+    end
+
     def options_parse_version
       if @args.include? "--version"
         say version
@@ -43,18 +52,12 @@ module RHC
     def run!
       trace = false
       require_program :version, :description
-      #trap('INT') { abort program(:int_message) } if program(:int_message)
-      #trap('INT') { program(:int_block).call } if program(:int_block)
 
       global_option('-h', '--help', 'Help on any command', :hide => true)
       global_option('--version', 'Display version information', :hide => true)
 
-      # remove these because we monkey patch Commands to process all options
-      # at once, avoiding conflicts between the global and command options
-      # code left here just in case someone compares this with the original
-      # commander code
-      #parse_global_options
-      #remove_global_options options, @args
+      # special case --debug so all commands can output relevant info on it
+      $terminal.debug = options_parse_debug
 
       # special case --trace because we need to use it in the runner
       trace = options_parse_trace

data/lib/rhc/commands.rb

@@ -46,6 +46,7 @@ module Commander
       begin
         @config = RHC::Config.new
         @config.use_config(config_path) if config_path
+        $terminal.debug("Using config file #{@config.config_path}")
 
         unless clean
           @config.to_options.each_pair do |key, value|

data/lib/rhc/commands/base.rb

@@ -51,10 +51,6 @@ class RHC::Commands::Base
       raise ArgumentError, "Please specify an action to take"
     end
 
-    def debug?
-      @options.debug
-    end
-
     class InvalidCommand < StandardError ; end
 
     def self.inherited(klass)

data/lib/rhc/commands/port_forward.rb

@@ -85,7 +85,9 @@ module RHC::Commands
         say "Checking available ports ... "
 
         Net::SSH.start(ssh_uri.host, ssh_uri.user) do |ssh|
-          ssh.exec! "rhc-list-ports" do |channel, stream, data|
+          # If a specific gear is targeted, do not include remote (e.g. database) ports
+          list_ports_cmd = "rhc-list-ports#{options.gear ? ' --exclude-remote' : ''}"
+          ssh.exec! list_ports_cmd do |channel, stream, data|
             if stream == :stderr
               data.each_line do |line|
                 line.chomp!

data/lib/rhc/config.rb

@@ -5,7 +5,7 @@ module RHC
 
   module ConfigEnv
     def conf_name
-      'express.conf'
+      "#{ENV['OPENSHIFT_CONFIG'].presence || 'express'}.conf"
     end
     def home_conf_dir
       File.join(home_dir, '.openshift')

data/lib/rhc/helpers.rb

@@ -198,14 +198,14 @@ module RHC
       $stdout.tty? and not options.noprompt
     end
 
-    def debug(msg)
-      $stderr.puts "DEBUG: #{msg}" if debug?
+    def debug(*args)
+      $terminal.debug(*args)
     end
-    def debug_error(e)
-      debug "#{e.message} (#{e.class})\n  #{e.backtrace.join("\n  ")}"
+    def debug_error(*args)
+      $terminal.debug_error(*args)
     end
     def debug?
-      false
+      $terminal.debug?
     end
 
     def disable_deprecated?
@@ -295,6 +295,7 @@ module RHC
         :connection_info => "Connection URL",
         :gear_profile   => "Gear Size",
         :visible_to_ssh? => 'Available',
+        :downloaded_cartridge_url => 'From',
       })
 
       headings[value]

data/lib/rhc/highline_extensions.rb

@@ -4,6 +4,8 @@ require 'delegate'
 # Add specific improved functionality
 #
 class HighLineExtension < HighLine
+  attr_writer :debug
+
   [:ask, :agree].each do |sym|
     define_method(sym) do |*args, &block|
       separate_blocks
@@ -13,6 +15,16 @@ class HighLineExtension < HighLine
     end
   end
 
+  def debug(msg)
+    $stderr.puts "DEBUG: #{msg}" if debug?
+  end
+  def debug_error(e)
+    debug "#{e.message} (#{e.class})\n  #{e.backtrace.join("\n  ")}"
+  end
+  def debug?
+    @debug
+  end
+
   # OVERRIDE
   def say(msg)
     if msg.respond_to? :to_str
@@ -392,19 +404,28 @@ class HighLine::Table
 
     def header_rows
       @header_rows ||= begin
-        headers << column_widths.map{ |w| '-' * (w.set > 0 ? w.set : w.max) } if headers.present?
+        headers << widths.map{ |w| '-' * w } if headers.present?
         headers
       end
     end
 
     def rows
       @rows ||= begin
-        fmt = "#{indent}#{widths.zip(align).map{ |w, al| "%#{al == :right ? '' : '-'}#{w}s" }.join(joiner)}"
-          
         body = (header_rows + source_rows).inject([]) do |a,row| 
           row = row.zip(widths).map{ |column,w| w && w > 0 ? column.textwrap_ansi(w, false) : [column] }
           (row.map(&:length).max || 0).times do |i|
-            a << (fmt % row.map{ |r| r[i] }).rstrip
+            s = []
+            row.each_with_index do |lines, j|
+              cell = lines[i]
+              l = cell ? cell.strip_ansi.length : 0
+              s << 
+                  if align[j] == :right 
+                    "#{' '*(widths[j]-l) if l < widths[j]}#{cell}"
+                  else
+                    "#{cell}#{' '*(widths[j]-l) if l < widths[j]}"
+                  end
+            end
+            a << "#{indent}#{s.join(joiner).rstrip}"
           end
           a
         end

data/lib/rhc/output_helpers.rb

@@ -90,6 +90,7 @@ module RHC
       say format_table \
         format_cart_header(cart),
         get_properties(cart, *properties).
+          concat([[:downloaded_cartridge_url, cart.url]]).
           concat([[cart.scalable? ? :scaling : :gears, format_cart_gears(cart)]]).
           concat(cart.properties.map{ |p| ["#{table_heading(p['name'])}:", p['value']] }.sort{ |a,b| a[0] <=> b[0] }),
         :delete => true

data/lib/rhc/rest.rb

@@ -113,6 +113,8 @@ module RHC
 
     class MultipleCartridgeCreationNotSupported < Exception; end
 
+    class DownloadingCartridgesNotSupported < Exception; end
+
     class InitialGitUrlNotSupported < Exception; end
 
     class SslCertificatesNotSupported < Exception; end

data/lib/rhc/rest/alias.rb

@@ -10,30 +10,24 @@ module RHC
 
       def destroy
         debug "Deleting alias #{self.id}"
-        rest_method "DELETE"
+        rest_method :delete
       end
       alias :delete :destroy
 
       def add_certificate(ssl_certificate_content, private_key_content, pass_phrase)
         debug "Running add_certificate for alias #{@id}"
-        if (client.api_version_negotiated >= 1.4)
-          foo = rest_method "UPDATE", {
-            :ssl_certificate => ssl_certificate_content, 
-            :private_key => private_key_content, 
-            :pass_phrase => pass_phrase
-          }
-        else
-          raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases."
-        end
+        raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases." unless supports? :update
+        foo = rest_method :update, {
+          :ssl_certificate => ssl_certificate_content, 
+          :private_key => private_key_content, 
+          :pass_phrase => pass_phrase
+        }
       end
 
       def delete_certificate
         debug "Running delete_certificate for alias #{@id}"
-        if (client.api_version_negotiated >= 1.4)
-          rest_method "UPDATE", {}
-        else
-          raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases."
-        end
+        raise RHC::Rest::SslCertificatesNotSupported, "The server does not support SSL certificates for custom aliases." unless supports? :update
+        rest_method :update, {}
       end
 
       def <=>(a)

data/lib/rhc/rest/application.rb

@@ -24,25 +24,32 @@ module RHC
       def add_cartridge(cart, options={})
         debug "Adding cartridge #{name}"
         clear_attribute :cartridges
-        rest_method(
-          "ADD_CARTRIDGE",
+        cart = 
           if cart.is_a? String 
             {:name => cart}
           elsif cart.respond_to? :[]
             cart
           else
             cart.url ? {:url => cart.url} : {:name => cart.name}
-          end,
+          end
+
+        if cart.respond_to?(:[]) and cart[:url] and !has_param?('ADD_CARTRIDGE', 'url')
+          raise RHC::Rest::DownloadingCartridgesNotSupported, "The server does not support downloading cartridges."
+        end
+
+        rest_method(
+          "ADD_CARTRIDGE",
+          cart,
           options
         )
       end
 
       def cartridges
-        debug "Getting all cartridges for application #{name}"
         @cartridges ||=
           unless (carts = attributes['cartridges']).nil?
             carts.map{|x| Cartridge.new(x, client) }
           else
+            debug "Getting all cartridges for application #{name}"
             rest_method "LIST_CARTRIDGES"
           end
       end

data/lib/rhc/rest/base.rb

@@ -17,7 +17,7 @@ module RHC
       end
 
       def rest_method(link_name, payload={}, options={})
-        link = links[link_name.to_s]
+        link = link(link_name)
         raise "No link defined for #{link_name}" unless link
         url = link['href']
         url = url.gsub(/:\w+/) { |s| options[:params][s] } if options[:params]
@@ -35,12 +35,22 @@ module RHC
       end
 
       def supports?(sym)
-        !!(links[sym.to_s] || links[sym.to_s.upcase])
+        !!link(sym)
+      end
+
+      def has_param?(sym, name)
+        if l = link(sym)
+          (l['required_params'] || []).any?{ |p| p['name'] == name} or (l['optional_params'] || []).any?{ |p| p['name'] == name}
+        end
       end
 
       protected
         attr_reader :client
 
+        def link(sym)
+          (links[sym.to_s] || links[sym.to_s.upcase])
+        end
+
         def debug(msg, obj=nil)
           client.debug("#{msg}#{obj ? " #{obj}" : ''}") if client && client.debug?
         end

data/lib/rhc/rest/cartridge.rb

@@ -3,7 +3,9 @@ module RHC
     class Cartridge < Base
       HIDDEN_TAGS = [:framework, :web_framework, :cartridge].map(&:to_s)
 
-      define_attr :type, :name, :display_name, :properties, :gear_profile, :status_messages, :scales_to, :scales_from, :scales_with, :current_scale, :supported_scales_to, :supported_scales_from, :tags, :description, :collocated_with, :base_gear_storage, :additional_gear_storage, :url
+      define_attr :type, :name, :display_name, :properties, :gear_profile, :status_messages, :scales_to, :scales_from, :scales_with, 
+                  :current_scale, :supported_scales_to, :supported_scales_from, :tags, :description, :collocated_with, :base_gear_storage, 
+                  :additional_gear_storage, :url
 
       def scalable?
         supported_scales_to != supported_scales_from

data/lib/rhc/rest/client.rb

@@ -36,26 +36,10 @@ module RHC
         @user ||= api.rest_method "GET_USER"
       end
 
-      def sshkeys
-        debug "Finding all keys for #{user.login}"
-        user.keys
-      end
-
-      def add_key(name, key, content)
-        debug "Adding key #{key} for #{user.login}"
-        user.add_key name, key, content
-      end
-
-      def delete_key(name)
-        debug "Deleting key '#{name}'"
-        key = find_key(name)
-        key.destroy
-      end
-
       #Find Domain by namesapce
       def find_domain(id)
         debug "Finding domain #{id}"
-        domains.each { |domain| return domain if domain.id == id }
+        domains.each { |domain| return domain if domain.id.downcase == id.downcase }
 
         raise DomainNotFoundException.new("Domain #{id} not found")
       end
@@ -120,17 +104,17 @@ module RHC
       end
 
       def sshkeys
-        logger.debug "Finding all keys for #{user.login}" if @mydebug
+        debug "Finding all keys for #{user.login}"
         user.keys
       end
 
       def add_key(name, key, content)
-        logger.debug "Adding key #{key} for #{user.login}" if @mydebug
+        debug "Adding key #{key} for #{user.login}"
         user.add_key name, key, content
       end
 
       def delete_key(name)
-        logger.debug "Deleting key '#{name}'" if @mydebug
+        debug "Deleting key '#{name}'"
         key = find_key(name)
         key.destroy
       end
@@ -182,12 +166,6 @@ module RHC
           h
         end
       end
-
-      def logout
-        #TODO logout
-        debug "Logout/Close client"
-      end
-      alias :close :logout
     end
 
     class Client < Base
@@ -234,10 +212,6 @@ module RHC
         debug "Connecting to #{@end_point}"
       end
 
-      def debug?
-        @debug
-      end
-
       def url
         @end_point
       end
@@ -260,9 +234,9 @@ module RHC
             auth = options[:auth] || self.auth
             response = nil
 
-            debug "Request #{args[0].to_s.upcase} #{args[1]}#{"?#{args[2].map{|a| a.join('=')}.join(' ')}" if args[2] && args[0] == 'GET'}" if debug?
+            debug "Request #{args[0].to_s.upcase} #{args[1]}#{"?#{args[2].map{|a| a.join('=')}.join(' ')}" if args[2] && args[0] == 'GET'}"
             time = Benchmark.realtime{ response = client.request(*(args << true)) }
-            debug "   code %s %4i ms" % [response.status, (time*1000).to_i] if debug? && response
+            debug "   code %s %4i ms" % [response.status, (time*1000).to_i] if response
 
             next if retry_proxy(response, i, args, client)
             auth.retry_auth?(response, self) and next if auth
@@ -335,10 +309,7 @@ module RHC
           rescue RHC::Rest::Exception
             raise
           rescue => e
-            if debug?
-              logger.debug "#{e.message} (#{e.class})"
-              logger.debug e.backtrace.join("\n  ")
-            end
+            debug_error(e)
             raise ConnectionException.new("An unexpected error occured: #{e.message}").tap{ |n| n.set_backtrace(e.backtrace) }
           end
         end
@@ -389,9 +360,9 @@ module RHC
               cert = ctx.current_cert
               if cert && (cert.subject.cmp(cert.issuer) == 0)
                 @self_signed = true
-                debug "SSL Verification failed -- Using self signed cert" if debug?
+                debug "SSL Verification failed -- Using self signed cert"
               else
-                debug "SSL Verification failed -- Preverify: #{is_ok}, Error: #{ctx.error_string} (#{ctx.error})" if debug?
+                debug "SSL Verification failed -- Preverify: #{is_ok}, Error: #{ctx.error_string} (#{ctx.error})"
               end
               return false
             end
@@ -456,7 +427,7 @@ module RHC
 
         def retry_proxy(response, i, args, client)
           if response.status == 502
-            debug "ERROR: Received bad gateway from server, will retry once if this is a GET" if debug?
+            debug "ERROR: Received bad gateway from server, will retry once if this is a GET"
             return true if i == 0 && args[0] == :get
             raise ConnectionException.new(
               "An error occurred while communicating with the server. This problem may only be temporary."\
@@ -529,7 +500,7 @@ module RHC
               m.blank?
             end
           rescue => e
-            logger.debug "Response did not include a message from server: #{e.message}" if debug?
+            debug "Response did not include a message from server: #{e.message}"
           end
           case response.status
           when 400
@@ -571,10 +542,6 @@ module RHC
         end
 
       private
-        def logger
-          @logger ||= Logger.new(STDOUT)
-        end
-
         def messages_to_error(messages)
           errors, remaining = messages.partition{ |m| (m['severity'] || "").upcase == 'ERROR' }
           if errors.present?
@@ -598,7 +565,7 @@ module RHC
           # HTTPClient, being sure to add the http protocol
           # if not specified already
           proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-          ENV['http_proxy'] = "http://#{proxy}" if proxy && proxy !~ /^(\w+):\/\//
+          ENV['http_proxy'] = "http://#{proxy}" if proxy.present? && proxy !~ /^(\w+):\/\//
         end
     end
   end

data/lib/rhc/rest/domain.rb

@@ -22,6 +22,11 @@ module RHC
               cart.url ? {:url => cart.url} : cart.name
             end
           end.compact.uniq
+
+        if cartridges.any?{ |c| c.is_a?(Hash) and c[:url] } and !has_param?('ADD_APPLICATION', 'cartridges[][url]')
+          raise RHC::Rest::DownloadingCartridgesNotSupported, "The server does not support downloading cartridges."
+        end
+
         if client.api_version_negotiated >= 1.3
           payload[:cartridges] = cartridges
         else
@@ -29,7 +34,7 @@ module RHC
           payload[:cartridge] = cartridges.first
         end
 
-        if client.api_version_negotiated < 1.3 && payload[:initial_git_url]
+        if payload[:initial_git_url] and !has_param?('ADD_APPLICATION', 'initial_git_url')
           raise RHC::Rest::InitialGitUrlNotSupported, "The server does not support creating applications from a source repository."
         end
 

data/lib/rhc/rest/mock.rb

@@ -161,14 +161,14 @@ module RHC::Rest::Mock
     def stub_no_domains
       stub_api_request(:get, 'broker/rest/domains', mock_user_auth).to_return(empty_domains)
     end
-    def stub_one_domain(name)
+    def stub_one_domain(name, optional_params=nil)
       stub_api_request(:get, 'broker/rest/domains', mock_user_auth).
         to_return({
           :body => {
             :type => 'domains',
             :data => [{:id => name, :links => mock_response_links([
               ['LIST_APPLICATIONS', "broker/rest/domains/#{name}/applications", 'get'],
-              ['ADD_APPLICATION', "broker/rest/domains/#{name}/applications", 'post'],
+              ['ADD_APPLICATION', "broker/rest/domains/#{name}/applications", 'post', ({:optional_params => optional_params} if optional_params)],
             ])}],
           }.to_json
         })
@@ -313,16 +313,11 @@ module RHC::Rest::Mock
       "https://#{uri_string}/#{relative}"
     end
 
-    # This formats link lists for JSONification
     def mock_response_links(links)
       link_set = {}
       links.each do |link|
-        operation = link[0]
-        href      = link[1]
-        method    = link[2]
-        # Note that the 'relative' key/value pair below is a convenience for testing;
-        # this is not used by the API classes.
-        link_set[operation] = { 'href' => mock_href(href), 'method' => method, 'relative' => href }
+        options   = link[3] || {}
+        link_set[link[0]] = { 'href' => mock_href(link[1]), 'method' => link[2], 'relative' => link[1]}.merge(options)
       end
       link_set
     end

data/lib/rhc/wizard.rb

@@ -45,7 +45,6 @@ module RHC
     def initialize(config=RHC::Config.new, opts=Commander::Command::Options.new)
       @config = config
       @options = opts
-      @debug = opts.debug if opts
     end
 
     # Public: Runs the setup wizard to make sure ~/.openshift and ~/.ssh are correct
@@ -76,10 +75,6 @@ module RHC
     attr_accessor :auth, :user
     attr_writer :rest_client
 
-    def debug?
-      @debug
-    end
-
     def hostname
       Socket.gethostname
     end

data/spec/rhc/commands/app_spec.rb

@@ -522,6 +522,20 @@ describe RHC::Commands::App do
       it { run_output.should match(/Gears:\s+Located with mock_type/) }
       it { run_output.should match(/Gears:\s+1 medium/) }
     end
+
+    context 'when run with custom app' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        app = @domain.add_application("app1", "mock_type", true)
+        cart1 = app.add_cartridge('mock_cart-1')
+        cart1.url = 'https://foo.bar.com'
+      end
+      it { run_output.should match("app1 @ https://app1-mockdomain.fake.foo/") }
+      it { run_output.should match(/Scaling:.*x2/) }
+      it { run_output.should match(/Gears:\s+Located with mock_type/) }
+      it { run_output.should match(/Gears:\s+1 small/) }
+      it { run_output.should match(%r(From:\s+ https://foo.bar.com)) }
+    end    
   end
 
   describe 'app show' do

data/spec/rhc/commands/port_forward_spec.rb

@@ -181,7 +181,7 @@ describe RHC::Commands::PortForward do
         @gear_id = 'fakegearid'
         Net::SSH.should_receive(:start).with(gear_host, gear_user).and_yield(@ssh).twice
 
-        @ssh.should_receive(:exec!).with("rhc-list-ports").
+        @ssh.should_receive(:exec!).with("rhc-list-ports --exclude-remote").
           and_yield(nil, :stderr, "mongodb -> #{gear_host}:35541")
         forward = mock(Net::SSH::Service::Forward)
         @ssh.should_receive(:forward).and_return(forward)

data/spec/rhc/helpers_spec.rb

@@ -71,7 +71,7 @@ describe RHC::Helpers do
     it_should_behave_like "colorized output"
   end
 
-  it("should invoke debug from debug_error"){ expect{ subject.debug_error(mock(:class => "Mock", :message => 'msg', :backtrace => [])) }.to call(:debug).on(subject).with("msg (Mock)\n  ") }
+  it("should invoke debug from debug_error"){ expect{ subject.debug_error(mock(:class => "Mock", :message => 'msg', :backtrace => [])) }.to call(:debug).on($terminal).with("msg (Mock)\n  ") }
 
   it("should draw a table") do
     subject.table([[10,2], [3,40]]) do |i|

data/spec/rhc/highline_extensions_spec.rb

@@ -182,6 +182,14 @@ describe HighLineExtension do
     ]
   end
 
+  it "should give the header priority over width when color is involved" do
+    subject.table([["\e[31mabcd\e[0m", "1234567890"]], :header => ['abcdef', '123'], :width => 12).to_a.should == [
+      'abcdef 123',
+      '------ ----------',
+      "\e[31mabcd\e[0m   1234567890",
+    ]
+  end
+
   it "should add a header to a table" do
     subject.table([["abcd efgh", "1234 6789 a"]], :width => 9, :heading => "Alongtextstring").to_a.should == [
       "Alongtext",

data/spec/rhc/rest_application_spec.rb

@@ -75,7 +75,12 @@ module RHC
 
         context "with a URL cart" do
           before{ stub_api_request(:any, app_links['ADD_CARTRIDGE']['relative']).with(:body => {:url => 'http://foo.com'}.to_json).to_return(mock_cartridge_response(1, true)) }
+          it "raises without a param" do
+            app_obj.should_receive(:has_param?).with('ADD_CARTRIDGE','url').and_return(false)
+            expect{ app_obj.add_cartridge({:url => 'http://foo.com'}) }.to raise_error(RHC::Rest::DownloadingCartridgesNotSupported)
+          end
           it "accepts a hash" do
+            app_obj.should_receive(:has_param?).with('ADD_CARTRIDGE','url').and_return(true)
             cart = app_obj.add_cartridge({:url => 'http://foo.com'})
             cart.should be_an_instance_of RHC::Rest::Cartridge
             cart.name.should == 'mock_cart_0'
@@ -86,6 +91,7 @@ module RHC
             cart.only_in_existing?.should be_false
           end
           it "accepts an object" do
+            app_obj.should_receive(:has_param?).with('ADD_CARTRIDGE','url').and_return(true)
             cart = app_obj.add_cartridge(stub(:url => 'http://foo.com'))
             cart.should be_an_instance_of RHC::Rest::Cartridge
             cart.name.should == 'mock_cart_0'

data/spec/rhc/rest_client_spec.rb

@@ -4,20 +4,6 @@ require 'stringio'
 require 'rest_spec_helper'
 require 'rhc/rest'
 
-# This object is used in a few cases where we need to inspect
-# the logged output.
-class MockClient < RHC::Rest::Client
-  def logger
-    Logger.new((@output = StringIO.new))
-  end
-  def use_debug
-    @debug = true
-  end
-  def logged
-    @output.string
-  end
-end
-
 module RHC
   module Rest
     describe Client do
@@ -228,7 +214,12 @@ module RHC
           it "returns a domain object for matching domain IDs" do
             match = nil
             expect { match = client.find_domain('mock_domain_0') }.to_not raise_error
-
+            match.id.should == 'mock_domain_0'
+            match.class.should == RHC::Rest::Domain
+          end
+          it "returns a domain object for matching case-insensitive domain IDs" do
+            match = nil
+            expect { match = client.find_domain('MOCK_DOMAIN_0') }.to_not raise_error
             match.id.should == 'mock_domain_0'
             match.class.should == RHC::Rest::Domain
           end
@@ -458,32 +449,6 @@ module RHC
           end
         end
 
-        shared_examples_for "a logout method" do
-          before(:each) do
-            stub_api_request(:get, '').
-              to_return({ :body   => { :data => client_links, :supported_api_versions => [1.0, 1.1] }.to_json,
-                          :status => 200
-                        })
-          end
-          context "debug mode is on" do
-            let(:use_debug){ true }
-            it "writes a message to the logger" do
-              capture do
-                client.send logout_method.to_sym
-                stderr.should match(/Logout\/Close client$/)
-              end
-            end
-          end
-          context "debug mode is off" do
-            it "does nothing" do
-              capture do
-                client.send logout_method.to_sym
-                stderr.should be_empty
-              end
-            end
-          end
-        end
-
         context "#delete_key" do
           before(:each) do
             stub_api_request(:any, client_links['GET_USER']['relative']).
@@ -528,16 +493,6 @@ module RHC
             expect { client.find_key('no_match') }.to raise_error(RHC::KeyNotFoundException)
           end
         end
-
-        context "#logout" do
-          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"
-        end
       end
 
       context "when server supports API versions 1.0 and 1.1" do

data/spec/rhc/rest_spec.rb

@@ -2,16 +2,6 @@ require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc/rest'
 
-class RHCRest
-  include RHC::Rest
-  def debug?
-    false
-  end
-  def debug(*args)
-    raise "Unchecked debug"
-  end
-end
-
 module MockRestResponse
   attr_accessor :code, :read
 end
@@ -44,13 +34,14 @@ 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{ expect{ domain.add_application('foo', :cartridges => [{:url => 'a_url'}]) }.to raise_error(RHC::Rest::DownloadingCartridgesNotSupported) }
     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 }
   end
-  context "against a server newer than 1.3" do
+  context "against a server that supports initial git urls and downloaded carts" do
     let(:cartridges){ ['bar'] }
-    before{ stub_api; stub_one_domain('bar') }
+    before{ stub_api; stub_one_domain('bar', [{:name => 'initial_git_url'},{:name => 'cartridges[][url]'}]) }
     before do 
       stub_api_request(:post, 'broker/rest/domains/bar/applications', false).
         with(:body => {:name => 'foo', :cartridges => cartridges}.to_json).
@@ -95,17 +86,6 @@ module RHC
   describe Rest do
     subject{ RHC::Rest::Client.new }
 
-    # logger function
-    describe "#logger" do
-      it "establishes a logger" do
-        logger = Logger.new(STDOUT)
-        subject.send(:logger).should have_same_attributes_as(logger)
-      end
-      it "reuses a logger" do
-        subject.send(:logger).should equal(subject.send(:logger))
-      end
-    end
-
     describe "#default_verify_callback" do
       def invoked_with(is_ok, ctx)
         subject.send(:default_verify_callback).call(is_ok, ctx)

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'pry' if ENV['PRY']
 # Environment reset
 ENV['http_proxy'] = nil
 ENV['HTTP_PROXY'] = nil
+ENV['OPENSHIFT_CONFIG'] = nil
 
 class FakeFS::Mode
   def initialize(mode_s)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 63
   prerelease: 
   segments: 
   - 1
-  - 8
   - 9
-  version: 1.8.9
+  - 6
+  version: 1.9.6
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-10 00:00:00 Z
+date: 2013-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh