lib/jira4r/jira_tool.rb in jira4r-0.3.0 vs lib/jira4r/jira_tool.rb in jira4r-1.1.0

@@ -1,26 +1,9 @@
-################################################################################
-#  Copyright 2006-2009 Codehaus Foundation
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-################################################################################
 require 'logger'
+require 'rubygems'
+gem 'soap4r'
 
-#It is the responsibility of the caller to ensure SOAP4R is installed and working correctly
-#require 'rubygems'
-#gem 'soap4r'
-
 module Jira4R
   
   class JiraTool
     attr_accessor :enhanced
     
@@ -38,30 +21,24 @@
     
     #Assign a new logger to the tool. By default a STDERR logger is used.
     def logger=(logger)
       @logger = logger
     end
-
-    def http_auth(http_username, http_password, http_realm)
-      @http_username = http_username
-      @http_password = http_password
-      @http_realm = http_realm
-    end
     
     #Retrieve the driver, creating as required.
     def driver()
       if not @driver
         @logger.info( "Connecting driver to #{@endpoint_url}" )
 
+        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)
         @driver = service.send(:new, @endpoint_url)
-
-        if not ( @http_realm.nil? or @http_username.nil? or @http_password.nil? )
-          @driver.options["protocol.http.basic_auth"] << [ @http_realm, @http_username, @http_password ]
-        end
       end
       @driver
     end
     
     #Assign a wiredump file prefix to the driver.
@@ -170,46 +147,46 @@
       @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
     def fix_args(args)
       args.collect { |arg|