rhc 0.85.12 → 0.86.7

data/bin/rhc-chk

@@ -186,7 +186,7 @@ module TestBase
   ensure
     $debuginfo['fetches'] ||= []
     body = JSON.parse(response.body)
-    body['data'] = body['data'] ? JSON.parse(body['data']) : ''
+    body['data'] = body['data'] && body['data'] != '' ? JSON.parse(body['data']) : ''
     $debuginfo['fetches'] << {url.to_s => {
       'body' => body,
       'header' => response.instance_variable_get(:@header)
@@ -205,16 +205,29 @@ end
 #####################################################
 #                Tests start here                   #
 #####################################################
-#                                                   #                                                  
-#  Note: Tests and testcases are run alphabetically # 
-#                                                   #                                                  
+#                                                   #
+#  Note: Tests and testcases are run alphabetically #
+#                                                   #
 #####################################################
 
 def error_for(name,*args)
   if name.kind_of? String
     name = name.downcase.to_sym
   end
-  sprintf($messages[name],*args)
+  message = sprintf(get_message(:errors,name),*args)
+  solution = get_message(:solutions,name)
+  if solution
+    message << "\n" << sprintf(solution,*args)
+  end
+  message
+end
+
+def get_message(type,name)
+  val = $messages[type][name]
+  if val.is_a? Symbol
+    val = get_message(type,val)
+  end
+  val
 end
 
 class Test1_Connectivity < Test::Unit::TestCase
@@ -292,14 +305,13 @@ class Test3_SSH < Test::Unit::TestCase
     assert_not_nil $user_info, error_for(:no_account) 
 
     $remote_ssh_pubkeys = []
-    additional_ssh_keys = RHC::get_ssh_keys($libra_server, $rhlogin, $password, $http)
-    if additional_ssh_keys['keys'] && additional_ssh_keys['keys'].kind_of?(Hash)
-      additional_ssh_keys['keys'].each do |name, sshkey|
-        $remote_ssh_pubkeys.push(sshkey['key'])
-      end
-    end
+    ssh_keys = RHC::get_ssh_keys($libra_server, $rhlogin, $password, $http)
+    my_keys = [ssh_keys['ssh_key'], ssh_keys['keys'].values.map{|k| k['key']}].flatten
+    my_keys.delete_if{|x| x.length == 0 }
+    $remote_ssh_pubkeys = my_keys
 
-    $remote_ssh_pubkeys.push($user_info["user_info"]["ssh_key"])
+    # Ensure that the user has ssh keys
+    assert(!$remote_ssh_pubkeys.empty?, error_for(:no_remote_pub_keys ) )
     assert $remote_ssh_pubkeys.include?(@@local_derived_ssh_pubkey), error_for(:no_match_pub, @libra_kfile)
   end
 
@@ -313,6 +325,7 @@ class Test3_SSH < Test::Unit::TestCase
     assert_not_nil @@local_ssh_pubkey, error_for(:no_pubkey, 'the remote key')
 
     # Test public key and remote key
+    assert_not_nil $user_info, error_for(:no_account) 
     assert $remote_ssh_pubkeys.include?(@@local_ssh_pubkey), error_for(:no_match_pub, @libra_kfile)
   ensure
     fp.close if fp
@@ -327,7 +340,7 @@ class Test3_SSH < Test::Unit::TestCase
     # Make sure we can load keys from ssh-agent
     assert !loaded_keys.empty?, error_for(:no_keys_loaded)
     loaded_keys.map!{|key| key.split(' ')[1]}
-    
+
     assert_not_nil @@local_ssh_pubkey, error_for(:no_pubkey, 'the keys in ssh-agent')
     assert loaded_keys.include?(@@local_ssh_pubkey),error_for(:pubkey_not_loaded)
   end
@@ -366,7 +379,7 @@ class CheckRunner < Test::Unit::UI::Console::TestRunner
   def initialize(*args)
     super
     @output_level = 1
-    puts $messages[:started]
+    puts get_message(:status,:started)
   end
 
   def add_fault(fault)
@@ -402,9 +415,9 @@ class CheckRunner < Test::Unit::UI::Console::TestRunner
     $debuginfo['errors'] = @faults
 
     if @faults.empty?
-      print_underlined $messages[:passed]
+      print_underlined get_message(:status,:passed)
     else
-      print_underlined $messages[:failed]
+      print_underlined get_message(:status,:failed)
       @errors = []
       # Need to separate the failures from the errors
 
@@ -420,7 +433,7 @@ class CheckRunner < Test::Unit::UI::Console::TestRunner
       # Errors mean something in the test is broken, not just failed
       unless @errors.empty?
         @num = 0
-        print_underlined $messages[:error]
+        print_underlined get_message(:status,:error)
         @errors.each do |e| 
           lines = e.long_display.to_a[1..-1]
           puts "#{@num+=1}) #{lines.shift}"
@@ -445,24 +458,45 @@ Test::Unit::AutoRunner::RUNNERS[:console] = proc do |r|
   CheckRunner
 end
 
+############################
+#  The following are the error messages to be used for different tests
+#  You need to specify a value in :errors
+#  If there is a solution, it may also be specified in :solutions
+#
+#  Values in may be reused by specifying another symbol as the value
+#   for instance the following will use the solution for :bar as the solution for :foo
+#
+#   :solutions
+#     :foo: :bar
+############################
 $messages = YAML.load <<-EOF
 ---
+:status:
   :started: Analyzing system
   :passed: Congratulations, your system has passed all tests
   :failed: Your system did not pass all of the tests
   :error: Something went wrong, and not all tests completed
-  :no_derive: "We were unable to derive your public SSH key and compare it to the remote\n FIX: ???"
-  :no_connectivity: "Cannot connect to server, therefore most tests will not work\n FIX: Ensure that you are able to connect to %s"
+:errors:
+  :no_derive: "We were unable to derive your public SSH key and compare it to the remote"
+  :no_connectivity: "Cannot connect to server, therefore most tests will not work"
   :no_account: You must have an account on the server in order to test SSH key matches
   :cant_connect: You need to be able to connect to the server in order to test authentication
-  :no_match_pub: "Local %s does not match remote pub key, SSH auth will not work\n FIX: Perhaps you should regenerate your public key, or run 'rhc sshkey add' to add your new key"
-  :_404: "The user %s does not have an account on this server\n FIX: Please ensure that you've entered the correct username"
+  :no_match_pub: "Local %s does not match remote pub key, SSH auth will not work"
+  :_404: "The user %s does not have an account on this server"
   :no_pubkey: We were unable to read your public SSH key to compare to %s
-  :_401: "Invalid user credentials for %s\n FIX: Please ensure you used the correct password"
+  :_401: "Invalid user credentials for %s"
   :file_not_found: File %s does not exist, cannot check permissions
   :_other_http: "There was an error communicating with the server: %s"
-  :bad_permissions: "File %s has incorrect permissions %s\n FIX: Permissions should match %s"
+  :bad_permissions: "File %s has incorrect permissions %s"
   :no_keys_loaded: Either ssh-agent is not running or you do not have any keys loaded 
   :pubkey_not_loaded: Your public key is not loaded into a running ssh-agent
   :cant_ssh: "Cannot SSH into your app: %s"
-  EOF
+  :no_remote_pub_keys: "It appears you do not have any public ssh keys."
+:solutions:
+  :no_connectivity: "Ensure that you are able to connect to %s"
+  :no_match_pub: "Perhaps you should regenerate your public key, or run 'rhc sshkey add' to add your new key"
+  :_404: "Please ensure that you've entered the correct username or that you've created an account"
+  :_401: "Please ensure you used the correct password"
+  :bad_permissions: "Permissions should match %s"
+  :no_remote_pub_keys: "You should try to add your ssh-key by running 'rhc sshkey add'"
+EOF

data/bin/rhc-create-app

@@ -43,10 +43,10 @@ Create an OpenShift Express app.
   --no-dns                   Skip DNS check. Must be used in combination with --nogit
   --config  path             Path of alternate config file
   --timeout #                Timeout, in seconds, for connection
-  --enable-jenkins [name]    Indicates to create a Jenkins application (if not already available)
-                             and embed the Jenkins client into this application.  The default 
-                             name will be 'jenkins' if not specified. Note that --no-dns is ignored
-                             for the creation of the Jenkins application.
+  --enable-jenkins [name]    Create a Jenkins application (see Note 1)
+
+Notes:
+1. Jenkins applications will have Jenkins embedded.  Their default name will be 'jenkins' if not specified and the '--no-dns' flag is ignored.
 
 USAGE
 exit 255
@@ -247,4 +247,4 @@ unless opt['no-dns']
     puts "Unable to access your new application."
     exit 1
   end
-end
+end

data/bin/rhc-ctl-app

@@ -123,8 +123,8 @@ unless opt["embed"] or opt["command"]
 end
 
 if opt["command"]
-  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump)$/
-    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump)"
+  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump|expose-port|conceal-port)$/
+    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump|expose-port|conceal-port)"
     p_usage
   end
 elsif opt["embed"]

data/bin/rhc-snapshot

@@ -118,7 +118,7 @@ if opt['save']
   puts "Pulling down a snapshot to #{opt['save']}"
 else
   if File.exists? opt['restore']
-    `tar -tf #{opt['restore']} './*/#{app}'`
+    `tar --wildcards -tf #{opt['restore']} './*/#{app}'`
     if $?.exitstatus != 0
       puts "Archive at #{opt['restore']} does not contain the target application: ./*/#{app}"
       puts "If you created this archive rather than exported with rhc-snapshot, be sure"
@@ -126,7 +126,7 @@ else
       puts "i.e.: tar -czvf <app_name>.tar.gz ./<app_uuid>/"
       exit 255
     else
-      `tar -tf #{opt['restore']} './*/git'`
+      `tar --wildcards -tf #{opt['restore']} './*/git'`
       include_git = $?.exitstatus == 0
       ssh_cmd = "cat #{opt['restore']} | ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
       puts "Restoring from snapshot #{opt['restore']}"
@@ -156,4 +156,4 @@ end
     exit 1
 end
 puts output if opt['restore'] && debug
-exit 0
+exit 0

data/bin/rhc-tail-files

@@ -127,7 +127,11 @@ puts "Use ctl + c to stop"
 puts 
 puts ssh_cmd if debug
 begin
-  exec ssh_cmd
+  if opt['files'] == 'system-messages'
+     RHC::ctl_app(libra_server, @http, opt['app'], opt['rhlogin'], password, 'system-messages', false, nil, nil)
+  else
+     exec ssh_cmd
+  end
 rescue SystemCallError
   puts
   puts "Error in trying to tail files.  You can tail manually by running:"

data/lib/rhc

@@ -68,11 +68,11 @@ _rhc()
                     create)
                         opts="--debug --help --rhlogin --password --no-dns --nogit --app --repo --type --enable-jenkins --config --timeout"
                         ;;
-                    show | start | stop | force-stop | restart | reload | status | destroy | tidy | add-alias | remove-alias | threaddump | destroy)
+                    show | start | stop | force-stop | restart | reload | status | destroy | tidy | add-alias | remove-alias | threaddump | destroy | expose-port | conceal-port )
                         opts="--debug --help --rhlogin --password --app --alias --bypass --config --timeout"
                         ;;
                     tail)
-                        opts="--debug --help --rhlogin --password -app --opts --filepath --config --timeout"
+                        opts="--debug --help --rhlogin --password --app --opts --filepath --config --timeout"
                         ;;
                     snapshot)
                         opts="save restore"
@@ -108,7 +108,7 @@ _rhc()
                     snapshot)
                         case "${COMP_WORDS[3]}" in
                             save | restore)
-                                opts="--debug --help --rhlogin --password -app --filepath --config --timeout"
+                                opts="--debug --help --rhlogin --password --app --filepath --config --timeout"
                                 ;;
                             *)
                                 ;;
@@ -117,7 +117,7 @@ _rhc()
                     cartridge)
                         case "${COMP_WORDS[3]}" in
                             add | remove | stop | start | restart | status | reload | list)
