blastr 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.6 2009-01-17
+
+* Code cleanup
+
 == 0.0.5 2009-01-17
 
 * Improved instructions in README.rdoc

data/Manifest.txt

@@ -5,12 +5,12 @@ README.rdoc
 Rakefile
 bin/blastr
 lib/blastr.rb
-lib/blastr/git.rb
-lib/blastr/scm.rb
-lib/blastr/svn.rb
-lib/blastr/tts.rb
+lib/scm/git.rb
+lib/scm/scm.rb
+lib/scm/svn.rb
+lib/tts/tts.rb
 script/console
 script/destroy
 script/generate
-test/test_blastr.rb
 test/test_helper.rb
+test/test_tts.rb

data/bin/blastr

@@ -1,42 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'yaml'
 require "#{File.dirname(__FILE__)}/../lib/blastr.rb"
-require "#{File.dirname(__FILE__)}/../lib/blastr/tts.rb"
 
-scm_url = ARGV[0]
-scm = Blastr.scm(scm_url)
-since_revision = scm.as_revision(ARGV[1]) if ARGV.size > 1
-since_revision = scm.latest_revision unless ARGV.size > 1
-
-class Author
-  PEOPLE_FILE = File.expand_path("~/.blastr/people")
-  def self.people
-    if File.file?(PEOPLE_FILE)
-      yaml = YAML.load_file(PEOPLE_FILE)
-      return yaml unless yaml == false
-    end
-    { }
-  end
-
-  def self.full_name_of(username)
-    people[username] ||= username
-  end
-end
-
-def announce(commit)
-  puts "[#{commit.revision}] Commit by #{commit.author}: #{commit.comment}"
-  Blastr::TTS.speak("Commit by #{Author.full_name_of(commit.author)}: #{commit.comment}")
-end
-
-puts "Polling for #{scm.name} commits since revision #{since_revision}..."
-while true
-  scm.commits_since(since_revision.to_s).each do |commit|
-    if since_revision.before?(commit.revision)
-      announce(commit)
-      since_revision = commit.revision
-    end
-  end
-  sleep 30
-end
+Blastr::Process.new(ARGV).run

data/lib/blastr.rb

@@ -1,11 +1,55 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'yaml'
+require 'scm/git.rb'
+require 'scm/svn.rb'
+require 'tts/tts.rb'
+
 module Blastr
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
+  
+  class Author
+    PEOPLE_FILE = File.expand_path("~/.blastr/people")
+    def self.people
+      if File.file?(PEOPLE_FILE)
+        yaml = YAML.load_file(PEOPLE_FILE)
+        return yaml unless yaml == false
+      end
+      { }
+    end
 
-  require 'blastr/git.rb'
-  require 'blastr/svn.rb'
+    def self.full_name_of(username)
+      people[username] ||= username
+    end
+  end
+  
+  class Process
+    def initialize(args=[])
+      scm_url = ARGV[0]
+      @scm = Blastr.scm(scm_url)
+      @since_revision = @scm.as_revision(ARGV[1]) if ARGV.size > 1
+      @since_revision = @scm.latest_revision unless ARGV.size > 1
+    end
+
+    def announce(commit)
+      puts "[#{commit.revision}] Commit by #{commit.author}: #{commit.comment}"
+      Blastr::TTS.speak("Commit by #{Author.full_name_of(commit.author)}: #{commit.comment}")
+    end
+    
+    def run
+      puts "Polling #{@scm.name} commits since revision #{@since_revision}..."
+      while true
+        @scm.commits_since(@since_revision.to_s).each do |commit|
+          if @since_revision.before?(commit.revision)
+            announce(commit)
+            @since_revision = commit.revision
+          end
+        end
+        sleep 30
+      end
+    end
+  end
   
   def Blastr::temp_dir
     temp_file = Tempfile.new("tmp")

data/lib/{blastr → scm}/svn.rb

@@ -25,7 +25,7 @@ module Blastr
     def name; "Subversion"; end
     
     def self.understands_url?(url)
-      not url.match(/(https?|svn):\/\/.+/).nil?
+      not url.match(/(https?|svn):\/\/.+/u).nil?
     end
     
     def initialize(svn_url)
@@ -44,11 +44,12 @@ module Blastr
     end
 
     def commits_since(since_revision = 1)
+      nonascii = /([^a-zA-Z0-9\.,:;\-_\?!"'\s]+?)/u
       entries = []
-      svn_log(since_revision).scan(/r(\d+)\s\|\s(.*?)\s\|.*?\n\n(.*)\n-+/).each do |entry|
+      svn_log(since_revision).scan(/r(\d+)\s\|\s(.*?)\s\|.*?\n\n(.*)\n-+/u).each do |entry|
         revision = as_revision(entry[0])
         author = entry[1]
-        comment = entry[2]
+        comment = entry[2].gsub(nonascii, 'X ')
         entries << LogEntry.new(revision, author, comment)
       end
       entries

data/lib/{blastr → tts}/tts.rb

@@ -45,7 +45,7 @@ module Blastr
     end
 
     def TTS::speak(msg)
-      resolve_tts_system.speak(msg)
+      resolve_tts_system.speak(msg.gsub(/"/u, '\"').gsub(/'/u, '\''))
     end
 
   end

data/test/test_tts.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestTTSImplementation < Test::Unit::TestCase
+
+  def test_availability_depends_on_binary_existing_in_PATH
+    assert Blastr::TTS::TTSImplementation.new("nosuchbinaryexists").available? == false
+    assert Blastr::TTS::TTSImplementation.new("echo").available? == true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blastr
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Lasse Koskela
@@ -62,15 +62,15 @@ files:
 - Rakefile
 - bin/blastr
 - lib/blastr.rb
-- lib/blastr/git.rb
-- lib/blastr/scm.rb
-- lib/blastr/svn.rb
-- lib/blastr/tts.rb
+- lib/scm/git.rb
+- lib/scm/scm.rb
+- lib/scm/svn.rb
+- lib/tts/tts.rb
 - script/console
 - script/destroy
 - script/generate
-- test/test_blastr.rb
 - test/test_helper.rb
+- test/test_tts.rb
 has_rdoc: true
 homepage: http://blastr.rubyforge.org
 post_install_message: 
@@ -99,5 +99,5 @@ signing_key:
 specification_version: 2
 summary: Blastr observes a version control repository for commits and makes audible announcements out of the commit messages
 test_files: 
-- test/test_blastr.rb
 - test/test_helper.rb
+- test/test_tts.rb

data/test/test_blastr.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestBlastr < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end