svn-hook-tools 0.5.8 → 0.5.9

data/Rakefile

@@ -13,8 +13,8 @@ begin
     gem.homepage = "http://github.com/crazycode/svn-hooks"
     gem.authors = ["crazycode"]
 
-    # gem.add_dependency "soap4r"
-    gem.add_dependency "rubyjedi-soap4r", "~> 1.5.8.20100619003610"
+    gem.add_dependency "soap4r-ruby1.9"
+    # gem.add_dependency "rubyjedi-soap4r", "~> 1.5.8.20100619003610"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/lib/jira4r/jira_tool.rb

@@ -1,29 +1,29 @@
 require 'logger'
 require 'rubygems'
-gem 'soap4r'
+gem 'soap4r-ruby1.9'
 
 module Jira4R
-  
+
   class JiraTool
     attr_accessor :enhanced
-    
+
     # Create a new JiraTool
-    # 
+    #
     # where:
     # version ... the version of the SOAP API you wish to use - currently supported versions  [ 2 ]
     # base_url ... the base URL of the JIRA instance - eg. http://confluence.atlassian.com
     def initialize(version, base_url)
       @version = version
-      @base_url = base_url  
+      @base_url = base_url
       @logger = Logger.new(STDERR)
       @endpoint_url = "#{@base_url}/rpc/soap/jirasoapservice-v#{version}"
     end
-    
+
     #Assign a new logger to the tool. By default a STDERR logger is used.
     def logger=(logger)
       @logger = logger
     end
-    
+
     #Retrieve the driver, creating as required.
     def driver()
       if not @driver
@@ -32,7 +32,7 @@ module Jira4R
         require "jira4r/v#{@version}/jiraService.rb"
         require "jira4r/v#{@version}/JiraSoapServiceDriver.rb"
         require "jira4r/v#{@version}/jiraServiceMappingRegistry.rb"
-        
+
         service_classname = "Jira4R::V#{@version}::JiraSoapService"
         puts "Service: #{service_classname}"
         service = eval(service_classname)
@@ -40,37 +40,37 @@ module Jira4R
       end
       @driver
     end
-    
+
     #Assign a wiredump file prefix to the driver.
     def wiredump_file_base=(base)
       driver().wiredump_file_base = base
     end
-    
-  
-    #Login to the JIRA instance, storing the token for later calls. 
-    # 
+
+
+    #Login to the JIRA instance, storing the token for later calls.
+    #
     #This is typically the first call that is made on the JiraTool.
     def login(username, password)
       @token = driver().login(username, password)
     end
 
-    #Clients should avoid using the authentication token directly.    
+    #Clients should avoid using the authentication token directly.
     def token()
       @token
     end
-    
+
     #Call a method on the driver, adding in the authentication token previously determined using login()
     def call_driver(method_name, *args)
       @logger.debug("Finding method #{method_name}")
-      method = driver().method(method_name)     
-      
+      method = driver().method(method_name)
+
       if args.length > 0
-        method.call(@token, *args)     
+        method.call(@token, *args)
       else
         method.call(@token)
       end
     end
-    
+
     #Retrieve a project without the associated PermissionScheme.
     #This will be significantly faster for larger Jira installations.
     #See: JRA-10660
@@ -78,17 +78,17 @@ module Jira4R
       puts "getProjectNoScheme is deprecated. Please call getProjectNoSchemes."
       getProjectNoSchemes(key)
     end
-    
+
     def getProjectNoSchemes(key)
       self.getProjectsNoSchemes().find { |project| project.key == key }
     end
-    
+
     def getProject(key)
       #Jira > 3.10 has been patched to support this method directly as getProjectByKey
       puts "Using deprecated JIRA4R API call getProject(key); replace with getProjectByKey(key)"
       return getProjectByKey(key)
     end
-    
+
     def getProjectByKey( projectKey )
       begin
         return call_driver( "getProjectByKey", projectKey )
@@ -101,7 +101,7 @@ module Jira4R
         end
       end
     end
-    
+
     def getGroup( groupName )
       begin
         return call_driver( "getGroup", groupName )
@@ -114,78 +114,78 @@ module Jira4R
         end
       end
     end
-    
+
     def getProjectRoleByName( projectRoleName )
       getProjectRoles.each{ |projectRole|
         return projectRole if projectRole.name == projectRoleName
       }
     end
-    
+
     def getPermissionScheme( permissionSchemeName )
