manifests-vmc-plugin 0.4.11 → 0.4.12

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

@@ -1,3 +1,5 @@
+require "pathname"
+
 require "vmc/plugin"
 require "manifests-vmc-plugin"
 
@@ -5,6 +7,8 @@ require "manifests-vmc-plugin"
 class Manifests < VMC::CLI
   include VMCManifests
 
+  @@showed_manifest_usage = false
+
   option :manifest, :aliases => "-m", :value => :file,
     :desc => "Path to manifest file to use"
 
@@ -13,6 +17,15 @@ class Manifests < VMC::CLI
     fail "No applications or manifest to operate on."
   end
 
+  def show_manifest_usage
+    return if @@showed_manifest_usage
+
+    path = Pathname.new(manifest_file).relative_path_from(Pathname.pwd)
+    line "Using manifest file #{c(path, :name)}"
+    line
+
+    @@showed_manifest_usage = true
+  end
 
   # basic commands that, when given no name, act on the
   # app(s) described by the manifest, in dependency-order
@@ -32,6 +45,8 @@ class Manifests < VMC::CLI
         end
       end
 
+      show_manifest_usage
+
       num = 0
       rest =
         specific_apps_or_all(input) do |info|
@@ -58,6 +73,8 @@ class Manifests < VMC::CLI
     around(wrap) do |cmd, input|
       next cmd.call if input[:all] || !manifest
 
+      show_manifest_usage
+
       reversed = []
       rest =
         specific_apps_or_all(input) do |info|
@@ -108,6 +125,8 @@ class Manifests < VMC::CLI
         push.call
       end
     else
+      show_manifest_usage
+
       apps.each do |app|
         with_filters(
             :push => {

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

@@ -1,3 +1,3 @@
 module VMCManifests
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

data/lib/manifests-vmc-plugin.rb

@@ -22,23 +22,26 @@ module VMCManifests
 
   # find the manifest file to work with
   def manifest_file
-    return input[:manifest] if input[:manifest]
     return @manifest_file if @manifest_file
 
-    where = Dir.pwd
-    while true
-      if File.exists?(File.join(where, MANIFEST_FILE))
-        @manifest_file = File.join(where, MANIFEST_FILE)
-        break
-      elsif File.basename(where) == "/"
-        @manifest_file = nil
-        break
-      else
-        where = File.expand_path("../", where)
+    unless path = input[:manifest]
+      where = Dir.pwd
+      while true
+        if File.exists?(File.join(where, MANIFEST_FILE))
+          path = File.join(where, MANIFEST_FILE)
+          break
+        elsif File.basename(where) == "/"
+          path = nil
+          break
+        else
+          where = File.expand_path("../", where)
+        end
       end
     end
 
-    @manifest_file
+    return unless path
+
+    @manifest_file = File.expand_path(path)
   end
 
   # convert any deprecated structuring to the modern format
@@ -234,7 +237,7 @@ module VMCManifests
     path, info = app_by_name(path_or_name) || app_by_path(path_or_name)
     return unless info
 
-    data = { :path => from_manifest(path) }
+    data = { :path => path }
 
     toplevel_attributes.merge(info).each do |k, v|
       name = k.to_sym
@@ -246,6 +249,8 @@ module VMCManifests
       data[name] = input && input.given(name) || v
     end
 
+    data[:path] = from_manifest(data[:path])
+
     data
   end
 

metadata

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