rhc 0.82.18 → 0.83.9

data/bin/rhc-ctl-app

@@ -35,7 +35,7 @@ Control an OpenShift express app
   -a|--app   application   Application name  (alphanumeric) (required)
   -l|--rhlogin rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -p|--password password   RHLogin password  (optional, will prompt)
-  -c|--command command     (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias)
+  -c|--command command     (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump)
   -L|--embedded-list       List supported embedded cartridges
   -e|--embed               (add|remove|stop|start|restart|status|reload)-$cartridge eg: add-mysql-5.1
   -b|--bypass              Bypass warnings
@@ -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)$/
-    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias)"
+  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)"
     p_usage
   end
 elsif opt["embed"]
@@ -144,6 +144,9 @@ if opt['command'] and (opt['alias'] and !(opt['command'] =~ /-alias$/)) || ((opt
     p_usage
 end
 
+if opt["command"] == "threaddump"
+    print "NOTE: The threaddump command is only applicable to applications of type jbossas-7.0. The thread dump file will be available via 'rhc-tail-files -f app-name/jbossas-7.0/stdout.log'"  
+end
 
 password = opt['password']
 if !password

data/lib/rhc-common.rb

@@ -26,6 +26,8 @@ require 'getoptlong'
 require 'json'
 require 'net/http'
 require 'net/https'
+#require 'net/ssh'
+require 'open3'
 require 'parseconfig'
 require 'resolv'
 require 'uri'
@@ -38,10 +40,11 @@ module RHC
   MAX_RETRIES = 7
   DEFAULT_DELAY = 2
   API = "1.1.1"
+  PATTERN_VERSION=/\A\d+\.\d+\.\d+\z/
   @mytimeout = 10
   @mydebug = false
-  broker_version = "?.?.?"
-  api_version = "?.?.?"
+  @@broker_version = "?.?.?"
+  @@api_version = "?.?.?"
 
   # reset lines
   # \r moves the cursor to the beginning of line
@@ -75,11 +78,19 @@ module RHC
   end
 
   def self.update_server_api_v(dict)
-    if !dict['broker'].nil? && (dict['broker'] =~ /\A\d+\.\d+\.\d+\z/)
-      broker_version = dict['broker']
+    if !dict['broker'].nil? && (dict['broker'] =~ PATTERN_VERSION)
+      @@broker_version = dict['broker']
     end
-    if !dict['api'].nil? && (dict['api'] =~ /\A\d+\.\d+\.\d+\z/)
-      api_version = dict['api']
+    if !dict['api'].nil? && (dict['api'] =~ PATTERN_VERSION)
+      @@api_version = dict['api']
+    end
+  end
+
+  def self.check_version
+    if @@api_version =~ PATTERN_VERSION
+      if API != @@api_version
+        puts "\nNOTICE: Client API version (#{API}) does not match the server (#{@@api_version}).\nThough requests may succeed, you should consider updating your client tools.\n\n"
+      end
     end
   end
 
@@ -283,8 +294,6 @@ module RHC
     end
     exit_code = 1
     if response.content_type == 'application/json'
-      print "JSON response:"
-      $stdout.flush
       begin
         json_resp = JSON.parse(response.body)
         exit_code = print_json_body(json_resp)
@@ -432,6 +441,9 @@ module RHC
       puts
     end
     
+    # construct the Git URL
+    git_url = "ssh://#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}/~/git/#{app_name}.git/"
+
     # If the hostname couldn't be resolved, print out the git URL
     # and exit cleanly.  This will help solve issues where DNS times
     # out in APAC, etc on resolution.
@@ -473,8 +485,6 @@ WARNING
     # Pull new repo locally
     #
     
-    git_url = "ssh://#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}/~/git/#{app_name}.git/"
-    
     unless no_git
         puts "Pulling new repo down" if @mydebug
     
@@ -599,6 +609,62 @@ LOOKSGOOD
     http_post(net_http, url, json_data, password)
   end
   
+  # Runs rhc-list-ports on server to check available ports
+  # :stderr return user-friendly port name, :stdout returns 127.0.0.1:8080 format
+  def self.list_ports(rhc_domain, namespace, app_name, app_uuid, debug=true)
+
+    ip_and_port_simple_regex = /[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\:[0-9]{1,5}/
+
+    ssh_host = "#{app_name}-#{namespace}.#{rhc_domain}"
+
+    ssh_cmd = "ssh -t #{app_uuid}@#{ssh_host} 'rhc-list-ports'"
+
+    hosts_and_ports = []
+    hosts_and_ports_descriptions = []
+
+    puts ssh_cmd if debug
+
+    Open3.popen3(ssh_cmd) { |stdin, stdout, stderr| 
+
+      stdout.each { |line|
+        line = line.chomp
+        if ip_and_port_simple_regex.match(line)
+          hosts_and_ports << line
+        end
+      }
+
+      stderr.each { |line|
+        line = line.chomp
+        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/)
+
+    # Net::SSH.start(ssh_host, app_uuid) do |ssh| 
+
+    #   ssh.exec!("rhc-list-ports") do |channel, stream, data|
+
+    #     array = data.split(/\n/)
+
+    #     if stream == :stderr 
+    #       hosts_and_ports_descriptions = array
+    #     elsif stream == :stdout 
+    #       hosts_and_ports = array
+    #     end
+
+    #   end
+
+    # end
+
+    return hosts_and_ports, hosts_and_ports_descriptions
+
+  end
+  
   def self.ctl_app(libra_server, net_http, app_name, rhlogin, password, action, embedded=false, framework=nil, server_alias=nil, print_result=true)
     data = {:action => action,
             :app_name => app_name,
@@ -634,6 +700,12 @@ LOOKSGOOD
 
 end
 
+# provide a hook for performing actions before rhc-* commands exit
+at_exit {
+  # ensure client tools are up to date
+  RHC::check_version
+}
+
 #
 # Config paths... /etc/openshift/express.conf or $GEM/conf/express.conf -> ~/.openshift/express.conf
 #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 371
+  hash: 321
   prerelease: 
   segments: 
   - 0
-  - 82
-  - 18
-  version: 0.82.18
+  - 83
+  - 9
+  version: 0.83.9
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 Z
+date: 2011-12-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -61,13 +61,13 @@ extra_rdoc_files: []
 
 files: 
 - lib/rhc-common.rb
-- bin/rhc-create-app
-- bin/rhc-chk
-- bin/rhc-user-info
-- bin/rhc-create-domain
-- bin/rhc-snapshot
 - bin/rhc-ctl-app
 - bin/rhc-tail-files
+- bin/rhc-user-info
+- bin/rhc-snapshot
+- bin/rhc-chk
+- bin/rhc-create-app
+- bin/rhc-create-domain
 - conf/express.conf
 - LICENSE
 - README