command_timer 0.0.8 → 0.0.9

data/lib/command_timer/command.rb

@@ -4,12 +4,13 @@ module CommandTimer
     attr_accessor :description
     attr_accessor :content
     attr_accessor :observer
+    attr_accessor :grep
 
     def burn_time
       if @burn_time =~ /[0-9]{2}:[0-9]{2}:[0-9]{2}/
         CommandTimer.parse_time(@burn_time)
       else
-        nil
+        @burn_time
       end
     end
 
@@ -17,26 +18,53 @@ module CommandTimer
       echo_command
       system @content
       if @observer
-        puts "===================="
-        puts "= Start observer, input S to stop it."
-        puts "= #{@observer}"
-        puts "===================="
-        thread = Thread.new do
+        run_observer
+      end
+    end
+
+    def echo_command
+      @content.split(';').each do |line|
+        puts ">> #{line.strip.gsub('\\', '')}"
+      end
+    end
+
+    def run_observer
+      puts "===================="
+      puts "= Start observer, input S to stop it."
+      puts "= #{@observer}"
+      puts "===================="
+      observer_thread = Thread.new do
+        if @grep
+          run_grep
+        else
           system @observer
         end
-        thread.run
+      end
+      observer_thread.run
+      interaction_thread = Thread.new do
         input = ""
         until ["s", "S", "stop"].include?(input) do
           input = STDIN.gets.chomp
         end
-        thread.kill
-        puts "Observer stopped."
       end
+      interaction_thread.run
+      while observer_thread.alive? and interaction_thread.alive? do
+      end
+      observer_thread.kill
+      interaction_thread.kill
+      puts "Observer stopped."
     end
 
-    def echo_command
-      @content.split(';').each do |line|
-        puts ">> #{line.strip.gsub('\\', '')}"
+    def run_grep
+      current_count = 0
+      grep_str = @grep.split(",").first
+      end_count = @grep.split(",").last.to_i
+      IO.popen @observer do |f|
+        while line = f.gets
+          puts line
+          current_count += 1 if line.include?(grep_str)
+          break if current_count >= end_count
+        end
       end
     end
   end

data/lib/command_timer/runner.rb

@@ -14,7 +14,11 @@ module CommandTimer
         puts "# #{command.description}" if command.description
         puts "####################"
         if command.burn_time
-          count_down_and_burn_command(command)
+          if ['auto', 'Auto'].include?(command.burn_time)
+            command.exec
+          else
+            count_down_and_burn_command(command)
+          end
         else
           wait_input_to_continue(command)
         end

data/lib/command_timer/version.rb

@@ -1,3 +1,3 @@
 module CommandTimer
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_timer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies: []
 description: Simple tool to execute commands on schedule
 email: