subtrigger 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/subtrigger/email.rb

@@ -17,6 +17,7 @@ module Subtrigger
   # TODO: Use a hash of options rather than plain arguments.
   class Email
     attr_accessor :from, :to, :subject, :body, :development
+    attr_reader :sendmail
 
     # Sets up a new message and tries to find +sendmail+ on your system.
     def initialize(options = {})
@@ -25,7 +26,7 @@ module Subtrigger
       @subject     = options[:subject]
       @body        = options[:body]
       @development = options[:development] || false
-      @sendmail    = `which sendmail`.strip
+      @sendmail    = Subtrigger.sendmail || `which sendmail`.strip
       raise 'Could not find sendmail; aborting.' if @sendmail.nil?
     end
 
@@ -33,7 +34,7 @@ module Subtrigger
     def send
       message = header + "\n" + body
       unless development
-        fd = open("|#{@sendmail} #{@to}", "w")
+        fd = open("|#{sendmail} #{to}", "w")
         fd.print(message)
         fd.close
       end

data/lib/subtrigger/repository.rb

@@ -32,7 +32,7 @@ module Subtrigger
       raise "Invalid revision number '#{revision}'" unless revision.to_i > 0
       @path = path
       @revision = revision.to_i
-      @svn_path = `which svn`.strip
+      @svn_path = Subtrigger.svn || `which svn`.strip
       raise 'Could not locate svn' if @svn_path.nil?
     end
 
@@ -97,7 +97,7 @@ module Subtrigger
 
     # Runs an arbitrary +svn+ command and returns its results.
     def exec(command)
-      command = "#{@svn_path} #{command}"
+      command = "#{@svn_path} #{command} #{Subtrigger.svn_args}"
       `#{command}`
     end
 
@@ -105,7 +105,7 @@ module Subtrigger
 
     # Execute a +svnlook+ command for the current repository and revision.
     def look_at(subcommand)
-      `#{File.join(File.dirname(@svn_path), 'svnlook')} #{subcommand} #{@path} -r #{@revision}`
+      `#{File.join(File.dirname(@svn_path), 'svnlook')} #{subcommand} #{@path} -r #{@revision} #{Subtrigger.svn_args}`
     end
 
     # Get the contents of a line from the <tt>svnlook info</tt> output, which

data/lib/subtrigger.rb

@@ -54,8 +54,10 @@ $:.unshift File.dirname(__FILE__)
 # that Subversion runs its hooks in an empty environment, with no PATH set,
 # and you will also see no output.
 module Subtrigger
+  attr_accessor :svn, :sendmail, :svn_args
+
   # Output the version number for this gem by reading /VERSION
-  def self.version
+  def version
     File.read(File.join(File.dirname(__FILE__), *%w{.. VERSION}))
   end
 
@@ -65,7 +67,7 @@ module Subtrigger
   # number.
   #
   # If an exception occurs, the program will quit with its error message.
-  def self.run(*args)
+  def run(*args)
     Trigger.run(Repository.new(*args))
   rescue Exception => e
     puts "Error: #{e}" and exit(1)
@@ -74,10 +76,11 @@ module Subtrigger
   # Define a new +Trigger+ object -- shortcut method to
   # <tt>Trigger#define</tt>. To enable method chaining this method returns
   # itself.
-  def self.on(pattern, &block)
+  def on(pattern, &block)
     Trigger.define(pattern, &block)
     self
   end
+  extend self
 end
 
 require 'subtrigger/email'

data/subtrigger.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{subtrigger}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arjan van der Gaag"]

data/test/test_email.rb

@@ -13,6 +13,11 @@ class TestEmail < Test::Unit::TestCase
       @message = @email.send
     end
 
+    should 'use custom sendmail location' do
+      Subtrigger.sendmail = 'foo'
+      assert_equal('foo', Subtrigger::Email.new.sendmail)
+    end
+
     should 'set all e-mail attributes' do
       assert_equal('from@from.com', @email.from)
       assert_equal('to@to.com', @email.to)

data/test/test_repository.rb

@@ -24,6 +24,16 @@ class TestRepository < Test::Unit::TestCase
       assert_equal('Foo', @r.author)
     end
 
+    should 'use custom configuration' do
+      Subtrigger::Repository.any_instance.expects(:`).with('/usr/foo/svn info --non-interactive').once
+      Subtrigger::Repository.any_instance.expects(:`).with('/usr/foo/svnlook info path/to/repo -r 1 --non-interactive').once.returns('')
+      Subtrigger.svn = '/usr/foo/svn'
+      Subtrigger.svn_args = '--non-interactive'
+      @r = Subtrigger::Repository.new('path/to/repo', 1)
+      @r.exec('info')
+      @r.author
+    end
+
     should 'yield changed directories' do
       @r.expects(:look_at).with('dirs-changed').returns("www.project1.com/trunk\nsub/www.project2.com/tags/v1")
       yieldings = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: subtrigger
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Arjan van der Gaag