rhc 0.84.15 → 0.85.12

data/bin/rhc-tail-files

@@ -76,7 +76,7 @@ check_cpath(opt)
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-if opt['help'] || !opt['app']
+if opt['help'] || !opt['app'] || 0 != ARGV.length
     p_usage
 end
 
@@ -104,7 +104,7 @@ app = opt['app']
 
 unless user_info['app_info'][app]
     puts
-    puts "Could not find app '#{opt['app']}'.  Please run rhc-user-info to get a list"
+    puts "Could not find app '#{opt['app']}'.  Please run rhc-domain-info to get a list"
     puts "of your current running applications"
     puts
     exit 101

data/bin/rhc-user-info

@@ -29,9 +29,13 @@ puts""
 
 args = ""
 ARGV.each do|a|
+  if a.to_s.strip.length == 0; a = "'#{a}'" end
   args += " #{a}"
 end
 
 system("rhc-domain-info #{args} 2>&1")
+retcode = $?
+
+exit 1 if retcode != 0
 
 exit 0

data/lib/rhc

@@ -0,0 +1,135 @@
+# 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.
+
+
+#
+# This is the bash auto completion script for the rhc command
+# 
+_rhc()
+{
+    local cur opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+
+    if [ $COMP_CWORD -eq 1 ]; then
+        opts="domain app sshkey help"
+        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+    elif [ $COMP_CWORD -eq 2 ]; then
+        case "${COMP_WORDS[1]}" in
+            domain)
+                opts="create show alter status destroy"
+                ;;
+            app)
+                opts="create show start stop force-stop restart reload status destroy tidy add-alias remove-alias threaddump snapshot tail cartridge"
+                ;;
+            sshkey)
+                opts="add update remove list"
+                ;;
+            *)
+                opts=""
+                ;;
+        esac
+
+    elif [ $COMP_CWORD -eq 3 ]; then
+        case "${COMP_WORDS[1]}" in
+            domain)
+                case "${COMP_WORDS[2]}" in
+                    create | alter | destroy)
+                        opts="--debug --help --rhlogin --password --namespace --config --timeout"
+                        ;;
+                    show | status)
+                        opts="--debug --help --rhlogin --password --config --timeout"
+                        ;;
+                    *)
+                        ;;
+                esac
+                ;;
+            app)
+                case "${COMP_WORDS[2]}" in
+                    create)
+                        opts="--debug --help --rhlogin --password --no-dns --nogit --app --repo --type --enable-jenkins --config --timeout"
+                        ;;
+                    show | start | stop | force-stop | restart | reload | status | destroy | tidy | add-alias | remove-alias | threaddump | destroy)
+                        opts="--debug --help --rhlogin --password --app --alias --bypass --config --timeout"
+                        ;;
+                    tail)
+                        opts="--debug --help --rhlogin --password -app --opts --filepath --config --timeout"
+                        ;;
+                    snapshot)
+                        opts="save restore"
+                        ;;
+                    cartridge)
+                        opts="add remove stop start restart status reload list"
+                        ;;
+                    *)
+                        ;;
+                esac
+                ;;
+            sshkey)
+                case "${COMP_WORDS[2]}" in
+                    add | update)
+                        opts="--debug --help --rhlogin --password --identifier --ssh --config --timeout"
+                        ;;
+                    remove)
+                        opts="--debug --help --rhlogin --password --identifier --config --timeout"
+                        ;;
+                    list)
+                        opts="--debug --help --rhlogin --password --config --timeout"
+                        ;;
+                    *)
+                        ;;
+                esac
+                ;;
+        esac
+
+    elif [ $COMP_CWORD -eq 4 ]; then
+        case "${COMP_WORDS[1]}" in
+            app)
+                case "${COMP_WORDS[2]}" in
+                    snapshot)
+                        case "${COMP_WORDS[3]}" in
+                            save | restore)
+                                opts="--debug --help --rhlogin --password -app --filepath --config --timeout"
+                                ;;
+                            *)
+                                ;;
+                        esac
+                        ;;
+                    cartridge)
+                        case "${COMP_WORDS[3]}" in
+                            add | remove | stop | start | restart | status | reload | list)
+                                opts="--debug --help --rhlogin --password -app --cartridge --config --timeout"
+                                ;;
+                            *)
+                                ;;
+                        esac
+                        ;;
+                esac
+                ;;
+        esac
+
+    fi
+
+   if [ ${#opts[@]} -gt 0 ]; then COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ); fi
+   return 0
+}
+complete -o default -F _rhc rhc

data/lib/rhc-common.rb

@@ -1,4 +1,4 @@
-# Copyright 2010 Red Hat, Inc.
+# 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
@@ -219,7 +219,7 @@ module RHC
         if not_found_message
           puts not_found_message
         else
-          puts "A user with rhlogin '#{rhlogin}' does not have a registered domain.  Be sure to run rhc-create-domain before using the other rhc tools."
+          puts "A user with rhlogin '#{rhlogin}' does not have a registered domain.  Be sure to run 'rhc domain create' before using the other rhc tools."
         end
         exit 99
       elsif response.code == '401'
@@ -274,7 +274,7 @@ module RHC
     end
     update_server_api_v(json_resp)
     begin
-      ssh_keys = (JSON.parse(json_resp['data'].to_s))['keys']
+      ssh_keys = (JSON.parse(json_resp['data'].to_s))
     rescue JSON::ParserError
       exit 1
     end
@@ -320,7 +320,7 @@ module RHC
     rescue Exception => e
       puts "There was a problem communicating with the server. Response message: #{e.message}"
       puts "If you were disconnected it is possible the operation finished without being able to report success."
-      puts "You can use rhc-user-info and rhc-ctl-app to learn about the status of your user and application(s)."
+      puts "You can use 'rhc domain show' and 'rhc app status' to learn about the status of your user and application(s)."
       exit 219
     end
   end
@@ -415,6 +415,7 @@ module RHC
     data = {:cartridge => app_type,
             :action => 'configure',
             :app_name => app_name,
+            :node_profile => 'large',
             :rhlogin => rhlogin
            }
     if @mydebug
@@ -505,7 +506,7 @@ clone your git repository.
 If you can't get your application '#{app_name}' running in the browser, you can
 also try destroying and recreating the application as well using:
 
-  rhc-ctl-app -c destroy -a #{app_name} -l #{rhlogin}
+  rhc app destroy -a #{app_name} -l #{rhlogin}
 
 If this doesn't work for you, let us know in the forums or in IRC and we'll
 make sure to get you up and running.
@@ -719,7 +720,7 @@ LOOKSGOOD
     end
     
     json_data = generate_json(data)
-
+    puts json_data
     url = nil
     if embedded
       url = URI.parse("https://#{libra_server}/broker/embed_cartridge")
@@ -735,7 +736,7 @@ LOOKSGOOD
         print_response_err(response)
     end
   end
-
+  
 end
 
 # provide a hook for performing actions before rhc-* commands exit
@@ -845,7 +846,7 @@ end
 def kfile_not_found
   puts <<KFILE_NOT_FOUND
 Your SSH keys are created either by running ssh-keygen (password optional)
-or by having the rhc-create-domain command do it for you.  If you created
+or by having the 'rhc domain create' command do it for you.  If you created
 them on your own (or want to use an existing keypair), be sure to paste
 your public key into the express console at http://www.openshift.com.
 The client tools use the value of 'ssh_key_file' in express.conf to find
@@ -889,4 +890,90 @@ def get_kpfile(kfile, check_exists=true)
     kfile_not_found
   end
   return kpfile
-end
+end
+
+# Add a new namespace to configs
+def self.add_rhlogin_config(rhlogin, uuid)
+    f = open(File.expand_path(config_path), 'a')
+    unless config.get_value('default_rhlogin')
+        f.puts("# Default rhlogin to use if none is specified")
+        f.puts("default_rhlogin=#{rhlogin}")
+        f.puts("")
+    end
+    f.close
+end
+
+# Check / add new host to ~/.ssh/config
+def self.add_ssh_config_host(rhc_domain, ssh_key_file_path, ssh_config, ssh_config_d)
+  
+  puts "Checking ~/.ssh/config"
+  ssh_key_file_name = File.basename(ssh_key_file_path)
+  if ssh_key_file_path =~ /^#{ENV['HOME']}/
+    ssh_key_file_path = ssh_key_file_path[ENV['HOME'].length..-1]
+    if ssh_key_file_path =~ /^\// || ssh_key_file_path =~ /^\\/
+      ssh_key_file_path = '~' + ssh_key_file_path
+    else
+      ssh_key_file_path = '~/' + ssh_key_file_path
+    end
+  end
+  if (ssh_key_file_name != 'id_rsa')
+    found = false
+
+    begin
+        File.open(ssh_config, "r") do |sline|
+            while(line = sline.gets)
+                if line.to_s.index("Host *.#{rhc_domain}") == 0
+                    found = true
+                    break
+                end
+            end
+        end
+    rescue Errno::EACCES
+        puts "Could not read from #{ssh_config}"
+        puts "Reason: " + $!
+        puts
+        puts "Please correct this first.  Then run rerun."
+        puts
+        exit 213
+    rescue Errno::ENOENT
+        puts "Could not find #{ssh_config}.  This is ok, continuing"
+    end
+    if found
+        puts "Found #{rhc_domain} in ~/.ssh/config... No need to adjust"
+    else
+        puts "    Adding #{rhc_domain} to ~/.ssh/config"
+        begin
+            f = File.open(ssh_config, "a")
+            f.puts <<SSH
+
+# Added by 'rhc domain create' on #{`date`}
+Host *.#{rhc_domain}
+  IdentityFile #{ssh_key_file_path}
+  VerifyHostKeyDNS yes
+  StrictHostKeyChecking no
+  UserKnownHostsFile ~/.ssh/libra_known_hosts
+
+SSH
+            f.close
+        rescue Errno::EACCES
+            puts "Could not write to #{ssh_config}"
+            puts "Reason: " + $!
+            puts
+            puts "Please correct this first.  Then run rerun."
+            puts
+            exit 214
+        rescue Errno::ENOENT
+            # Make directory and config if they do not exist
+            puts "Could not find directory: " + $!
+            puts "creating"
+            FileUtils.mkdir_p ssh_config_d
+            file = File.open(ssh_config, 'w')
+            file.close
+            retry
+        end
+    end
+
+    File.chmod(0700, ssh_config_d)
+    File.chmod(0600, ssh_config)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 337
+  hash: 339
   prerelease: 
   segments: 
   - 0
-  - 84
-  - 15
-  version: 0.84.15
+  - 85
+  - 12
+  version: 0.85.12
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -48,6 +48,10 @@ dependencies:
 description: The client tools for the OpenShift Express platform that allow for application management.
 email: openshift@redhat.com
 executables: 
+- rhc
+- rhc-domain
+- rhc-app
+- rhc-sshkey
 - rhc-chk
 - rhc-create-app
 - rhc-create-domain
@@ -57,21 +61,28 @@ executables:
 - rhc-domain-info
 - rhc-user-info
 - rhc-tail-files
+- rhc-port-forward
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - lib/rhc-common.rb
+- lib/rhc
+- bin/rhc-ctl-domain
+- bin/rhc-port-forward
 - bin/rhc-ctl-app
-- bin/rhc-create-app
-- bin/rhc-chk
-- bin/rhc-create-domain
-- bin/rhc-domain-info
+- bin/rhc-tail-files
 - bin/rhc-user-info
 - bin/rhc-snapshot
-- bin/rhc-tail-files
-- bin/rhc-ctl-domain
+- bin/rhc-domain-info
+- bin/rhc-chk
+- bin/rhc-domain
+- bin/rhc-create-app
+- bin/rhc
+- bin/rhc-app
+- bin/rhc-create-domain
+- bin/rhc-sshkey
 - conf/express.conf
 - LICENSE
 - README