elapsed_watch 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0a4cd545cf031a3a912f3b7c6851043b6cf4069
-  data.tar.gz: 0a244c7f158357cf4f4e2f2cf29bd3c1027ff0d1
+  metadata.gz: d4a32dc7d72d3da2e5f898dd7167393eb989124f
+  data.tar.gz: 244caddcbfb97fa2bf71a2d3203d523c2c6e2c58
 SHA512:
-  metadata.gz: dd245efb45ede736ff03c18d19a1b1a04a85fe15fdca506c6bfa8b2a222081a1fe1ddb2b67284faa443a6dd48e0f7a6a7eb5e246637f4cd2c74654e7d31b789b
-  data.tar.gz: 15734b55c4e1d9efebde81511ec7dbfaa26418e070d27cc510f4615f42547d348b04c332d507899f977503d82a02dcd21cef18df160b17e85282cf8e2b41b208
+  metadata.gz: 30b7fe96c6a571346591741588b6973967b01f7b390fb958d2fbe92a1e463e79bd8b59690c9118ac824531eb06276183eeda0d3a03e592ad2a200a5f26ba1e7b
+  data.tar.gz: 4d5a7a90df196c3690ecced7da3db2bafd4fe0cdf6d10272525abf7be06e4b2a0c99a82bc57265f1999cc607517c3bf629563087fe244ea3bc00283bccced8e7

data/Gemfile

@@ -4,10 +4,12 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'guard'
+  gem 'guard','~> 2'
   gem 'guard-bundler'
   gem 'guard-rspec'
   gem 'guard-cucumber'
   gem 'timecop'
+  gem 'growl'
+  gem 'growl_notify'
 end
 

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    elapsed_watch (1.0.0)
+    elapsed_watch (1.1.0)
+      chronic
       chronic_duration
       methadone (~> 1.3.0)
 
@@ -13,8 +14,11 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (3.2.2)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
+    chronic (0.10.2)
     chronic_duration (0.10.2)
       numerizer (~> 0.1.1)
     coderay (1.0.9)
@@ -27,33 +31,36 @@ GEM
     diff-lcs (1.2.4)
     ffi (1.9.0)
     formatador (0.2.4)
-    gherkin (2.12.1)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
-    guard (1.8.2)
+    growl (1.0.3)
+    growl_notify (0.0.3)
+      rb-appscript
+    guard (2.2.2)
       formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-bundler (1.0.0)
-      bundler (~> 1.0)
-      guard (~> 1.1)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-bundler (0.1.3)
+      bundler (>= 1.0.0)
+      guard (>= 0.2.2)
     guard-cucumber (1.4.0)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (3.0.2)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    json (1.8.0)
-    listen (1.3.1)
+    guard-rspec (4.0.3)
+      guard (>= 2.1.1)
+      rspec (~> 2.14)
+    json (1.8.1)
+    listen (2.1.1)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     lumberjack (1.0.4)
     methadone (1.3.0)
       bundler
     method_source (0.8.2)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     multi_test (0.0.2)
     numerizer (0.1.1)
     pry (0.9.12.2)
@@ -61,24 +68,24 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (0.9.6)
+    rb-appscript (0.6.1)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
     rdoc (4.0.1)
       json (~> 1.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.14.4)
     slop (3.4.6)
     thor (0.18.1)
     timecop (0.6.3)
+    timers (1.1.0)
 
 PLATFORMS
   ruby
@@ -87,11 +94,13 @@ DEPENDENCIES
   aruba
   bundler (~> 1.3)
   elapsed_watch!
-  guard
+  growl
+  growl_notify
+  guard (~> 2)
   guard-bundler
   guard-cucumber
   guard-rspec
-  rake (~> 0.9.2)
+  rake
   rdoc
   rspec
   timecop

data/Guardfile

@@ -6,7 +6,7 @@ guard 'cucumber', :cli => '--color --format pretty' do
   watch('bin/elapsed_watch') { 'features' }
 end
 
-guard :rspec, :cli => '--color --format documentation' do
+guard :rspec, :cmd => 'bundle exec rspec --color --format documentation', all_on_start: true do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -17,3 +17,5 @@ guard 'bundler' do
   watch('Gemfile')
   watch(/^.+\.gemspec/)
 end
+
+

data/elapsed_watch.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency('rdoc')
   spec.add_development_dependency('aruba')
-  spec.add_development_dependency('rake', '~> 0.9.2')
   spec.add_development_dependency('rspec')
   spec.add_development_dependency('timecop')
   
   spec.add_dependency('methadone', '~> 1.3.0')
+  spec.add_dependency('chronic')
   spec.add_dependency('chronic_duration')
   
 end

data/lib/elapsed_watch/event.rb

@@ -1,7 +1,21 @@
+=begin rdoc
+
+event.rb -- defines the Class ElapsedWatch::Event for holding events
+
+* Time-stamp: <2013-11-04 06:26:02 tamara>
+* Copyright (C) 2013 Tamara Temple Web Development
+* Author:     Tamara Temple <tamouse@gmail.com>
+* License:    MIT
+
+=end
+
+
+require 'chronic'
 require 'chronic_duration'
 require 'yaml'
 require 'erb'
 require 'time'
+require 'methadone'
 
 module ElapsedWatch
 
@@ -11,31 +25,22 @@ module ElapsedWatch
   # The format for events occuring in the future
   FUTURE_EVENT_FORMAT = "%s in %s"    
 
-=begin rdoc
-
-event.rb -- Class for holding events
-
-* Time-stamp: <2013-09-13 01:42:22 tamara>
-* Copyright (C) 2013 Tamara Temple Web Development
-* Author:     Tamara Temple <tamouse@gmail.com>
-* License:    MIT
-
-== Description
-
-Defines an object class that deals with individual events.
-
-Events have a name and a time.
-
-=end
 
+  # == Description
+  #
+  # Defines an object class that deals with individual events.
+  #
+  # Events have a name and a time.
   class Event 
     
+    include Methadone::CLILogging
+
     # Instantiates a new Event object.
     #
     # The event_string consists of a tiny piece of YAML that defines
     # the event. The format is:
     #
-    # Event Name: YYYY-MM-DD HH:MM (anything parsable by Time.parse)
+    # Event Name: YYYY-MM-DD HH:MM (anything parsable by Chronic.parse)
     def initialize(event_string)
       raise "event_string is empty" if event_string.nil? or event_string.empty?
       ev_yaml = YAML.load(ERB.new(event_string).result)
@@ -45,7 +50,7 @@ Events have a name and a time.
       case @event_time
       when String
         raise "No event time spec: #{event_string}" if @event_time.empty?
-        @event_time = Time.parse(@event_time)
+        @event_time = Chronic.parse(@event_time)
       when Date
         @event_time = @event_time.to_time
       when DateTime
@@ -95,7 +100,7 @@ Events have a name and a time.
     
     # Memoizes now
     def now(use_time=nil)
-      @now ||= (use_time.nil? ? Time.now : use_time)
+      @now ||= use_time ||= Time.now
     end
 
   end

data/lib/elapsed_watch/version.rb

@@ -1,5 +1,5 @@
 module ElapsedWatch
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 
   DESCRIPTION = "
 Reading a file of events, containing an event name (a string) and a

data/spec/lib/elapsed_watch/event_spec.rb

@@ -41,10 +41,16 @@ describe ElapsedWatch do
     it{event3.instance_variable_get("@event_time").should eq Time.new(1957)}
   end
 
+  context "events with only MM-DD given" do
+    let(:event4) {ElapsedWatch::Event.new("Birthday: 10-12")}
+    it{event4.instance_variable_get("@event_name").should eq "Birthday"}
+    it{event4.instance_variable_get("@event_time").should eq Chronic.parse("10-12")}
+  end
+
+  
+
+
   context "sad paths" do
-    it "event without a day should fail" do
-      expect {ElapsedWatch::Event.new("No day: 2013-09")}.to raise_error ArgumentError
-    end
     it "event without a date should fail" do
       expect {ElapsedWatch::Event.new("No date:")}.to raise_error RuntimeError
     end
@@ -54,8 +60,9 @@ describe ElapsedWatch do
     it "event with empty name should fail" do
       expect {ElapsedWatch::Event.new(": 2013-09-01")}.to raise_error Psych::SyntaxError
     end
-    it "event with unparsable time spec should fail" do
-      expect {ElapsedWatch::Event.new("Bad spec: another fine mess")}.to raise_error ArgumentError
+    it "event with unparsable time spec should have nil time" do
+      event5 = ElapsedWatch::Event.new("Bad spec: another fine mess")
+      event5.instance_variable_get("@event_time").should be_nil
     end
 
 

data/spec/spec_helper.rb

@@ -16,5 +16,9 @@ RSpec.configure do |config|
   # config.order = 'random'
 end
 
+require 'methadone'
+extend Methadone::CLILogging
+logger.error_level = Logger::DEBUG
+
 require 'elapsed_watch'
 require 'timecop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elapsed_watch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tamara Temple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement