meta_project 0.4.2 → 0.4.3

data/CHANGES

@@ -1,5 +1,13 @@
 = XForge Changelog
 
+== Version 0.4.3
+
+This is a bugfix release.
+
+* Aligned properties between TracTracker and JiraTracker with ProjectAnalyzer.
+* Stripping leading and trailing whitespace from issue summaries (SF seems to have changed).
+* Added name to XForge projects.
+
 == Version 0.4.2
 
 This is a minor release that accommodates fos some changes needed by DamageControl.

data/Rakefile

@@ -24,7 +24,7 @@ require 'rake/rdoctask'
 #
 # REMEMBER TO KEEP PKG_VERSION IN SYNC WITH THE CHANGES FILE!
 PKG_NAME = "meta_project"
-PKG_VERSION = "0.4.2"
+PKG_VERSION = "0.4.3"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/meta_project/project/base.rb

@@ -1,7 +1,7 @@
 module MetaProject
   module Project
     class Base
-      attr_reader :scm, :scm_web, :tracker
+      attr_reader :scm, :scm_web, :tracker, :name, :home_page
     end
   end
 end

data/lib/meta_project/project/codehaus/codehaus_project_svn.rb

@@ -4,6 +4,7 @@ module MetaProject
       class CodehausProjectSvn < Base
 
         def initialize(project_id, svn_path, jira_id)
+          @name = project_id
           @scm = RSCM::Subversion.new("svn://svn.#{project_id}.codehaus.org/#{project_id}/scm/#{svn_path}", svn_path)
           @tracker = ::MetaProject::Tracker::Jira::JiraTracker.new("http://jira.codehaus.org", jira_id)
 

data/lib/meta_project/project/xforge/xforge_base.rb

@@ -10,6 +10,7 @@ module MetaProject
         def initialize(host, unix_name, cvs_mod)
           @host = host
           @unix_name = unix_name
+          @name = unix_name
 
           @tracker = tracker_class.new(group_id_uri("tracker"), self)
 
@@ -45,14 +46,14 @@ module MetaProject
         def group_id
           unless(@group_id)
             regexp = /stats\/[?&]group_id=(\d+)/
-            html = open(project_uri) { |data| data.read }
+            html = open(xforge_project_url) { |data| data.read }
             @group_id = html[regexp, 1]
             raise "Couldn't get group_id" unless @group_id
           end
           @group_id
         end
 
-        def project_uri
+        def xforge_project_url
           "http://#{@host}/projects/#{@unix_name}/"
         end
 
@@ -63,7 +64,7 @@ module MetaProject
         # The home page of this project
         def home_page
           unless(@home_page)
-            html = open(project_uri) { |data| data.read }
+            html = open(xforge_project_url) { |data| data.read }
             @home_page = html[home_page_regexp, 1]
             raise "Couldn't get home_page" unless @home_page
           end

data/lib/meta_project/project_analyzer.rb

@@ -20,14 +20,14 @@ module MetaProject
       if(url =~ /(http:\/\/.*)\/browser\/(.*)/)
         trac_base_url = $1
         svn_path = $2[-1..-1] == "/" ? $2[0..-2] : $2
-        return Project::Trac::TracProject.new(trac_base_url, options[:svn_root_url], svn_path)
+        return Project::Trac::TracProject.new(trac_base_url, options[:trac_svn_root_url], svn_path)
       end
       
       # Codehaus SVN
       if(url =~ /http:\/\/svn.(.*).codehaus.org\/(.*)/)
         svn_id = $1
         svn_path = $2[-1..-1] == "/" ? $2[0..-2] : $2
-        return Project::Codehaus::CodehausProjectSvn.new(svn_id, svn_path, options[:jira_id])
+        return Project::Codehaus::CodehausProjectSvn.new(svn_id, svn_path, options[:jira_project_id])
       end
 
     end

data/lib/meta_project/tracker/jira/jira_tracker.rb

@@ -6,7 +6,7 @@ module MetaProject
       class JiraTracker < Base
         JIRA_API = "jira1"
       
-        attr_accessor :rooturl, :identifier
+        attr_accessor :jira_base_url, :jira_project_id
       
         # Creates a new JiraTracker. In order to successfully get issue info (via XMLRPC),
         # two env vars must be defined. Example:
@@ -17,8 +17,8 @@ module MetaProject
         #
         #   JIRA_CODEHAUS_ORG_JIRA_USER
         #   JIRA_CODEHAUS_ORG_JIRA_PASSWORD
-        def initialize(rooturl=nil, identifier=nil)
-          @rooturl, @identifier = rooturl, identifier
+        def initialize(jira_base_url=nil, jira_project_id=nil)
+          @jira_base_url, @jira_project_id = jira_base_url, jira_project_id
         end
 
         def identifier_regexp
@@ -30,14 +30,14 @@ module MetaProject
         end
 
         def overview
-          "#{@rooturl}/browse/#{@identifier}"
+          "#{@jira_base_url}/browse/#{@jira_project_id}"
         end
 
         def issue(issue_identifier)
           begin
             session = login
             issue = session.getIssue(issue_identifier)
-            Issue.new("#{@rooturl}/browse/#{issue_identifier}", issue["summary"])
+            Issue.new("#{@jira_base_url}/browse/#{issue_identifier}", issue["summary"])
           rescue XMLRPC::FaultException => e
             # Probably bad issue number or failed login
             STDERR.puts("Couldn't get issue #{issue_identifier}: #{e.message}")
@@ -60,7 +60,7 @@ module MetaProject
       private
             
         def login
-          client = XMLRPC::Client.new2("#{@rooturl}/rpc/xmlrpc")
+          client = XMLRPC::Client.new2("#{@jira_base_url}/rpc/xmlrpc")
           token = client.call("#{JIRA_API}.login", user, password)
           Session.new(client, token)
         end
@@ -76,10 +76,10 @@ module MetaProject
         end
         
         def login_env_var_prefix
-          if(rooturl =~ /http:\/\/([^\/]+)/)
+          if(jira_base_url =~ /http:\/\/([^\/]+)/)
             $1.gsub(/\./, "_").upcase
           else
-            raise "Bad root url: #{rooturl}"
+            raise "Bad jira_base_url: #{jira_base_url}"
           end
         end
 

data/lib/meta_project/tracker/xforge/xforge_tracker.rb

@@ -49,7 +49,7 @@ module MetaProject
             regexp = @tracker.issue_regexp(identifier)
             if(html =~ regexp)
               issue_uri = @tracker.project.group_id_uri("tracker/index.php", "&atid=#{@atid}&func=detail&aid=#{identifier}")
-              return Issue.new(issue_uri, $1)
+              return Issue.new(issue_uri, $1.strip)
             end
             nil
           end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: meta_project
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
-date: 2005-08-23 00:00:00 -04:00
+  version: 0.4.3
+date: 2005-08-24 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: 
   - lib