rhc 0.73.14 → 0.74.5

data/Rakefile

@@ -19,17 +19,19 @@ spec = Gem::Specification.new do |s|
     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']
+    begin
     # 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/
+    if ENV['JSON_PURE'] or (RUBY_VERSION == "1.8.6" or RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /darwin/)
         s.add_dependency('json_pure')
     else
         s.add_dependency('json')
     end
+    end
     s.add_dependency('parseconfig')
 end
 
 # Define a :package task that bundles the gem
-Gem::PackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg, args|
   pkg.need_tar = false
 end
 

data/bin/rhc-create-app

@@ -50,10 +50,10 @@ begin
         ["--debug", "-d", GetoptLong::NO_ARGUMENT],
         ["--help",  "-h", GetoptLong::NO_ARGUMENT],
         ["--nogit", "-n", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin",  "-l", GetoptLong::OPTIONAL_ARGUMENT],
-        ["--password",  "-p", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--app",   "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--repo",  "-r", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--repo",  "-r", GetoptLong::REQUIRED_ARGUMENT],
         ["--type",  "-t", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}

data/bin/rhc-create-domain

@@ -51,7 +51,7 @@ begin
         ["--debug", "-d", GetoptLong::NO_ARGUMENT],
         ["--help",  "-h", GetoptLong::NO_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--namespace", "-n", GetoptLong::REQUIRED_ARGUMENT],
         ["--alter", "-a", GetoptLong::NO_ARGUMENT]
     )

data/bin/rhc-ctl-app

@@ -63,9 +63,9 @@ begin
         ["--help",      "-h", GetoptLong::NO_ARGUMENT],
         ["--bypass",    "-b", GetoptLong::NO_ARGUMENT],
         ["--embedded-list",   "-L", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin",    "-l", GetoptLong::OPTIONAL_ARGUMENT],
-        ["--embed",      "-e", GetoptLong::OPTIONAL_ARGUMENT],
-        ["--password",   "-p", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--rhlogin",    "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--embed",      "-e", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password",   "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--app",        "-a", GetoptLong::REQUIRED_ARGUMENT],
         ["--command",    "-c", GetoptLong::REQUIRED_ARGUMENT]
     )

data/bin/rhc-snapshot

@@ -49,9 +49,9 @@ begin
         ["--debug", "-d", GetoptLong::NO_ARGUMENT],
         ["--help",  "-h", GetoptLong::NO_ARGUMENT],
         ["--app",  "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--save",  "-s", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--save",  "-s", GetoptLong::REQUIRED_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::OPTIONAL_ARGUMENT]
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|

data/bin/rhc-tail-files

@@ -22,6 +22,7 @@
 # SOFTWARE.
 
 require 'rhc-common'
+require 'base64'
 
 #
 # print help
@@ -36,6 +37,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 <application_name>/logs/*) (optional)
+  -o|--opts                 Options to pass to the server-side (linux based) tail command (-f is implicit.  See the linux tail man page full list of options.) (Ex: --opts '-n 100')
   -p|--password  password   RHLogin password (optional, will prompt)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
@@ -49,9 +51,10 @@ begin
         ["--debug", "-d", GetoptLong::NO_ARGUMENT],
         ["--help",  "-h", GetoptLong::NO_ARGUMENT],
         ["--app",  "-a", GetoptLong::REQUIRED_ARGUMENT],
-        ["--files",  "-f", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--opts",  "-o", GetoptLong::REQUIRED_ARGUMENT],
+        ["--files",  "-f", GetoptLong::REQUIRED_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::OPTIONAL_ARGUMENT]
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -69,15 +72,15 @@ debug = get_var('debug') == 'false' ? nil : get_var('debug')
 libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
 libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
 
-if opt["help"] || !opt['app']
+if opt['help'] || !opt['app']
     p_usage
 end
 
-if opt["debug"]
+if opt['debug']
     debug = true
 end
 
-opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
+opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
 
 if !RHC::check_rhlogin(opt['rhlogin'])
     p_usage
@@ -105,7 +108,7 @@ 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']
-ssh_cmd = "ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'tail #{file_glob}'"
+ssh_cmd = "ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'tail#{opt['opts'] ? ' --opts ' + Base64::encode64(opt['opts']).chomp : ''} #{file_glob}'"
 
 puts "Attempting to tail files: #{file_glob}"
 puts "Use ctl + c to stop"

data/bin/rhc-user-info

@@ -51,7 +51,7 @@ begin
         ["--apps",  "-a", GetoptLong::NO_ARGUMENT],
         ["--info",  "-i", GetoptLong::NO_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::OPTIONAL_ARGUMENT]
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -114,7 +114,7 @@ if opt['apps']
         puts "   Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/"
         puts ""
         puts " Embedded: "
-        if val['embedded']
+        if val['embedded'] && !val['embedded'].empty? 
             val['embedded'].each do |embed_key, embed_val|
                 puts "      #{embed_key} - #{embed_val['info']}"
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 295
+  hash: 317
   prerelease: false
   segments: 
   - 0
-  - 73
-  - 14
-  version: 0.73.14
+  - 74
+  - 5
+  version: 0.74.5
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -05:00
+date: 2011-07-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,12 +61,12 @@ extra_rdoc_files: []
 
 files: 
 - lib/rhc-common.rb
+- bin/rhc-ctl-app
+- bin/rhc-snapshot
 - bin/rhc-create-domain
+- bin/rhc-user-info
 - bin/rhc-tail-files
 - bin/rhc-create-app
-- bin/rhc-ctl-app
-- bin/rhc-user-info
-- bin/rhc-snapshot
 - conf/express.conf
 - LICENSE
 - README