vmc 0.4.0.beta.47 → 0.4.0.beta.48

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

@@ -131,6 +131,8 @@ module VMC
     input(:command, :desc => "Startup command for standalone app") {
       ask("Startup command")
     }
+    input :plan, :default => "D100",
+      :desc => "Application plan (e.g. D100, P200)"
     input :start, :type => :boolean, :default => true,
       :desc => "Start app after pushing?"
     input :restart, :type => :boolean, :default => true,
@@ -162,20 +164,21 @@ module VMC
       app.name = name
       app.space = client.current_space if client.current_space
       app.total_instances = input[:instances]
+      app.production = input[:plan].capitalize.start_with?("P")
 
       detector = Detector.new(client, path)
       frameworks = detector.all_frameworks
       detected, default = detector.frameworks
 
       if detected.empty?
-        framework = input[:framework, frameworks, nil, false]
+        framework = input[:framework, frameworks]
       else
         detected_names = detected.collect(&:name).sort
-        framework = input[:framework, detected, default, true]
+        framework = input[:framework, detected, default, :other]
 
         if framework == :other
           input.forget(:framework)
-          framework = input[:framework, frameworks, nil, false]
+          framework = input[:framework, frameworks]
         end
       end
 
@@ -188,10 +191,10 @@ module VMC
       app.framework = framework
       app.runtime = runtime
 
-      app.command = input[:command] if framework == "standalone"
+      app.command = input[:command] if framework.name == "standalone"
 
       url =
-        if framework == "standalone"
+        if framework.name == "standalone"
           if (given = input[:url, "none"]) != "none"
             given
           end
@@ -412,6 +415,8 @@ module VMC
           :allow_other => true,
           :default => human_size(default * 1024 * 1024, 0))
     }
+    input :plan, :default => "D100",
+      :desc => "Application plan (e.g. D100, P200)"
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
     def scale
@@ -419,22 +424,26 @@ module VMC
 
       instances = input.given(:instances)
       memory = input.given(:memory)
+      plan_name = input.given(:plan)
 
-      unless instances || memory
+      unless instances || memory || plan_name
         instances = input[:instances, app.total_instances]
         memory = input[:memory, app.memory]
       end
 
       megs = megabytes(memory)
+      production = plan_name && plan_name.capitalize.start_with?("P")
 
       memory_changed = megs != app.memory
       instances_changed = instances != app.total_instances
+      plan_changed = production != app.production
 
-      return unless memory_changed || instances_changed
+      return unless memory_changed || instances_changed || plan_changed
 
       with_progress("Scaling #{c(app.name, :name)}") do
-        app.total_instances = instances.to_i if instances
-        app.memory = megs if memory
+        app.total_instances = instances.to_i if instances_changed
+        app.memory = megs if memory_changed
+        app.production = production if plan_changed
         app.update!
       end
 

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

@@ -38,7 +38,7 @@ module VMC
         matched = false
 
         # e.g. standalone has no detection
-        next if framework.detection.nil?
+        next if framework.detection.nil? || framework.detection.empty?
 
         framework.detection.first.each do |file, match|
           files =
@@ -67,11 +67,15 @@ module VMC
               matched = false
               break
             else
-              files.each do |f|
-                contents = File.open(f, &:read)
-                if contents =~ Regexp.new(match)
-                  matched = true
+              begin
+                files.each do |f|
+                  contents = File.open(f, &:read)
+                  if contents =~ Regexp.new(match)
+                    matched = true
+                  end
                 end
+              rescue RegexpError
+                # some regexps may fail on 1.8 as the server runs 1.9
               end
             end
           end

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.47"
+  VERSION = "0.4.0.beta.48"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 3780277393
+  hash: -3893770324
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 47
-  version: 0.4.0.beta.47
+  - 48
+  version: 0.4.0.beta.48
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-07 00:00:00 Z
+date: 2012-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 45
         segments: 
         - 0
         - 3
-        - 30
-        version: 0.3.30
+        - 31
+        version: 0.3.31
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency