manifests-vmc-plugin 0.1.1 → 0.1.2

data/lib/manifests-vmc-plugin/plugin.rb

@@ -16,36 +16,36 @@ VMC.Plugin(VMC::App) do
   # app(s) described by the manifest, in dependency-order
   [:start, :instances, :logs].each do |wrap|
     around(wrap) do |cmd, args|
-      if args.empty?
+      if args.empty? && !passed_value(:name)
         each_app do |a|
-          cmd.call(a["name"])
+          cmd.call(:name => a["name"])
           puts "" unless simple_output?
         end || err("No applications to act on.")
       else
-        cmd.call(args)
+        cmd.call
       end
     end
   end
 
   # same as above but in reverse dependency-order
   around(:stop) do |cmd, args|
-    if args.empty?
+    if args.empty? && !passed_value(:name)
       reversed = []
       each_app do |a|
         reversed.unshift a["name"]
       end || err("No applications to act on.")
 
       reversed.each do |name|
-        cmd.call(name)
+        cmd.call(:name => name)
         puts "" unless simple_output?
       end
     else
-      cmd.call(args)
+      cmd.call
     end
   end
 
   around(:delete) do |cmd, args|
-    if args.empty? && !options[:all]
+    if args.empty? && !options[:all] && !passed_value(:name)
       reversed = []
       has_manifest =
         each_app do |a|
@@ -53,22 +53,22 @@ VMC.Plugin(VMC::App) do
         end
 
       unless has_manifest
-        return cmd.call(args)
+        return cmd.call
       end
 
       reversed.each do |name|
-        cmd.call(name)
+        cmd.call(:name => name)
         puts "" unless simple_output?
       end
     else
-      cmd.call(args)
+      cmd.call
     end
   end
 
   # stop apps in reverse dependency order,
   # and then start in dependency order
   around(:restart) do |cmd, args|
-    if args.empty?
+    if args.empty? && !passed_value(:name)
       reversed = []
       forwards = []
       each_app do |a|
@@ -77,55 +77,53 @@ VMC.Plugin(VMC::App) do
       end || err("No applications to act on.")
 
       reversed.each do |name|
-        stop(name)
+        with_inputs(:name => name) do
+          stop
+        end
       end
 
       puts "" unless simple_output?
 
       forwards.each do |name|
-        start(name)
+        with_inputs(:name => name) do
+          start
+        end
       end
     else
-      cmd.call(args)
+      cmd.call
     end
   end
 
   # push and sync meta changes in the manifest
   # also sets env data on creation if present in manifest
   around(:push) do |push, args|
-    if args.empty?
-      all_pushed =
-        each_app do |a|
-          app = client.app(a["name"])
-          updating = app.exists?
+    name = passed_value(:name) || args.first
 
-          start = input(:start)
+    all_pushed =
+      each_app do |a|
+        next if name && a["name"] != name
 
-          begin
-            inputs[:start] = false
+        app = client.app(a["name"])
+        updating = app.exists?
 
-            sync_changes(a)
-            push.call(a["name"])
+        sync_changes(a)
+        push.call(:name => a["name"], :start => false)
 
-            unless updating
-              app.env = a["env"]
+        unless updating
+          app.env = a["env"]
 
-              if start
-                start(a["name"])
-              else
-                app.update!
-              end
+          if input(:start)
+            with_inputs(:name => a["name"]) do
+              start
             end
-          ensure
-            inputs[:start] = start
+          else
+            app.update!
           end
-
-          puts "" unless simple_output?
         end
 
-      push.call unless all_pushed
-    else
-      push.call(args)
-    end
+        puts "" unless simple_output?
+      end
+
+    push.call unless all_pushed
   end
 end

data/lib/manifests-vmc-plugin/version.rb

@@ -1,3 +1,3 @@
 module VMCManifests
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/manifests-vmc-plugin.rb

@@ -251,41 +251,18 @@ module VMCManifests
 
   private
 
-  def inputs
-    @inputs ||= {}
-  end
-
   # call the block as if the app info and path were given as flags
-  def with_app(path, info)
-    before_path = inputs[:path]
-    before_info = {}
-
-    inputs[:path] = path
-
+  def with_app(path, info, &blk)
+    inputs = {:path => path}
     info.each do |k, v|
       if k == "mem"
         k = "memory"
       end
 
-      before_info[k.to_sym] = inputs[k.to_sym]
       inputs[k.to_sym] = v
     end
 
-    yield
-  ensure
-    if before_path.nil?
-      inputs.delete :path
-    else
-      inputs[:path] = before_path
-    end
-
-    before_info.each do |k, v|
-      if v.nil?
-        inputs.delete k
-      else
-        inputs[k] = v
-      end
-    end
+    with_inputs(inputs, &blk)
   end
 
   # sort applications in dependency order

metadata

@@ -1,23 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
-authors:
+authors: 
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+
+date: 2012-05-30 00:00:00 Z
 dependencies: []
+
 description: 
-email:
+email: 
 - asuraci@vmware.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Rakefile
 - lib/manifests-vmc-plugin/errors.rb
 - lib/manifests-vmc-plugin/manifest.rb
@@ -26,26 +36,36 @@ files:
 - lib/manifests-vmc-plugin.rb
 homepage: http://cloudfoundry.com/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: manifests-vmc-plugin
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cloud Foundry automation via manifest documents.
 test_files: []
+