rhc 1.35.3 → 1.35.4

data/lib/rhc/commands/app.rb

@@ -109,6 +109,7 @@ module RHC::Commands
       scaling = options.scaling
       region = options.region
       gear_profile = options.gear_size
+      ha = nil
 
       raise RHC::RegionsAndZonesNotSupportedException if region.present? && !rest_client.supports_regions_and_zones?
 
@@ -116,6 +117,7 @@ module RHC::Commands
         scaling = from_app.scalable if scaling.nil?
         region = from_app.region if region.nil?
         gear_profile = from_app.gear_profile if gear_profile.nil?
+        ha = from_app.ha? if !from_app.ha.nil?
 
         if region.present? && !rest_client.allows_region_selection?
           region = nil
@@ -142,6 +144,7 @@ module RHC::Commands
               (["From app:", from_app.name] if from_app),
                ["Gear Size:", options.gear_size || (from_app ? "Copied from '#{from_app.name}'" : "default")],
                ["Scaling:", (scaling ? "yes" : "no") + (from_app && options.scaling.nil? ? " (copied from '#{from_app.name}')" : '')],
+              (["HA:", (ha ? "yes" : "no") + (from_app ? " (copied from '#{from_app.name}')" : '')] if ha.present?),
               (["Environment Variables:", env.map{|item| "#{item.name}=#{item.value}"}.join(', ')] if env.present?),
               (["Region:", region + (from_app && options.region.nil? ? " (copied from '#{from_app.name}')" : '')] if region),
               ].compact
@@ -152,7 +155,7 @@ module RHC::Commands
         say "Creating application '#{name}' ... "
 
         # create the main app
-        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)
+        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, ha)
         success "done"
 
         paragraph{ indent{ success rest_app.messages.map(&:strip) } }
@@ -590,7 +593,7 @@ module RHC::Commands
         result
       end
 
-      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)
+      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, ha=nil)
         app_options = {:cartridges => Array(cartridges)}
         app_options[:gear_profile] = gear_profile if gear_profile
         app_options[:scale] = scale if scale
@@ -602,6 +605,7 @@ module RHC::Commands
         app_options[:deployment_branch] = deployment_branch if deployment_branch
         app_options[:deployment_type] = deployment_type if deployment_type
         app_options[:region] = region if region
+        app_options[:ha] = ha if ha
         debug "Creating application '#{name}' with these options - #{app_options.inspect}"
         rest_domain.add_application(name, app_options)
       rescue RHC::Rest::Exception => e

data/lib/rhc/core_ext.rb

@@ -18,9 +18,11 @@ class Object
 
   # Avoid a conflict if to_json is already defined
   unless Object.new.respond_to? :to_json
+    #:nocov:
     def to_json(options=nil)
       RHC::Json.encode(self)
     end
+    #:nocov:
   end
 end
 

data/lib/rhc/rest/application.rb

@@ -7,7 +7,7 @@ module RHC
 
       define_attr :domain_id, :name, :creation_time, :uuid,
                   :git_url, :app_url, :gear_profile, :framework,
-                  :scalable, :health_check_path, :embedded, :gear_count,
+                  :scalable, :health_check_path, :embedded, :gear_count, :ha,
                   :ssh_url, :building_app, :cartridges, :initial_git_url,
                   :auto_deploy, :deployment_branch, :deployment_type, :keep_deployments, :deployments
                   :region
@@ -18,6 +18,10 @@ module RHC
         scalable
       end
 
+      def ha?
+        ha
+      end
+
       def id
         attributes['id'] || uuid
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 157
+  hash: 147
   prerelease: 
   segments: 
   - 1
   - 35
-  - 3
-  version: 1.35.3
+  - 4
+  version: 1.35.4
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-04-10 00:00:00 Z
+date: 2015-06-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh