manifests-vmc-plugin 0.4.4 → 0.4.5

data/lib/manifests-vmc-plugin.rb

@@ -366,105 +366,6 @@ module VMCManifests
     ordered
   end
 
-  # detect changes in app info, and update the app if necessary.
-  #
-  # redeploys the app if necessary (after prompting the user), e.g. for
-  # runtime/framework change
-  def sync_changes(info)
-    app = client.app_by_name(info[:name])
-    return unless app
-
-    diff = {}
-    need_restage = []
-    info.each do |k, v|
-      case k.to_s
-      when /ur[li]s?/
-        old = app.urls
-        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.inspect, v.inspect]
-          app.env = v
-        end
-      when "framework", "runtime"
-        old = app.send(k)
-        new = client.send(:"#{k}_by_name", v)
-
-        if old != new
-          diff[k] = [old.name, new.name]
-          app.send(:"#{k}=", new)
-          need_restage << k
-        end
-      when "command"
-        old = app.command
-        if old != v
-          diff[k] = [old, v]
-          app.send(:"#{k}=", v)
-          need_restage << k
-        end
-      when "instances"
-        old = app.total_instances
-        if old != v
-          diff[k] = [old, v]
-          app.total_instances = v
-        end
-      when "mem", "memory"
-        old = app.memory
-        new = megabytes(v)
-
-        if old != new
-          diff[:memory] = [human_size(old * 1024 * 1024, 0), v]
-          app.memory = new
-        end
-      end
-    end
-
-    return if diff.empty?
-
-    unless quiet?
-      puts "Detected the following changes to #{c(app.name, :name)}:"
-      diff.each do |k, d|
-        old, new = d
-        label = c(k, need_restage.include?(k) ? :bad : :good)
-        puts "  #{label}: #{old} #{c("->", :dim)} #{new}"
-      end
-
-      puts ""
-    end
-
-    if need_restage.empty?
-      with_progress("Updating #{c(app.name, :name)}") do
-        app.update!
-      end
-    else
-      unless quiet?
-        puts "The following changes require the app to be recreated:"
-        need_restage.each do |n|
-          puts "  #{c(n, :error)}"
-        end
-        puts ""
-      end
-
-      if force? || ask("Redeploy?", :default => false)
-        bindings = app.services
-
-        with_progress("Deleting #{c(app.name, :name)}") do
-          app.delete!
-        end
-
-        with_progress("Recreating #{c(app.name, :name)}") do
-          app.create!
-          app.bind(*bindings)
-        end
-      end
-    end
-  end
-
   def ask_to_save(input, app)
     return if manifest_file
 

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

@@ -79,7 +79,11 @@ class Manifests < VMC::CLI
   # 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)
+  change_argument :push, :name, :optional
+
+  add_input :push, :reset, :type => :boolean, :default => false,
+    :desc => "Reset to values in the manifest"
+
   around(:push) do |push, input|
     app =
       if input.given?(:name)
@@ -92,8 +96,6 @@ class Manifests < VMC::CLI
     app ||= app_info(".", input)
 
     if app
-      sync_changes(app)
-
       with_filters(
           :push => {
             :create_app => proc { |a|
@@ -105,7 +107,13 @@ class Manifests < VMC::CLI
               a
             }
           }) do
-        push.call(input.merge_given(app).merge(
+        # only set inputs if creating app or updating with --reset
+        if input[:reset] || !client.app_by_name(app[:name])
+          input = input.merge_given(app)
+        end
+
+        push.call(input.merge(
+          :name => app[:name],
           :bind_services => false,
           :create_services => false))
       end

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

@@ -1,3 +1,3 @@
 module VMCManifests
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-29 00:00:00 Z
+date: 2012-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cfoundry