svn-hook-tools 0.5.1 → 0.5.2

data/README

@@ -3,10 +3,7 @@ This is a lib for access jira application, use jira4r interface.
 = Prerequisites =
 SOAP4R (http://dev.ctor.org/soap4r) is required.
 
-= Build =
-gem build rujira.gemspec
-
 = Installation
 
-sudo gem install rujira*.gem
+sudo gem install svn-jira-hook
 

data/Rakefile

@@ -5,12 +5,12 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "svn-jira-hook"
+    gem.name = "svn-hook-tools"
     # gem.executables     = %W(svn-jira-hook)
     gem.summary = %Q{svn jira hook lib.}
     gem.description = %Q{svn jira hook ruby lib.}
     gem.email = "crazycode@gmail.com"
-    gem.homepage = "http://github.com/crazycode/svn-jira-hook"
+    gem.homepage = "http://github.com/crazycode/svn-hook-tools"
     gem.authors = ["crazycode"]
 
     gem.add_dependency "soap4r"
@@ -50,7 +50,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "check-taskr #{version}"
+  rdoc.title = "svn-hook-tools #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -0,0 +1 @@
+0.5.2

data/lib/svn_hook_tools.rb

@@ -0,0 +1 @@
+require 'svn_jira_hook'

data/lib/svn_jira_hook.rb

@@ -1,22 +1,24 @@
 # encoding: utf-8
 require "jira4r/jira_tool"
-
+require "yaml"
 
 class JiraHook
 
-  def initialize(base_url)
-    @jira = ::Jira4R::JiraTool.new(2, base_url)
+  def initialize(base_url = nil)
+    @jira = ::Jira4R::JiraTool.new(2, base_url) unless base_url.nil?
   end
 
   def login(user, pass)
     @jira.login(user, pass)
   end
 
-  def self.check(argv)
+
+  def self.check(argv, keyprefix, config = nil)
     repo_path = argv[0]
     transaction = argv[1]
     svnlook = 'svnlook'
 
+
     #commit_dirs_changed = `#{svnlook} dirs-changed #{repo_path} -t #{transaction}`
     #commit_changed = `#{svnlook} changed #{repo_path} -t #{transaction}`
     commit_author = `#{svnlook} author #{repo_path} -t #{transaction}`.chop
@@ -25,15 +27,26 @@ class JiraHook
     #commit_date = `#{svnlook} date #{repo_path} -t #{transaction}`
 
     if commit_log.nil? || commit_log.empty?
-      STDERR.puts("提交注释必须填写，而且需要包括分配给你的bug号!")
+      STDERR.puts("'#{commit_log}' doesn't exist as a issue on Jira")
       exit(1)
     end
 
-    jira = JiraHook.new('http://192.168.0.3/jira')
-    jira.login('username', 'password')
+    check(commit_author, commit_log, keyprefix, config)
+  end
+
+  def self.check(commit_author, commit_log, keyprefix, config = nil)
+    if config
+      jira_configuration = config
+    else
+      # TODO die if configuration file is missing
+      jira_configuration = configuration()
+    end
+
+    jira = JiraHook.new(jira_configuration['jira_url'])
+    jira.login(jira_configuration['jira_username'], jira_configuration['jira_password'])
 
-    unless jira.check_right(commit_author, '[Ss][Bb]', commit_log)
-      STDERR.puts("提交注释中必须包括分配给你的bug号!\n例如： SB-10: 修改说明")
+    unless jira.check_right(commit_author, keyprefix, commit_log)
+      STDERR.puts("Doesn't exist as a issue on Jira!\n： #{keyprefix}-10: 修改说明")
       exit(1)
     end
 
@@ -45,7 +58,7 @@ class JiraHook
     if message.nil? || message.empty?
       return false
     end
-    issue_id = getIssueNumber(message, issue_key_regex)
+    issue_id = get_issue_number(message, issue_key_regex)
     if issue_id.nil?
       return false
     end
@@ -65,13 +78,29 @@ class JiraHook
     end
   end
 
-  def getIssueNumber(message, keyreg)
-    re = Regexp.new("#{keyreg}-[0-9]+")
+  def get_issue_number(message, keyprefix)
+    # key="ab" => key=[Aa][Bb]
+    keyreg = []
+    keyprefix.each_char do |c|
+      keyreg << "[#{c.upcase}#{c.downcase}]"
+    end
+
+    re = Regexp.new("#{keyreg.join("")}-[0-9]+")
     if message =~ re
       "#{$&}".upcase
     end
   end
 
+  def self.configuration
+    if defined?(SVN_HOOKS_CONFIG_PATH)
+      config_file = SVN_HOOKS_CONFIG_PATH
+    else
+      config_file = '/etc/svn_hooks.yml'
+    end
+
+    YAML::load(IO.read(config_file))
+  end
+
 end
 
 

data/svn-hook-tools.gemspec

@@ -0,0 +1,57 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{svn-hook-tools}
+  s.version = "0.5.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["crazycode"]
+  s.date = %q{2011-05-09}
+  s.description = %q{svn jira hook ruby lib.}
+  s.email = %q{crazycode@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README"
+  ]
+  s.files = [
+    "LICENSE",
+    "README",
+    "Rakefile",
+    "VERSION",
+    "lib/jira4r/jira4r.rb",
+    "lib/jira4r/jira_tool.rb",
+    "lib/jira4r/v2/JiraSoapServiceDriver.rb",
+    "lib/jira4r/v2/jiraService.rb",
+    "lib/jira4r/v2/jiraServiceMappingRegistry.rb",
+    "lib/jiraService.rb",
+    "lib/jiraServiceMappingRegistry.rb",
+    "lib/svn_hook_tools.rb",
+    "lib/svn_jira_hook.rb",
+    "pre-commit.sample",
+    "svn-hook-tools.gemspec",
+    "test/config/svn_hooks.yml",
+    "test/test_helper.rb",
+    "test/test_jira.rb"
+  ]
+  s.homepage = %q{http://github.com/crazycode/svn-hook-tools}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{svn jira hook lib.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<soap4r>, [">= 0"])
+    else
+      s.add_dependency(%q<soap4r>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<soap4r>, [">= 0"])
+  end
+end
+

data/test/config/svn_hooks.yml

@@ -0,0 +1,5 @@
+
+# Jira Default config
+jira_url: http://10.241.14.35:8880
+jira_username: jira_user
+jira_password: 1qaz2wsx

data/test/test_helper.rb

@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/rujira'
-
+require 'svn_hook_tools'
+#require File.dirname(__FILE__) + '/../lib/svn_hook_tools'

data/test/test_jira.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+SVN_HOOKS_CONFIG_PATH = File.dirname(__FILE__) + '/config/svn_hooks.yml'
+
+class TestJira < Test::Unit::TestCase
+  def test_simple
+    assert_equal 1, 1
+  end
+
+  def test_get_issue_number
+    jira = JiraHook.new
+    assert_nil jira.get_issue_number("helo,ixist", "SB")
+    assert_nil jira.get_issue_number("SB:helo,ixist", "SB")
+    assert_nil jira.get_issue_number("SB-: helo,ixist", "SB")
+    assert_nil jira.get_issue_number("helo,ixSBist", "SB")
+    assert_nil jira.get_issue_number("helo,iSB-xist", "SB")
+    isn = jira.get_issue_number("SB-1: Test", "SB")
+    assert_not_nil isn
+    assert_equal "SB-1", isn
+    assert_equal "SB-34234", jira.get_issue_number("hello SB-34234", "SB")
+    assert_equal "SB-34234", jira.get_issue_number("hello SB-34234abcd", "SB")
+    assert_equal "SB-34234", jira.get_issue_number("hello SB-34234", "sb")
+    assert_equal "SB-34234", jira.get_issue_number("hello sB-34234abcd", "sb")
+    assert_equal "SB-34234", jira.get_issue_number("hello Sb-34234", "SB")
+    assert_equal "SB-34234", jira.get_issue_number("hello sB-34234abcd", "Sb")
+    assert_equal "SB-34234", jira.get_issue_number("hello Sb-34234", "sb")
+    assert_equal "SB-34234", jira.get_issue_number("hello sb-34234abcd", "sB")
+  end
+
+
+  def test_check_jira
+    # JiraHook.check("tangliqun", "Message-99:hello", 'Message')
+  end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svn-hook-tools
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - crazycode
@@ -45,6 +45,7 @@ files:
 - LICENSE
 - README
 - Rakefile
+- VERSION
 - lib/jira4r/jira4r.rb
 - lib/jira4r/jira_tool.rb
 - lib/jira4r/v2/JiraSoapServiceDriver.rb
@@ -52,9 +53,13 @@ files:
 - lib/jira4r/v2/jiraServiceMappingRegistry.rb
 - lib/jiraService.rb
 - lib/jiraServiceMappingRegistry.rb
+- lib/svn_hook_tools.rb
 - lib/svn_jira_hook.rb
 - pre-commit.sample
+- svn-hook-tools.gemspec
+- test/config/svn_hooks.yml
 - test/test_helper.rb
+- test/test_jira.rb
 has_rdoc: true
 homepage: http://github.com/crazycode/svn-hook-tools
 licenses: []