blastr 0.1.0 → 0.1.1

data/Rakefile

@@ -3,6 +3,8 @@ require 'hoe'
 $:.unshift(File.dirname(__FILE__) + "/lib")
 require File.expand_path(File.join(File.dirname(__FILE__), 'lib/blastr'))
 
+Hoe.plugin :git
+
 Hoe.spec 'blastr' do
   name = "blastr"
   developer('Lasse Koskela', 'lasse.koskela@gmail.com')
@@ -14,6 +16,6 @@ Hoe.spec 'blastr' do
   remote_rdoc_dir = '' # Release to root
   rsync_args = '-av --delete --ignore-errors'
   extra_deps = [
-    ['git','>= 1.0.5'],
+    ['git','>= 1.2.5'],
   ]
 end

data/lib/blastr.rb

@@ -3,26 +3,20 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) unless
 
 module Blastr
   require File.expand_path(File.join(File.dirname(__FILE__), 'error.rb'))
+  require File.expand_path(File.join(File.dirname(__FILE__), 'filesystem.rb'))
   require File.expand_path(File.join(File.dirname(__FILE__), 'scm/scm.rb'))
   require File.expand_path(File.join(File.dirname(__FILE__), 'tts/tts.rb'))
   require File.expand_path(File.join(File.dirname(__FILE__), 'people/people.rb'))
 
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   COPYRIGHT = "Copyright (c) 2009-#{Time.now.year}, Lasse Koskela. All Rights Reserved."
   
   def self.trap_and_exit(signal)
     trap(signal) {
-      puts ""
+      puts "\nBye!"
       exit 0
     }
   end
-  
-  def self.delete_at_exit(file_or_directory)
-    at_exit do
-      puts "Cleaning up leftovers: #{temp_dir}" if File.directory?(temp_dir) if $DEBUG
-      FileUtils.remove_dir(temp_dir, :force => true)
-    end
-  end
 
   class Process
     def initialize(args)
@@ -36,7 +30,7 @@ module Blastr
     
     def run
       puts "Polling #{@scm.name} commits since revision #{@since_revision}..."
-      while true
+      while should_run?
         announce_new_commits
         sleep 30
       end
@@ -48,6 +42,9 @@ module Blastr
     end
     
     private
+    
+    def should_run? ; true ; end
+    
     def announce_new_commits
       @scm.commits_since(@since_revision.to_s).each do |commit|
         if @since_revision.before?(commit.revision)
@@ -56,16 +53,9 @@ module Blastr
         end
       end
     end
+
     def validate(args=[])
       raise UsageError.new if args.size == 0 or args.size > 2
     end
   end
-  
-  def Blastr::temp_dir
-    temp_file = Tempfile.new("tmp")
-    temp_dir = temp_file.path
-    temp_file.unlink
-    FileUtils.mkdir_p(temp_dir)
-    temp_dir
-  end
 end

data/lib/scm/git.rb

@@ -57,7 +57,6 @@ module Blastr::SourceControl
 
     def as_revision(arg)
       raise "Invalid revision: #{arg}" unless arg =~ /^(HEAD(~\d+)?)|([\d\w:-]+)$/
-      obj = nil
       revision = nil
       with_clone do |clone|
         obj = clone.object(arg.to_s)
@@ -91,8 +90,8 @@ module Blastr::SourceControl
     end
     
     def with_clone
-      temp_dir = Blastr::temp_dir
-      Blastr::delete_at_exit(temp_dir)
+      temp_dir = Blastr::FileSystem.temp_dir
+      Blastr::FileSystem.delete_at_exit(temp_dir)
       begin
         clone = ::Git.clone(@git_url, temp_dir)
         clone.chdir do

data/lib/scm/hg.rb

@@ -74,8 +74,8 @@ module Blastr::SourceControl
     
     private
     def with_clone
-      clone_dir = Blastr::temp_dir
-      Blastr::delete_at_exit(clone_dir)
+      clone_dir = Blastr::FileSystem.temp_dir
+      Blastr::FileSystem::delete_at_exit(clone_dir)
       %x[hg clone #{@repo_url} #{clone_dir}]
       current_dir = Dir.pwd
       Dir.chdir(clone_dir)

data/lib/scm/svn.rb

@@ -86,7 +86,7 @@ module Blastr::SourceControl
     
     def svn_log(since_revision = as_revision("1"))
       temp_file = Tempfile.new("svn.log").path
-      Blastr::delete_at_exit(temp_file)
+      Blastr::FileSystem::delete_at_exit(temp_file)
       begin
         revision = "#{since_revision}:#{as_revision('HEAD')}"
         revision = as_revision("HEAD") if since_revision.to_s == as_revision("HEAD").to_s

data/test/people/test_people.rb

@@ -28,7 +28,7 @@ class TestPeopleFile < Test::Unit::TestCase
   private
   def backup_people_file
     people_file = Blastr::People::PEOPLE_FILE
-    @backup_of_people_file = File.join(Blastr::temp_dir, File.basename(people_file))
+    @backup_of_people_file = File.join(Blastr::FileSystem.temp_dir, File.basename(people_file))
     FileUtils.cp(people_file, @backup_of_people_file)
   end
   def restore_people_file

data/test/scm/test_git.rb

@@ -55,7 +55,7 @@ class TestGit < AbstractScmTestCase
   private
   
   def create_local_repo
-    dir = File.join(Blastr::temp_dir, 'git_repo')
+    dir = File.join(Blastr::FileSystem.temp_dir, 'git_repo')
     %x[git init #{dir}]
     assert File.directory? dir
     dir

data/test/scm/test_svn.rb

@@ -51,7 +51,7 @@ class TestSubversion < AbstractScmTestCase
   end
   
   def create_local_repo
-    dir = File.join(Blastr::temp_dir, 'svn_repo')
+    dir = File.join(Blastr::FileSystem.temp_dir, 'svn_repo')
     %x[svnadmin create #{dir}]
     assert File.directory? dir
     dir

data/test/test_blastr.rb

@@ -1,6 +1,28 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper.rb'))
+require 'mocha'
 
-class TestBlastrProcess < Test::Unit::TestCase
+module Blastr
+  class Process
+    attr_accessor :scm
+    attr_reader :seconds_slept
+    
+    # override sleep() to speed up test runs
+    def sleep(seconds)
+      @seconds_slept ||= 0
+      @seconds_slept += seconds
+    end
+    
+    # override should_run? to make the process 
+    # stop after three polling iterations
+    def should_run?
+      @iterations ||= 0
+      @iterations += 1
+      @iterations <= 3
+    end
+  end
+end
+
+class TestBlastrProcessArguments < Test::Unit::TestCase
   def test_command_line_arguments_are_validated
     assert_raise Blastr::UsageError do
       Blastr::Process.new([])
@@ -12,4 +34,48 @@ class TestBlastrProcess < Test::Unit::TestCase
       Blastr::Process.new(["http://svn.com", "123"])
     end
   end
+end
+
+class TestBlastrProcess < Test::Unit::TestCase
+  def setup
+    @since_revision = '1'
+    @process = create_blastr_process_polling("http://svn.com", @since_revision)
+  end
+  
+  def test_polls_for_new_commits_every_30_seconds
+    @process.expects(:announce_new_commits).times(3)
+    @process.run
+    assert_equal 3*30, @process.seconds_slept
+  end
+  
+  def test_announcing_all_new_commits
+    commits = [ fake_commit('2'), fake_commit('3') ]
+    commit_sequence = sequence('commit sequence')
+    @process.scm.expects(:commits_since).with(@since_revision).returns(commits)
+    @process.expects(:announce).with(commits.first).in_sequence(commit_sequence)
+    @process.expects(:announce).with(commits.last).in_sequence(commit_sequence)
+    @process.send(:announce_new_commits)
+  end
+  
+  def test_announcing_a_given_commit
+    commit = fake_commit('42')
+    Blastr::People.stubs(:full_name_of).returns('Full Name')
+    Blastr::TTS.expects(:speak).with("Commit by Full Name: #{commit.comment}")
+    @process.expects(:puts).with("[#{commit.revision}] Commit by #{commit.author}: #{commit.comment}")
+    @process.announce(commit)
+  end
+  
+  private
+  
+  def fake_commit(rev)
+    revision = Blastr::SourceControl::SubversionRevision.new(rev)
+    Blastr::SourceControl::LogEntry.new(revision, 'author', 'comment')
+  end
+  
+  def create_blastr_process_polling(url, since_revision)
+    process = Blastr::Process.new([url, since_revision])
+    process.scm = mock()
+    process.scm.class.any_instance.stubs(:name).returns('Fake')
+    process
+  end
 end

data/test/test_filesystem.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper.rb'))
+
+module Blastr::FileSystem
+  # intercept calls to Kernel.at_exit to allow invoking
+  # registered at_exit blocks before the process exits
+  def self.at_exit(&block)
+    @at_exit_blocks ||= []
+    @at_exit_blocks << block
+  end
+  
+  def self.execute_all_at_exit_blocks
+    @at_exit_blocks.each { |block| block.call }
+  end
+end
+
+class FileSystemTest < Test::Unit::TestCase
+  
+  def setup
+    @file_to_delete = File.expand_path(File.join(Blastr::FileSystem.temp_dir, 'file_to_be_deleted'))
+    FileUtils.touch(@file_to_delete)
+  end
+  
+  def teardown
+    FileUtils.rm(@file_to_delete) if File.exist?(@file_to_delete)
+  end
+  
+  def test_delete_at_exit
+    Blastr::FileSystem.delete_at_exit(@file_to_delete)
+    assert File.exist?(@file_to_delete)
+    Blastr::FileSystem.execute_all_at_exit_blocks
+    assert ! File.exist?(@file_to_delete)
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blastr
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Lasse Koskela
@@ -104,6 +104,7 @@ files:
 - test/test_helper.rb
 - test/tts/test_tts.rb
 - website/index.html
+- test/test_filesystem.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/blastr/
 licenses: []
@@ -152,5 +153,6 @@ test_files:
 - test/scm/test_svn_log.rb
 - test/scm/test_svn_revision.rb
 - test/test_blastr.rb
+- test/test_filesystem.rb
 - test/test_helper.rb
 - test/tts/test_tts.rb