-      self.getPermissionSchemes().each { |permission_scheme| 
+      self.getPermissionSchemes().each { |permission_scheme|
         return permission_scheme if permission_scheme.name == permissionSchemeName
       }
       return nil
     end
-    
+
     def getNotificationScheme( notificationSchemeName )
-      self.getNotificationSchemes().each { |notification_scheme| 
+      self.getNotificationSchemes().each { |notification_scheme|
         return notification_scheme if notification_scheme.name == notificationSchemeName
       }
       return nil
     end
-    
+
     def getPermission( permissionName )
       if not @permissions
         @permissions = self.getAllPermissions()
       end
-      
+
       @permissions.each { |permission|
         return permission if permission.name.downcase == permissionName.downcase
       }
-      
+
       @logger.warn("No permission #{permissionName} found")
       return nil
     end
-    
+
     def findPermission(allowedPermissions, permissionName)
-		allowedPermissions.each { |allowedPermission|
-		   #puts "Checking #{allowedPermission.name} against #{permissionName} "
-		   return allowedPermission if allowedPermission.name == permissionName
-		}
-		return nil    
+    allowedPermissions.each { |allowedPermission|
+       #puts "Checking #{allowedPermission.name} against #{permissionName} "
+       return allowedPermission if allowedPermission.name == permissionName
+    }
+    return nil
     end
-    
+
     def findEntityInPermissionMapping(permissionMapping, entityName)
       permissionMapping.remoteEntities.each { |entity|
-	    return entity if entity.name == entityName
-	  }
-	  return nil
-	end
-    
+      return entity if entity.name == entityName
+    }
+    return nil
+  end
+
     #Removes entity
     def setPermissions( permissionScheme, allowedPermissions, entity)
       allowedPermissions = [ allowedPermissions ].flatten.compact
       #Remove permissions that are no longer allowed
       permissionScheme.permissionMappings.each { |mapping|
         next unless findEntityInPermissionMapping(mapping, entity.name)
-      
+
         allowedPermission = findPermission(allowedPermissions, mapping.permission.name)
-	    if allowedPermission
-  	      puts "Already has #{allowedPermission.name} in #{permissionScheme.name} for #{entity.name}"
-		  allowedPermissions.delete(allowedPermission)
-	      next
-	    end
+      if allowedPermission
+          puts "Already has #{allowedPermission.name} in #{permissionScheme.name} for #{entity.name}"
+      allowedPermissions.delete(allowedPermission)
+        next
+      end
 
-		puts "Deleting #{mapping.permission.name} from #{permissionScheme.name} for #{entity.name}"
+    puts "Deleting #{mapping.permission.name} from #{permissionScheme.name} for #{entity.name}"
         deletePermissionFrom( permissionScheme, mapping.permission, entity)
       }
-      
+
       puts allowedPermissions.inspect
       allowedPermissions.each { |allowedPermission|
-		puts "Granting #{allowedPermission.name} to #{permissionScheme.name} for #{entity.name}"
-		addPermissionTo(permissionScheme, allowedPermission, entity) 
-	  }   
+    puts "Granting #{allowedPermission.name} to #{permissionScheme.name} for #{entity.name}"
+    addPermissionTo(permissionScheme, allowedPermission, entity)
+    }
     end
 
 private
@@ -198,14 +198,14 @@ private
         end
       }
     end
-    
+
     def method_missing(method_name, *args)
       args = fix_args(args)
       call_driver(method_name, *args)
     end
-    
-    
-  
-  end  
+
+
+
+  end
 
 end

data/lib/svn_jira_hook.rb

@@ -4,14 +4,6 @@ require "yaml"
 
 class JiraHook
 
-  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.init(config = nil)
     if config
       @@config = config
@@ -20,9 +12,17 @@ class JiraHook
     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
 
   def self.check(keyprefix, argv, config = nil)
-    #self.init(nil)
     repo_path = argv[0]
     transaction = argv[1]
     svnlook = 'svnlook'
@@ -42,6 +42,8 @@ class JiraHook
     check_log(commit_author, commit_log, keyprefix, config)
   end
 
+  private
+
   def self.check_log(commit_author, commit_log, keyprefix, config = nil)
     if config
       jira_configuration = config
@@ -50,14 +52,24 @@ class JiraHook
       jira_configuration = configuration()
     end
 
-    jira = JiraHook.new(jira_configuration['jira_url'])
-    jira.login(jira_configuration['jira_username'], jira_configuration['jira_password'])
+    @jira = JiraProxy.new(jira_configuration['jira_url'])
+    @jira.login(jira_configuration['jira_username'], jira_configuration['jira_password'])
 
-    unless jira.check_right(commit_author, keyprefix, commit_log)
+    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
+  end
 
+end
+
+class JiraProxy
+  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
 
   # check the message is match the issue_key_regex
@@ -99,16 +111,4 @@ class JiraHook
     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

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "svn-hook-tools"
-  s.version = "0.5.8"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["crazycode"]
-  s.date = "2012-01-04"
+  s.date = "2012-01-05"
   s.description = "svn jira hook ruby lib."
   s.email = "crazycode@gmail.com"
   s.extra_rdoc_files = [
@@ -45,12 +45,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubyjedi-soap4r>, ["~> 1.5.8.20100619003610"])
+      s.add_runtime_dependency(%q<soap4r-ruby1.9>, [">= 0"])
     else
-      s.add_dependency(%q<rubyjedi-soap4r>, ["~> 1.5.8.20100619003610"])
+      s.add_dependency(%q<soap4r-ruby1.9>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rubyjedi-soap4r>, ["~> 1.5.8.20100619003610"])
+    s.add_dependency(%q<soap4r-ruby1.9>, [">= 0"])
   end
 end
 

data/test/test_helper.rb

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

data/test/test_jira.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 SVN_HOOKS_CONFIG_PATH = File.dirname(__FILE__) + '/config/svn_hooks.yml'
 
@@ -30,6 +30,9 @@ class TestJira < Test::Unit::TestCase
 
   def test_check_jira
     # JiraHook.check_log("tangliqun", "Message-99:hello", 'Message')
+    jira = JiraHook.new('http://dev.uhuila.cn/jira')
+    jira.login('daemon', '1qaz@WSX#EDC')
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn-hook-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubyjedi-soap4r
-  requirement: &17442420 !ruby/object:Gem::Requirement
+  name: soap4r-ruby1.9
+  requirement: &6176920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.8.20100619003610
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17442420
+  version_requirements: *6176920
 description: svn jira hook ruby lib.
 email: crazycode@gmail.com
 executables: []