bosh_cli_plugin_micro 1.5.0.pre.1117 → 1.5.0.pre.1134

data/lib/bosh/cli/commands/micro.rb

@@ -1,5 +1,8 @@
 require 'pp'
 require 'bosh/deployer'
+require 'bosh/deployer/deployer_renderer'
+require 'bosh/stemcell'
+require 'bosh/stemcell/archive'
 
 module Bosh::Cli::Command
   class Micro < Base
@@ -11,7 +14,7 @@ module Bosh::Cli::Command
 
     def initialize(runner)
       super(runner)
-      options[:config] ||= DEFAULT_CONFIG_PATH #hijack Cli::Config
+      options[:config] ||= DEFAULT_CONFIG_PATH # hijack Cli::Config
     end
 
     usage 'micro'
@@ -19,15 +22,14 @@ module Bosh::Cli::Command
     def micro_help
       say('bosh micro sub-commands:')
       nl
-      cmds = Bosh::Cli::Config.commands.values.find_all {|c|
-        c.usage =~ /^micro/
-      }
+      cmds = Bosh::Cli::Config.commands
+      cmds = cmds.values.find_all { |c| c.usage =~ /^micro/ }
       Bosh::Cli::Command::Help.list_commands(cmds)
     end
 
     usage 'micro deployment'
     desc 'Choose micro deployment to work with, or display current deployment'
-    def micro_deployment(name=nil)
+    def micro_deployment(name = nil)
       if name
         set_current(name)
       else
@@ -35,10 +37,11 @@ module Bosh::Cli::Command
       end
     end
 
+    # rubocop:disable MethodLength
     def set_current(name)
       manifest_filename = find_deployment(name)
 
-      if !File.exists?(manifest_filename)
+      unless File.exists?(manifest_filename)
         err "Missing manifest for #{name} (tried '#{manifest_filename}')"
       end
 
@@ -68,6 +71,7 @@ module Bosh::Cli::Command
       config.set_deployment(manifest_filename)
       config.save
     end
+    # rubocop:enable MethodLength
 
     def show_current
       say(deployment ? "Current deployment is '#{deployment.make_green}'" : 'Deployment not set')
@@ -95,11 +99,12 @@ module Bosh::Cli::Command
       say('Target'.ljust(15) + target_name)
     end
 
+    # rubocop:disable MethodLength
     usage 'micro deploy'
     desc 'Deploy a micro BOSH instance to the currently selected deployment'
     option '--update', 'update existing instance'
     option '--update-if-exists', 'create new or update existing instance'
-    def perform(stemcell=nil)
+    def perform(stemcell = nil)
       update = !!options[:update]
 
       err 'No deployment set' unless deployment
@@ -134,10 +139,12 @@ module Bosh::Cli::Command
         prefered_dir = File.dirname(File.dirname(deployment))
 
         unless prefered_dir == Dir.pwd
-          confirm_deployment("\n#{'No `bosh-deployments.yml` file found in current directory.'.make_red}\n\n" +
-                               'Conventionally, `bosh-deployments.yml` should be saved in ' +
-                                 "#{prefered_dir.make_green}.\n" +
-                                 "Is #{Dir.pwd.make_yellow} a directory where you can save state?")
+          confirm_deployment(
+            "\n#{'No `bosh-deployments.yml` file found in current directory.'.make_red}\n\n" +
+            'Conventionally, `bosh-deployments.yml` should be saved in ' +
+            "#{prefered_dir.make_green}.\n" +
+            "Is #{Dir.pwd.make_yellow} a directory where you can save state?"
+          )
         end
 
         err 'No existing instance to update' if update
@@ -162,15 +169,17 @@ module Bosh::Cli::Command
         unless stemcell_file.valid?
           err('Stemcell is invalid, please fix, verify and upload again')
         end
+
+        stemcell_archive = Bosh::Stemcell::Archive.new(stemcell)
       end
 
-      renderer = DeployerRenderer.new
+      renderer = Bosh::Deployer::DeployerRenderer.new
       renderer.start
       deployer.renderer = renderer
 
       start_time = Time.now
 
-      deployer.send(method, stemcell)
+      deployer.send(method, stemcell, stemcell_archive)
 
       renderer.finish('done')
 
@@ -180,6 +189,7 @@ module Bosh::Cli::Command
 
       say("Deployed #{desc}, took #{format_time(duration).make_green} to complete")
     end
+    # rubocop:enable MethodLength
 
     usage 'micro delete'
     desc 'Delete micro BOSH instance (including persistent disk)'
@@ -190,15 +200,17 @@ module Bosh::Cli::Command
 
       name = deployer.state.name
 
-      say "\nYou are going to delete micro BOSH deployment `#{name}'.\n\n" \
-      "THIS IS A VERY DESTRUCTIVE OPERATION AND IT CANNOT BE UNDONE!\n".make_red
+      say(
+        "\nYou are going to delete micro BOSH deployment `#{name}'.\n\n" +
+        "THIS IS A VERY DESTRUCTIVE OPERATION AND IT CANNOT BE UNDONE!\n".make_red
+      )
 
       unless confirmed?
         say 'Canceled deleting deployment'.make_green
         return
       end
 
-      renderer = DeployerRenderer.new
+      renderer = Bosh::Deployer::DeployerRenderer.new
       renderer.start
       deployer.renderer = renderer
 
@@ -228,16 +240,16 @@ module Bosh::Cli::Command
       na = 'n/a'
 
       deployments_table = table do |t|
-        t.headings = [ 'Name', 'VM name', 'Stemcell name']
+        t.headings = ['Name', 'VM name', 'Stemcell name']
         deployments.each do |r|
-          t << [ r[:name], r[:vm_cid] || na, r[:stemcell_cid] || na  ]
+          t << [r[:name], r[:vm_cid] || na, r[:stemcell_cid] || na]
         end
       end
 
       say("\n")
       say(deployments_table)
       say("\n")
-      say('Deployments total: %d' % deployments.size)
+      say("Deployments total: #{deployments.size}")
     end
 
     usage 'micro agent <args>'
@@ -293,13 +305,13 @@ AGENT_HELP
 
     private
 
-    def deployer(manifest_filename=nil)
+    def deployer(manifest_filename = nil)
       deployment_required unless manifest_filename
 
       if @deployer.nil?
         manifest_filename ||= deployment
 
-        if !File.exists?(manifest_filename)
+        unless File.exists?(manifest_filename)
           err("Cannot find deployment manifest in `#{manifest_filename}'")
         end
 
@@ -342,6 +354,7 @@ AGENT_HELP
       config.target_uuid = nil
     end
 
+    # rubocop:disable MethodLength
     def update_target
       if deployer.exists?
         bosh_ip = deployer.discover_bosh_ip
@@ -372,6 +385,7 @@ AGENT_HELP
 
       config.save
     end
+    # rubocop:enable MethodLength
 
     def confirm_deployment(msg)
       unless confirmed?(msg)
@@ -380,63 +394,13 @@ AGENT_HELP
     end
 
     def deployer_state(column)
-      if value = deployer.state.send(column)
+      value = deployer.state.send(column)
+
+      if value
         value.make_green
       else
         'n/a'.make_red
       end
     end
-
-    class DeployerRenderer < Bosh::Cli::EventLogRenderer
-      attr_accessor :stage, :total, :index
-
-      DEFAULT_POLL_INTERVAL = 1
-
-      def interval_poll
-        Bosh::Cli::Config.poll_interval || DEFAULT_POLL_INTERVAL
-      end
-
-      def start
-        @thread = Thread.new do
-          loop do
-            refresh
-            sleep(interval_poll)
-          end
-        end
-      end
-
-      def finish(state)
-        @thread.kill
-        super(state)
-      end
-
-      def enter_stage(stage, total)
-        @stage = stage
-        @total = total
-        @index = 0
-      end
-
-      def parse_event(event)
-        event
-      end
-
-      def update(state, task)
-        event = {
-          'time' => Time.now,
-          'stage' => @stage,
-          'task' => task,
-          'tags' => [],
-          'index' => @index+1,
-          'total' => @total,
-          'state' => state.to_s,
-          'progress' => state == :finished ? 100 : 0
-        }
-
-        add_event(event)
-
-        @index += 1 if state == :finished
-      end
-    end
-
   end
 end

data/lib/bosh/deployer/configuration.rb

@@ -5,6 +5,7 @@ module Bosh::Deployer
     attr_accessor :logger, :db, :uuid, :resources, :cloud_options,
                   :spec_properties, :agent_properties, :bosh_ip, :env, :name, :net_conf
 
+    # rubocop:disable MethodLength
     def configure(config)
       plugin = cloud_plugin(config)
 
@@ -34,10 +35,12 @@ module Bosh::Deployer
 
       @db.create_table :instances do
         primary_key :id
-        column :name, :text, :unique => true, :null => false
+        column :name, :text, unique: true, null: false
         column :uuid, :text
         column :stemcell_cid, :text
+        column :stemcell_sha1, :text
         column :stemcell_name, :text
+        column :config_sha1, :text
         column :vm_cid, :text
         column :disk_cid, :text
       end
@@ -55,11 +58,12 @@ module Bosh::Deployer
       @cloud = nil
       @networks = nil
     end
+    # rubocop:enable MethodLength
 
     def cloud
       if @cloud.nil?
-        @cloud = Bosh::Clouds::Provider.create(@cloud_options['plugin'],
-                                               @cloud_options['properties'])
+        @cloud = Bosh::Clouds::Provider.create(
+          @cloud_options['plugin'], @cloud_options['properties'])
       end
       @cloud
     end
@@ -69,10 +73,11 @@ module Bosh::Deployer
       user, password = uri.userinfo.split(':', 2)
       uri.userinfo = nil
       uri.host = bosh_ip
-      Bosh::Agent::HTTPClient.new(uri.to_s,
-                                  { 'user' => user,
-                                    'password' => password,
-                                    'reply_to' => uuid })
+      Bosh::Agent::HTTPClient.new(uri.to_s, {
+        'user' => user,
+        'password' => password,
+        'reply_to' => uuid,
+      })
     end
 
     def agent_url
@@ -90,7 +95,7 @@ module Bosh::Deployer
           'ip' => @net_conf['ip'],
           'dns' => @net_conf['dns'],
           'type' => @net_conf['type'],
-          'default' => ['dns', 'gateway']
+          'default' => %w(dns gateway)
         }
       }
       if @net_conf['vip']
@@ -116,14 +121,12 @@ module Bosh::Deployer
     def migrate_cpi
       cpi = @cloud_options['plugin']
       require_path = File.join('cloud', cpi)
-      cpi_path = $LOAD_PATH.find { |p| File.exist?(
-        File.join(p, require_path)) }
+      cpi_path = $LOAD_PATH.find { |p| File.exist?(File.join(p, require_path)) }
       migrations = File.expand_path('../db/migrations', cpi_path)
 
       if File.directory?(migrations)
         Sequel.extension :migration
-        Sequel::TimestampMigrator.new(
-          @db, migrations, :table => "#{cpi}_cpi_schema").run
+        Sequel::TimestampMigrator.new(@db, migrations, table: "#{cpi}_cpi_schema").run
       end
     end
 
@@ -131,9 +134,9 @@ module Bosh::Deployer
       src.merge(dst) do |key, old, new|
         if new.respond_to?(:blank) && new.blank?
           old
-        elsif old.kind_of?(Hash) and new.kind_of?(Hash)
+        elsif old.kind_of?(Hash) && new.kind_of?(Hash)
           deep_merge(old, new)
-        elsif old.kind_of?(Array) and new.kind_of?(Array)
+        elsif old.kind_of?(Array) && new.kind_of?(Array)
           old.concat(new).uniq
         else
           new
@@ -142,7 +145,7 @@ module Bosh::Deployer
     end
 
     def load_defaults(provider)
-      file = File.join(File.dirname(File.expand_path(__FILE__)), "../../../config/#{provider}_defaults.yml")
+      file = File.expand_path("../../../../config/#{provider}_defaults.yml", __FILE__)
       Psych.load_file(file)
     end
   end

data/lib/bosh/deployer/deployer_renderer.rb

@@ -0,0 +1,52 @@
+module Bosh::Deployer
+  class DeployerRenderer < Bosh::Cli::EventLogRenderer
+    attr_accessor :stage, :total, :index
+
+    DEFAULT_POLL_INTERVAL = 1
+
+    def interval_poll
+      Bosh::Cli::Config.poll_interval || DEFAULT_POLL_INTERVAL
+    end
+
+    def start
+      @thread = Thread.new do
+        loop do
+          refresh
+          sleep(interval_poll)
+        end
+      end
+    end
+
+    def finish(state)
+      @thread.kill
+      super(state)
+    end
+
+    def enter_stage(stage, total)
+      @stage = stage
+      @total = total
+      @index = 0
+    end
+
+    def parse_event(event)
+      event
+    end
+
+    def update(state, task)
+      event = {
+        'time'     => Time.now,
+        'stage'    => @stage,
+        'task'     => task,
+        'tags'     => [],
+        'index'    => @index + 1,
+        'total'    => @total,
+        'state'    => state.to_s,
+        'progress' => state == :finished ? 100 : 0
+      }
+
+      add_event(event)
+
+      @index += 1 if state == :finished
+    end
+  end
+end

data/lib/bosh/deployer/hash_fingerprinter.rb

@@ -0,0 +1,22 @@
+require 'digest/sha1'
+require 'yajl'
+
+module Bosh::Deployer
+  class HashFingerprinter
+    def sha1(hash)
+      encoded = JSON.dump(sorted_hash(hash))
+      Digest::SHA1.hexdigest(encoded)
+    end
+
+    private
+
+    def sorted_hash(hash)
+      mapped_hash = hash.map do |k, v|
+        sorted_value = v.is_a?(Hash) ? sorted_hash(v) : v
+        [k, sorted_value]
+      end
+
+      mapped_hash.sort_by { |(k, _)| k }
+    end
+  end
+end

data/lib/bosh/deployer/helpers.rb

@@ -1,11 +1,7 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 require 'net/ssh'
 
 module Bosh::Deployer
-
   module Helpers
-
     DEPLOYMENTS_FILE = 'bosh-deployments.yml'
 
     def is_tgz?(path)
@@ -26,11 +22,9 @@ module Bosh::Deployer
     end
 
     def process_exists?(pid)
-      begin
-        Process.kill(0, pid)
-      rescue Errno::ESRCH
-        false
-      end
+      Process.kill(0, pid)
+    rescue Errno::ESRCH
+      false
     end
 
     def socket_readable?(ip, port)
@@ -54,23 +48,21 @@ module Bosh::Deployer
       socket.close if socket
     end
 
+    # rubocop:disable MethodLength
     def remote_tunnel(port)
       @sessions ||= {}
       return if @sessions[port]
 
       ip = Config.bosh_ip
 
-      loop until socket_readable?(ip, @ssh_port) do
-        #sshd is up, sleep while host keys are generated
-        sleep @ssh_wait
-      end
+      # sshd is up, sleep while host keys are generated
+      loop until socket_readable?(ip, @ssh_port) { sleep(@ssh_wait) }
 
       if @sessions[port].nil?
         logger.info("Starting SSH session for port forwarding to #{@ssh_user}@#{ip}...")
         loop do
           begin
-            @sessions[port] = Net::SSH.start(ip, @ssh_user, :keys => [@ssh_key],
-                                             :paranoid => false)
+            @sessions[port] = Net::SSH.start(ip, @ssh_user, keys: [@ssh_key], paranoid: false)
             logger.debug("ssh #{@ssh_user}@#{ip}: ESTABLISHED")
             break
           rescue => e
@@ -90,7 +82,10 @@ module Bosh::Deployer
           begin
             @sessions[port].loop { true }
           rescue IOError => e
-            logger.debug("SSH session #{@sessions[port].inspect} forwarding for port #{port} terminated: #{e.inspect}")
+            logger.debug(
+              "SSH session #{@sessions[port].inspect} " +
+              "forwarding for port #{port} terminated: #{e.inspect}"
+            )
             @sessions.delete(port)
           end
         end
@@ -102,6 +97,7 @@ module Bosh::Deployer
         exit status if status
       end
     end
+    # rubocop:enable MethodLength
 
     def close_ssh_sessions
       @sessions.each_value { |s| s.close }
@@ -111,5 +107,4 @@ module Bosh::Deployer
       path[/#{Regexp.escape File.join(Dir.pwd, '')}(.*)/, 1] || path
     end
   end
-
 end

data/lib/bosh/deployer/instance_manager/aws.rb

@@ -1,16 +1,16 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Deployer
   class InstanceManager
-
     class Aws < InstanceManager
-
       def update_spec(spec)
         properties = spec.properties
 
-        # pick from micro_bosh.yml the aws settings in `apply_spec` section (apply_spec.properties.aws),
-        # and if it doesn't exist, use the bosh deployer aws properties (cloud.properties.aws)
-        properties['aws'] = Config.spec_properties['aws'] || Config.cloud_options['properties']['aws'].dup
+        # pick from micro_bosh.yml the aws settings in
+        # `apply_spec` section (apply_spec.properties.aws),
+        # and if it doesn't exist, use the bosh deployer
+        # aws properties (cloud.properties.aws)
+        properties['aws'] =
+          Config.spec_properties['aws'] ||
+          Config.cloud_options['properties']['aws'].dup
 
         properties['aws']['registry'] = Config.cloud_options['properties']['registry']
         properties['aws']['stemcell'] = Config.cloud_options['properties']['stemcell']
@@ -18,6 +18,7 @@ module Bosh::Deployer
         spec.delete('networks')
       end
 
+      # rubocop:disable MethodLength
       def configure
         properties = Config.cloud_options['properties']
         @ssh_user = properties['aws']['ssh_user']
@@ -60,9 +61,11 @@ module Bosh::Deployer
         @registry_config.write(Psych.dump(registry_config))
         @registry_config.close
       end
+      # rubocop:enable MethodLength
 
+      # rubocop:disable MethodLength
       def start
-        configure()
+        configure
 
         Sequel.connect(@registry_connection_settings) do |db|
           migrate(db)
@@ -87,7 +90,7 @@ module Bosh::Deployer
         end
 
         timeout_time = Time.now.to_f + (60 * 5)
-        http_client = HTTPClient.new()
+        http_client = HTTPClient.new
         begin
           http_client.head("http://127.0.0.1:#{@registry_port}")
           sleep 0.5
@@ -103,6 +106,7 @@ module Bosh::Deployer
       ensure
         @registry_config.unlink if @registry_config
       end
+      # rubocop:enable MethodLength
 
       def stop
         if @registry_pid && process_exists?(@registry_pid)
@@ -113,7 +117,7 @@ module Bosh::Deployer
         return unless @registry_connection_settings
 
         Sequel.connect(@registry_connection_settings) do |db|
-          @deployments['registry_instances'] = db[:registry_instances].map {|row| row}
+          @deployments['registry_instances'] = db[:registry_instances].map { |row| row }
         end
 
         save_state
@@ -161,7 +165,7 @@ module Bosh::Deployer
 
       private
 
-      def has_bosh_registry?(path=ENV['PATH'])
+      def has_bosh_registry?(path = ENV['PATH'])
         path.split(':').each do |dir|
           return true if File.exist?(File.join(dir, 'bosh-registry'))
         end
@@ -171,11 +175,10 @@ module Bosh::Deployer
       def migrate(db)
         db.create_table :registry_instances do
           primary_key :id
-          column :instance_id, :text, :unique => true, :null => false
-          column :settings, :text, :null => false
+          column :instance_id, :text, unique: true, null: false
+          column :settings,    :text, null: false
         end
       end
-
     end
   end
 end

data/lib/bosh/deployer/instance_manager/openstack.rb

@@ -1,10 +1,6 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Deployer
   class InstanceManager
-
     class Openstack < InstanceManager
-
       def update_spec(spec)
         properties = spec.properties
 
@@ -18,6 +14,7 @@ module Bosh::Deployer
         spec.delete('networks')
       end
 
+      # rubocop:disable MethodLength
       def configure
         properties = Config.cloud_options['properties']
         @ssh_user = properties['openstack']['ssh_user']
@@ -59,9 +56,11 @@ module Bosh::Deployer
         @registry_config.write(Psych.dump(registry_config))
         @registry_config.close
       end
+      # rubocop:enable MethodLength
 
+      # rubocop:disable MethodLength
       def start
-        configure()
+        configure
 
         Sequel.connect(@registry_connection_settings) do |db|
           migrate(db)
@@ -86,7 +85,7 @@ module Bosh::Deployer
         end
 
         timeout_time = Time.now.to_f + (60 * 5)
-        http_client = HTTPClient.new()
+        http_client = HTTPClient.new
         begin
           http_client.head("http://127.0.0.1:#{@registry_port}")
           sleep 0.5
@@ -102,6 +101,7 @@ module Bosh::Deployer
       ensure
         @registry_config.unlink if @registry_config
       end
+      # rubocop:enable MethodLength
 
       def stop
         if @registry_pid && process_exists?(@registry_pid)
@@ -112,7 +112,7 @@ module Bosh::Deployer
         return unless @registry_connection_settings
 
         Sequel.connect(@registry_connection_settings) do |db|
-          @deployments['registry_instances'] = db[:registry_instances].map {|row| row}
+          @deployments['registry_instances'] = db[:registry_instances].map { |row| row }
         end
 
         save_state
@@ -154,7 +154,7 @@ module Bosh::Deployer
 
       private
 
-      def has_bosh_registry?(path=ENV['PATH'])
+      def has_bosh_registry?(path = ENV['PATH'])
         path.split(':').each do |dir|
           return true if File.exist?(File.join(dir, 'bosh-registry'))
         end
@@ -164,11 +164,10 @@ module Bosh::Deployer
       def migrate(db)
         db.create_table :registry_instances do
           primary_key :id
-          column :instance_id, :text, :unique => true, :null => false
-          column :settings, :text, :null => false
+          column :instance_id, :text, unique: true, null: false
+          column :settings, :text, null: false
         end
       end
-
     end
   end
 end

data/lib/bosh/deployer/instance_manager/vcloud.rb

@@ -2,10 +2,7 @@
 
 module Bosh::Deployer
   class InstanceManager
-
     class Vcloud < InstanceManager
-
-
       def remote_tunnel(port)
         # VCloud / vsphere does not use bosh-registry so no remote_tunnel
         # to bosh-registry is required
@@ -36,6 +33,5 @@ module Bosh::Deployer
         end
       end
     end
-
   end
 end

data/lib/bosh/deployer/instance_manager.rb

@@ -1,6 +1,8 @@
 require 'open3'
 require 'bosh/deployer/logger_renderer'
+require 'bosh/deployer/hash_fingerprinter'
 require 'bosh/deployer/director_gateway_error'
+require 'bosh/deployer/ui_messager'
 
 module Bosh::Deployer
   class InstanceManager
@@ -20,18 +22,22 @@ module Bosh::Deployer
     attr_accessor :renderer
 
     def self.create(config)
-      plugin = cloud_plugin(config)
+      plugin_name = cloud_plugin(config)
 
       begin
-        require "bosh/deployer/instance_manager/#{plugin}"
+        require "bosh/deployer/instance_manager/#{plugin_name}"
       rescue LoadError
-        err "Could not find Provider Plugin: #{plugin}"
+        err "Could not find Provider Plugin: #{plugin_name}"
       end
 
-      InstanceManager.const_get(plugin.capitalize).new(config)
+      config_sha1 = Bosh::Deployer::HashFingerprinter.new.sha1(config)
+      ui_messager = Bosh::Deployer::UiMessager.for_deployer
+
+      plugin_class = InstanceManager.const_get(plugin_name.capitalize)
+      plugin_class.new(config, config_sha1, ui_messager)
     end
 
-    def initialize(config)
+    def initialize(config, config_sha1, ui_messager)
       Config.configure(config)
 
       @state_yml = File.join(config['dir'], DEPLOYMENTS_FILE)
@@ -39,6 +45,8 @@ module Bosh::Deployer
 
       Config.uuid = state.uuid
 
+      @config_sha1 = config_sha1
+      @ui_messager = ui_messager
       @renderer = LoggerRenderer.new
     end
 
@@ -86,25 +94,20 @@ module Bosh::Deployer
       stop
     end
 
-    def create_deployment(stemcell_tgz)
-      with_lifecycle do
-        create(stemcell_tgz)
-      end
+    def create_deployment(stemcell_tgz, stemcell_archive)
+      with_lifecycle { create(stemcell_tgz, stemcell_archive) }
     end
 
-    def update_deployment(stemcell_tgz)
-      with_lifecycle do
-        update(stemcell_tgz)
-      end
+    def update_deployment(stemcell_tgz, stemcell_archive)
+      with_lifecycle { update(stemcell_tgz, stemcell_archive) }
     end
 
     def delete_deployment
-      with_lifecycle do
-        destroy
-      end
+      with_lifecycle { destroy }
     end
 
-    def create(stemcell_tgz)
+    # rubocop:disable MethodLength
+    def create(stemcell_tgz, stemcell_archive)
       err "VM #{state.vm_cid} already exists" if state.vm_cid
       if state.stemcell_cid && state.stemcell_cid != state.stemcell_name
         err "stemcell #{state.stemcell_cid} already exists"
@@ -150,7 +153,12 @@ module Bosh::Deployer
           err 'Unable to connect to Bosh Director. Retry manually or check logs for more details.'
         end
       end
+
+      # Capture stemcell and config sha1 here (end of the deployment)
+      # to avoid locking deployer out if this deployment does not succeed
+      save_fingerprints(stemcell_archive)
     end
+    # rubocop:enable MethodLength
 
     def destroy
       renderer.enter_stage('Delete micro BOSH', 7)
@@ -166,7 +174,12 @@ module Bosh::Deployer
       delete_stemcell
     end
 
-    def update(stemcell_tgz)
+    def update(stemcell_tgz, stemcell_archive)
+      result, message = has_pending_changes?(state, stemcell_archive)
+      @ui_messager.info(message)
+
+      return unless result
+
       renderer.enter_stage('Prepare for update', 5)
       agent_stop
       detach_disk(state.disk_cid)
@@ -176,9 +189,10 @@ module Bosh::Deployer
       # we can upgrade to a bigger persistent disk.
       # Perhaps use "--preserve" to skip the delete?
       delete_stemcell
-      create(stemcell_tgz)
+      create(stemcell_tgz, stemcell_archive)
     end
 
+    # rubocop:disable MethodLength
     def create_stemcell(stemcell_tgz)
       unless is_tgz?(stemcell_tgz)
         step 'Using existing stemcell' do
@@ -211,6 +225,7 @@ module Bosh::Deployer
       delete_stemcell if is_tgz?(stemcell_tgz) && state.stemcell_cid
       raise e
     end
+    # rubocop:enable MethodLength
 
     def create_vm(stemcell_cid)
       resources = Config.resources['cloud_properties']
@@ -236,8 +251,7 @@ module Bosh::Deployer
         if disk_info.include?(disk_cid)
           agent.run_task(:unmount_disk, disk_cid.to_s)
         else
-          logger.error("not unmounting %s as it doesn't belong to me: %s" %
-                         [disk_cid, disk_info])
+          logger.error("not unmounting #{disk_cid} as it doesn't belong to me: #{disk_info}")
         end
       end
     end
@@ -269,19 +283,21 @@ module Bosh::Deployer
         step 'Detach disk' do
           cloud.detach_disk(vm_cid, disk_cid) if vm_cid
         end
-      rescue Bosh::Clouds::DiskNotAttached
+      rescue Bosh::Clouds::DiskNotAttached => e
+        logger.info(e.inspect)
       end
 
       begin
         step 'Delete disk' do
           cloud.delete_disk(disk_cid)
         end
-      rescue Bosh::Clouds::DiskNotFound
+      rescue Bosh::Clouds::DiskNotFound => e
+        logger.info(e.inspect)
       end
     end
 
     # it is up to the caller to save/update disk state info
-    def attach_disk(disk_cid, is_create=false)
+    def attach_disk(disk_cid, is_create = false)
       return unless disk_cid
 
       cloud.attach_disk(state.vm_cid, disk_cid)
@@ -382,7 +398,8 @@ module Bosh::Deployer
       step 'Stopping agent services' do
         begin
           agent.run_task(:stop)
-        rescue
+        rescue => e
+          logger.info(e.inspect)
         end
       end
     end
@@ -394,7 +411,12 @@ module Bosh::Deployer
     end
 
     def wait_until_ready(component, wait_time = 1, retries = 300)
-      Bosh::Common.retryable(sleep: wait_time, tries: retries, on: CONNECTION_EXCEPTIONS) do |tries, e|
+      retry_options = {
+        sleep: wait_time,
+        tries: retries,
+        on: CONNECTION_EXCEPTIONS,
+      }
+      Bosh::Common.retryable(retry_options) do |tries, e|
         logger.debug("Waiting for #{component} to be ready: #{e.inspect}") if tries > 0
         yield
         true
@@ -402,14 +424,11 @@ module Bosh::Deployer
     end
 
     def agent_port
-      uri = URI.parse(Config.cloud_options['properties']['agent']['mbus'])
-
-      uri.port
+      URI.parse(Config.cloud_options['properties']['agent']['mbus']).port
     end
 
-    def wait_until_agent_ready #XXX >> agent_client
+    def wait_until_agent_ready
       remote_tunnel(@registry_port)
-
       wait_until_ready('agent') { agent.ping }
     end
 
@@ -422,7 +441,7 @@ module Bosh::Deployer
         http_client = HTTPClient.new
 
         http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        http_client.ssl_config.verify_callback = Proc.new {}
+        http_client.ssl_config.verify_callback = proc {}
 
         response = http_client.get(url)
         message = 'Nginx has started but the application it is proxying to has not started yet.'
@@ -436,8 +455,7 @@ module Bosh::Deployer
       err 'Cannot find existing stemcell' unless state.stemcell_cid
 
       if state.stemcell_cid == state.stemcell_name
-        step 'Preserving stemcell' do
-        end
+        step('Preserving stemcell') { }
       else
         step 'Delete stemcell' do
           cloud.delete_stemcell(state.stemcell_cid)
@@ -451,10 +469,7 @@ module Bosh::Deployer
 
     def delete_vm
       err 'Cannot find existing VM' unless state.vm_cid
-
-      step 'Delete VM' do
-        cloud.delete_vm(state.vm_cid)
-      end
+      step('Delete VM') { cloud.delete_vm(state.vm_cid) }
       state.vm_cid = nil
       save_state
     end
@@ -497,11 +512,12 @@ module Bosh::Deployer
       disk_model.insert_multiple(@deployments['disks']) if disk_model
       instance_model.insert_multiple(@deployments['instances'])
 
-      @state = instance_model.find(:name => name)
+      @state = instance_model.find(name: name)
       if @state.nil?
         @state = instance_model.new
         @state.uuid = "bm-#{generate_unique_name}"
         @state.name = name
+        @state.stemcell_sha1 = nil
         @state.save
       else
         discover_bosh_ip
@@ -525,5 +541,19 @@ module Bosh::Deployer
         err "'#{command}' failed with exit status=#{status.exitstatus} [#{output}]"
       end
     end
+
+    def has_pending_changes?(state, stemcell_archive)
+      return [true,  :update_stemcell_unknown] unless stemcell_archive
+      return [true,  :update_stemcell_changed] if state.stemcell_sha1 != stemcell_archive.sha1
+      return [true,  :update_config_changed]   if state.config_sha1   != @config_sha1
+      [false, :update_no_changes]
+    end
+
+    def save_fingerprints(stemcell_archive)
+      state.stemcell_sha1 = stemcell_archive ? stemcell_archive.sha1 : nil
+      state.config_sha1 = @config_sha1
+      save_state
+    end
   end
 end
+

data/lib/bosh/deployer/models/instance.rb

@@ -1,6 +1,4 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Deployer::Models
-  class Instance < Sequel::Model(Bosh::Deployer::Config.db[:instances])
+  class Instance < Sequel.Model(Bosh::Deployer::Config.db[:instances])
   end
 end

data/lib/bosh/deployer/specification.rb

@@ -1,6 +1,5 @@
 module Bosh::Deployer
   class Specification
-
     def self.load_from_stemcell(dir)
       spec = load_apply_spec(dir)
       Specification.new(spec)
@@ -9,9 +8,7 @@ module Bosh::Deployer
     def self.load_apply_spec(dir)
       file = 'apply_spec.yml'
       apply_spec = File.join(dir, file)
-      unless File.exist?(apply_spec)
-        err "this isn't a micro bosh stemcell - #{file} missing"
-      end
+      err "this isn't a micro bosh stemcell - #{file} missing" unless File.exist?(apply_spec)
       Psych.load_file(apply_spec)
     end
 
@@ -50,10 +47,14 @@ module Bosh::Deployer
       # need to update the service address, but we still want to
       # be able to override values in the apply_spec
       override_property(@properties, 'hm', Config.spec_properties['hm'])
-
       override_property(@properties, 'director', Config.spec_properties['director'])
       set_property(@properties, 'ntp', Config.spec_properties['ntp'])
-      set_property(@properties, 'compiled_package_cache', Config.spec_properties['compiled_package_cache'])
+
+      set_property(
+        @properties,
+        'compiled_package_cache',
+        Config.spec_properties['compiled_package_cache'],
+      )
 
       @spec
     end

data/lib/bosh/deployer/ui_messager.rb

@@ -0,0 +1,37 @@
+require 'cli/core_ext'
+
+module Bosh::Deployer
+  class UiMessager
+    include BoshExtensions
+
+    class UnknownMessageName < StandardError; end
+
+    def self.for_deployer(options = {})
+      new(
+        {
+        update_stemcell_unknown: 'Will deploy because new stemcell fingerprint is unknown',
+        update_stemcell_changed: 'Will deploy due to stemcell changes',
+        update_config_changed:   'Will deploy due to configuration changes',
+        update_no_changes:       'Will skip deploy due to no changes',
+        },
+        options)
+    end
+
+    def initialize(messages, options = {})
+      @messages = messages
+      @options = options
+    end
+
+    def info(message_name)
+
+      raise ArgumentError, 'message_name must be a Symbol' unless message_name.is_a?(Symbol)
+
+      message = @messages[message_name]
+      if message
+        say(message) unless @options[:silent]
+      else
+        raise UnknownMessageName, message_name
+      end
+    end
+  end
+end

data/lib/bosh/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = '1.5.0.pre.1117'
+    VERSION = '1.5.0.pre.1134'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli_plugin_micro
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1117
+  version: 1.5.0.pre.1134
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
+- !ruby/object:Gem::Dependency
+  name: bosh-stemcell
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0.pre.1134
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0.pre.1134
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
 - !ruby/object:Gem::Dependency
   name: agent_client
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1117
+        version: 1.5.0.pre.1134
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +189,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI plugin for Micro BOSH deployment
 
-  bf16f0'
+  bdd163'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -187,7 +203,9 @@ files:
 - lib/bosh/deployer.rb
 - lib/bosh/deployer/config.rb
 - lib/bosh/deployer/configuration.rb
+- lib/bosh/deployer/deployer_renderer.rb
 - lib/bosh/deployer/director_gateway_error.rb
+- lib/bosh/deployer/hash_fingerprinter.rb
 - lib/bosh/deployer/helpers.rb
 - lib/bosh/deployer/instance_manager.rb
 - lib/bosh/deployer/instance_manager/aws.rb
@@ -197,6 +215,7 @@ files:
 - lib/bosh/deployer/logger_renderer.rb
 - lib/bosh/deployer/models/instance.rb
 - lib/bosh/deployer/specification.rb
+- lib/bosh/deployer/ui_messager.rb
 - lib/bosh/deployer/version.rb
 - README.rdoc
 homepage: https://github.com/cloudfoundry/bosh