gemwarrior 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b11f28fb910a20ab8c22ad7c97f67403c0ea9b
-  data.tar.gz: 884e88c0ee09cd7c34cd75b675c09d301750642a
+  metadata.gz: 2cf065fa4c0e9564a627c3ce4cf75b9ffff0f1b9
+  data.tar.gz: cdbe3d70715d1681f14578fa2ef9823a09f9dd6c
 SHA512:
-  metadata.gz: 59cc678e76ce6dbd0d88fcef353eeef743185f4d78fa27dde69a84b7bc7779b1fc50d35c4ab1a2cb3d0a43588c0b866460838459b6499a7620074cb076922e88
-  data.tar.gz: 94ef68e78d3e118385b91b26ee3ac71123546a6535b05fbe8baeb3a41b197e5977c10fd4a19c66aad557c2443d5a717fe2c4152343bc03c1618567ab9ea5905f
+  metadata.gz: 8e71c30f11de78dc95ce694381cce617f7ff4022a7ff172bc81663111cb3a6c656d50b03fd85ab51c8d56874a50b69454a12a8dc994d49ee6c6d8d5ed42f890f
+  data.tar.gz: a6fcb8ea07fa73b489e69f6fbba6d9027153f5e3fc344433bae76dd1a34aefc5277545128ecde7b10a2cb212aef50631367362ee170978e923cabfd4f40bc440

data/lib/gemwarrior/misc/timer.rb

@@ -1,19 +1,24 @@
 # lib/gemwarrior/misc/timer.rb
 # Timer
 
+require 'observer'
+
 module Gemwarrior
   class Timer
-    attr_accessor :duration_in_s, :timer_name, :background, :progress, :verbose
+    include Observable
+
+    attr_accessor :duration_in_s, :timer_name, :background, :progress, :verbose, :command
 
     DEFAULTS = {
-      duration_in_s: 1, 
-      timer_name:    'Timer', 
-      background:    false,
+      duration_in_s: 5, 
+      timer_name:    'timer', 
+      background:    true,
       progress:      false,
-      verbose:       true
+      verbose:       false,
+      command:       nil
     }
 
-    def initialize(options = {})
+    def initialize(options = {}, repl)
       options = DEFAULTS.merge(options)
 
       self.duration_in_s  = options[:duration_in_s]
@@ -21,6 +26,9 @@ module Gemwarrior
       self.background     = options[:background]
       self.progress       = options[:progress]
       self.verbose        = options[:verbose]
+      self.command        = options[:command]
+
+      add_observer(repl)
     end
 
     def start
@@ -40,11 +48,15 @@ module Gemwarrior
         sleep 1
         print '.' if progress
         if Time.now >= end_time
-          print "\n"
-          puts "#{timer_name} ended at #{Time.now}" if verbose
-          return
+          return stop
         end
       end
     end
+
+    def stop
+      puts "\n#{timer_name} ended at #{Time.now}" if verbose
+      changed
+      notify_observers(self.command) unless self.command.nil?
+    end
   end
 end

data/lib/gemwarrior/repl.rb

@@ -76,15 +76,7 @@ module Gemwarrior
         loop do
           prompt
           begin
-            input = read_line
-            result = evaluator.parse(input)
-            if result.eql?('exit')
-              exit
-            elsif result.eql?('checkupdate')
-              check_for_new_release
-            else
-              puts result
-            end
+            main_loop
           rescue Interrupt
             puts
             puts QUIT_MESSAGE
@@ -94,6 +86,23 @@ module Gemwarrior
       end
     end
 
+    def main_loop(ext_input = nil)
+      input = ext_input.nil? ? read_line : ext_input
+      result = evaluator.parse(input)
+      if result.eql?('exit')
+        exit
+      elsif result.eql?('checkupdate')
+        check_for_new_release
+      else
+        puts result
+      end
+    end
+
+    # timer observer
+    #def update(command)
+    #  main_loop(command)
+    #end
+
     private
 
     def clear_screen

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -367,4 +367,6 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files: []
+test_files:
+- spec/gemwarrior_spec.rb
+- spec/spec_helper.rb