rhc 1.31.5 → 1.32.2

data/autocomplete/rhc_bash

@@ -494,7 +494,7 @@ _rhc()
 
       "rhc apps")
         if [[ "$cur" == -* ]]; then
-          opts="--mine --verbose"
+          opts="--mine --summary --verbose"
         else
           opts=""
         fi

data/lib/rhc/commands/app.rb

@@ -108,12 +108,14 @@ module RHC::Commands
 
       scaling = options.scaling
       region = options.region
+      gear_profile = options.gear_size
 
       raise RHC::RegionsAndZonesNotSupportedException if region.present? && !rest_client.supports_regions_and_zones?
 
       if from_app
         scaling = from_app.scalable if scaling.nil?
         region = from_app.region if region.nil?
+        gear_profile = from_app.gear_profile if gear_profile.nil?
 
         if region.present? && !rest_client.allows_region_selection?
           region = nil
@@ -150,7 +152,7 @@ module RHC::Commands
         say "Creating application '#{name}' ... "
 
         # create the main app
-        rest_app = create_app(name, cartridges, rest_domain, options.gear_size, scaling, options.from_code, env, options.auto_deploy, options.keep_deployments, options.deployment_branch, options.deployment_type, region)
+        rest_app = create_app(name, cartridges, rest_domain, gear_profile, scaling, options.from_code, env, options.auto_deploy, options.keep_deployments, options.deployment_branch, options.deployment_type, region)
         success "done"
 
         paragraph{ indent{ success rest_app.messages.map(&:strip) } }
@@ -588,9 +590,9 @@ module RHC::Commands
         result
       end
 
-      def create_app(name, cartridges, rest_domain, gear_size=nil, scale=nil, from_code=nil, environment_variables=nil, auto_deploy=nil, keep_deployments=nil, deployment_branch=nil, deployment_type=nil, region=nil)
+      def create_app(name, cartridges, rest_domain, gear_profile=nil, scale=nil, from_code=nil, environment_variables=nil, auto_deploy=nil, keep_deployments=nil, deployment_branch=nil, deployment_type=nil, region=nil)
         app_options = {:cartridges => Array(cartridges)}
-        app_options[:gear_profile] = gear_size if gear_size
+        app_options[:gear_profile] = gear_profile if gear_profile
         app_options[:scale] = scale if scale
         app_options[:initial_git_url] = from_code if from_code
         app_options[:debug] = true if @debug

data/lib/rhc/commands/apps.rb

@@ -5,17 +5,22 @@ module RHC::Commands
     summary "List all your applications"
     description "Display the list of applications that you own. Includes information about each application."
     option ['--mine'], "Display only applications you own"
-    option ["-v", "--verbose"], "Display additional details about the application's cartridges"
+    option ["-s", "--summary"], "Display a summary about the applications you own."
+    option ["-v", "--verbose"], "Display additional details about the application's cartridges."
+
     def run
       applications = (options.mine ?
         rest_client.owned_applications(:include => :cartridges) :
         rest_client.applications(:include => :cartridges)).sort
 
       info "In order to deploy applications, you must create a domain with 'rhc setup' or 'rhc create-domain'." and return 1 if applications.empty? && rest_client.domains.empty?
+      info "No applications. Use 'rhc create-app'." and return 1 if applications.nil? || applications.empty?
 
-      applications.each{ |a| display_app(a, a.cartridges, nil, options.verbose) }.blank? and
-        info "No applications. Use 'rhc create-app'." and
-        return 1
+      if options.summary
+        display_app_summary(applications)
+      else
+        applications.each{|a| display_app(a, a.cartridges, nil, options.verbose) }
+      end
 
       success "You have#{options.mine ? '' : ' access to'} #{pluralize(applications.length, 'application')}."
       0

data/lib/rhc/output_helpers.rb

@@ -66,6 +66,21 @@ module RHC
         end
       end
     end
+    
+    def display_app_summary(applications)
+      section do
+        if !applications.nil? and !applications.empty?
+          paragraph do
+            indent do
+              say table(applications.map do |app|
+                [app.name, app.app_url]
+                  end)
+              end
+          end
+        end
+    end
+   
+    end
 
     def display_app_configurations(rest_app)
       display_app(rest_app, nil, [:auto_deploy, :keep_deployments, :deployment_type, :deployment_branch])

data/spec/rhc/commands/apps_spec.rb

@@ -32,6 +32,18 @@ describe RHC::Commands::Apps do
           output.should match(/scaled.*\-\-.*php.*Scaling:.*x2 \(minimum/m)
         end
       end
+      
+      context 'with apps in summary mode' do
+        let(:arguments) { ['apps', '--summary' ] }
+        before{ domain.add_application('scaled', 'php', true) }
+
+        it { expect { run }.to exit_with_code(0) }
+        it "should match output" do
+          output = run_output
+          output.should match("You have access to 1 application\\.")
+          output.should match(/scaled.*https.*/m)
+        end
+      end
 
       context 'with one owned app' do
         let(:arguments) { ['apps', '--mine'] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 97
+  hash: 147
   prerelease: 
   segments: 
   - 1
-  - 31
-  - 5
-  version: 1.31.5
+  - 32
+  - 2
+  version: 1.32.2
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-04 00:00:00 Z
+date: 2014-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh