hr_deploy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28b9132177e558b47d24cb7f9c82fcef1d8e868
-  data.tar.gz: 67d784589f95f0f7aa318be470c41eafee993fe5
+  metadata.gz: 93edb710600a30c90ce512be9dae066d6cfb64f5
+  data.tar.gz: 9129a7c55e56c7fed6c3a269763c22ccc6a01ceb
 SHA512:
-  metadata.gz: c6d9b7ada7ca554d8599255e6a25f4df5a970ca0eaa3d0559e89de8b3f8388ba641a67de98d72c2070a5d067dd637c31e31234ad95e1f744a24e736eb213cbd8
-  data.tar.gz: 2cab2dbd608ace629c1d29bb7b6d7cd4bac6010025087ff372488a3a5c013874a81842c84afb41a58cfddc7e3d891f94728879c7f7c79f9b3da4dfbc2622fa9e
+  metadata.gz: d84c22c58a26875b651ef921ae5ac61c25e9e4791be78f523d0abf7ceb77f6089ad9a48a834302540b3f4bce6b316a577362e8391fd66699910cf62c867df29e
+  data.tar.gz: 8447cc2204afa97ee798a40201a7ee2efecb13688f199f0fca99e9776a5f98fd010cc763598c5e2a3e5d24923c1f7b1d04fb45b1fcaa927df01a03d49f1a357c

data/bin/hr_deploy

@@ -29,10 +29,34 @@ def parse(opts)
   elsif opts == ['generate']
     { command: :generate }
 
-  elsif opts.first == 'deploy' && (opts.length == 1 || opts.length == 2)
-    # This will extract the name of the target to deploy to or nil if no target is specified
-    target = opts[1, opts.length].first
-    { command: :deploy, target: target }
+  elsif opts.first == 'deploy'
+    # Deploy command
+    # Possible combinations:
+    #
+    # (empty)
+    # (target)
+    # --no-confirm
+    # (target) --no-confirm
+    # --no-confirm target
+
+    deploy_options = opts[1, opts.length]
+
+    # 0 to 2 additional options to 'deploy' command
+    return nil unless deploy_options.length <= 2
+
+    confirm = true
+    confirm = false if deploy_options.delete('--no-confirm')
+
+    # After we have removed '--no-confirm', we either have one param (target) or nothing
+    return nil unless deploy_options.length <= 1
+
+    # 'nil' for no target (default target)
+    target = deploy_options.first
+
+    # Explicit target should not be a command argument
+    return nil if target && target.start_with?('--')
+
+    { command: :deploy, target: target, confirm: confirm }
 
   else
     nil
@@ -48,8 +72,12 @@ def react(command)
 
   elsif command[:command] == :generate || command[:command] == :deploy
     if inside_app?
-      generate if command[:command] == :generate
-      attempt_deploy(command[:target]) if command[:command] == :deploy
+      if command[:command] == :generate
+        generate
+      else
+        attempt_deploy(command[:target], command[:confirm])
+      end
+
     else
       puts 'You should be inside a Heroku app to run this command'
       exit 1
@@ -74,7 +102,7 @@ def generate
   end
 end
 
-def attempt_deploy(target_name)
+def attempt_deploy(target_name, confirm)
 
   # These tools are needed for all deploys
   exit 1 unless tools_available?('heroku', 'git')
@@ -86,9 +114,11 @@ def attempt_deploy(target_name)
       targets = raw_targets.map { |raw_target| HR_Deploy::Target.new(raw_target) }
 
       if target_name
+        # Explicit target name given
+
         target = targets.find { |target| target.name == target_name }
         if target
-          deploy(target)
+          deploy(target, confirm)
         else
           puts "No such target: #{target_name}"
           exit 1
@@ -106,7 +136,7 @@ def attempt_deploy(target_name)
           exit 1
         else
           # Deploy default target
-          deploy(default_targets.first)
+          deploy(default_targets.first, confirm)
         end
       end
     else
@@ -119,12 +149,12 @@ def attempt_deploy(target_name)
   end
 end
 
-def deploy(target)
+def deploy(target, confirm)
   # Some targets need 'curl' to disable/enable New Relic pinger
   exit 1 if target.requires_curl? && !tools_available?('curl')
 
   # Actual deployment
-  deployer = HR_Deploy::Deployer.new(target)
+  deployer = HR_Deploy::Deployer.new(target, confirm)
   deployer.deploy
 end
 
@@ -175,10 +205,19 @@ generate          Generate a config file which specifies targets to deploy to.
 
 deploy [target]   Deploy to [target]. If no [target] is specified, deploy
                   to default target specified in config.
+                  This command supports the following options:
+
+                  --no-confirm   Skip confirmations while deploying.
+                                 This does not affect the initial
+                                 confirmation that triggers the deploy itself.
+                                 Default behavior is to confirm actions.
 
 version           Show gem version.
 
 help              Show help.
+
+Verbose documentation is at:
+https://github.com/enthrops/hr_deploy/blob/master/README.md
   eos
 
   puts help_string

data/lib/hr_deploy/deployer.rb

@@ -2,14 +2,18 @@ module HR_Deploy
 
   class Deployer
 
+    DEBUG = false
+
     attr_reader :target
     attr_reader :pinging_interaction
     attr_reader :perform_db_backup
+    attr_reader :confirm
 
-    def initialize(target)
+    def initialize(target, confirm)
       @target = target
       @pinging_interaction = target.requires_pinging_interaction?
       @perform_db_backup = target.backup_db?
+      @confirm = confirm
     end
 
     def deploy
@@ -50,7 +54,7 @@ module HR_Deploy
         puts 'Waiting 10 seconds for application to go live...'
         sleep 10
         puts 'Opening application...'
-        system("heroku open --remote #{target.name}")
+        execute_system_command("heroku open --remote #{target.name}")
         puts
 
         puts "Deploy completed in #{(Time.now - start_time).round} seconds"
@@ -200,46 +204,61 @@ module HR_Deploy
     end
 
     def continue?(stage)
-      answered = false
 
-      until answered
-
-        case stage
-        when :disabling_pinger
-          print 'Pinger disabled? (Yes / No) > '
-        when :enabling_maintenance
-          print 'Maintenance mode enabled? (Yes / No) > '
-        when :backing_up_db
-          print 'Database backed up? (Yes / No) > '
-        when :pushing_code
-          print 'Code pushed successfully? (Yes / No) > '
-        when :migrating_db
-          print 'Database migrated? (Yes / No) > '
-        when :restarting
-          print 'Restarted? (Yes / No) > '
-        when :enabling_pinger
-          print 'Pinger enabled? (Yes / No) > '
-        when :disabling_maintenance
-          print 'Maintenance mode disabled? (Yes / No) > '
-        else
-          raise 'Unknown stage'
-        end
+      if confirm
+        # User wants confirmations
+
+        answered = false
+        until answered
+
+          case stage
+          when :disabling_pinger
+            print 'Pinger disabled? (Yes / No) > '
+          when :enabling_maintenance
+            print 'Maintenance mode enabled? (Yes / No) > '
+          when :backing_up_db
+            print 'Database backed up? (Yes / No) > '
+          when :pushing_code
+            print 'Code pushed successfully? (Yes / No) > '
+          when :migrating_db
+            print 'Database migrated? (Yes / No) > '
+          when :restarting
+            print 'Restarted? (Yes / No) > '
+          when :enabling_pinger
+            print 'Pinger enabled? (Yes / No) > '
+          when :disabling_maintenance
+            print 'Maintenance mode disabled? (Yes / No) > '
+          else
+            raise 'Unknown stage'
+          end
 
-        answer = $stdin.gets.chomp
+          answer = $stdin.gets.chomp
 
-        if answer == 'Yes' || answer == 'yes'
-          answered = true
-          puts
-          yield
-        elsif answer == 'No' || answer == 'no'
-          puts
-          abort_deploy(nil, stage)
-        else
-          puts 'Unknown answer'
-          puts
+          if answer == 'Yes' || answer == 'yes'
+            answered = true
+            puts
+            yield
+          elsif answer == 'No' || answer == 'no'
+            puts
+            abort_deploy(nil, stage)
+          else
+            puts 'Unknown answer'
+            puts
+          end
         end
+
+      else
+        # User does not want confirmations, continue
+        yield
       end
+    end
 
+    def execute_system_command(cmd)
+      if DEBUG
+        puts "Executing command: #{cmd}"
+      else
+        system(cmd)
+      end
     end
 
     def check_connectivity
@@ -319,49 +338,49 @@ module HR_Deploy
 
     def disable_pinging
       puts 'Disabling availability pinger...'
-      system("curl #{target.disable_pinger_url}")
+      execute_system_command("curl #{target.disable_pinger_url}")
       puts
     end
 
     def enable_maintenance
       puts 'Enabling maintenance mode...'
-      system("heroku maintenance:on --remote #{target.name}")
+      execute_system_command("heroku maintenance:on --remote #{target.name}")
       puts
     end
 
     def backup_db
       puts 'Backing up database...'
-      system("heroku pgbackups:capture --expire --remote #{target.name}")
+      execute_system_command("heroku pgbackups:capture --expire --remote #{target.name}")
       puts
     end
 
     def push_code
       puts 'Pushing code...'
-      system("git push #{target.name} master")
+      execute_system_command("git push #{target.name} master")
       puts
     end
 
     def migrate_db
       puts 'Migrating database...'
-      system("heroku run rake db:migrate --remote #{target.name}")
+      execute_system_command("heroku run rake db:migrate --remote #{target.name}")
       puts
     end
 
     def restart
       puts 'Restarting...'
-      system("heroku restart --remote #{target.name}")
+      execute_system_command("heroku restart --remote #{target.name}")
       puts
     end
 
     def enable_pinging
       puts 'Enabling availability pinger...'
-      system("curl #{target.enable_pinger_url}")
+      execute_system_command("curl #{target.enable_pinger_url}")
       puts
     end
 
     def disable_maintenance
       puts 'Disabling maintenance mode...'
-      system("heroku maintenance:off --remote #{target.name}")
+      execute_system_command("heroku maintenance:off --remote #{target.name}")
       puts
     end
   end

data/lib/hr_deploy/version.rb

@@ -1,3 +1,3 @@
 module HR_Deploy
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hr_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dmitry Gubitskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 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