manifests-vmc-plugin 0.1.0 → 0.1.1

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

@@ -1,7 +1,7 @@
-require "cf/plugin"
+require "vmc/plugin"
 require File.expand_path("../../manifests-vmc-plugin", __FILE__)
 
-CF.Plugin do
+VMC.Plugin do
   class_option :manifest,
     :aliases => "-m", :desc => "Manifest file"
 
@@ -9,7 +9,7 @@ CF.Plugin do
     :aliases => "-p", :desc => "Application path"
 end
 
-CF.Plugin(CF::App) do
+VMC.Plugin(VMC::App) do
   include VMCManifests
 
   # basic commands that, when given no args, act on the
@@ -28,21 +28,40 @@ CF.Plugin(CF::App) do
   end
 
   # same as above but in reverse dependency-order
-  [:stop, :delete].each do |wrap|
-    around(wrap) do |cmd, args|
-      if args.empty?
-        reversed = []
+  around(:stop) do |cmd, args|
+    if args.empty?
+      reversed = []
+      each_app do |a|
+        reversed.unshift a["name"]
+      end || err("No applications to act on.")
+
+      reversed.each do |name|
+        cmd.call(name)
+        puts "" unless simple_output?
+      end
+    else
+      cmd.call(args)
+    end
+  end
+
+  around(:delete) do |cmd, args|
+    if args.empty? && !options[:all]
+      reversed = []
+      has_manifest =
         each_app do |a|
           reversed.unshift a["name"]
-        end || err("No applications to act on.")
-
-        reversed.each do |name|
-          cmd.call(name)
-          puts "" unless simple_output?
         end
-      else
-        cmd.call(args)
+
+      unless has_manifest
+        return cmd.call(args)
+      end
+
+      reversed.each do |name|
+        cmd.call(name)
+        puts "" unless simple_output?
       end
+    else
+      cmd.call(args)
     end
   end
 

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

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

data/lib/manifests-vmc-plugin.rb

@@ -13,7 +13,7 @@ module VMCManifests
   end
 
   def save_manifest(save_to = manifest_file)
-    err "No manifest to save!" unless @manifest
+    raise "No manifest to save!" unless @manifest
 
     File.open(save_to, "w") do |io|
       YAML.dump(@manifest, io)
@@ -103,7 +103,7 @@ module VMCManifests
         resolve_lexically(v, ctx)
       end
     when String
-      val.gsub!(/\$\{([[:alnum:]\-]+)\}/) do
+      val.gsub!(/\$\{([^\}]+)\}/) do
         resolve_symbol($1, ctx)
       end
     end
@@ -123,6 +123,9 @@ module VMCManifests
     when "random-word"
       "%04x" % [rand(0x0100000)]
 
+    when /^ask (.+)/
+      ask($1)
+
     else
       found = find_symbol(sym, ctx)
 
@@ -130,7 +133,7 @@ module VMCManifests
         resolve_lexically(found, ctx)
         found
       else
-        err("Unknown symbol in manifest: #{sym}")
+        raise("Unknown symbol in manifest: #{sym}")
       end
     end
   end
@@ -305,7 +308,7 @@ module VMCManifests
         deps.each do |dep|
           edep = File.expand_path("../" + dep, manifest_file)
 
-          err "Circular dependency detected." if processed.include? edep
+          raise "Circular dependency detected." if processed.include? edep
 
           dep_apps[dep] = abspaths[edep]
         end

metadata

@@ -1,34 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: manifests-vmc-plugin
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-01 00:00:00 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies: []
-
 description: 
-email: 
+email:
 - asuraci@vmware.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- LICENSE
+files:
 - Rakefile
 - lib/manifests-vmc-plugin/errors.rb
 - lib/manifests-vmc-plugin/manifest.rb
@@ -37,36 +26,26 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: manifests-vmc-plugin
-rubygems_version: 1.8.23
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Cloud Foundry automation via manifest documents.
 test_files: []
-

data/LICENSE

@@ -1,30 +0,0 @@
-Copyright (c)2012, Alex Suraci
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Alex Suraci nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.