rhc 0.91.12 → 0.92.11

data/Rakefile

@@ -21,9 +21,9 @@ spec = Gem::Specification.new do |s|
     s.version = /(Version: )(.*)/.match(File.read("client.spec"))[2]
     s.author = "Red Hat"
     s.email = %q{openshift@redhat.com}
-    s.summary = %q{OpenShift Express Client Tools}
+    s.summary = %q{OpenShift Client Tools}
     s.homepage = %q{https://openshift.redhat.com/app/express}
-    s.description = %q{The client tools for the OpenShift Express platform that allow for application management.}
+    s.description = %q{The client tools for the OpenShift platform that allow for application management.}
     s.files = FileList['lib/**/*.rb', 'lib/rhc', 'bin/*', 'conf/*'].to_a
     s.files += %w(LICENSE COPYRIGHT README.md Rakefile)
     s.executables = ['rhc', 'rhc-domain', 'rhc-app', 'rhc-sshkey', 'rhc-chk', 'rhc-create-app', 'rhc-create-domain', 'rhc-ctl-domain', 'rhc-ctl-app', 'rhc-snapshot', 'rhc-domain-info', 'rhc-user-info', 'rhc-tail-files', 'rhc-port-forward']
@@ -37,19 +37,6 @@ spec = Gem::Specification.new do |s|
     #   - json_pure (Ruby (Ruby 1.8.6, Windows, Mac) / json (everything else)
     # http://en.wikibooks.org/wiki/Ruby_Programming/RubyGems
     s.extensions << 'ext/mkrf_conf.rb'
-
-    # Leave this message for a few versions, or until we can 
-    #   figure out how to get it only displayed if rhc-rest 
-    #   is installed (taken care of in extension)
-    s.post_install_message = <<-MSG
-      ===================================================
-        rhc-rest is no longer needed as an external gem
-          - If it is installed, it will be removed
-          - Its libraries are now included in rhc
-            - Any applications requiring rhc-rest will 
-              still function as expected
-      ===================================================
-    MSG
 end
 
 # Define a :package task that bundles the gem

data/bin/rhc-app

@@ -50,7 +50,7 @@ List of arguments
   -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 for creating an application)
   -c|--cartridge    cartridge    The embedded cartrige to manage (required for the cartridge command)
-  -g|--gear-size    size         The size of the gear for this app ([small|medium|large], defaults to small)
+  -g|--gear-size    size         The size of the gear for this app ([small|medium], defaults to small)
   -s|--scaling                   Enable scaling for this app
   -r|--repo         path         Git Repo path (defaults to ./$app_name)
   -n|--nogit                     Only create remote space, don't pull it locally
@@ -172,10 +172,6 @@ currently being created: '#{$opt['app']}'
   end
 
   $opt['gear-size']='small' unless $opt['gear-size']
-  if !['small','medium','large'].include? $opt['gear-size']
-    puts "Invalid gear size:  %s" % $opt['gear-size']
-    p_usage
-  end
   
   $opt['repo'] = $opt['app'] unless $opt['repo']
   

data/bin/rhc-create-app

@@ -1,24 +1,6 @@
 #!/usr/bin/env ruby
 require 'rhc-common'
 
-# FIXME: get better descriptions from runtime or docs team
-$gear_size_order = ['small', 'medium', 'large']
-$valid_gear_sizes = {'small'  => 'allocates the standard resources for your application (default)',
-                     'medium' => 'allocates a medium chunk of resources for your application',
-                     'large'  => 'allocates a larger chunk of resources for your application'
-                   }
-
-def p_valid_gear_sizes(invalid_gear_size)
-    puts "Invalid gear size #{invalid_gear_size}"
-    puts "Valid options are:"
-    puts ""
-    $gear_size_order.each do |gear_size|
-        puts "    #{gear_size} - #{$valid_gear_sizes[gear_size]}"
-    end
-
-    exit 255
-end
-
 def p_usage(error_code = 255)
     libra_server = get_var('libra_server')
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
@@ -30,7 +12,7 @@ Create an OpenShift app.
 
   -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)
-  -g|--gear-size size        The size of the gear for this app ([small|medium|large], defaults to small)
+  -g|--gear-size size        The size of the gear for this app ([small|medium], defaults to small)
   -s|--scaling               Enable scaling for this app
   -l|--rhlogin  rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -p|--password  password    RHLogin password  (optional, will prompt)
@@ -116,13 +98,8 @@ end
 
 # Default gear size is small
 gear_size = opt['gear-size']
-if !gear_size
-    gear_size = 'small'
-else
-    if !$valid_gear_sizes.include? gear_size
-        p_valid_gear_sizes gear_size
-    end
-end
+gear_size = 'small' if !gear_size
+
 
 password = opt['password']
 if !password

data/bin/rhc-create-domain

@@ -187,9 +187,9 @@ end
 #
 
 if File.readable?(ssh_key_file_path)
-    puts "OpenShift Express key found at #{ssh_key_file_path}.  Reusing..."
+    puts "OpenShift key found at #{ssh_key_file_path}.  Reusing..."
 else
-    puts "Generating OpenShift Express ssh key to #{ssh_key_file_path}"
+    puts "Generating OpenShift ssh key to #{ssh_key_file_path}"
     # Use system for interaction
     system("ssh-keygen -t rsa -f '#{ssh_key_file_path}'")
 end

data/lib/rhc-common.rb

@@ -439,7 +439,7 @@ module RHC
       namespace = domain.id
       # Catch errors
       begin
-        application = domain.add_application(app_name,{:cartridge => app_type, :scale => true})
+        application = domain.add_application(app_name,{:cartridge => app_type, :scale => true, :gear_profile => gear_size})
 
         # Variables that are needed for the rest of the function
         app_uuid = application.uuid
@@ -668,7 +668,7 @@ To make changes to '#{app_name}', you must first clone it with:
       git clone #{git_url}
 
 LOOKSGOOD
-                puts "Then run 'git push' to update your OpenShift Express space."
+                puts "Then run 'git push' to update your OpenShift space."
               end
             end
             if result && !result.empty?
@@ -697,7 +697,7 @@ LOOKSGOOD
     http_post(net_http, url, json_data, password)
   end
   
-  # Runs rhc-list-ports on server to check available ports
+# Runs rhc-list-ports on server to check available ports
   # :stderr return user-friendly port name, :stdout returns 127.0.0.1:8080 format
   def self.list_ports(rhc_domain, namespace, app_name, app_uuid, debug=true)
 
@@ -709,6 +709,7 @@ LOOKSGOOD
 
     hosts_and_ports = []
     hosts_and_ports_descriptions = []
+    scaled_uuids = []
 
     puts ssh_cmd if debug
 
@@ -716,25 +717,34 @@ LOOKSGOOD
 
       stdout.each { |line|
         line = line.chomp
-        if ip_and_port_simple_regex.match(line)
-          hosts_and_ports << line
+        if line.downcase =~ /scale/
+          scaled_uuid = line[5..-1]
+          scaled_uuids << scaled_uuid
+        else
+          if ip_and_port_simple_regex.match(line)
+            hosts_and_ports << line
+          end
         end
       }
 
       stderr.each { |line|
         line = line.chomp
-
         if line.downcase =~ /permission denied/
           puts line
           exit 1
         end
         
+        
         if line.index(ip_and_port_simple_regex)
           hosts_and_ports_descriptions << line
         end
       }
 
     }
+
+    scaled_uuids.each { |uuid|
+      list_scaled_ports(rhc_domain, namespace, app_name, uuid, hosts_and_ports, hosts_and_ports_descriptions, debug)
+    }
     
     #hosts_and_ports_descriptions = stderr.gets.chomp.split(/\n/)
     #hosts_and_ports = stdout.gets.chomp.split(/\n/)
@@ -758,6 +768,44 @@ LOOKSGOOD
     return hosts_and_ports, hosts_and_ports_descriptions
 
   end
