rhc 1.3.8 → 1.4.7

data/lib/rhc/commands/port_forward.rb

@@ -66,7 +66,9 @@ module RHC::Commands
 
     UP_TO_256 = /25[0-5]|2[0-4][0-9]|[01]?(?:[0-9][0-9]?)/
     UP_TO_65535 = /6553[0-5]|655[0-2][0-9]|65[0-4][0-9][0-9]|6[0-4][0-9][0-9][0-9]|[0-5]?(?:[0-9][0-9]{0,3})/
-    IP_AND_PORT = /\b(#{UP_TO_256}(?:\.#{UP_TO_256}){3})\:(#{UP_TO_65535})\b/
+    # 'host' part is a bit lax; we rely on 'rhc-list-ports' to hand us a reasonable output
+    # about the host information, be it numeric or FQDN in IPv4 or IPv6.
+    HOST_AND_PORT = /(.+):(#{UP_TO_65535})\b/
 
     summary "Forward remote ports to the workstation"
     syntax "<application>"
@@ -96,7 +98,7 @@ module RHC::Commands
                 raise RHC::PermissionDeniedException.new "Permission denied." if line =~ /permission denied/i
                 # ...and also which services are available for the application
                 # for us to forward ports for.
-                if line =~ /\A\s*(\S+) -> #{IP_AND_PORT}/
+                if line =~ /\A\s*(\S+) -> #{HOST_AND_PORT}\z/
                   debug fs = ForwardingSpec.new($1, $2, $3.to_i)
                   forwarding_specs << fs
                 else

data/lib/rhc/coverage_helper.rb

@@ -18,14 +18,12 @@ if RUBY_VERSION >= '1.9' and ENV['RHC_FEATURE_COVERAGE']
     # Groups - general categories of test areas
     add_group('Commands') { |src_file| src_file.filename.include?(File.join(%w[lib rhc commands])) }
     add_group('RHC Lib')  { |src_file| src_file.filename.include?(File.join(%w[lib rhc])) }
-    add_group('REST')     { |src_file| src_file.filename.include?(File.join(%w[lib rhc/rest])) }  
-    add_group('Legacy')   { |src_file| src_file.filename.include?(File.join(%w[bin])) or
-                                       src_file.filename.include?(File.join(%w[lib rhc-common.rb])) }
+    add_group('REST')     { |src_file| src_file.filename.include?(File.join(%w[lib rhc/rest])) }
     add_group('Test')     { |src_file| src_file.filename.include?(File.join(%w[features])) or
                                        src_file.filename.include?(File.join(%w[spec])) }
 
     use_merging = true
-    # Note, the #:nocov: coverage exclusion  should only be used on external functions 
+    # Note, the #:nocov: coverage exclusion  should only be used on external functions
     #  that cannot be nondestructively tested in a developer environment.
   end
 

data/lib/rhc/exceptions.rb

@@ -123,8 +123,6 @@ module RHC
     end
   end
 
-=begin
-#  Commenting this out for US2438
   class AdditionalStorageArgumentsException < Exception
     def initialize(message="Only one storage action can be performed at a time.")
       super message, 1
@@ -142,5 +140,4 @@ module RHC
       super message, 1
     end
   end
-=end
 end

data/lib/rhc/git_helpers.rb

@@ -1,4 +1,4 @@
-require 'open4'
+  require 'open4'
 
 module RHC
   module GitHelpers

data/lib/rhc/helpers.rb

@@ -254,14 +254,6 @@ module RHC
       count == 1 ? "#{count} #{s}" : "#{count} #{s}s"
     end
 
-    ## report a result (true/false) and return result
-    ## if the result is false, msg is displayed
-    def report_result(result, msg, fatal = true)
-      result ? $terminal.instance_variable_get(:@output).print('.') : error(msg)
-      # ignore the result if non-fatal
-      fatal ? result : true
-    end
-
     # given an array of arrays "items", construct an array of strings that can
     # be used to print in tabular form.
     def table(items, opts={}, &block)
@@ -457,10 +449,32 @@ module RHC
     end
 
     def hosts_file_contains?(host)
+      with_tolerant_encoding do
+        begin
+          resolver = Resolv::Hosts.new
+          resolver.getaddress host
+        rescue => e
+          debug "Error while resolving with Resolv::Hosts: #{e.message}(#{e.class})\n  #{e.backtrace.join("\n  ")}"
+        end
+      end
+    end
+    
+    def with_tolerant_encoding(&block)
       # :nocov:
-      resolver = Resolv::Hosts.new
-      resolver.getaddress host
-    rescue Resolv::ResolvError
+      if RUBY_VERSION.to_f >= 1.9
+        orig_default_internal = Encoding.default_internal
+        Encoding.default_internal = 'ISO-8859-1'
+      else
+        orig_default_kcode = $KCODE
+        $KCODE = 'N'
+      end
+      yield
+    ensure
+      if RUBY_VERSION.to_f >= 1.9
+        Encoding.default_internal = orig_default_internal
+      else
+        $KCODE = orig_default_kcode
+      end
       # :nocov:
     end
 

data/lib/rhc/output_helpers.rb

@@ -69,7 +69,7 @@ module RHC
 
     def format_cart_header(cart)
       [
-        cart.name, 
+        cart.name,
         cart.name != cart.display_name ? "(#{cart.display_name})" : nil,
       ].compact.join(' ')
     end
@@ -127,8 +127,6 @@ module RHC
       ].compact.join(' ')
     end
 
-=begin
-#  Commenting this out for US2438
     def display_cart_storage_info(cart, title="Storage Info")
       say_table \
         title,
@@ -141,7 +139,6 @@ module RHC
         display_cart_storage_info(cart, cart.display_name)
       end
     end
-=end
 
     #---------------------------
     # Misc information
@@ -204,11 +201,8 @@ module RHC
           (value == -1 ? "available" : value)
         when :gear_info
           format_gear_info(value)
-=begin
-#  Commenting this out for US2438
         when :base_gear_storage,:additional_gear_storage
           ((value.nil? or value == 0) ? "None" : "#{value}GB")
-=end
         when :aliases
           value.join ', '
         else

data/lib/rhc/rest/cartridge.rb

@@ -3,7 +3,7 @@ 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
+      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
 
       def scalable?
         supported_scales_to != supported_scales_from

data/lib/rhc/rest/client.rb

@@ -24,7 +24,7 @@ module RHC
           else
             [
               options.delete(:url) ||
-                (options[:server] && "https://#{options.delete(:server)}/broker/rest/api"), 
+                (options[:server] && "https://#{options.delete(:server)}/broker/rest/api"),
               options.delete(:debug),
               options.delete(:preferred_api_versions)
             ]
@@ -118,10 +118,10 @@ module RHC
                   "A secure connection could not be established to the server (#{e.message}). You may disable secure connections to your server with the -k (or --insecure) option '#{args[1]}'.\n\n"\
                   "If your server is using a self-signed certificate, you may disable certificate checks with the -k (or --insecure) option. Using this option means that your data is potentially visible to third parties.")
               end
-          rescue SocketError => e
+          rescue SocketError, Errno::ECONNREFUSED => e
             raise ConnectionException.new(
               "Unable to connect to the server (#{e.message})."\
-              "#{client.proxy.present? ? " Check that you have correctly specified your proxy server '#{client.proxy}' as well as your OpenShift server '#{args[1]}'." : " Check that you have correctly specified your OpenShift server '#{args[0]}'."}")
+              "#{client.proxy.present? ? " Check that you have correctly specified your proxy server '#{client.proxy}' as well as your OpenShift server '#{args[1]}'." : " Check that you have correctly specified your OpenShift server '#{args[1]}'."}")
           rescue RHC::Rest::Exception
             raise
           rescue => e

data/lib/rhc/rest/mock.rb

@@ -34,7 +34,7 @@ module RHC::Rest::Mock
           :body => {
             :data => mock_response_links(mock_real_client_links),
             :supported_api_versions => [1.0, 1.1, 1.2, 1.3],
-          }.to_json 
+          }.to_json
         })
     end
     def stub_user(auth=mock_user_auth)
@@ -127,7 +127,7 @@ module RHC::Rest::Mock
     def stub_simple_carts
       stub_api_request(:get, 'broker/rest/cartridges', mock_user_auth).to_return(simple_carts)
     end
-    
+
     def define_exceptional_test_on_wizard
       RHC::Wizard.module_eval <<-EOM
       private
@@ -559,6 +559,7 @@ module RHC::Rest::Mock
       @scales_to = 1
       @current_scale = 1
       @gear_profile = 'small'
+      @additional_gear_storage = 5
     end
 
     def destroy
@@ -594,6 +595,11 @@ module RHC::Rest::Mock
       @scales_to = values[:scales_to] if values[:scales_to]
       self
     end
+
+    def set_storage(values)
+      @additional_gear_storage = values[:additional_gear_storage] if values[:additional_gear_storage]
+      self
+    end
   end
 
   class MockRestKey < RHC::Rest::Key

data/lib/rhc/wizard.rb

@@ -1,6 +1,4 @@
-require 'rhc/helpers'
-require 'rhc/ssh_helpers'
-require 'rhc/git_helpers'
+require 'rhc'
 require 'highline/system_extensions'
 require 'fileutils'
 require 'socket'
@@ -59,6 +57,7 @@ module RHC
       include RHC::Helpers
       include RHC::SSHHelpers
       include RHC::GitHelpers
+      include RHC::CartridgeHelpers
       attr_reader :config, :options
       attr_accessor :auth, :user
 
@@ -83,13 +82,17 @@ module RHC
         auth.send(:password)
       end
 
+      def print_dot
+        $terminal.instance_variable_get(:@output).print('.')
+      end
+
     private
-    
+
     # cache SSH keys from the REST client
     def ssh_keys
       @ssh_keys ||= rest_client.sshkeys
     end
-    
+
     # clear SSH key cache
     def clear_ssh_keys_cache
       @ssh_keys = nil
@@ -352,8 +355,7 @@ module RHC
 
           paragraph{ say "Run 'rhc app create' to create your first application." }
           paragraph do
-            application_types = rest_client.find_cartridges :type => "standalone"
-            say table(application_types.sort {|a,b| a.display_name <=> b.display_name }.map do |cart|
+            say table(standalone_cartridges.sort {|a,b| a.display_name <=> b.display_name }.map do |cart|
               [' ', cart.display_name, "rhc app create <app name> #{cart.name}"]
             end).join("\n")
           end
@@ -379,10 +381,20 @@ module RHC
     def setup_test_stage
       say "Checking common problems "
       tests = private_methods.select {|m| m.to_s.start_with? 'test_'}
+      failed = false
       tests.sort.each do |test|
-        send(test)
+        begin
+          send(test)
+          print_dot unless failed
+          true
+        rescue => e
+          say "\n" unless failed
+          failed = true
+          paragraph{ error e.message }
+          false
+        end
       end.tap do |pass|
-        success(' done') if pass
+        success(' done') if !failed
       end
 
       true
@@ -400,32 +412,27 @@ module RHC
       pub_key_file = RHC::Config.ssh_pub_key_file_path
       private_key_file = RHC::Config.ssh_priv_key_file_path
       if File.exist?(private_key_file)
-        report_result (File.exist?(private_key_file) and File.stat(private_key_file).mode.to_s(8) =~ /[4-7]00$/),
-          "#{private_key_file} should not be accessible by anyone but the current user"
-      else
-        #:nocov:
-        true
-        #:nocov:
+        unless File.stat(private_key_file).mode.to_s(8) =~ /[4-7]00$/
+          raise "Your private SSH key file should be set as readable only to yourself.  Please run 'chmod 600 #{system_path(private_key_file)}'"
+        end
       end
+      true
     end
 
     # test connectivity an app
     def test_ssh_connectivity
-      unless ssh_key_uploaded?
-        return true
-      end
-      
+      return true unless ssh_key_uploaded?
+
       applications.take(1).each do |app|
         begin
           ssh = Net::SSH.start(app.host, app.uuid, :timeout => 60)
-          return true
         rescue => e
-          report_result(ssh, "An SSH connection could not be established to #{app.host}. Your SSH configuration may not be correct, or the application may not be responding. #{e.message} (#{e.class})", false)
-          return false
+          raise "An SSH connection could not be established to #{app.host}. Your SSH configuration may not be correct, or the application may not be responding. #{e.message} (#{e.class})"
         ensure
           ssh.close if ssh
         end
       end
+      true
     end
 
     ###

data/spec/coverage_helper.rb

@@ -13,7 +13,7 @@ unless RUBY_VERSION < '1.9'
       @missed_lines
     end
   end
-  
+
   original_stderr = $stderr # in case helpers don't properly cleanup
   SimpleCov.at_exit do
     SimpleCov.result.format!
@@ -22,7 +22,7 @@ unless RUBY_VERSION < '1.9'
       exit 1
     end
   end
-  
+
   SimpleCov.start do
     coverage_dir 'coverage/spec/'
 
@@ -31,7 +31,6 @@ unless RUBY_VERSION < '1.9'
                                    # namespaces changed
     add_filter 'lib/rhc/rest/'     # REST coverage is not yet 100%
     add_filter 'lib/bin/'          # This is just for safety; simplecov isn't picking these up.
-    add_filter 'lib/rhc-common.rb' # deprecated, functionality moved into client or rhc/helpers.rb
     add_filter 'features/'         # Don't report on the files that run the cucumber tests
     add_filter 'lib/rhc-feature-coverage-helper.rb'
     add_filter 'spec/'             # Don't report on the files that run the spec tests
@@ -39,13 +38,11 @@ unless RUBY_VERSION < '1.9'
     # Groups - general categories of test areas
     add_group('Commands') { |src_file| src_file.filename.include?(File.join(%w[lib rhc commands])) }
     add_group('RHC Lib')  { |src_file| src_file.filename.include?(File.join(%w[lib rhc])) }
-    add_group('REST')     { |src_file| src_file.filename.include?(File.join(%w[lib rhc/rest])) }  
-    add_group('Legacy')   { |src_file| src_file.filename.include?(File.join(%w[bin])) or
-                                       src_file.filename.include?(File.join(%w[lib rhc-common.rb])) }  
+    add_group('REST')     { |src_file| src_file.filename.include?(File.join(%w[lib rhc/rest])) }
     add_group('Test')     { |src_file| src_file.filename.include?(File.join(%w[features])) or
                                        src_file.filename.include?(File.join(%w[spec])) }
-  
-    # Note, the #:nocov: coverage exclusion  should only be used on external functions 
+
+    # Note, the #:nocov: coverage exclusion  should only be used on external functions
     #  that cannot be nondestructively tested in a developer environment.
   end
 end

data/spec/rhc/commands/app_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'rest_spec_helper'
 require 'rhc/commands/app'
 require 'rhc/config'
+require 'resolv'
 
 describe RHC::Commands::App do
   let!(:rest_client){ MockRestClient.new }
@@ -60,6 +61,18 @@ describe RHC::Commands::App do
       it { run_output.should match("Cartridges: mock_standalone_cart-1\n") }
     end
 
+    context 'when Hosts resolver raises an Exception' do
+      let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', '--noprompt', '--timeout', '10', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+      before :each do
+        resolver = Object.new
+        Resolv::Hosts.should_receive(:new).and_return(resolver)
+        resolver.should_receive(:getaddress).with('app1-mockdomain.fake.foo').and_raise(ArgumentError)
+      end
+      
+      it { expect { run }.should exit_with_code(0) }
+      it { run_output.should match("Success") }
+    end
+
     context 'when run with multiple carts' do
       let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', 'mock_cart-1', '--noprompt', '-p',  'password'] }
       it { expect { run }.should exit_with_code(0) }
@@ -80,8 +93,6 @@ describe RHC::Commands::App do
     context 'when no cartridges are returned' do
       before(:each) do
         domain = rest_client.domains.first
-        #rest_client.stub(:cartridges) { [] }
-#        domain.stub(:add_application).and_raise(RHC::Rest::ValidationException.new('Each application needs a web cartridge', '', '109'))
       end
       context 'without trace' do
         let(:arguments) { ['app', 'create', 'app1', 'nomatch_cart', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
@@ -94,15 +105,39 @@ describe RHC::Commands::App do
     end
   end
 
-  describe 'app create too many carts found error' do
-    let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart', '--trace', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }
+  describe 'cart matching behavior' do
+    before(:each) do
+      domain = rest_client.add_domain("mockdomain")
+    end
 
-    context 'when run' do
-      before(:each) do
-        domain = rest_client.add_domain("mockdomain")
-      end
+    context 'multiple web matches' do
+      let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart', '--trace', '--noprompt'] }
       it { expect { run }.should raise_error(RHC::MultipleCartridgesException) }
     end
+    context 'when only a single cart can match' do
+      let(:arguments) { ['app', 'create', 'app1', 'unique', '--trace', '--noprompt'] }
+      it('picks the cart') { run_output.should match('Using mock_unique_standalone_cart-1') }
+    end
+    context 'when I pick a web cart and an ambiguous non web cart' do
+      let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1', 'unique', '--trace', '--noprompt'] }
+      it('picks the non web cart') { run_output.should match('Using unique_mock_cart-1') }
+    end
+    context 'when I pick very ambiguous carts' do
+      let(:arguments) { ['app', 'create', 'app1', 'mock', '--noprompt'] }
+      it('shows only web carts') { run_output.should_not match('unique_mock_cart-1') }
+    end
+    context 'when I pick only embedded carts' do
+      let(:arguments) { ['app', 'create', 'app1', 'mock_cart', '--trace', '--noprompt'] }
+      it { expect { run }.should raise_error(RHC::CartridgeNotFoundException, /Every application needs a web cartridge/) }
+    end
+    context 'when I pick multiple embedded carts' do
+      let(:arguments) { ['app', 'create', 'app1', 'unique_standalone', 'mock_cart', '--trace', '--noprompt'] }
+      it { expect { run }.should raise_error(RHC::MultipleCartridgesException, /There are multiple cartridges matching 'mock_cart'/) }
+    end
+    context 'when I pick multiple standalone carts' do
+      let(:arguments) { ['app', 'create', 'app1', 'unique_standalone', 'mock_standalone_cart', '--trace', '--noprompt'] }
+      it { expect { run }.should raise_error(RHC::MultipleCartridgesException, /You must select only a single web cart/) }
+    end
   end
 
   describe 'app create enable-jenkins' do
@@ -381,6 +416,58 @@ describe RHC::Commands::App do
     end
   end
 
+  describe 'app ssh' do
+    let(:arguments) { ['app', 'ssh', 'app1'] }
+
+    context 'when run' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        Kernel.should_receive(:system).with("ssh fakeuuidfortestsapp1@127.0.0.1").and_return(0)
+      end
+      it { run_output.should match("Connecting to fakeuuidfortestsapp") }
+      it { expect { run }.should exit_with_code(0) }
+    end
+  end
+
+  describe 'app ssh no system ssh' do
+    let(:arguments) { ['app', 'ssh', 'app1'] }
+
+    context 'when run' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        @instance.should_receive(:has_ssh?).and_return(false)
+      end
+      it { run_output.should match("Please use the --ssh option to specify the path to your SSH executable, or install SSH.") }
+      it { expect { run }.should exit_with_code(1) }
+    end
+  end
+
+  describe 'app ssh can use system exec' do
+    let(:arguments) { ['app', 'ssh', 'app1', '--ssh', 'path_to_ssh'] }
+
+    context 'when run' do
+      before(:each) do
+        @domain = rest_client.add_domain("mockdomain")
+        @domain.add_application("app1", "mock_type")
+        @instance.should_not_receive(:has_ssh?)
+        Kernel.should_receive(:system).with("path_to_ssh fakeuuidfortestsapp1@127.0.0.1").and_return(1)
+      end
+      it { run_output.should match("Connecting to fakeuuidfortestsapp") }
+      it { expect { run }.should exit_with_code(1) }
+    end
+  end
+
+  describe 'ssh tests' do
+    let(:arguments) { ['app', 'ssh', 'app1', '-s /bin/blah'] }
+
+    context 'has_ssh?' do
+      before{ @instance.stub(:ssh_version){ raise "Fake Exception" } }
+      its(:has_ssh?) { should be_false }
+    end
+  end
+
   describe 'app status' do
     let(:arguments) { ['app', 'status', 'app1', '--noprompt', '--config', 'test.conf', '-l', 'test@test.foo', '-p',  'password'] }