blastr 0.0.17 → 0.0.18

data/History.txt

@@ -1,7 +1,6 @@
 == 0.0.17 2009-02-21
 
 * Removed replacement of non-ascii characters in commit messages.
-
 == 0.0.16 2009-02-21
 
 * Added support for HTTP-based, SSH-based, Rsync-based, and file system-based Git URLs.

data/Manifest.txt

@@ -1,7 +1,7 @@
 History.txt
 Manifest.txt
 PostInstall.txt
-README.rdoc
+README.txt
 Rakefile
 bin/blastr
 config/website.yml

data/{README.rdoc → README.txt}

@@ -1,7 +1,6 @@
 = Blastr, the audible commit radiator
 
-See the project website at Rubyforge[http://rubyforge.org/projects/blastr/]
-to file a bug report or submit a feature request.
+* http://rubyforge.org/projects/blastr/
 
 == DESCRIPTION:
 
@@ -10,6 +9,9 @@ announcements out of the commit messages. It currently supports Subversion,
 Git, and Mercurial on Linux and OS X, possibly on other UNIX-like operating 
 systems as well.
 
+See the project website at Rubyforge[http://rubyforge.org/projects/blastr/]
+to file a bug report or submit a feature request.
+
 === FEATURES:
 
 Blastr can observe a "branch" (identified by a URL) by polling the
@@ -122,3 +124,4 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 POSSIBILITY OF SUCH DAMAGE.
+

data/Rakefile

@@ -1,30 +1,19 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+require 'rubygems'
+require 'hoe'
+$:.unshift(File.dirname(__FILE__) + "/lib")
 require File.dirname(__FILE__) + '/lib/blastr'
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('blastr', Blastr::VERSION) do |p|
-  p.developer('Lasse Koskela', 'lasse.koskela@gmail.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  p.rubyforge_name       = p.name
-  p.extra_deps         = [
+Hoe.spec 'blastr' do
+  name = "blastr"
+  developer('Lasse Koskela', 'lasse.koskela@gmail.com')
+  description = "Blastr observes a version control repository for commits and makes audible announcements out of the commit messages."
+  summary = "Blastr is an audible commit radiator"
+  url = "http://github.com/lkoskela/blastr"
+  clean_globs = ['test/output/*.png', '**/.DS_Store', 'tmp', '*.log']
+  changes = paragraphs_of('History.txt', 0..1).join("\n\n")
+  remote_rdoc_dir = '' # Release to root
+  rsync_args = '-av --delete --ignore-errors'
+  extra_deps = [
     ['git','>= 1.0.5'],
   ]
-  #p.extra_dev_deps = [
-  #  ['newgem', ">= #{::Newgem::VERSION}"]
-  #]
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  #p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.remote_rdoc_dir = '' # Release to root
-  p.rsync_args = '-av --delete --ignore-errors'
-  p.bin_files = 'announce-svn-commits'
-  #puts "Methods on p:\n  #{p.methods.sort.join(', ')}"
 end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]

data/lib/blastr.rb

@@ -6,8 +6,8 @@ module Blastr
   require 'tts/tts.rb'
   require 'people/people.rb'
 
-  VERSION = '0.0.17'
-  COPYRIGHT = 'Copyright (c) 2009, Lasse Koskela. All Rights Reserved.'
+  VERSION = '0.0.18'
+  COPYRIGHT = "Copyright (c) 2009-#{Time.now.year}, Lasse Koskela. All Rights Reserved."
   puts "Blastr #{VERSION}\n#{COPYRIGHT}\n"
   
   def self.trap_and_exit(signal)
@@ -96,5 +96,4 @@ EOS
     temp_file.unlink
     temp_dir
   end
-
 end

data/lib/tts/tts.rb

@@ -9,7 +9,7 @@ module Blastr
       end
       
       def binary
-        %x[which #{@name}].strip
+        %x[#{locate_which_binary} #{@name}].strip
       end
       
       def available?
@@ -19,6 +19,14 @@ module Blastr
       def speak(msg)
         %x[#{binary} "#{msg}"]
       end
+
+      private
+      def locate_which_binary
+        @path_to_which_command ||= ['/bin/which', '/usr/bin/which'].find do |path|
+          File.exists? path
+        end
+        @path_to_which_command ||= 'which'
+      end
     end
 
     class Say < TTSImplementation
@@ -45,8 +53,31 @@ module Blastr
     end
 
     def TTS::speak(msg)
-      resolve_tts_system.speak(msg.gsub(/"/u, '\"').gsub(/'/u, '\''))
+      msg.gsub!(/"/u, '\"')
+      msg.gsub!(/'/u, '\'')
+      resolve_tts_system.speak(normalize_for_speech(msg))
     end
 
+    private
+    def TTS::normalize_for_speech(msg)
+      msg = omit_url_scheme("git", msg)
+      msg = omit_url_scheme("http", msg)
+      msg = omit_url_scheme("https", msg)
+      msg.gsub!(/(.*?)([^\w\(\)])(.?)/, '\1 \2 \3').squeeze!(" ")
+      words = msg.split(/\s/).collect do |word|
+        camel_case_word = /[A-Z][a-z0-9_]+/
+        if word =~ camel_case_word
+          word = word.scan(camel_case_word)
+        end
+        word
+      end
+      words.flatten.join(' ')
+    end
+    
+    def TTS::omit_url_scheme(scheme, msg)
+      return nil if msg.nil?
+      msg.gsub!(/\b#{scheme}:\/\/([^\s]+)/, '(path omitted)')
+      msg
+    end
   end
 end

data/test/test_git_log_entry.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestGitLogEntry < Test::Unit::TestCase
-  
   COMMIT_HASH = "db4ace1c9ba6add9a2b08c153367e2b379f8fb4c"
   COMMIT_DATE = Time.now
   COMMIT_AUTHOR = "johndoe"

data/test/test_tts.rb

@@ -1,9 +1,37 @@
-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
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'mocha'
+
+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("ruby").available? == true
+  end
+end
+
+class TestCamelCaseSpelling < Test::Unit::TestCase
+  def setup
+    @tts = mock()
+    Blastr::TTS.stubs(:resolve_tts_system).returns(@tts)
+  end
+
+  def test_spelling_out_camel_case_words
+    @tts.expects(:speak).with("this is Camel Case")
+    Blastr::TTS.speak("this is CamelCase")
+  end
+
+  def test_camel_case_words_ending_with_special_character
+    @tts.expects(:speak).with("is this Camel Case ?")
+    Blastr::TTS.speak("is this CamelCase?")
+  end
+  
+  def test_git_urls_are_not_spoken_out
+    @tts.expects(:speak).with("Merge X from (path omitted) into Y")
+    Blastr::TTS.speak("Merge X from git://github.com/lassekoskela/blastr into Y")
+  end
+  
+  def test_http_urls_are_not_spoken_out
+    @tts.expects(:speak).with("Merge X from (path omitted) into Y").times(2)
+    Blastr::TTS.speak("Merge X from http://repo.com/svn/path into Y")
+    Blastr::TTS.speak("Merge X from https://repo.com/svn/file.txt into Y")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blastr
 version: !ruby/object:Gem::Version 
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors: 
 - Lasse Koskela
@@ -9,18 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 +02:00
+date: 2010-02-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: git
-  type: :runtime
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: 0.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,9 +40,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.5.0
     version: 
-description: Blastr observes a version control repository for commits and makes audible  announcements out of the commit messages. It currently supports Subversion,  Git, and Mercurial on Linux and OS X, possibly on other UNIX-like operating  systems as well.
+description: |-
+  Blastr observes a version control repository for commits and makes audible 
+  announcements out of the commit messages. It currently supports Subversion, 
+  Git, and Mercurial on Linux and OS X, possibly on other UNIX-like operating 
+  systems as well.
+  
+  See the project website at Rubyforge[http://rubyforge.org/projects/blastr/]
+  to file a bug report or submit a feature request.
 email: 
 - lasse.koskela@gmail.com
 executables: 
@@ -43,12 +60,12 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
+- README.txt
 files: 
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
+- README.txt
 - Rakefile
 - bin/blastr
 - config/website.yml
@@ -75,11 +92,13 @@ files:
 - test/test_tts.rb
 - website/index.html
 has_rdoc: true
-homepage: See the project website at Rubyforge[http://rubyforge.org/projects/blastr/]
+homepage: http://rubyforge.org/projects/blastr/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -97,9 +116,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: blastr
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Blastr observes a version control repository for commits and makes audible  announcements out of the commit messages
 test_files: 
 - test/test_blastr.rb