blastr 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.3 2009-01-17
+
+* Implementation for both Subversion and Git along with a new structure.
+
 == 0.0.2 2009-01-16
 
 * Cleaned up stuff that was specific to the original proof-of-concept.

data/Manifest.txt

@@ -5,6 +5,10 @@ README.rdoc
 Rakefile
 bin/blastr
 lib/blastr.rb
+lib/blastr/tts.rb
+lib/blastr/scm.rb
+lib/blastr/git.rb
+lib/blastr/svn.rb
 script/console
 script/destroy
 script/generate

data/README.rdoc

@@ -31,8 +31,8 @@ All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of this software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of this software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 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/bin/blastr

@@ -1,114 +1,40 @@
 #!/usr/bin/env ruby
 
-PEOPLE = {
-  "jdoe" => "John Doe"
-}
-
-class TTSImplementation
-  attr_accessor :name
-  def initialize(name)
-    @name = name
-  end
-  def binary
-    %x[which #{@name}].strip
-  end
-  def available?
-    binary.empty? == false
-  end
-  def speak(msg)
-    %x[#{binary} "#{msg}"]
-  end
-end
-
-class Say < TTSImplementation
-  def initialize; super("say"); end
-end
-
-class Espeak < TTSImplementation
-  def initialize; super("espeak"); end
-end
-
-class Festival < TTSImplementation
-  def initialize; super("festival"); end
-  def speak(msg)
-    %x[echo "#{msg}" | #{binary} --tts]
-  end
-end
-
-def resolve_tts_system
-  return $tts unless $tts.nil?
-  [ Say.new, Espeak.new, Festival.new ].each do |impl|
-    return impl if impl.available?
-  end
-  raise "No TTS implementation found."
-end
-
-def speak(msg)
-  resolve_tts_system.speak(msg)
-end
-
-def full_name_of(username)
-  PEOPLE[username] ||= username
-end
-
-class LogEntry
-  attr_accessor :revision, :author, :comment
-  def initialize(revision, author, comment)
-    @revision = revision.to_i
-    @author = author
-    @comment = comment
-  end
-  def to_s
-    "revision #{@revision} by #{@author}: #{@comment}"
+require 'rubygems'
+require 'yaml'
+require 'lib/blastr.rb'
+require '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
-end
-
-def content_of(file)
-  file = open(file)
-  content = file.read
-  file.close
-  content
-end
-
-def svn_log(working_copy_path, since_revision = 1)
-  revision = "#{since_revision}:HEAD"
-  revision = "HEAD" if since_revision == "HEAD"
-  cmd = "svn log #{working_copy_path} -r #{revision} > /tmp/svn.log"
-  system(cmd)
-  content_of("/tmp/svn.log")
-end
 
-def svn_log_entries(working_copy_path, since_revision = 1)
-  entries = []
-  svn_log(working_copy_path, since_revision).scan(/r(\d+)\s\|\s(.*?)\s\|.*?\n\n(.*)\n-+/).each do |entry|
-    entries << LogEntry.new(*entry)
+  def self.full_name_of(username)
+    people[username] ||= username
   end
-  entries
 end
 
-def latest_revision(working_copy_path)
-  entries = svn_log_entries(working_copy_path, "HEAD")
-  return entries.first.revision unless entries.empty?
-  1
+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
 
-wc_path = "."
-wc_path = ARGV[0] if ARGV.size > 0
-revision = latest_revision(wc_path)
-revision = ARGV[1].to_i if ARGV.size > 1
-
-puts "svn path:  #{wc_path}\nrevision: #{revision}\n"
-speak("Observing Subversion for commits...")
-
-while true do
-  svn_log_entries(wc_path, revision).each do |entry|
-    if entry.revision.to_i > revision
-      msg = "revision #{entry.revision} by #{full_name_of(entry.author)}: #{entry.comment}"
-      puts msg
-      speak(msg)
-      revision = entry.revision
-    end
+puts "Polling for #{scm.name} commits since revision #{since_revision}..."
+while true
+  scm.commits_since(since_revision.to_s).reverse.each do |commit|
+    announce(commit) if since_revision.before?(commit.revision)
+    since_revision = commit.revision
   end
-  sleep 15
-end
-
+  sleep 30
+end

data/lib/blastr.rb

@@ -2,5 +2,28 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Blastr
-  VERSION = '0.0.2'
-end
+  VERSION = '0.0.3'
+
+  require 'blastr/git.rb'
+  require 'blastr/svn.rb'
+  
+  def Blastr::temp_dir
+    temp_file = Tempfile.new("tmp")
+    temp_dir = temp_file.path
+    temp_file.unlink
+    temp_dir
+  end
+
+  def Blastr::scm_implementations
+    [ Blastr::Subversion, Blastr::Git ]
+  end
+
+  def Blastr::scm(url)
+    scm_implementations.each do |impl|
+      if impl.understands_url?(url)
+        return impl.new(url)
+      end
+    end
+    raise "No SCM implementation found that would understand #{url}"
+  end
+end

data/lib/blastr/git.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'git'
+require 'blastr/scm.rb'
+
+module Blastr
+  
+  class GitLogEntry < LogEntry
+    def initialize(commit)
+      @revision = GitRevision.new(commit.sha)
+      @author = commit.author.name
+      @comment = commit.message
+    end
+  end
+
+  class GitRevision
+    attr_accessor :name
+    
+    def initialize(name)
+      @name = name
+    end
+    
+    def to_s
+      @name
+    end
+    
+    def before?(revision)
+      return false if @name == "HEAD"
+      return true if revision.name == "HEAD"
+      @name < revision.name
+    end
+  end
+    
+  class Git
+    def name; "Git"; end
+
+    def self.understands_url?(url)
+      url.index("git://") == 0
+    end
+
+    def initialize(git_url)
+      @git_url = git_url
+    end
+
+    def as_revision(arg)
+      raise "Invalid revision: #{arg}" unless arg =~ /^(HEAD(~\d+)?)|([\d\w:-]+)$/
+      GitRevision.new(arg.to_s)
+    end
+  
+    def understands_url?(url)
+      url.index("git://") == 0
+    end
+    
+    def latest_revision
+      commits = commits_since(as_revision("HEAD~5"))
+      return as_revision("HEAD") unless commits.size > 0
+      GitRevision.new(commits.last.revision.to_s)
+    end
+
+    def commits_since(revision)
+      @clone = ::Git.clone(@git_url, Blastr::temp_dir)
+      begin
+        @clone.chdir do
+          commits = []
+          @clone.log.between(revision.to_s).each do |commit|
+            commits << GitLogEntry.new(commit)
+          end
+          return commits.reverse
+        end
+      ensure
+        FileUtils.remove_dir(@clone.dir, :force => true)
+      end
+    end
+  end
+
+end

data/lib/blastr/scm.rb

@@ -0,0 +1,13 @@
+module Blastr
+  class LogEntry
+    attr_accessor :revision, :author, :comment
+    def initialize(revision, author, comment)
+      @revision = revision
+      @author = author
+      @comment = comment
+    end
+    def to_s
+      "revision #{@revision} by #{@author}: #{@comment}"
+    end
+  end
+end

data/lib/blastr/svn.rb

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'blastr/scm.rb'
+
+module Blastr
+  
+  class SubversionRevision
+    attr_accessor :name
+    
+    def initialize(name)
+      @name = name
+    end
+    
+    def to_s
+      @name
+    end
+    
+    def before?(revision)
+      return false if @name == "HEAD"
+      return true if revision.name == "HEAD"
+      @name.to_i < revision.name.to_i
+    end
+  end
+  
+  class Subversion
+    def name; "Subversion"; end
+    
+    def self.understands_url?(url)
+      not url.match(/(https?|svn):\/\/.+/).nil?
+    end
+    
+    def initialize(svn_url)
+      @svn_url = svn_url
+    end
+    
+    def as_revision(arg)
+      raise "Invalid revision: #{arg}" unless arg =~ /^(HEAD)|(\d+)$/
+      SubversionRevision.new(arg.to_s)
+    end
+    
+    def latest_revision
+      entries = commits_since(as_revision("HEAD"))
+      return entries.first.revision unless entries.empty?
+      1
+    end
+
+    def commits_since(since_revision = 1)
+      entries = []
+      svn_log(since_revision).scan(/r(\d+)\s\|\s(.*?)\s\|.*?\n\n(.*)\n-+/).each do |entry|
+        revision = as_revision(entry[0])
+        author = entry[1]
+        comment = entry[2]
+        entries << LogEntry.new(revision, author, comment)
+      end
+      entries.reverse
+    end
+
+    private
+    def svn_log(since_revision = as_revision("1"))
+      temp_file = Tempfile.new("svn.log").path
+      begin
+        revision = "#{since_revision}:#{as_revision('HEAD')}"
+        revision = as_revision("HEAD") if since_revision.to_s == as_revision("HEAD").to_s
+        cmd = "svn log #{@svn_url} -r #{revision} > #{temp_file}"
+        system(cmd)
+        return content_of(temp_file)
+      ensure
+        FileUtils.remove_file(temp_file)
+      end
+    end
+
+    private
+    def content_of(file)
+      file = open(file)
+      content = file.read
+      file.close
+      content
+    end
+    
+  end
+
+end

data/lib/blastr/tts.rb

@@ -0,0 +1,52 @@
+module Blastr
+  module TTS
+    
+    class TTSImplementation
+      attr_accessor :name
+      
+      def initialize(name)
+        @name = name
+      end
+      
+      def binary
+        %x[which #{@name}].strip
+      end
+      
+      def available?
+        binary.empty? == false
+      end
+      
+      def speak(msg)
+        %x[#{binary} "#{msg}"]
+      end
+    end
+
+    class Say < TTSImplementation
+      def initialize; super("say"); end
+    end
+
+    class Espeak < TTSImplementation
+      def initialize; super("espeak"); end
+    end
+
+    class Festival < TTSImplementation
+      def initialize; super("festival"); end
+      def speak(msg)
+        %x[echo "#{msg}" | #{binary} --tts]
+      end
+    end
+
+    def TTS::resolve_tts_system
+      return $tts unless $tts.nil?
+      [ Say.new, Espeak.new, Festival.new ].each do |impl|
+        return impl if impl.available?
+      end
+      raise "No TTS implementation found."
+    end
+
+    def TTS::speak(msg)
+      resolve_tts_system.speak(msg)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blastr
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lasse Koskela
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-16 00:00:00 +02:00
+date: 2009-01-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,10 @@ files:
 - Rakefile
 - bin/blastr
 - lib/blastr.rb
+- lib/blastr/tts.rb
+- lib/blastr/scm.rb
+- lib/blastr/git.rb
+- lib/blastr/svn.rb
 - script/console
 - script/destroy
 - script/generate