manifests-vmc-plugin 0.2.4 → 0.3.0

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

@@ -1,161 +1,100 @@
 require "vmc/plugin"
 require "manifests-vmc-plugin"
 
-VMC.Plugin do
-  class_option :manifest,
-    :aliases => "-m", :desc => "Manifest file"
 
-  class_option :path,
-    :aliases => "-p", :desc => "Application path"
-end
-
-VMC.Plugin(VMC::App) do
+class Manifests < VMC::CLI
   include VMCManifests
 
-  # basic commands that, when given no args, act on the
-  # app(s) described by the manifest, in dependency-order
-  [:start, :instances, :logs, :file, :files, :health, :stats].each do |wrap|
-    around(wrap) do |cmd, args|
-      if args.empty? && !passed_value(:name)
-        each_app do |a|
-          cmd.call(:name => a["name"])
-          puts "" unless simple_output?
-        end || err("No applications to act on.")
-      else
-        cmd.call
-      end
-    end
-  end
+  option :manifest, :aliases => "-m", :value => :file,
+    :desc => "Path to manifest file to use"
 
-  # same as above but in reverse dependency-order
-  around(:stop) do |cmd, args|
-    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 => name)
-        puts "" unless simple_output?
-      end
-    else
-      cmd.call
-    end
+  def no_apps
+    err "No applications or manifest to operate on."
   end
 
-  around(:delete) do |cmd, args|
-    if args.empty? && !options[:all] && !passed_value(:name)
-      reversed = []
-      has_manifest =
-        each_app do |a|
-          reversed.unshift a["name"]
-        end
 
-      if has_manifest
-        reversed.each do |name|
-          cmd.call(:name => name)
-          puts "" unless simple_output?
+  # 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
+  ].each do |wrap|
+    change_argument(wrap, :name, :optional)
+
+    around(wrap) do |cmd, input|
+      use_manifest =
+        specific_apps_or_all(input) do |app|
+          cmd.call(input.merge(:name => app[:name]))
+          puts "" unless quiet?
         end
-      else
-        cmd.call
+
+      # 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
+        no_apps
       end
-    else
-      cmd.call
     end
   end
 
-  # stop apps in reverse dependency order,
-  # and then start in dependency order
-  around(:restart) do |cmd, args|
-    if args.empty? && !passed_value(:name)
+
+  # same as above but in reverse dependency-order
+  [:stop, :delete].each do |wrap|
+    around(wrap) do |cmd, input|
+      next cmd.call if input[:all]
+
       reversed = []
-      forwards = []
-      each_app do |a|
-        reversed.unshift a["name"]
-        forwards << a["name"]
-      end || err("No applications to act on.")
-
-      reversed.each do |name|
-        with_inputs(:name => name) do
-          stop
+      use_manifest =
+        specific_apps_or_all(input) do |app|
+          reversed.unshift app[:name]
         end
-      end
 
-      puts "" unless simple_output?
+      # array of unhandled names
+      if use_manifest === Array
+        cmd.call(input.merge(:names => use_manifest))
 
-      forwards.each do |name|
-        with_inputs(:name => name) do
-          start
-        end
+      # no manifest or no apps described by it
+      elsif !use_manifest
+        next no_apps
       end
-    else
-      cmd.call
+
+      cmd.call(input.merge(:names => reversed))
     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|
-    name = passed_value(:name) || args.first
-
-    use_name =
-      if manifest && apps = manifest["applications"]
-        apps.size == 1
-      else
-        # legacy single-app manifest
-        true
-      end
-
-    all_pushed =
-      each_app do |info|
-        next if !use_name && name && info["name"] != name
-
-        app_name = use_name ? name : info["name"]
-
-        app = client.app(app_name)
-
-        sync_changes(info)
-
-        with_filters(:push_app => proc { |a| setup_app(a, info); a }) do
+  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(
-            :name => app_name,
-            :bind_services => false,
-            :create_services => false)
+            input.merge(app).merge(
+              :bind_services => false,
+              :create_services => false))
         end
-
-        puts "" unless simple_output?
       end
 
-    unless all_pushed
+    unless use_manifest
       bound = []
 
-      with_filters(:push_app => proc { |a| ask_to_save(a); a}) do
+      with_filters(
+          :push => {
+            :push_app =>
+              proc { |a| ask_to_save(input, a); a }
+          }) do
         push.call
       end
     end
   end
-
-  # need to do this specially so it doesn't call it with the instance/memory
-  # flags set (via each_app), which would cause it to do nothing
-  around(:scale) do |cmd, args|
-    if args.empty? && !passed_value(:name)
-      apps = []
-      has_manifest =
-        each_app do |a|
-          apps << a["name"]
-        end
-
-      if has_manifest
-        apps.each do |name|
-          cmd.call(:name => name)
-          puts "" unless simple_output?
-        end
-      else
-        cmd.call
-      end
-    else
-      cmd.call
-    end
-  end
 end

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

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

data/lib/manifests-vmc-plugin.rb

@@ -22,7 +22,7 @@ module VMCManifests
 
   # find the manifest file to work with
   def manifest_file
-    return options[:manifest] if options[:manifest]
+    return option(:manifest) if option(:manifest)
     return @manifest_file if @manifest_file
 
     where = Dir.pwd
@@ -188,60 +188,58 @@ module VMCManifests
     end
   end
 
-  def app_info(find_path)
-    return unless manifest and manifest["applications"]
-    
-    manifest["applications"].each do |path, info|
-      if info["framework"].is_a?(Hash)
-        info["framework"] = info["framework"]["name"]
+  def app_info(find_path, input = nil)
+    return unless manifest
+
+    mandir = File.dirname(manifest_file)
+    full_path = File.expand_path(find_path, mandir)
+
+    path, info =
+      if apps = manifest["applications"]
+        manifest["applications"].find do |path, info|
+          if info["framework"].is_a?(Hash)
+            info["framework"] = info["framework"]["name"]
+          end
+
+          app = File.expand_path(path, mandir)
+          File.expand_path(path, mandir) == full_path
+        end
+      elsif find_path == "."
+        [".", {}]
       end
 
-      app = File.expand_path(path, File.dirname(manifest_file))
-      if find_path == app
-        return toplevel_attributes.merge info
+    return unless info
+
+    data = { :path => full_path }
+
+    toplevel_attributes.merge(info).each do |k, v|
+      name = k.to_sym
+
+      if name == :mem
+        name = :memory
       end
+
+      data[name] = input && input.given(name) || v
     end
 
-    nil
+    data
   end
 
   # call a block for each app in a manifest (in dependency order), setting
   # inputs for each app
-  def each_app
-    given_path = passed_value(:path)
-    full_path = given_path && File.expand_path(given_path)
-
+  def each_app(input = nil, &blk)
     if manifest and all_apps = manifest["applications"]
       use_inputs = all_apps.size == 1
 
-      # given a specific application
-      if given_path
-        if info = app_info(full_path)
-          with_app(full_path, info, use_inputs) do
-            yield info
-          end
-        else
-          raise "Path #{given_path} is not described by the manifest."
-        end
-      else
-        # all apps in the manifest
-        ordered_by_deps(all_apps).each do |path|
-          app = File.expand_path(path, File.dirname(manifest_file))
-          info = app_info(app)
-
-          with_app(app, info, use_inputs) do
-            yield info
-          end
-        end
+      ordered_by_deps(all_apps).each do |path|
+        yield app_info(path, use_inputs && input)
       end
 
       true
-    
+
     # manually created or legacy single-app manifest
     elsif single = toplevel_attributes
-      with_app(full_path || ".", single, true) do
-        yield single
-      end
+      yield app_info(".", input)
 
       true
 
@@ -250,24 +248,56 @@ module VMCManifests
     end
   end
 
-  private
+  # 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"]
 
-  # call the block as if the app info and path were given as flags
-  def with_app(path, info, use_inputs = false, &blk)
-    inputs = {:path => path}
-    info.each do |k, v|
-      input = k.to_sym
+    use_name = false if apps.size > 1
 
-      if input == :mem
-        input = :memory
+    names_or_paths =
+      if input.given?(:names)
+        input[:names]
+      elsif input.given?(:name)
+        [input[:name]]
+      else
+        []
       end
 
-      inputs[input] = use_inputs && passed_value(input) || v
+    return each_app(input, &blk) if names_or_paths.empty?
+
+    input = input.without(:name, :names)
+
+    paths = []
+    names = []
+    names_or_paths.each do |x|
+      path = File.expand_path(x)
+
+      if File.exists?(path)
+        paths << path
+      else
+        names << x
+      end
     end
 
-    with_inputs(inputs, &blk)
+    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)))
+    end
+
+    names
   end
 
+
+  private
+
   # sort applications in dependency order
   # e.g. if A depends on B, B will be listed before A
   def ordered_by_deps(apps, abspaths = nil, processed = Set[])
@@ -313,18 +343,18 @@ module VMCManifests
   # redeploys the app if necessary (after prompting the user), e.g. for
   # runtime/framework change
   def sync_changes(info)
-    app = client.app(info["name"])
+    app = client.app(info[:name])
     return unless app.exists?
 
     diff = {}
     need_restage = []
     info.each do |k, v|
-      case k
+      case k.to_s
       when /ur[li]s?/
         old = app.urls
         new = Array(v)
         if old != new
-          diff["urls"] = [old.inspect, new.inspect]
+          diff[:urls] = [old.inspect, new.inspect]
           app.urls = new
         end
       when "env"
@@ -351,7 +381,7 @@ module VMCManifests
         new = megabytes(v)
 
         if old != new
-          diff["memory"] = [human_size(old * 1024 * 1024, 0), v]
+          diff[:memory] = [human_size(old * 1024 * 1024, 0), v]
           app.memory = new
         end
       end
@@ -359,7 +389,7 @@ module VMCManifests
 
     return if diff.empty?
 
-    unless simple_output?
+    unless quiet?
       puts "Detected the following changes to #{c(app.name, :name)}:"
       diff.each do |k, d|
         old, new = d
@@ -375,7 +405,7 @@ module VMCManifests
         app.update!
       end
     else
-      unless simple_output?
+      unless quiet?
         puts "The following changes require the app to be recreated:"
         need_restage.each do |n|
           puts "  #{c(n, :error)}"
@@ -395,7 +425,7 @@ module VMCManifests
     end
   end
 
-  def ask_to_save(app)
+  def ask_to_save(input, app)
     return if manifest_file
 
     services = app.services.collect { |name| client.service(name) }
@@ -427,7 +457,7 @@ module VMCManifests
     if ask("Save configuration?", :default => false)
       File.open("manifest.yml", "w") do |io|
         YAML.dump(
-          {"applications" => {(options[:path] || ".") => meta}},
+          {"applications" => {(input[:path] || ".") => meta}},
           io)
       end
 
@@ -436,13 +466,13 @@ module VMCManifests
   end
 
   def setup_app(app, info)
-    app.env = info["env"]
+    app.env = info[:env]
 
-    return if !info["services"] || info["services"].empty?
+    return if !info[:services] || info[:services].empty?
 
     services = client.system_services
 
-    info["services"].each do |name, svc|
+    info[:services].each do |name, svc|
       service = client.service(name)
 
       unless service.exists?
@@ -460,6 +490,6 @@ module VMCManifests
       end
     end
 
-    app.services = info["services"].keys
+    app.services = info[:services].keys
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-22 00:00:00 Z
+date: 2012-07-03 00:00:00 Z
 dependencies: []
 
 description: