vmc 0.4.0.beta.68 → 0.4.0.beta.69

data/vmc-ng/lib/vmc/cli/app.rb

@@ -344,32 +344,32 @@ module VMC
     def scale
       app = input[:app]
 
-      instances = input.given(:instances)
-      memory = input.given(:memory)
-      plan_name = input.given(:plan)
-
-      unless instances || memory || plan_name
+      if input.given?(:instances)
         instances = input[:instances, app.total_instances]
-        memory = input[:memory, app.memory]
       end
 
-      if instances
-        instances = instances.to_i
-        instances_changed = instances != app.total_instances
-      end
-
-      if memory
-        memory = megabytes(memory)
-        memory_changed = memory != app.memory
+      if input.given?(:memory)
+        memory = input[:memory, app.memory]
       end
 
-      if plan_name
+      if input.given?(:plan)
         fail "Plans not supported on target cloud." unless v2?
 
+        plan_name = input[:plan]
         production = !!(plan_name =~ /^p/i)
-        plan_changed = production != app.production
       end
 
+      unless instances || memory || plan_name
+        instances = input[:instances, app.total_instances]
+        memory = input[:memory, app.memory]
+      end
+
+      memory = megabytes(memory) if memory
+
+      instances_changed = instances && instances != app.total_instances
+      memory_changed = memory && memory != app.memory
+      plan_changed = plan_name && production != app.production
+
       unless memory_changed || instances_changed || plan_changed
         fail "No changes!"
       end

data/vmc-ng/lib/vmc/cli/service.rb

@@ -130,7 +130,7 @@ module VMC
         services.reject! { |s| s.version != input[:version] }
       end
 
-      if plan = input.given(:plan)
+      if v2? && plan = input.given(:plan)
         services.reject! do |s|
           if plan.is_a?(String)
             s.service_plans.none? { |p| p.name == plan.upcase }

data/vmc-ng/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.68"
+  VERSION = "0.4.0.beta.69"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 211893165
+  hash: -49077658
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 68
-  version: 0.4.0.beta.68
+  - 69
+  version: 0.4.0.beta.69
 platform: ruby
 authors: 
 - VMware
@@ -297,12 +297,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 31
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 4
+        version: 0.2.4
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency