rhc 0.79.5 → 0.80.5

data/bin/rhc-create-app

@@ -32,7 +32,7 @@ def p_usage
 Usage: #{$0}
 Create an OpenShift Express app.
 
-  -a|--app   application     Application name  (alphanumeric - max #{RHC::Maxdlen} chars) (required)
+  -a|--app   application     Application name  (alphanumeric - max #{RHC::APP_NAME_MAX_LENGTH} chars) (required)
   -t|--type  type            Type of app to create (#{type_keys}) (required)
   -l|--rhlogin  rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -p|--password  password    RHLogin password  (optional, will prompt)
@@ -281,7 +281,7 @@ sleep 15
 # Now start checking for DNS
 loop = 0
 sleep_time = 2
-while loop < RHC::Maxretries && !RHC::hostexist?(fqdn)
+while loop < RHC::MAX_RETRIES && !RHC::hostexist?(fqdn)
     sleep sleep_time
     loop+=1
     puts "  retry # #{loop} - Waiting for DNS: #{fqdn}"
@@ -305,7 +305,7 @@ git_url = "ssh://#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}/~/git/#{app_
 # 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.
-if loop >= RHC::Maxretries
+if loop >= RHC::MAX_RETRIES
     puts <<WARNING
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -379,7 +379,7 @@ end
 sleep_time = 2
 attempt = 0
 puts "Confirming application #{opt['app']} is available"
-while attempt < RHC::Maxretries
+while attempt < RHC::MAX_RETRIES
     attempt+=1
     puts "  Attempt # #{attempt}"
     url = URI.parse("http://#{fqdn}/#{health_check_path}")

data/bin/rhc-create-domain

@@ -36,7 +36,7 @@ Bind a registered rhcloud user to a domain in rhcloud.
   NOTE: to change ssh key, alter your openshift <id_rsa> and
         <id_rsa>.pub keys, then re-run with --alter
 
-  -n|--namespace   namespace   Namespace for your application(s) (alphanumeric - max #{RHC::Maxdlen} chars) (required)
+  -n|--namespace   namespace   Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required)
   -l|--rhlogin     rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (required)
   -p|--password    password    RHLogin password (optional, will prompt)
   -a|--alter                   Alter namespace (will change urls) and/or ssh key
@@ -187,14 +187,14 @@ EOF
                   # Now start checking for DNS
                   loop = 0
                   sleep_time = 2
-                  while loop < RHC::Maxretries && !RHC::hostexist?(fqdn)
+                  while loop < RHC::MAX_RETRIES && !RHC::hostexist?(fqdn)
                       sleep sleep_time
                       loop+=1
                       puts "  retry # #{loop} - Waiting for DNS: #{fqdn}"
                       sleep_time = RHC::delay(sleep_time)
                   end
                   
-                  if loop >= RHC::Maxretries
+                  if loop >= RHC::MAX_RETRIES
                       puts "Host could not be found: #{fqdn}"
                       dns_success = false
                   end

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|restart|reload|status|destroy)
+  -c|--command command     (start|stop|force-stop|restart|reload|status|destroy)
   -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
@@ -121,8 +121,8 @@ unless opt["embed"] or opt["command"]
 end
 
 if opt["command"]
-  unless opt["command"] =~ /^(start|stop|restart|reload|status|destroy)$/
-    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|restart|reload|status|destroy)"
+  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy)$/
+    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy)"
     p_usage
   end
 elsif opt["embed"]

data/bin/rhc-snapshot

@@ -120,7 +120,10 @@ else
   if File.exists? opt['restore']
     `tar -tf #{opt['restore']} './*/#{app}'`
     if $?.exitstatus != 0
-      puts "Archive at #{opt['restore']} does not contain the target application: ./#{app}"
+      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"
+      puts "the directory structure inside the archive starts with ./<app_uuid>/"
+      puts "i.e.: tar -czvf <app_name>.tar.gz ./<app_uuid>/"
       exit 255
     else
       `tar -tf #{opt['restore']} './*/git'`

data/bin/rhc-user-info

@@ -123,7 +123,11 @@ if opt['apps']
         puts " Embedded: "
         if val['embedded'] && !val['embedded'].empty? 
             val['embedded'].each do |embed_key, embed_val|
-                puts "      #{embed_key} - #{embed_val['info']}"
+                if embed_val.has_key?('info') && !embed_val['info'].empty?
+                    puts "      #{embed_key} - #{embed_val['info']}"
+                else
+                    puts "      #{embed_key}"
+                end
             end
         else
             puts "      None"

data/lib/rhc-common.rb

@@ -33,9 +33,10 @@ require 'uri'
 
 module RHC
 
-  Maxdlen = 16
-  Maxretries = 7
-  Defaultdelay = 2
+  DEFAULT_MAX_LENGTH = 16
+  APP_NAME_MAX_LENGTH = 32
+  MAX_RETRIES = 7
+  DEFAULT_DELAY = 2
   API = "1.1.1"
   @mytimeout = 10
   @mydebug = false
@@ -65,7 +66,7 @@ module RHC
     end
   end
 
-  def self.delay(time, adj=Defaultdelay)
+  def self.delay(time, adj=DEFAULT_DELAY)
     (time*=adj).to_int
   end
 
@@ -130,11 +131,11 @@ module RHC
   end
 
   def self.check_app(app)
-    check_field(app, 'application', Maxdlen)
+    check_field(app, 'application', APP_NAME_MAX_LENGTH)
   end
 
   def self.check_namespace(namespace)
-    check_field(namespace, 'namespace', Maxdlen)
+    check_field(namespace, 'namespace', DEFAULT_MAX_LENGTH)
   end
 
   def self.check_field(field, type, max=0)
@@ -143,8 +144,8 @@ module RHC
         puts "#{type} contains non-alphanumeric characters!"
         return false
       end
-      if max != 0 && field.length > Maxdlen
-        puts "maximum #{type} size is #{Maxdlen} characters"
+      if max != 0 && field.length > max
+        puts "maximum #{type} size is #{max} characters"
         return false
       end
     else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 297
+  hash: 341
   prerelease: 
   segments: 
   - 0
-  - 79
+  - 80
   - 5
-  version: 0.79.5
+  version: 0.80.5
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 Z
+date: 2011-10-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure