manifests-vmc-plugin 0.3.0 → 0.3.1

data/lib/manifests-vmc-plugin.rb

@@ -41,10 +41,27 @@ module VMCManifests
     @manifest_file
   end
 
+  # convert any deprecated structuring to the modern format
+  def simplify_info(info)
+    if info["framework"].is_a?(Hash)
+      info["framework"] = info["framework"]["name"]
+    end
+  end
+
   # load and resolve a given manifest file
   def load_manifest(file)
     manifest = build_manifest(file)
     resolve_manifest(manifest)
+
+    # single-app manifest
+    simplify_info(manifest)
+
+    if apps = manifest["applications"]
+      apps.each do |path, info|
+        simplify_info(info)
+      end
+    end
+
     manifest
   end
 
@@ -180,37 +197,43 @@ module VMCManifests
           MANIFEST_META.include? k
         end
 
-      if info["framework"].is_a?(Hash)
-        info["framework"] = info["framework"]["name"]
-      end
-
       info
     end
   end
 
-  def app_info(find_path, input = nil)
+  def app_by_name(name, input = nil)
     return unless manifest
 
-    mandir = File.dirname(manifest_file)
-    full_path = File.expand_path(find_path, mandir)
+    if apps = manifest["applications"]
+      manifest["applications"].find do |path, info|
+        info["name"] == name
+      end
+    elsif name == manifest["name"]
+      [".", toplevel_attributes]
+    end
+  end
+
+  def app_by_path(find_path)
+    return unless manifest
 
-    path, info =
-      if apps = manifest["applications"]
-        manifest["applications"].find do |path, info|
-          if info["framework"].is_a?(Hash)
-            info["framework"] = info["framework"]["name"]
-          end
+    if apps = manifest["applications"]
+      mandir = File.dirname(manifest_file)
+      full_path = File.expand_path(find_path, mandir)
 
-          app = File.expand_path(path, mandir)
-          File.expand_path(path, mandir) == full_path
-        end
-      elsif find_path == "."
-        [".", {}]
+      manifest["applications"].find do |path, info|
+        File.expand_path(path, mandir) == full_path
       end
+    elsif find_path == "."
+      [".", toplevel_attributes]
+    end
+  end
 
+  def app_info(path_or_name, input = nil)
+    path, info = app_by_name(path_or_name) || app_by_path(path_or_name)
     return unless info
 
-    data = { :path => full_path }
+    abspath = File.expand_path(path, File.dirname(manifest_file))
+    data = { :path => abspath }
 
     toplevel_attributes.merge(info).each do |k, v|
       name = k.to_sym
@@ -248,51 +271,58 @@ module VMCManifests
     end
   end
 
+
+  def no_apps
+    fail "No applications or manifest to operate on."
+  end
+
   # like each_app, but only acts on apps specified as paths instead of names
   #
   # returns the names that were not paths
   def specific_apps_or_all(input = nil, use_name = true, &blk)
-    return false unless manifest && apps = manifest["applications"]
-
-    use_name = false if apps.size > 1
-
     names_or_paths =
       if input.given?(:names)
-        input[:names]
+        # names may be given but be [], which will still cause
+        # interaction, so use #given instead of #[] here
+        input.given(:names)
       elsif input.given?(:name)
         [input[:name]]
       else
         []
       end
 
-    return each_app(input, &blk) if names_or_paths.empty?
+    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 []
+    end
 
     input = input.without(:name, :names)
 
-    paths = []
-    names = []
+    in_manifest = []
+    external = []
     names_or_paths.each do |x|
       path = File.expand_path(x)
 
-      if File.exists?(path)
-        paths << path
+      if app = app_info(File.exists?(path) ? path : x, input)
+        in_manifest << app
       else
-        names << x
+        external << x
       end
     end
 
-    paths.each do |path|
-      blk.call app_info(path, input)
-    end
-
-    if use_name && names.size == 1
-      blk.call(
-        app_info(
-          manifest["applications"].keys.first,
-          input.merge(:name => names.first)))
+    in_manifest.each do |app|
+      blk.call app
     end
 
-    names
+    external
   end
 
 

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

@@ -10,7 +10,7 @@ class Manifests < VMC::CLI
 
 
   def no_apps
-    err "No applications or manifest to operate on."
+    fail "No applications or manifest to operate on."
   end
 
 
@@ -19,21 +19,22 @@ class Manifests < VMC::CLI
   [ :start, :instances, :logs, :file, :files, :env,
     :health, :stats, :scale
   ].each do |wrap|
-    change_argument(wrap, :name, :optional)
+    optional_name = change_argument(wrap, :name, :optional)
 
     around(wrap) do |cmd, input|
-      use_manifest =
+      rest =
         specific_apps_or_all(input) do |app|
-          cmd.call(input.merge(:name => app[:name]))
+          cmd.call(input.without(:names).merge(:name => app[:name]))
           puts "" unless quiet?
         end
 
-      # array of unhandled names
-      if use_manifest === Array
-        cmd.call(input.merge(:names => use_manifest))
+      if rest
+        rest.each do |n|
+          cmd.call(input.merge(:name => n))
+        end
 
-      # no manifest or no apps described by it
-      elsif !use_manifest
+      # fail manually for commands whose name we made optional
+      elsif optional_name
         no_apps
       end
     end
@@ -46,48 +47,54 @@ class Manifests < VMC::CLI
       next cmd.call if input[:all]
 
       reversed = []
-      use_manifest =
+      rest =
         specific_apps_or_all(input) do |app|
           reversed.unshift app[:name]
         end
 
-      # array of unhandled names
-      if use_manifest === Array
-        cmd.call(input.merge(:names => use_manifest))
-
-      # no manifest or no apps described by it
-      elsif !use_manifest
-        next no_apps
+      unless reversed.empty?
+        cmd.call(input.merge(:names => reversed))
       end
 
-      cmd.call(input.merge(:names => reversed))
+      if rest
+        cmd.call(input.merge(:names => rest)) unless rest.empty?
+      else
+        cmd.call(input.without(:names))
+      end
     end
   end
 
 
   # push and sync meta changes in the manifest
   # also sets env data on creation if present in manifest
+  #
+  # vmc push [name in manifest] = push that app from its path
+  # vmc push [name not in manifest] = push new app using given name
+  # vmc push [path] = push app from its path
   change_argument(:push, :name, :optional)
   around(:push) do |push, input|
-    use_manifest =
-      specific_apps_or_all(input, true) do |app|
-        sync_changes(app)
-
-        with_filters(
-            :push => {
-              :push_app =>
-                proc { |a| setup_app(a, app); a }
-            }) do
-          push.call(
-            input.merge(app).merge(
-              :bind_services => false,
-              :create_services => false))
-        end
+    app =
+      if input.given?(:name)
+        path = File.expand_path(input[:name])
+        find_by = File.exists?(path) ? path : input[:name]
+
+        app_info(find_by, input.without(:name))
       end
 
-    unless use_manifest
-      bound = []
+    app ||= app_info(".", input)
 
+    if app
+      sync_changes(app)
+
+      with_filters(
+          :push => {
+            :push_app => proc { |a| setup_app(a, app); a }
+          }) do
+        push.call(input.merge(app).merge(
+          :bind_services => false,
+          :create_services => false))
+      end
+    else
       with_filters(
           :push => {
             :push_app =>

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

@@ -1,3 +1,3 @@
 module VMCManifests
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Alex Suraci