+
+  # Runs rhc-list-ports on server to check available ports
+  # :stderr return user-friendly port name, :stdout returns 127.0.0.1:8080 format
+  def self.list_scaled_ports(rhc_domain, namespace, app_name, app_uuid, hosts_and_ports, hosts_and_ports_descriptions, debug=true)
+
+    ip_and_port_simple_regex = /[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\:[0-9]{1,5}/
+
+    ssh_host = "#{app_name}-#{namespace}.#{rhc_domain}"
+
+    ssh_cmd = "ssh -t #{app_uuid}@#{ssh_host} 'rhc-list-ports'"
+
+    puts ssh_cmd if debug
+
+    Open3.popen3(ssh_cmd) { |stdin, stdout, stderr| 
+
+      stdout.each { |line|
+        line = line.chomp
+     
+        if ip_and_port_simple_regex.match(line)
+          hosts_and_ports << line
+        end
+      }
+
+      stderr.each { |line|
+        line = line.chomp
+
+        if line.downcase =~ /permission denied/
+          puts line
+          exit 1
+        end
+        
+        if line.index(ip_and_port_simple_regex)
+          hosts_and_ports_descriptions << line
+        end
+      }
+    }
+
+  end
   
   def self.ctl_app(libra_server, net_http, app_name, rhlogin, password, action, embedded=false, framework=nil, server_alias=nil, print_result=true)
     data = {:action => action,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 363
+  hash: 377
   prerelease: 
   segments: 
   - 0
-  - 91
-  - 12
-  version: 0.91.12
+  - 92
+  - 11
+  version: 0.92.11
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-30 00:00:00 Z
+date: 2012-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: parseconfig
@@ -59,7 +59,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-description: The client tools for the OpenShift Express platform that allow for application management.
+description: The client tools for the OpenShift platform that allow for application management.
 email: openshift@redhat.com
 executables: 
 - rhc
@@ -81,31 +81,31 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- lib/rhc-rest.rb
-- lib/rhc-rest/version.rb
+- lib/rhc-common.rb
 - lib/rhc-rest/domain.rb
+- lib/rhc-rest/application.rb
 - lib/rhc-rest/cartridge.rb
 - lib/rhc-rest/client.rb
-- lib/rhc-rest/application.rb
+- lib/rhc-rest/key.rb
 - lib/rhc-rest/exceptions/exceptions.rb
 - lib/rhc-rest/user.rb
-- lib/rhc-rest/key.rb
-- lib/rhc-common.rb
+- lib/rhc-rest/version.rb
+- lib/rhc-rest.rb
 - lib/rhc
-- bin/rhc-ctl-app
-- bin/rhc-app
-- bin/rhc-create-app
-- bin/rhc-domain
+- bin/rhc-user-info
 - bin/rhc-chk
-- bin/rhc-create-domain
+- bin/rhc-create-app
 - bin/rhc-domain-info
-- bin/rhc
-- bin/rhc-user-info
+- bin/rhc-ctl-domain
 - bin/rhc-sshkey
-- bin/rhc-port-forward
-- bin/rhc-snapshot
 - bin/rhc-tail-files
-- bin/rhc-ctl-domain
+- bin/rhc-create-domain
+- bin/rhc-ctl-app
+- bin/rhc-domain
+- bin/rhc-snapshot
+- bin/rhc-app
+- bin/rhc-port-forward
+- bin/rhc
 - conf/express.conf
 - LICENSE
 - COPYRIGHT
@@ -115,7 +115,7 @@ files:
 homepage: https://openshift.redhat.com/app/express
 licenses: []
 
-post_install_message: "      ===================================================\n        rhc-rest is no longer needed as an external gem\n          - If it is installed, it will be removed\n          - Its libraries are now included in rhc\n            - Any applications requiring rhc-rest will \n              still function as expected\n      ===================================================\n"
+post_install_message: 
 rdoc_options: []
 
 require_paths: 
@@ -144,6 +144,6 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: OpenShift Express Client Tools
+summary: OpenShift Client Tools
 test_files: []