rhc 0.72.29 → 0.73.14

data/Rakefile

@@ -3,7 +3,7 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 task :default => [:package]
 
@@ -15,16 +15,21 @@ spec = Gem::Specification.new do |s|
     s.email = %q{openshift@redhat.com}
     s.summary = %q{OpenShift Express Client Tools}
     s.homepage = %q{https://openshift.redhat.com/app/express}
-    s.description = %q{OpenShift Express Client Tools}
+    s.description = %q{The client tools for the OpenShift Express platform that allow for application management.}
     s.files = FileList['lib/**/*.rb', 'bin/*', 'conf/*'].to_a
     s.files += %w(LICENSE README Rakefile)
     s.executables = ['rhc-create-app', 'rhc-create-domain', 'rhc-ctl-app', 'rhc-snapshot', 'rhc-user-info', 'rhc-tail-files']
-    s.add_dependency('json')
+    # Use Ruby version to target F13, RHEL5, Windows and OSX (assume no Xcode)
+    if RUBY_VERSION == "1.8.6" or RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /darwin/
+        s.add_dependency('json_pure')
+    else
+        s.add_dependency('json')
+    end
     s.add_dependency('parseconfig')
 end
 
 # Define a :package task that bundles the gem
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = false
 end
 

data/bin/rhc-create-app

@@ -26,7 +26,7 @@ require 'rhc-common'
 def p_usage
     libra_server = get_var('libra_server')
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
-    type_keys = RHC::get_cartridge_list(nil, ', ', libra_server, @http, false)
+    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, @http, 'standalone', false)
     puts <<USAGE
 
 Usage: #{$0}
@@ -90,8 +90,7 @@ if !RHC::check_app(opt['app'])
     p_usage
 end
 
-type = RHC::get_cartridge_type(opt['type'])
-if !type
+if !opt['type']
     puts 'Type is required'
     p_usage
 end
@@ -175,7 +174,10 @@ url = URI.parse("https://#{libra_server}/broker/cartridge")
 response = RHC::http_post(@http, url, json_data, password)
 
 if response.code == '200'
-    RHC::print_response_success(response, debug, true)
+    json_resp = JSON.parse(response.body)
+    RHC::print_response_success(json_resp, debug, true)
+    json_data = JSON.parse(json_resp['data'])
+    health_check_path = json_data['health_check_path']
 else
     RHC::print_response_err(response, debug)
 end
@@ -213,7 +215,7 @@ found = false
 begin
     File.open(ssh_config, "r") do |sline|
         while(line = sline.gets)
-            if line.to_s.start_with? "Host *.#{user_info['user_info']['rhc_domain']}"
+            if line.to_s.index("Host *.#{user_info['user_info']['rhc_domain']}") == 0
                 found = true
                 break
             end
@@ -307,7 +309,8 @@ unless opt['nogit']
     puts "Pulling new repo down"
 
     puts "git clone --quiet #{git_url} #{opt['repo']}" if debug
-    git_pull = `git clone #{debug ? ' ' : '--quiet '}#{git_url} #{opt['repo']}`
+    quiet = (debug ? ' ' : '--quiet ')
+    git_pull = %x<git clone #{quiet} #{git_url} #{opt['repo']}>
     if $?.exitstatus != 0
         puts "Error in git pull"
         puts git_pull
@@ -345,13 +348,7 @@ puts "Confirming application #{opt['app']} is available"
 while attempt < RHC::Maxretries
     attempt+=1
     puts "  Attempt # #{attempt}"
-    page = 'health'
-    if (type == :php)
-      page = 'health_check.php'
-    elsif (type == :perl)
-      page = 'health_check.pl'
-    end
-    url = URI.parse("http://#{fqdn}/#{page}")
+    url = URI.parse("http://#{fqdn}/#{health_check_path}")
     begin
       response = @http.get_response(url)
     rescue Exception => e

data/bin/rhc-create-domain

@@ -148,9 +148,9 @@ response = RHC::http_post(@http, url, json_data, password)
 
 if response.code == '200'
     begin
-        RHC::print_response_success(response, debug)
-        json_resp = JSON.parse(response.body);
-        json_rhlogininfo = JSON.parse(json_resp['result'])
+        json_resp = JSON.parse(response.body)
+        RHC::print_response_success(json_resp, debug)
+        json_rhlogininfo = JSON.parse(json_resp['data'])
         add_rhlogin_config(json_rhlogininfo['rhlogin'], json_rhlogininfo['uuid'])
     
         if opt['alter'] != ''

data/bin/rhc-ctl-app

@@ -23,6 +23,8 @@
 
 require 'rhc-common'
 
+embed_mapper = { 'add' => 'configure', 'remove' => 'deconfigure' }
+
 def p_usage
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
@@ -34,6 +36,8 @@ Control an OpenShift express app
   -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|restart|reload|status|destroy)
+  -L|--embedded-list       List supported embedded cartridges
+  -e|--embed               (add-$cartridge|remove-$cartridge) eg: add-mysql-5.1
   -b|--bypass              Bypass warnings
   -d|--debug               Print Debug info
   -h|--help                Show Usage info
@@ -42,15 +46,28 @@ USAGE
 exit 255
 end
 
+def p_embedded_list
+    libra_server = get_var('libra_server')
+    puts ""
+    puts "List of supported embedded cartridges:"
+    puts ""
+    type_keys = RHC::get_cartridge_listing(nil, ', ', libra_server, @http, 'embedded', false)
+    puts type_keys
+    puts ""
+    exit 255
+end
+
 begin
     opts = GetoptLong.new(
         ["--debug",     "-d", GetoptLong::NO_ARGUMENT],
         ["--help",      "-h", GetoptLong::NO_ARGUMENT],
         ["--bypass",    "-b", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin",   "-l", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--embedded-list",   "-L", GetoptLong::NO_ARGUMENT],
+        ["--rhlogin",    "-l", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--embed",      "-e", GetoptLong::OPTIONAL_ARGUMENT],
         ["--password",   "-p", GetoptLong::OPTIONAL_ARGUMENT],
-        ["--app",       "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--command",   "-c", GetoptLong::REQUIRED_ARGUMENT]
+        ["--app",        "-a", GetoptLong::REQUIRED_ARGUMENT],
+        ["--command",    "-c", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -67,6 +84,9 @@ debug = get_var('debug') == 'false' ? nil : get_var('debug')
 ssh_config = "#{ENV['HOME']}/.ssh/config"
 ssh_config_d = "#{ENV['HOME']}/.ssh/"
 
+if opt["embedded-list"]
+    p_embedded_list
+end
 if opt["help"]
     p_usage
 end
@@ -85,12 +105,12 @@ if !RHC::check_app(opt['app'])
     p_usage
 end
 
-unless defined? opt["command"] and opt["command"] =~ /(start|stop|restart|reload|status|destroy)/
-    puts "Command is required"
+unless opt["embed"] or (opt["command"] and opt["command"] =~ /(start|stop|restart|reload|status|destroy)/)
+    puts "Command or embed is required"
     p_usage
 end
 
-if !opt['rhlogin'] || !opt['app'] || !opt['command']
+unless opt['rhlogin'] && opt['app'] && (opt['command'] || opt['embed'])
     p_usage
 end
 
@@ -133,8 +153,19 @@ WARNING
     end
 end
 
+if opt['embed']
+    action = opt['embed'].split('-')[0]
+    # override action if it's in the mapper
+    action = embed_mapper[opt['embed'].split('-')[0]] if embed_mapper[opt['embed'].split('-')[0]]
+    framework = opt['embed'].split('-')[1..-1].join('-')
+    url = URI.parse("https://#{libra_server}/broker/embed_cartridge")
+else
+    action = opt['command']
+    url = URI.parse("https://#{libra_server}/broker/cartridge")
+end
+
 data = {:cartridge => framework,
-                :action => opt['command'],
+                :action => action,
                 :app_name => "#{opt['app']}",
                 :rhlogin => "#{opt['rhlogin']}"
                 }
@@ -143,14 +174,15 @@ if debug
 end
 
 json_data = JSON.generate(data)
+puts "Submitting form: #{json_data}" if debug
 
 puts "Contacting https://#{libra_server}"
 
-url = URI.parse("https://#{libra_server}/broker/cartridge")
 response = RHC::http_post(@http, url, json_data, password)
 
 if response.code == '200'
-    RHC::print_response_success(response, debug, true)
+    json_resp = JSON.parse(response.body)
+    RHC::print_response_success(json_resp, debug, true)
 else
     RHC::print_response_err(response, debug)
 end

data/bin/rhc-tail-files

@@ -35,7 +35,7 @@ Tail the logs of an application
 
   -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -a|--app                  Target application (required)
-  -f|--files                File glob relative to app (default ./logs/*) (optional)
+  -f|--files                File glob relative to app (default <application_name>/logs/*) (optional)
   -p|--password  password   RHLogin password (optional, will prompt)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
@@ -100,8 +100,8 @@ unless user_info['app_info'][app]
     exit 101
 end
 
-opt['files'] = "logs/*" unless opt['files']
-file_glob = "#{opt['app']}/#{opt['files']}"
+opt['files'] = "#{opt['app']}/logs/*" unless opt['files']
+file_glob = "#{opt['files']}"
 app_uuid = user_info['app_info'][app]['uuid']
 namespace = user_info['user_info']['namespace']
 rhc_domain = user_info['user_info']['rhc_domain']

data/bin/rhc-user-info

@@ -107,11 +107,20 @@ if opt['apps']
     puts "================"
     user_info['app_info'].each do |key, val|
         puts key
-        puts "  Framework: #{val['framework']}"
-        puts "   Creation: #{val['creation_time']}"
-        puts "   UUID: #{val['uuid']}"
-        puts "    Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
-        puts " Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/"
+        puts "    Framework: #{val['framework']}"
+        puts "     Creation: #{val['creation_time']}"
+        puts "         UUID: #{val['uuid']}"
+        puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
+        puts "   Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/"
+        puts ""
+        puts " Embedded: "
+        if val['embedded']
+            val['embedded'].each do |embed_key, embed_val|
+                puts "      #{embed_key} - #{embed_val['info']}"
+            end
+        else
+            puts "      None"
+        end
         puts ""
     end
 

data/lib/rhc-common.rb

@@ -41,10 +41,10 @@ module RHC
     (time*=adj).to_int
   end
   
-  def self.get_cartridges_tbl(libra_server, net_http, debug=true, print_result=nil)
+  def self.get_cartridges_list(libra_server, net_http, cart_type="standalone", debug=true, print_result=nil)
     puts "Contacting https://#{libra_server} to obtain list of cartridges..."
     puts " (please excuse the delay)"
-    data = {'cart_types' => "standalone"}
+    data = {'cart_type' => cart_type}
     if debug
       data['debug'] = "true"
     end
@@ -58,31 +58,23 @@ module RHC
       print_response_err(response, debug)
       return []
     end
+    json_resp = JSON.parse(response.body)
     if print_result
-      print_response_success(response, debug)
+      print_response_success(json_resp, debug)
     end
     begin
-      json_resp = JSON.parse(response.body)
-      carts = (JSON.parse(json_resp['result']))['carts']
+      carts = (JSON.parse(json_resp['data']))['carts']
     rescue JSON::ParserError
       exit 254
     end
     carts
   end
 
-  def self.get_cartridge_list(carts, sep, libra_server, net_http, debug=true, print_result=nil)
-    carts = get_cartridges_tbl(libra_server, net_http, debug, print_result) if carts.nil?
+  def self.get_cartridge_listing(carts, sep, libra_server, net_http, cart_type="standalone", debug=true, print_result=nil)
+    carts = get_cartridges_list(libra_server, net_http, cart_type, debug, print_result) if carts.nil?
     carts.join(sep)
   end
 
-  def self.get_cartridge_type(type)
-    if type
-      type = type.split('-')[0]
-      return type.to_sym
-    end
-    nil
-  end
-
 
   # Invalid chars (") ($) (^) (<) (>) (|) (%) (/) (;) (:) (,) (\) (*) (=) (~)
   def self.check_rhlogin(rhlogin)
@@ -128,7 +120,7 @@ module RHC
 
   def self.print_post_data(h, debug)
     if (debug)
-      puts 'DEBUG: Submitting form:'
+      puts 'Submitting form:'
       h.each do |k,v|
         if k.to_s != 'password'
           puts "#{k.to_s}: #{v.to_s}"
@@ -172,12 +164,12 @@ module RHC
       end
       exit 254
     end
+    json_resp = JSON.parse(response.body)
     if print_result
-      print_response_success(response, debug)
+      print_response_success(json_resp, debug)
     end
     begin
-      json_resp = JSON.parse(response.body)
-      user_info = JSON.parse(json_resp['result'].to_s)
+      user_info = JSON.parse(json_resp['data'].to_s)
     rescue JSON::ParserError
       exit 254
     end
@@ -231,7 +223,8 @@ module RHC
     end
     exit_code = 254
     if response.content_type == 'application/json'
-      exit_code = print_json_body(response, debug)
+      json_resp = JSON.parse(response.body)
+      exit_code = print_json_body(json_resp, debug)
     elsif debug
       puts "HTTP response from server is #{response.body}"
     end
@@ -248,20 +241,18 @@ module RHC
     end
   end
 
-  def self.print_response_success(response, debug, always_print_result=false)
+  def self.print_response_success(json_resp, debug, always_print_result=false)
     if debug
       puts "Response from server:"
-      print_json_body(response, debug)
+      print_json_body(json_resp, debug)
     elsif always_print_result
-      print_json_body(response, debug)
+      print_json_body(json_resp, debug)
     else
-      json_resp = JSON.parse(response.body)
       print_response_messages(json_resp)
     end
   end
 
-  def self.print_json_body(response, debug)
-    json_resp = JSON.parse(response.body)
+  def self.print_json_body(json_resp, debug)
     print_response_messages(json_resp)
     exit_code = json_resp['exit_code']
     if debug
@@ -273,7 +264,7 @@ module RHC
         puts "Exit Code: #{exit_code}"
         if (json_resp.length > 3)
           json_resp.each do |k,v|
-            if (k != 'result' && k != 'debug' && k != 'exit_code' && k != 'messages')
+            if (k != 'result' && k != 'debug' && k != 'exit_code' && k != 'messages' && k != 'data')
               puts "#{k.to_s}: #{v.to_s}"
             end
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 261
+  hash: 295
   prerelease: false
   segments: 
   - 0
-  - 72
-  - 29
-  version: 0.72.29
+  - 73
+  - 14
+  version: 0.73.14
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 -05:00
+date: 2011-07-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-description: OpenShift Express Client Tools
+description: The client tools for the OpenShift Express platform that allow for application management.
 email: openshift@redhat.com
 executables: 
 - rhc-create-app