vmc 0.4.0.beta.10 → 0.4.0.beta.11

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

@@ -74,7 +74,7 @@ module VMC
     def push(name = nil)
       path = File.expand_path(input(:path) || ".")
 
-      name ||= input(:name)
+      name = input(:name) if input(:name)
 
       detector = Detector.new(client, path)
       frameworks = detector.all_frameworks
@@ -175,6 +175,8 @@ module VMC
 
       app.services = bindings
 
+      app = filter(:push_app, app)
+
       with_progress("Creating #{c(name, :name)}") do
         app.create!
       end
@@ -205,6 +207,8 @@ module VMC
 
         fail "Unknown application." unless app.exists?
 
+        app = filter(:start_app, app)
+
         switch_mode(app, input(:debug_mode))
 
         with_progress("Starting #{c(name, :name)}") do |s|
@@ -305,6 +309,7 @@ module VMC
         names = [input(:name, apps.collect(&:name).sort)]
       end
 
+      # TODO: handle invalid app name
       to_delete = names.collect { |n| apps.find { |a| a.name == n } }
       orphaned = find_orphaned_services(to_delete)
 
@@ -361,6 +366,7 @@ module VMC
           :default => human_size(default * 1024 * 1024, 0),
           :choices => MEM_CHOICES)
     }
+    flag :restart, :default => true
     def scale(name = nil)
       name ||= input(:name)
 
@@ -374,11 +380,24 @@ module VMC
         memory = input(:memory, app.memory)
       end
 
+      megs = megabytes(memory)
+
+      memory_changed = megs != app.memory
+      instances_changed = instances != app.total_instances
+
+      return unless memory_changed || instances_changed
+
       with_progress("Scaling #{c(name, :name)}") do
         app.total_instances = instances.to_i if instances
-        app.memory = megabytes(memory) if memory
+        app.memory = megs if memory
         app.update!
       end
+
+      if memory_changed && app.started? && input(:restart)
+        with_progress("Restarting #{c(name, :name)}") do
+          app.restart!
+        end
+      end
     end
 
     desc "logs APP", "Print out an app's logs"
@@ -564,6 +583,7 @@ module VMC
 
       desc "set APP [NAME] [VALUE]", "Set an environment variable"
       group :apps, :info, :hidden => true
+      flag :restart, :default => true
       def set(appname, name, value)
         unless name =~ VALID_NAME
           fail "Invalid variable name; must match #{VALID_NAME.inspect}"
@@ -578,10 +598,17 @@ module VMC
                           v.start_with?("#{name}=")
                         }.push("#{name}=#{value}"))
         end
+
+        if app.started? && input(:restart)
+          with_progress("Restarting #{c(app.name, :name)}") do
+            app.restart!
+          end
+        end
       end
 
       desc "unset APP [NAME]", "Remove an environment variable"
       group :apps, :info, :hidden => true
+      flag :restart, :default => true
       def unset(appname, name)
         app = client.app(appname)
         fail "Unknown application." unless app.exists?
@@ -592,6 +619,12 @@ module VMC
                           v.start_with?("#{name}=")
                         })
         end
+
+        if app.started? && input(:restart)
+          with_progress("Restarting #{c(app.ame, :name)}") do
+            app.restart!
+          end
+        end
       end
 
       desc "list APP", "Show all environment variables set for an app"

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

@@ -215,6 +215,10 @@ module VMC
       add_callback(:around, task, callback)
     end
 
+    def self.filter(task, &callback)
+      add_callback(:filter, task, callback)
+    end
+
     private
 
     def callbacks_for(what)
@@ -296,6 +300,18 @@ module VMC
       $exit_status = 1
     end
 
+    def with_filters(new)
+      new.each do |task, callback|
+        self.class.callbacks[:filter][task] << callback
+      end
+
+      yield
+    ensure
+      new.each do |task, _|
+        self.class.callbacks[:filter][task].pop
+      end
+    end
+
     def with_inputs(new)
       return yield if !new || new.empty?
 
@@ -322,6 +338,14 @@ module VMC
       raise UserError, msg
     end
 
+    def filter(name, val)
+      callbacks_for(:filter)[name].each do |f|
+        val = f.call val
+      end
+
+      val
+    end
+
     def invoke_task(task, args)
       callbacks_for(:before)[task.name.to_sym].each do |c|
         c.call
@@ -370,7 +394,7 @@ module VMC
         puts ""
         puts c("Not authenticated! Try logging in:", :warning)
 
-        VMC::CLI.start(["login"])
+        invoke :login
         @client = nil
 
         retry
@@ -522,6 +546,8 @@ module VMC
         str.to_i
       elsif str =~ /K$/i
         str.to_i / 1024
+      else # assume megabytes
+        str.to_i
       end
     end
 

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.10"
+  VERSION = "0.4.0.beta.11"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196471
+  hash: 62196469
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 10
-  version: 0.4.0.beta.10
+  - 11
+  version: 0.4.0.beta.11
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-15 00:00:00 Z
+date: 2012-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -281,12 +281,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 2
-        - 2
-        version: 0.2.2
+        - 3
+        version: 0.2.3
   type: :runtime
   version_requirements: *id016
 description: