rhc 0.68.5 → 0.69.3

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
     s.description = %q{OpenShift Express Client Tools}
     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']
+    s.executables = ['rhc-create-app', 'rhc-create-domain', 'rhc-ctl-app', 'rhc-snapshot', 'rhc-user-info', 'rhc-tail-files']
     s.add_dependency('json')
     s.add_dependency('parseconfig')
 end

data/bin/rhc-create-app

@@ -110,16 +110,18 @@ end
 
 uuid = get_var(opt["rhlogin"])
 unless uuid
-    puts "Could not find UUID for #{opt["rhlogin"]}"
+    puts "Could not find UUID for '#{opt["rhlogin"]}' in express.conf.  Be sure you have successfully ran rhc-create-domain before running rhc-create-app."
     exit 99
 end
 
 opt["repo"] = opt["app"] unless opt["repo"]
 
-puts ""
-puts "Please support the developer preview - let #openshift on freenode know of any"
-puts "bugs you find"
-puts ""
+puts "
+Found a bug? Post to the forum and we'll get right on it.
+    IRC: #openshift on freenode
+    Forums: https://www.redhat.com/openshift/forums
+
+"
 
 #
 # Confirm local git repo exists
@@ -310,8 +312,8 @@ git_url = "ssh://#{uuid}@#{opt['app']}-#{user_info['user_info']['namespace']}.#{
 unless opt['nogit']
     puts "Pulling new repo down"
 
-    puts "git clone #{git_url} #{opt['repo']}" if debug
-    git_pull = `git clone #{git_url} #{opt['repo']}`
+    puts "git clone --quiet #{git_url} #{opt['repo']}" if debug
+    git_pull = `git clone #{debug ? ' ' : '--quiet '}#{git_url} #{opt['repo']}`
     if $?.exitstatus != 0
         puts "Error in git pull"
         puts git_pull

data/bin/rhc-create-domain

@@ -38,7 +38,7 @@ Bind a registered rhcloud user to a domain in rhcloud.
   -n|--namespace   namespace   Opensift 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 ssh key
+  -a|--alter                   Alter namespace (will change urls) and/or ssh key
   -d|--debug                   Print Debug info
   -h|--help                    Show Usage info
 
@@ -127,7 +127,7 @@ if File.readable?(libra_kfile)
 else
     puts "Generating Openshift Express ssh key to #{libra_kfile}"
     # Use system for interaction
-    system("ssh-keygen -t rsa -f #{libra_kfile}")
+    system("ssh-keygen -t rsa -f '#{libra_kfile}'")
 end
 
 ssh_key = File.open(libra_kpfile).gets.chomp.split(' ')[1]
@@ -164,7 +164,7 @@ in #{@local_config_path} which has been created and populated for you.
 
 EOF
         else
-            puts "RHLogin alteration successful."
+            puts "Alteration successful.  You can use rhc-user-info to view any url changes."
             puts
         end
         exit 0

data/bin/rhc-tail-files

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+# Copyright 2011 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'rhc-common'
+
+#
+# print help
+#
+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
+
+  -l|--rhlogin   rhlogin    RHCloud rhlogin (#{rhlogin})
+  -a|--app                  Target application to snapshot (required)
+  -f|--files                File glob relative to app (default ./logs/*) (optional)
+  -p|--password  password   RHLogin password (optional, will prompt)
+  -d|--debug                Print Debug info
+  -h|--help                 Show Usage info
+
+USAGE
+exit 255
+end
+
+begin
+    opts = GetoptLong.new(
+        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
+        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+        ["--app",  "-a", GetoptLong::REQUIRED_ARGUMENT],
+        ["--files",  "-f", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password",  "-p", GetoptLong::OPTIONAL_ARGUMENT]
+    )
+    opt = {}
+    opts.each do |o, a|
+        opt[o[2..-1]] = a.to_s
+    end
+rescue Exception => e
+  #puts e.message
+    p_usage
+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"
+
+if opt["help"] || !opt['app']
+    p_usage
+end
+
+if opt["debug"]
+    debug = true
+end
+
+opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
+
+if !RHC::check_rhlogin(opt['rhlogin'])
+    p_usage
+end
+
+password = opt['password']
+if !password
+  password = RHC::get_password
+end
+
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, false)
+
+app = opt['app']
+
+begin
+    framework = user_info['app_info'][app]['framework'].split('-')[0]
+rescue NoMethodError
+    puts
+    puts "Could not find app '#{opt['app']}'.  Please run rhc-user-info to get a list"
+    puts "of your current running applications"
+    puts
+    exit 101
+end
+
+opt['files'] = "logs/*" unless opt['files']
+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}'")
+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
+    exit 254
+end
+exit 0

data/lib/rhc-common.rb

@@ -40,7 +40,8 @@ module RHC
   TYPES = {
     'php-5.3.2' => :php,
     'rack-1.1.0' => :rack,
-    'wsgi-3.2.1' => :wsgi
+    'wsgi-3.2.1' => :wsgi,
+    'jbossas-7.0.0' => :jbossas
   }
 
   def self.delay(time, adj=Defaultdelay)
@@ -222,6 +223,16 @@ module RHC
     end
     exit exit_code.nil? ? 666 : exit_code
   end
+  
+  def self.print_response_messages(json_resp)    
+    messages = json_resp['messages']
+    if (messages && !messages.empty?)
+      puts ''
+      puts 'MESSAGES:'
+      puts messages
+      puts ''
+    end
+  end
 
   def self.print_response_success(response, debug, always_print_result=false)
     if debug
@@ -229,11 +240,15 @@ module RHC
       print_json_body(response, debug)
     elsif always_print_result
       print_json_body(response, 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);
+    json_resp = JSON.parse(response.body)
+    print_response_messages(json_resp)
     exit_code = json_resp['exit_code']
     if debug
       if json_resp['debug']
@@ -244,7 +259,7 @@ module RHC
         puts "Exit Code: #{exit_code}"
         if (json_resp.length > 3)
           json_resp.each do |k,v|
-            if (k != 'results' && k != 'debug' && k != 'exit_code')
+            if (k != 'result' && k != 'debug' && k != 'exit_code' && k != 'messages')
               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: 269
   prerelease: false
   segments: 
   - 0
-  - 68
-  - 5
-  version: 0.68.5
+  - 69
+  - 3
+  version: 0.69.3
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 -05:00
+date: 2011-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ executables:
 - rhc-ctl-app
 - rhc-snapshot
 - rhc-user-info
+- rhc-tail-files
 extensions: []
 
 extra_rdoc_files: []
@@ -61,6 +62,7 @@ extra_rdoc_files: []
 files: 
 - lib/rhc-common.rb
 - bin/rhc-create-domain
+- bin/rhc-tail-files
 - bin/rhc-create-app
 - bin/rhc-ctl-app
 - bin/rhc-user-info