command_timer 0.0.4 → 0.0.5

data/command_timer.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["cctiger36@gmail.com"]
   gem.description   = %q{Simple tool to execute commands on schedule}
   gem.summary       = %q{Execute commands on schedule}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/cctiger36/command_timer"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/command_timer.rb

@@ -12,7 +12,7 @@ module CommandTimer
           return parse_time(%x[ntpdate -q #{server}].scan(/[0-9]{2}:[0-9]{2}:[0-9]{2}/).first)
         end
       end
-      puts "Warning: ntpdate not installed and use the local clock."
+      puts "Warning: ntpdate not found and then use the local clock."
       Time.now
     end
 

data/lib/command_timer/command.rb

@@ -5,7 +5,11 @@ module CommandTimer
     attr_writer :burn_time
 
     def burn_time
-      CommandTimer.parse_time(@burn_time)
+      if @burn_time =~ /[0-9]{2}:[0-9]{2}:[0-9]{2}/
+        CommandTimer.parse_time(@burn_time)
+      else
+        nil
+      end
     end
 
     def exec

data/lib/command_timer/runner.rb

@@ -8,15 +8,22 @@ module CommandTimer
     end
 
     def start
-      @commands.each_with_index do |command|
-        count_down_and_burn_command(command)
+      @commands.each_with_index do |command, index|
+        puts "####################"
+        puts "# Next: Command#{index + 1}"
+        puts "####################"
+        if command.burn_time
+          count_down_and_burn_command(command)
+        else
+          wait_input_to_continue(command)
+        end
       end
     end
 
     private
 
     def count_down_and_burn_command(command)
-      puts "Get ready to execute next command at #{command.burn_time}."
+      puts "Get ready to execute the next command at [#{command.burn_time}]."
       current_time = CommandTimer.ntp_time(@ntp_server)
       left_sec = command.burn_time.to_i - current_time.to_i
       if left_sec <= 0
@@ -32,7 +39,7 @@ module CommandTimer
           current_time += 1
           left_sec -= 1
         end
-        puts "[#{current_time}] Command will be executed in #{left_sec} second."
+        puts "[#{current_time}] Next command will be executed at [#{command.burn_time}] (#{left_sec} seconds left)."
         if left_sec < 1
           break
         else
@@ -46,6 +53,15 @@ module CommandTimer
       command.exec
     end
 
+    def wait_input_to_continue(command)
+      input = ""
+      until ["c", "C", "continue"].include?(input) do
+        print "Input C to execute the next command: "
+        input = STDIN.gets.chomp
+      end
+      command.exec
+    end
+
     def echo_commands
       @commands.each_with_index do |command, index|
         puts "--------------------"

data/lib/command_timer/version.rb

@@ -1,3 +1,3 @@
 module CommandTimer
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_timer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -31,8 +31,7 @@ files:
 - lib/command_timer/parser.rb
 - lib/command_timer/runner.rb
 - lib/command_timer/version.rb
-- sample_commands.yml
-homepage: ''
+homepage: https://github.com/cctiger36/command_timer
 licenses: []
 post_install_message: 
 rdoc_options: []

data/sample_commands.yml

@@ -1,17 +0,0 @@
-command1:
-  description: メンテナンス開始
-  burn_time: "11:33:00"
-  content: |
-    cd ~/Documents/workspace/bm_gree/tower7
-    ls
-command2:
-  description: デプロイ
-  burn_time: "14:10:00"
-  content: |
-    cap deploy ROLES=deploy
-    cap deploy\:admin ROLES=admin
-command3:
-  description: メンテナンス終了
-  burn_time: "15:00:00"
-  content: |
-    cap maintenance\:nginx_end