manifests-vmc-plugin 0.4.0 → 0.4.1

data/lib/manifests-vmc-plugin.rb

@@ -291,14 +291,6 @@ module VMCManifests
         []
       end
 
-    unless manifest
-      if names_or_paths.empty?
-        return false
-      else
-        return names_or_paths
-      end
-    end
-
     if names_or_paths.empty?
       each_app(input, &blk)
       return []
@@ -309,10 +301,16 @@ module VMCManifests
     in_manifest = []
     external = []
     names_or_paths.each do |x|
-      path = File.expand_path(x)
-
-      if app = app_info(File.exists?(path) ? path : x, input)
-        in_manifest << app
+      if x.is_a?(String)
+        path = File.expand_path(x)
+
+        if app = app_info(File.exists?(path) ? path : x, input)
+          in_manifest << app
+        elsif app = client.app_by_name(x)
+          external << app
+        else
+          fail("Unknown app '#{x}'")
+        end
       else
         external << x
       end

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

@@ -16,12 +16,20 @@ class Manifests < VMC::CLI
 
   # basic commands that, when given no name, act on the
   # app(s) described by the manifest, in dependency-order
-  [ :start, :instances, :logs, :file, :files, :env,
-    :health, :stats, :scale
+  [ :start, :restart, :instances, :logs, :file, :files, :env,
+    :health, :stats, :scale, :app
   ].each do |wrap|
     optional_name = change_argument(wrap, :app, :optional)
 
     around(wrap) do |cmd, input|
+      unless manifest
+        if optional_name && !input.given?(:app)
+          no_apps
+        else
+          next cmd.call
+        end
+      end
+
       num = 0
       rest =
         specific_apps_or_all(input) do |info|
@@ -32,7 +40,7 @@ class Manifests < VMC::CLI
 
       if rest
         rest.each do |name|
-          cmd.call(input.without(:apps).merge_given(:app => name))
+          cmd.call(input.without(:apps).merge(:app => name))
         end
 
       # fail manually for commands whose name we made optional
@@ -46,7 +54,7 @@ class Manifests < VMC::CLI
   # same as above but in reverse dependency-order
   [:stop, :delete].each do |wrap|
     around(wrap) do |cmd, input|
-      next cmd.call if input[:all]
+      next cmd.call if input[:all] || !manifest
 
       reversed = []
       rest =
@@ -58,12 +66,8 @@ class Manifests < VMC::CLI
         cmd.call(input.without(:apps).merge_given(:apps => reversed))
       end
 
-      if rest
-        unless rest.empty?
-          cmd.call(input.without(:apps).merge_given(:apps => rest))
-        end
-      else
-        cmd.call(input.without(:apps))
+      unless rest.empty?
+        cmd.call(input.without(:apps).merge(:apps => rest))
       end
     end
   end

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

@@ -1,3 +1,3 @@
 module VMCManifests
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-23 00:00:00 Z
+date: 2012-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cfoundry