subtrigger 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/subtrigger/email.rb

@@ -13,8 +13,6 @@ module Subtrigger
   #             :body => 'Your post-commit hook has just fired').send
   #
   # If +sendmail+ can not be found on your system an exception will be raised.
-  #--
-  # TODO: Use a hash of options rather than plain arguments.
   class Email
     attr_accessor :from, :to, :subject, :body, :development
     attr_reader :sendmail
@@ -31,6 +29,7 @@ module Subtrigger
     end
 
     # Tries to use +sendmail+ to send the message.
+    # The message sent is returned for inspecting purposes.
     def send
       message = header + "\n" + body
       unless development

data/lib/subtrigger/repository.rb

@@ -69,7 +69,10 @@ module Subtrigger
     #
     # Then committing to <tt>group1/project3/trunk</tt> will yield both
     # <tt>group1/project3/trunk</tt> and <tt>project3</tt>.
+    #
+    # The list of changed project names is returned as an array.
     def changed_projects #:yields: full_path, project_path
+      projects = []
       (@dirs_changed ||= look_at('dirs-changed')).split("\n").each do |dir|
         if dir =~ /([\w\-\.]+)\/(trunk|branches|tags)/
           project_name = $1
@@ -77,9 +80,11 @@ module Subtrigger
           when /^(.*\/trunk)/: $1
           when /^(.*\/(?:tags|branches)\/\w+)/: $1
           end
-          yield top_level_dir, project_name
+          projects << project_name
+          yield top_level_dir, project_name if block_given?
         end
       end
+      projects
     end
 
     # Returns the HEAD revision number (<tt>svnlook youngest</tt>)

data/lib/subtrigger.rb

@@ -44,7 +44,9 @@ $:.unshift File.dirname(__FILE__)
 #   #!/usr/local/bin/ruby
 #   require 'rubygems'
 #   require 'subtrigger'
-#   Subtrigger.on(/foo/) { |matches, repo|
+#   Subtrigger.configure { |c|
+#     c.svn = '/usr/bin/svn'
+#   }.on(/foo/) { |matches, repo|
 #     puts "#{repo.author} comitted foo!"
 #   }.on(/bar/) { |matches, repo|
 #     puts "#{repo.author} comitted bar!"
@@ -68,6 +70,14 @@ $:.unshift File.dirname(__FILE__)
 #   Subtrigger.sendmail = '/path/to/sendmail'
 #   Subtrigger.svn_args = ''
 #
+# You can alternatively use a block:
+#
+#   Subtrigger.configure do |c|
+#     c.svn = '/path/to/svn'
+#   end
+#
+# This will return Subtrigger itself, so you can chain further commands.
+#
 # The <tt>svn_args</tt> setting is a string appended to every +svn+ command.
 # This allows you to, for example, set a custom username and password. You
 # might also want to apply the <tt>--non-interactive</tt> argument. For
@@ -81,6 +91,16 @@ $:.unshift File.dirname(__FILE__)
 module Subtrigger
   attr_accessor :svn, :sendmail, :svn_args
 
+  def reset
+    self.svn      = nil
+    self.sendmail = nil
+    self.svn_args = nil
+  end
+
+  def configure(&block)
+    yield self and return self
+  end
+
   # Output the version number for this gem by reading /VERSION
   def version
     File.read(File.join(File.dirname(__FILE__), *%w{.. VERSION}))

data/subtrigger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{subtrigger}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arjan van der Gaag"]
-  s.date = %q{2010-03-04}
+  s.date = %q{2010-04-23}
   s.default_executable = %q{subtrigger}
   s.description = %q{This gem allows you to create simple Ruby triggers for Subversion commit messages, responding to keywords in your log messages to send e-mails, deploy sites or do whatever you need.}
   s.email = %q{arjan@arjanvandergaag.nl}

data/test/test_repository.rb

@@ -39,6 +39,17 @@ class TestRepository < Test::Unit::TestCase
       @r.author
     end
 
+    should 'return changed project names' do
+      lines = <<-EOS
+www.project1.com/trunk
+www.project2.com/trunk/inc
+sub/www.project2.com/tags/v1
+sub/www.project2.com/tags/v1/test
+EOS
+      @r.expects(:look_at).with('dirs-changed').returns(lines)
+      assert_equal(['www.project1.com', 'www.project2.com', 'www.project2.com', 'www.project2.com'], @r.changed_projects)
+    end
+
     should 'yield changed directories' do
       lines = <<-EOS
 www.project1.com/trunk

data/test/test_subtrigger.rb

@@ -3,6 +3,7 @@ require 'helper'
 class TestSubtrigger < Test::Unit::TestCase
   context 'with a clean slate' do
     setup do
+      Subtrigger.reset
       Subtrigger::Trigger.reset
     end
 
@@ -10,6 +11,15 @@ class TestSubtrigger < Test::Unit::TestCase
       assert_match(/\d+\.\d+\.\d+/, Subtrigger.version)
     end
 
+    should 'configure with a block' do
+      assert_nil Subtrigger.svn
+      output = Subtrigger.configure do |c|
+        c.svn = 'foo'
+      end
+      assert_equal('foo', Subtrigger.svn)
+      assert_equal(Subtrigger, output)
+    end
+
     should 'Create new Repository object' do
       Subtrigger::Repository.expects(:new).with('foo', '1')
       Subtrigger.run('foo', '1')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Arjan van der Gaag
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +01:00
+date: 2010-04-23 00:00:00 +02:00
 default_executable: subtrigger
 dependencies: 
 - !ruby/object:Gem::Dependency