hr_deploy 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269384c663c1693b844f227cbd8219d1e9e0ddaf
-  data.tar.gz: 3f9c00a090f410433ea4949950032515eeaa7f76
+  metadata.gz: bce644d0caddde4560e698e8995029f32da4976d
+  data.tar.gz: aeb328b6b9cec1f7a210f95b4c9fb9b4b6069b3b
 SHA512:
-  metadata.gz: d1a59907ccd34338cd0abf9fbaa37b57ad4368207e318918a494743718ad6a4910888923037a495d464bbc1a49654413fcd255003566caecac853928090e6a65
-  data.tar.gz: b55cfd0cf957c4f195fb3511326dacaa3c2d67bb266a5d78020268b69d54b75670ca775e76d1e7d5aaaf30f8a1eabd4e37463052d45f774809c0391cb1f2671e
+  metadata.gz: 13eb8c7a328d864f9e8db2bb7827e4c59ccc0e5be946232c4131320c4fee275c472c37a89db5bf7be6f3b89bc32d700ff086dce86563e8eff0d19b81f7679d29
+  data.tar.gz: f8cca7377f6ffa1ad386a96acd9a859c1d76f8ddb1ba0ca1ac7fbf547c0b7e59bcfa5aee0041d8737f197ed741d26f8eb38830602b16a2c6b4fcb6660aadaed8

data/lib/hr_deploy/config_handler.rb

@@ -60,6 +60,13 @@ module HR_Deploy
     # when you execute 'hr_deploy deploy' without arguments.
     :default: true
 
+    # URL to open after deploy is complete. If a 503 (maintenance) or no
+    # response is returned for 5 seconds, URL will be retried for a total
+    # time of up to a minute. If this is set, user perceived downtime will
+    # be calculated. Wrap in quotes and provide the protocol, e.g. 'http://'
+    # or 'https://'. Optional, delete to skip opening the app after the deploy.
+    :app_url: 'http://app'
+
 # Example of another target, feel free to delete or modify.
 - :production:
     :description: Production
@@ -236,6 +243,12 @@ module HR_Deploy
                 return false
               end
 
+            when :app_url
+              unless value.instance_of?(String)
+                self.error = 'App URL should be a string'
+                return false
+              end
+
             else
               self.error = "Option unknown: #{option}"
               return false
@@ -274,7 +287,8 @@ module HR_Deploy
                                 backup_db: options[:backup_db],
                                 maintenance: options[:maintenance],
                                 default: options[:default],
-                                s3_asset_sync: options[:s3_asset_sync])
+                                s3_asset_sync: options[:s3_asset_sync],
+                                app_url: options[:app_url])
         else
           # Only target name was given, 'options' hash is nil
           HR_Deploy::Target.new(name: name)

data/lib/hr_deploy/deployer.rb

@@ -13,6 +13,7 @@ require 'hr_deploy/tasks/precompile_assets_task.rb'
 require 'hr_deploy/tasks/push_code_task.rb'
 require 'hr_deploy/tasks/migrate_db_task.rb'
 require 'hr_deploy/tasks/restart_task.rb'
+require 'hr_deploy/tasks/open_app_task.rb'
 
 module HR_Deploy
 
@@ -196,6 +197,10 @@ module HR_Deploy
         tasks_to_run << HR_Deploy::DisableMaintenanceTask.new(target: target, confirm: confirm, dry_run: dry_run)
       end
 
+      if target.app_url
+        tasks_to_run << HR_Deploy::OpenAppTask.new(target: target, dry_run: dry_run)
+      end
+
       if target.pinging_interaction?
         tasks_to_run << HR_Deploy::EnablePingerTask.new(target: target, confirm: confirm, dry_run: dry_run)
       end
@@ -249,14 +254,36 @@ module HR_Deploy
     def deploy_succeeded
       if dry_run
         print_deploy_successful 'Dry run complete'
+
       else
-        print_deploy_successful "Deploy complete in #{(Time.now - start_time).round} seconds"
+        print_deploy_successful "Deploy complete in #{human_time(Time.now - start_time)}"
+
+        downtime = calculate_downtime
+        print_deploy_successful "User perceived downtime was #{human_time(downtime)}" if downtime
       end
 
       # Execution is finished
       exit 0
     end
 
+    def calculate_downtime
+      open_app = finished_tasks.find { |task| task.class == HR_Deploy::OpenAppTask }
+
+      # Can't calculate user perceived downtime accurately if app was not opened
+      return nil unless open_app
+
+      enable_maintenance = finished_tasks.find { |task| task.class == HR_Deploy::EnableMaintenanceTask }
+      push_code = finished_tasks.find { |task| task.class == HR_Deploy::PushCodeTask }
+
+      if enable_maintenance
+        starting_time = enable_maintenance.start_time
+      else
+        starting_time = push_code.start_time
+      end
+
+      open_app.end_time - starting_time
+    end
+
     def application_state(failed_task)
 
       did_not_change = 'Application state did not change'
@@ -286,6 +313,8 @@ module HR_Deploy
         unknown
       when HR_Deploy::DisableMaintenanceTask
         deployed
+      when HR_Deploy::OpenAppTask
+        deployed
       when HR_Deploy::EnablePingerTask
         deployed
       when HR_Deploy::CleanNewAssetsTask
@@ -336,5 +365,41 @@ module HR_Deploy
     def print_app_status(msg)
       puts msg.yellow
     end
+
+    def human_time(seconds)
+      seconds = seconds.round
+      minutes = seconds / 60
+      seconds = seconds % 60
+
+      minute_string = nil
+      second_string = nil
+
+      unless minutes == 0
+        if minutes == 1
+          minute_string = 'minute'
+        else
+          minute_string = 'minutes'
+        end
+      end
+
+      unless seconds == 0
+        if seconds == 1
+          second_string = 'second'
+        else
+          second_string = 'seconds'
+        end
+      end
+
+      result = ''
+      result += "#{minutes} #{minute_string} " unless minutes == 0
+      result += "#{seconds} #{second_string}" unless seconds == 0
+      result.strip!
+
+      if result == ''
+        '0 seconds'
+      else
+        result
+      end
+    end
   end
 end

data/lib/hr_deploy/target.rb

@@ -6,6 +6,7 @@ module HR_Deploy
     attr_reader :new_relic_disable_pinger_url
     attr_reader :new_relic_enable_pinger_url
     attr_reader :description
+    attr_reader :app_url
 
     def initialize(args)
 
@@ -14,6 +15,7 @@ module HR_Deploy
       @new_relic_enable_pinger_url = args[:new_relic_enable_pinger_url]
       @s3_asset_sync = args[:s3_asset_sync]
       @default = args[:default]
+      @app_url = args[:app_url]
 
       # Use name for description, if no description given
       @description = args[:description] || name

data/lib/hr_deploy/tasks/enable_maintenance_task.rb

@@ -7,6 +7,7 @@ module HR_Deploy
     def run
       print_stage 'Enabling maintenance mode...'
 
+      set_start_time
       execute_system_command("heroku maintenance:on --remote #{target.name}")
 
       if dry_run? || !confirm?

data/lib/hr_deploy/tasks/open_app_task.rb

@@ -0,0 +1,81 @@
+require 'hr_deploy/tasks/task'
+require 'timeout'
+require 'net/http'
+
+module HR_Deploy
+
+  class OpenAppTask < HR_Deploy::Task
+
+    ONE_TRY_TIME = 5
+    TOTAL_TRY_TIME = 60
+
+    def run
+      print_stage 'Opening app...'
+      open_command = "heroku open --remote #{target.name}"
+
+      if dry_run?
+        execute_system_command(open_command)
+        self.success = true
+        return
+      end
+
+      ending_time = Time.now + HR_Deploy::OpenAppTask::TOTAL_TRY_TIME
+
+      until success == true || success == false
+        status = try_status
+
+        if status == :ok
+          execute_system_command(open_command)
+          set_end_time
+          self.success = true
+
+        elsif status == :fail || (status == :retry && Time.now > ending_time)
+
+          self.success = false
+          self.error = "Could not open app\n" +
+              "To open manually: #{open_command}"
+        end
+      end
+    end
+
+    private
+
+    # :ok -> app returned a status other than 503 before timeout
+    # :retry -> app did not return a status before timeout or returned 503
+    # :fail -> an error occurred
+    def try_status
+      starting_time = Time.now
+
+      begin
+        Timeout::timeout(HR_Deploy::OpenAppTask::ONE_TRY_TIME) do
+
+          url = target.app_url
+          unless url.start_with?('https://') || url.start_with?('http://')
+            url = 'http://' + url
+          end
+
+          uri = URI.parse(url)
+          http = Net::HTTP.new(uri.host, uri.port)
+
+          if url.start_with?('https://')
+            http.use_ssl = true
+          end
+
+          request = Net::HTTP::Get.new(uri.request_uri)
+          response = http.request(request)
+
+          if response.code == '503'
+            sleep(HR_Deploy::OpenAppTask::ONE_TRY_TIME - (starting_time - Time.now))
+            :retry
+          else
+            :ok
+          end
+        end
+      rescue Timeout::Error
+        :retry
+      rescue
+        :fail
+      end
+    end
+  end
+end

data/lib/hr_deploy/tasks/push_code_task.rb

@@ -7,6 +7,7 @@ module HR_Deploy
     def run
       print_stage 'Pushing new code...'
 
+      set_start_time
       execute_system_command("git push #{target.name} master")
 
       if dry_run? || !confirm?

data/lib/hr_deploy/tasks/task.rb

@@ -6,6 +6,8 @@ module HR_Deploy
   class Task
 
     attr_reader :error
+    attr_reader :start_time
+    attr_reader :end_time
 
     def initialize(args = {})
       @target = args.fetch(:target, nil)
@@ -13,6 +15,8 @@ module HR_Deploy
       @dry_run = args.fetch(:dry_run, false)
       @success = nil
       @error = nil
+      @start_time = nil
+      @end_time = nil
     end
 
     def successful?
@@ -28,8 +32,18 @@ module HR_Deploy
 
     attr_reader :target
     attr_writer :error
+    attr_writer :start_time
+    attr_writer :end_time
     attr_accessor :success
 
+    def set_start_time
+      self.start_time = Time.now
+    end
+
+    def set_end_time
+      self.end_time = Time.now
+    end
+
     def confirm?
       !!@confirm
     end
@@ -64,7 +78,7 @@ module HR_Deploy
 
     def execute_system_command(cmd)
       if dry_run?
-        puts "Executing command: #{cmd}"
+        puts cmd
       else
         system(cmd)
       end

data/lib/hr_deploy/version.rb

@@ -1,3 +1,3 @@
 module HR_Deploy
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hr_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dmitry Gubitskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies: []
 description: Easily deploy your Rails apps to Heroku with one command, automatically
   taking care of things such as checking current Heroku status, enabling maintenance
@@ -40,6 +40,7 @@ files:
 - lib/hr_deploy/tasks/push_code_task.rb
 - lib/hr_deploy/tasks/migrate_db_task.rb
 - lib/hr_deploy/tasks/restart_task.rb
+- lib/hr_deploy/tasks/open_app_task.rb
 - lib/hr_deploy/version.rb
 - bin/hr_deploy
 homepage: https://github.com/enthrops/hr_deploy