atdo 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555a85a3b237ef5da7cb7f3946790eafe07d36b1
-  data.tar.gz: 11234da5c86fa981bb0034d64ca65e146e1af8a2
+  metadata.gz: deedb56fa531c6a41a0c0d7536e9eedcc32b0155
+  data.tar.gz: d1a079aa08f9d0a23a0585fc0299a4a70892d7f2
 SHA512:
-  metadata.gz: cb993d986361038735039ef1cd7f2547569e8f8dbe6b29171aa6f5403a2bb361e16922ff331314b45d24710b41f8d4c496ce080da1e9a22d03a4381f08ae510d
-  data.tar.gz: 1e8e86339816bb5bf998895a8917ce43fa39719f52402fc1d03df34a8642cb09ea609bce0e32806f974df7b1f3f10363036d935784c1921fa6e0a2f2b3009372
+  metadata.gz: 13f6bead5151b902888637b2374542dfc3a50c32b56be504e231e5fad94e2cb51fd7942dea830e8af1bd6f92a77d7cdee5f3ba8a611287b5c6bfef16d5cf6c0c
+  data.tar.gz: dfa6afd17bd3dcce51c6e993be0a61232d3576ad7838cb79cc4643243986c5e70f863508464acaeb454c9cffd6ae959a7b901afc5b9187381ba37015f9633da5

data/Rakefile

@@ -1,12 +1,19 @@
 require 'rake'
 require 'rake/testtask'
 
+PRJ = "atdo"
+
 def version
-  require 'atdo'
-  @version ||= AtDo::VERSION
+  @version ||= begin
+    require 'atdo'
+    warn "AtDo::VERSION not a string" unless AtDo::VERSION.kind_of? String
+    AtDo::VERSION
+  end
 end
 
-prj = "atdo"
+def tag
+  @tag ||= "#{PRJ}-#{version}"
+end
 
 desc "Run tests"
 Rake::TestTask.new :test do |t|
@@ -20,27 +27,37 @@ Rake::TestTask.new :bench do |t|
   t.test_files = FileList["bench/*.rb"]
 end
 
-desc "commit, tag, and push repo; build and push gem"
-task :release do
+desc "Commit, tag, and push repo; build and push gem"
+task :release => "release:is_new_version" do
   require 'tempfile'
   
-  tag = "#{prj}-#{version}"
-
-  sh "gem build #{prj}.gemspec"
+  sh "gem build #{PRJ}.gemspec"
 
   file = Tempfile.new "template"
   begin
     file.puts "release #{version}"
     file.close
-    sh "git commit -a -v -t #{file.path}"
+    sh "git commit --allow-empty -a -v -t #{file.path}"
   ensure
     file.close unless file.closed?
     file.unlink
   end
 
-  sh "git tag #{prj}-#{version}"
+  sh "git tag #{tag}"
   sh "git push"
   sh "git push --tags"
   
-  sh "gem push #{prj}-#{version}.gem"
+  sh "gem push #{tag}.gem"
+end
+
+namespace :release do
+  desc "Diff to latest release"
+  task :diff do
+    latest = `git describe --abbrev=0 --tags`
+    sh "git diff #{latest}"
+  end
+
+  task :is_new_version do
+    abort "#{tag} exists; update version!" unless `git tag -l #{tag}`.empty?
+  end
 end

data/lib/atdo.rb

@@ -1,22 +1,28 @@
 require 'thread'
 
 class AtDo
-  VERSION = 0.2
+  VERSION = "0.3"
 
   def initialize
     @events = [] ## option to use rbtree
-    @mutex = Mutex.new
-    @cvar = ConditionVariable.new
+    @mon = Monitor.new
+    @cvar = @mon.new_cond
     @thread = nil
   end
   
   def stop
+    @mon.synchronize do
+      @thread.kill if @thread
+    end
+  end
+
+  def stop!
     @thread.kill if @thread
   end
   
   def at time, &action
     thread
-    @mutex.synchronize do
+    @mon.synchronize do
       @events << [time, action]
       t, a = @events.sort_by! {|t, a| t}.first
       @cvar.signal if t == time
@@ -25,18 +31,22 @@ class AtDo
   
   def thread
     @thread ||= Thread.new do
-      @mutex.synchronize do
+      @mon.synchronize do
         loop do
-          t_now = Time.now
           duration =
             loop do
               t, a = @events.first
               break nil if !t
+              t_now = Time.now
               break t-t_now if t > t_now
-              a.call
+              begin
+                a.call
+              rescue => ex
+                ## ?
+              end
               @events.shift
             end
-          @cvar.wait @mutex, *duration
+          @cvar.wait *duration
         end
       end
     end

data/test/test-atdo.rb

@@ -6,6 +6,10 @@ class TestAtDo < Minitest::Test
     @s = AtDo.new
   end
   
+  def teardown
+    @s.stop
+  end
+
   def test_timing
     t0 = Time.now
     a = []
@@ -16,9 +20,60 @@ class TestAtDo < Minitest::Test
     end
     sleep 0.21
     assert a.all?
-    assert_in_delta t0, a[0], 0.02
-    (1..20).each do |i|
-      assert_in_delta t0 + i/100.0, a[i], 0.01
+    (0..20).each do |i|
+      assert_in_delta t0 + i/100.0, a[i], 0.02
+    end
+  end
+
+  def test_reentrant
+    t0 = Time.now
+    n = 20
+    dt = 0.01
+    i = 0
+    q = Queue.new
+    pr = proc do
+      i += 1
+      if i <= n
+        t1 = t0 + i*dt
+        @s.at t1, &pr
+      else
+        assert_in_delta n*dt, Time.now - t0, 0.01
+        q << 1
+      end
+    end
+    pr.call
+    q.pop
+  end
+
+  def test_wait_indefinitely
+    q = Queue.new
+    @s.at Time.now + 0.1 do
+      q << true
     end
+    q.pop; Thread.pass
+
+    events = @s.instance_variable_get(:@events)
+    assert_empty events
+    assert_equal "sleep", @s.thread.status
+
+    @s.at Time.now + 0.1 do
+      q << true
+    end
+    q.pop; Thread.pass
+
+    assert_empty events
+    assert_equal "sleep", @s.thread.status
+  end
+
+  def test_wait_negative
+    q = Queue.new
+    @s.at Time.now - 1 do
+      q << true
+    end
+    q.pop; Thread.pass
+
+    events = @s.instance_variable_get(:@events)
+    assert_empty events
+    assert_equal "sleep", @s.thread.status
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atdo
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies: []
 description: At time, do code.
 email: vjoel@users.sourceforge.net