-                                opts="--debug --help --rhlogin --password -app --cartridge --config --timeout"
+                                opts="--debug --help --rhlogin --password --app --cartridge --config --timeout"
                                 ;;
                             *)
                                 ;;

data/lib/rhc-common.rb

@@ -43,7 +43,6 @@ module RHC
   PATTERN_VERSION=/\A\d+\.\d+\.\d+\z/
   @mytimeout = 10
   @mydebug = false
-  @@broker_version = "?.?.?"
   @@api_version = "?.?.?"
 
   # reset lines
@@ -59,8 +58,7 @@ module RHC
     'exit_code' => nil,
     'messages' => nil,
     'data' => nil,
-    'api' => nil,
-    'broker' => nil
+    'api' => nil
   }
 
   def self.timeout(val)
@@ -78,9 +76,6 @@ module RHC
   end
 
   def self.update_server_api_v(dict)
-    if !dict['broker'].nil? && (dict['broker'] =~ PATTERN_VERSION)
-      @@broker_version = dict['broker']
-    end
     if !dict['api'].nil? && (dict['api'] =~ PATTERN_VERSION)
       @@api_version = dict['api']
     end
@@ -387,9 +382,6 @@ module RHC
       if json_resp['api']
         puts "API version:    #{json_resp['api']}"
       end
-      if json_resp['broker']
-        puts "Broker version: #{json_resp['broker']}"
-      end
     end
     if print_result && json_resp['result']
       puts ''
@@ -415,7 +407,6 @@ module RHC
     data = {:cartridge => app_type,
             :action => 'configure',
             :app_name => app_name,
-            :node_profile => 'large',
             :rhlogin => rhlogin
            }
     if @mydebug
@@ -674,13 +665,19 @@ LOOKSGOOD
 
       stderr.each { |line|
         line = line.chomp
+
+        if line.downcase =~ /permission denied/
+          puts line
+          exit 1
+        end
+        
         if line.index(ip_and_port_simple_regex)
           hosts_and_ports_descriptions << line
         end
       }
 
     }
-
+    
     #hosts_and_ports_descriptions = stderr.gets.chomp.split(/\n/)
     #hosts_and_ports = stdout.gets.chomp.split(/\n/)
 
@@ -720,7 +717,7 @@ LOOKSGOOD
     end
     
     json_data = generate_json(data)
-    puts json_data
+
     url = nil
     if embedded
       url = URI.parse("https://#{libra_server}/broker/embed_cartridge")
@@ -735,8 +732,8 @@ LOOKSGOOD
     else
         print_response_err(response)
     end
+    JSON.parse(response.body)
   end
-  
 end
 
 # provide a hook for performing actions before rhc-* commands exit
@@ -976,4 +973,4 @@ SSH
     File.chmod(0700, ssh_config_d)
     File.chmod(0600, ssh_config)
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 339
+  hash: 329
   prerelease: 
   segments: 
   - 0
-  - 85
-  - 12
-  version: 0.85.12
+  - 86
+  - 7
+  version: 0.86.7
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -69,20 +69,20 @@ extra_rdoc_files: []
 files: 
 - lib/rhc-common.rb
 - lib/rhc
-- bin/rhc-ctl-domain
-- bin/rhc-port-forward
 - bin/rhc-ctl-app
-- bin/rhc-tail-files
-- bin/rhc-user-info
-- bin/rhc-snapshot
-- bin/rhc-domain-info
-- bin/rhc-chk
-- bin/rhc-domain
-- bin/rhc-create-app
-- bin/rhc
 - bin/rhc-app
+- bin/rhc-create-app
+- bin/rhc-domain
+- bin/rhc-chk
 - bin/rhc-create-domain
+- bin/rhc-domain-info
+- bin/rhc
+- bin/rhc-user-info
 - bin/rhc-sshkey
+- bin/rhc-port-forward
+- bin/rhc-snapshot
+- bin/rhc-tail-files
+- bin/rhc-ctl-domain
 - conf/express.conf
 - LICENSE
 - README