rhc 0.69.6 → 0.71.2

data/bin/rhc-create-app

@@ -25,11 +25,11 @@ require 'rhc-common'
 
 def p_usage
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
-    type_keys = RHC::get_cartridge_types(', ')
+    type_keys = RHC::get_supported_cartridge_types(', ')
     puts <<USAGE
 
 Usage: #{$0}
-Create a new app Openshift Express project.
+Create an Openshift Express app.
 
   -a|--app   application     Application name  (alphanumeric - max #{RHC::Maxdlen} chars) (required)
   -t|--type  type            Type of app to create (#{type_keys}) (required)
@@ -65,7 +65,6 @@ rescue Exception => e
 end
 
 # Pull in configs from files
-libra_domain = get_var('libra_domain')
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
@@ -216,14 +215,14 @@ puts "Checking ~/.ssh/config"
 
 user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, false)
 
-my_url = "#{opt['app']}-#{user_info['user_info']['namespace']}.#{libra_domain}"
+my_url = "#{opt['app']}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}"
 
 found = false
 
 begin
     File.open(ssh_config, "r") do |sline|
         while(line = sline.gets)
-            if line.to_s.start_with? "Host *.#{libra_domain}"
+            if line.to_s.start_with? "Host *.#{user_info['user_info']['rhc_domain']}"
                 found = true
                 break
             end
@@ -240,15 +239,15 @@ rescue Errno::ENOENT
     puts "Could not find #{ssh_config}.  This is ok, continuing"
 end
 if found
-    puts "Found #{libra_domain} in ~/.ssh/config... No need to adjust"
+    puts "Found #{user_info['user_info']['rhc_domain']} in ~/.ssh/config... No need to adjust"
 else
-    puts "    Adding #{libra_domain} to ~/.ssh/config"
+    puts "    Adding #{user_info['user_info']['rhc_domain']} to ~/.ssh/config"
     begin
         f = File.open(ssh_config, "a")
         f.puts <<SSH
 
-# Added by rhc-create-app app on #{`date`}
-Host *.#{libra_domain}
+# Added by rhc-create-app on #{`date`}
+Host *.#{user_info['user_info']['rhc_domain']}
     IdentityFile ~/.ssh/libra_id_rsa
     VerifyHostKeyDNS yes
     StrictHostKeyChecking no
@@ -306,7 +305,7 @@ attempt = 0
 # Pull new repo locally
 #
 
-git_url = "ssh://#{uuid}@#{opt['app']}-#{user_info['user_info']['namespace']}.#{libra_domain}/~/git/#{opt['app']}.git/"
+git_url = "ssh://#{uuid}@#{opt['app']}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{opt['app']}.git/"
 
 unless opt['nogit']
     puts "Pulling new repo down"

data/bin/rhc-create-domain

@@ -35,7 +35,7 @@ Bind a registered rhcloud user to a domain in rhcloud.
   NOTE: to change ssh key, please alter your ~/.ssh/libra_id_rsa and
         ~/.ssh/libra_id_rsa.pub key, then re-run with --alter
 
-  -n|--namespace   namespace   Opensift Express namespace (alphanumeric - max #{RHC::Maxdlen} chars) (required)
+  -n|--namespace   namespace   Openshift Express namespace (alphanumeric - max #{RHC::Maxdlen} chars) (required)
   -l|--rhlogin     rhlogin     Red Hat login (required)
   -p|--password    password    RHLogin password (optional, will prompt)
   -a|--alter                   Alter namespace (will change urls) and/or ssh key

data/bin/rhc-ctl-app

@@ -62,7 +62,6 @@ rescue Exception => e
 end
 
 # Pull in configs from files
-libra_domain = get_var('libra_domain')
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 ssh_config = "#{ENV['HOME']}/.ssh/config"
@@ -123,7 +122,7 @@ if !opt["bypass"] and opt["command"] == "deconfigure"
 !!!! WARNING !!!! WARNING !!!! WARNING !!!!
 You are about to destroy the #{opt['app']} application.
 
-This is NOT reversable, all remote data for this application will be removed.
+This is NOT reversible, all remote data for this application will be removed.
 WARNING
 
     print "Do you want to destroy this application (y/n): "

data/bin/rhc-snapshot

@@ -30,7 +30,7 @@ def p_usage
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
     puts <<USAGE
 
-Usage: rhc-snapshot
+Usage: #{$0}
 Pull down application snapshot for a user
 
   -l|--rhlogin   rhlogin    RHCloud rhlogin (#{rhlogin})
@@ -65,7 +65,6 @@ end
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
-libra_domain = get_var('libra_domain')
 
 libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
 libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
@@ -106,13 +105,13 @@ end
 
 puts "Pulling down a snapshot to #{opt['save']}"
 puts 
-puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{libra_domain} 'snapshot #{framework} #{app}' > #{opt['save']}" if debug
-git_pull = `ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{libra_domain} 'snapshot #{framework} #{app}' > #{opt['save']}`
+puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'snapshot #{framework} #{app}' > #{opt['save']}" if debug
+git_pull = `ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'snapshot #{framework} #{app}' > #{opt['save']}`
 if $?.exitstatus != 0
     puts
     puts "Error in trying to save snapshot.  You can try to save manually by running:"
     puts
-    puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{libra_domain} 'snapshot #{framework} #{app}' > #{opt['save']}"
+    puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'snapshot #{framework} #{app}' > #{opt['save']}"
     puts
     exit 254
 end

data/bin/rhc-tail-files

@@ -30,11 +30,11 @@ def p_usage
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
     puts <<USAGE
 
-Usage: rhc-tail-file
-Pull down application snapshot for a user
+Usage: #{$0}
+Tail the logs of an application
 
   -l|--rhlogin   rhlogin    RHCloud rhlogin (#{rhlogin})
-  -a|--app                  Target application to snapshot (required)
+  -a|--app                  Target application (required)
   -f|--files                File glob relative to app (default ./logs/*) (optional)
   -p|--password  password   RHLogin password (optional, will prompt)
   -d|--debug                Print Debug info
@@ -65,7 +65,6 @@ end
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
-libra_domain = get_var('libra_domain')
 
 libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
 libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
@@ -109,13 +108,13 @@ file_glob = "#{framework}/#{opt['app']}/#{opt['files']}"
 puts "Attempting to tail files: #{file_glob}"
 puts "Use ctl + c to stop"
 puts 
-puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{libra_domain} 'tail #{file_glob}'" if debug
-system("ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{libra_domain} 'tail #{file_glob}'")
+puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'tail #{file_glob}'" if debug
+system("ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'tail #{file_glob}'")
 if $?.exitstatus != 0 and $?.exitstatus != 255
     puts
     puts "Error in trying to tail files.  You can tail manually by running:"
     puts
-    puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{libra_domain} 'tail #{file_glob}'`"
+    puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'tail #{file_glob}'`"
     puts
     exit 254
 end

data/bin/rhc-user-info

@@ -38,7 +38,7 @@ def p_usage
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
     puts <<USAGE
 
-Usage: rhc-user-info
+Usage: #{$0}
 Display information about a user
 
   -l|--rhlogin   rhlogin    RHCloud rhlogin (#{rhlogin})
@@ -85,7 +85,6 @@ end
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
-libra_domain = get_var('libra_domain')
 
 libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
 libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
@@ -141,8 +140,8 @@ if opt['apps']
         puts key
         puts "  Framework: #{val['framework']}"
         puts "   Creation: #{val['creation_time']}"
-        puts "    Git URL: ssh://#{user_info['user_info']['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{libra_domain}/~/git/#{key}.git/"
-        puts " Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{libra_domain}/"
+        puts "    Git URL: ssh://#{user_info['user_info']['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 ""
     end
 

data/conf/express.conf

@@ -1,6 +1,3 @@
-# Default OpenShift domain
-libra_domain='rhcloud.com'
-
 # Remote API server
 libra_server = 'openshift.redhat.com'
 

data/lib/rhc-common.rb

@@ -44,17 +44,27 @@ module RHC
     'wsgi-3.2.1' => :wsgi,
     'jbossas-7.0.0' => :jbossas
   }
+  
+  SUPPORTED_TYPES = {
+    'php-5.3.2' => :php,
+    'rack-1.1.0' => :rack,
+    'wsgi-3.2.1' => :wsgi
+  }
 
   def self.delay(time, adj=Defaultdelay)
     (time*=adj).to_int
   end
+  
+  def self.get_supported_cartridge_types(sep=', ')
+    return get_cartridge_types(SUPPORTED_TYPES)
+  end
 
-  def self.get_cartridge_types(sep=', ')
+  def self.get_cartridge_types(types=TYPES, sep=', ')
     i = 1
     type_keys = ''
-    TYPES.each_key do |key|
+    types.each_key do |key|
       type_keys += key
-      if i < TYPES.size
+      if i < types.size
         type_keys += sep
       end
       i += 1
@@ -107,7 +117,7 @@ module RHC
   def self.get_cartridge(type)
     if type
       if !(RHC::TYPES.has_key?(type))
-        puts 'type must be ' << get_cartridge_types(' or ')
+        puts 'type must be ' << get_supported_cartridge_types(' or ')
       else
         return RHC::TYPES[type]
       end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 69
-  - 6
-  version: 0.69.6
+  - 71
+  - 2
+  version: 0.71.2
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -05:00
+date: 2011-05-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency