manifests-vmc-plugin 0.2.2 → 0.2.3

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

@@ -1,5 +1,5 @@
 require "vmc/plugin"
-require File.expand_path("../../manifests-vmc-plugin", __FILE__)
+require "manifests-vmc-plugin"
 
 VMC.Plugin do
   class_option :manifest,
@@ -14,8 +14,7 @@ VMC.Plugin(VMC::App) do
 
   # basic commands that, when given no args, act on the
   # app(s) described by the manifest, in dependency-order
-  [:start, :instances, :scale, :logs,
-   :file, :files, :health, :stats].each do |wrap|
+  [: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|
@@ -100,64 +99,63 @@ VMC.Plugin(VMC::App) do
   around(:push) do |push, args|
     name = passed_value(:name) || args.first
 
+    use_name =
+      if apps = manifest["applications"]
+        apps.size == 1
+      else
+        # legacy single-app manifest
+        true
+      end
+
     all_pushed =
-      each_app do |a|
-        next if name && a["name"] != name
-
-        app = client.app(a["name"])
-        updating = app.exists?
-
-        sync_changes(a)
-        push.call(
-          :name => a["name"],
-          :start => false,
-          :bind_services => false,
-          :create_services => false)
-
-        unless updating
-          app.env = a["env"]
-
-          if input(:start)
-            with_inputs(:name => a["name"]) do
-              start
-            end
-          else
-            app.update!
-          end
+      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
+          push.call(
+            :name => app_name,
+            :bind_services => false,
+            :create_services => false)
         end
 
         puts "" unless simple_output?
       end
 
     unless all_pushed
-      begin
+      bound = []
+
+      with_filters(:push_app => proc { |a| ask_to_save(a); a}) do
         push.call
-      ensure
-        meta = {
-          "name" => passed_value(:name) || args.first,
-          "framework" => passed_value(:framework),
-          "runtime" => passed_value(:runtime),
-          "memory" => passed_value(:memory),
-          "instances" => passed_value(:instances).to_i,
-          "url" => passed_value(:url)
-        }
-
-        if cmd = passed_value(:command)
-          meta["command"] = cmd
-        end
+      end
+    end
+  end
 
-        unless manifest_file || meta.any? { |k, v| v.nil? }
-          puts ""
+  # 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 ask("Save configuration?", :default => false)
-            File.open("manifest.yml", "w") do |io|
-              YAML.dump(
-                {"applications" => {(options[:path] || ".") => meta}},
-                io)
-            end
-          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.2"
+  VERSION = "0.2.3"
 end

data/lib/manifests-vmc-plugin.rb

@@ -209,14 +209,15 @@ module VMCManifests
   # inputs for each app
   def each_app
     given_path = passed_value(:path)
+    full_path = given_path && File.expand_path(given_path)
 
     if manifest and all_apps = manifest["applications"]
+      use_inputs = all_apps.size == 1
+
       # given a specific application
       if given_path
-        full_path = File.expand_path(given_path)
-
         if info = app_info(full_path)
-          with_app(full_path, info) do
+          with_app(full_path, info, use_inputs) do
             yield info
           end
         else
@@ -228,7 +229,7 @@ module VMCManifests
           app = File.expand_path(path, File.dirname(manifest_file))
           info = app_info(app)
 
-          with_app(app, info) do
+          with_app(app, info, use_inputs) do
             yield info
           end
         end
@@ -238,7 +239,7 @@ module VMCManifests
     
     # manually created or legacy single-app manifest
     elsif single = toplevel_attributes
-      with_app(full_path || ".", single) do
+      with_app(full_path || ".", single, true) do
         yield single
       end
 
@@ -252,14 +253,16 @@ module VMCManifests
   private
 
   # call the block as if the app info and path were given as flags
-  def with_app(path, info, &blk)
+  def with_app(path, info, use_inputs = false, &blk)
     inputs = {:path => path}
     info.each do |k, v|
-      if k == "mem"
-        k = "memory"
+      input = k.to_sym
+
+      if input == :mem
+        input = :memory
       end
 
-      inputs[k.to_sym] = v
+      inputs[input] = use_inputs && passed_value(input) || v
     end
 
     with_inputs(inputs, &blk)
@@ -319,14 +322,15 @@ module VMCManifests
       case k
       when /ur[li]s?/
         old = app.urls
-        if old != Array(v)
-          diff[k] = [old, v]
-          app.urls = Array(v)
+        new = Array(v)
+        if old != new
+          diff["urls"] = [old.inspect, new.inspect]
+          app.urls = new
         end
       when "env"
         old = app.env
         if old != v
-          diff[k] = [old, v]
+          diff[k] = [old.inspect, v.inspect]
           app.env = v
         end
       when "framework", "runtime", "command"
@@ -345,8 +349,9 @@ module VMCManifests
       when "mem", "memory"
         old = app.memory
         new = megabytes(v)
+
         if old != new
-          diff["memory"] = [old, new]
+          diff["memory"] = [human_size(old * 1024 * 1024, 0), v]
           app.memory = new
         end
       end
@@ -359,7 +364,7 @@ module VMCManifests
       diff.each do |k, d|
         old, new = d
         label = c(k, need_restage.include?(k) ? :bad : :good)
-        puts "  #{label}: #{old.inspect} #{c("->", :dim)} #{new.inspect}"
+        puts "  #{label}: #{old} #{c("->", :dim)} #{new}"
       end
 
       puts ""
@@ -389,4 +394,72 @@ module VMCManifests
       end
     end
   end
+
+  def ask_to_save(app)
+    return if manifest_file
+
+    services = app.services.collect { |name| client.service(name) }
+
+    meta = {
+      "name" => app.name,
+      "framework" => app.framework,
+      "runtime" => app.runtime,
+      "memory" => human_size(app.memory, 0),
+      "instances" => app.total_instances,
+      "url" => app.url
+    }
+
+    unless services.empty?
+      meta["services"] = {}
+
+      services.each do |s|
+        meta["services"][s.name] = {
+          "vendor" => s.vendor,
+          "version" => s.version
+        }
+      end
+    end
+
+    if cmd = app.command
+      meta["command"] = cmd
+    end
+
+    if ask("Save configuration?", :default => false)
+      File.open("manifest.yml", "w") do |io|
+        YAML.dump(
+          {"applications" => {(options[:path] || ".") => meta}},
+          io)
+      end
+
+      puts "Saved to #{c("manifest.yml", :name)}."
+    end
+  end
+
+  def setup_app(app, info)
+    app.env = info["env"]
+
+    return if !info["services"] || info["services"].empty?
+
+    services = client.system_services
+
+    info["services"].each do |name, svc|
+      service = client.service(name)
+
+      unless service.exists?
+        service.vendor = svc["vendor"] || svc["type"]
+
+        service_meta = services[service.vendor]
+
+        service.type = service_meta[:type]
+        service.version = svc["version"] || service_meta[:versions].first
+        service.tier = "free"
+
+        with_progress("Creating service #{c(service.name, :name)}") do
+          service.create!
+        end
+      end
+    end
+
+    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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-06-21 00:00:00 Z
 dependencies: []
 
 description: