meta_project 0.4.1 → 0.4.2

data/CHANGES

@@ -1,5 +1,13 @@
 = XForge Changelog
 
+== Version 0.4.2
+
+This is a minor release that accommodates fos some changes needed by DamageControl.
+
+* Made tracker constructors empty so they can be used from DamageControl.
+* Made ScmWeb constructor empty so it can be used from DamageControl.
+* Made JiraTracker look for user/password in environment variables and log error if not defined.
+
 == Version 0.4.1
 
 This version renames xforge to meta_project. This is because the scope of this project

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.1"
+PKG_VERSION = "0.4.2"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -125,7 +125,7 @@ task :verify_env_vars do
 end
 
 task :publish_doc => [:rdoc] do
-  publisher = Rake::RubyForgePublisher.new(PKG_NAME, ENV['RUBYFORGE_USER'])
+  publisher = Rake::RubyForgePublisher.new('xforge', ENV['RUBYFORGE_USER'])
   publisher.upload
 end
 

data/lib/meta_project/scm_web.rb

@@ -4,13 +4,15 @@ module MetaProject
   # in an online scm web interface.
   class ScmWeb
 
+    attr_accessor :overview_spec, :history_spec, :raw_spec, :html_spec, :diff_spec
+
     # The variables to use in +uri_specs+ are:
     #
     # * path
     # * revision
     # * previous_revision
     #
-    def initialize(overview_spec, history_spec, raw_spec, html_spec, diff_spec)
+    def initialize(overview_spec=nil, history_spec=nil, raw_spec=nil, html_spec=nil, diff_spec=nil)
       @overview_spec, @history_spec, @raw_spec, @html_spec, @diff_spec = overview_spec, history_spec, raw_spec, html_spec, diff_spec
     end
 

data/lib/meta_project/tracker/base.rb

@@ -8,9 +8,10 @@ module MetaProject
     class Base
       def self.classes
         [
-          ::Tracker::Jira::JiraProject,
-          ::Tracker::XForge::RubyForgeProject,
-          ::Tracker::Trac::TracProject
+          Jira::JiraTracker,
+          Trac::TracTracker,
+          XForge::RubyForgeTracker,
+          XForge::SourceForgeTracker,
         ]
       end
     end

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

@@ -3,11 +3,22 @@ require 'xmlrpc/client'
 module MetaProject
   module Tracker
     module Jira
-      class JiraTracker
+      class JiraTracker < Base
         JIRA_API = "jira1"
       
-        def initialize(rooturl=nil, identifier=nil, username=nil, password=nil)
-          @rooturl, @identifier, @username, @password = rooturl, identifier, username, password
+        attr_accessor :rooturl, :identifier
+      
+        # Creates a new JiraTracker. In order to successfully get issue info (via XMLRPC),
+        # two env vars must be defined. Example:
+        #
+        #   JiraTracker.new("http://jira.codehaus.org", "DC")
+        #
+        # Then the following must be defined:
+        #
+        #   JIRA_CODEHAUS_ORG_JIRA_USER
+        #   JIRA_CODEHAUS_ORG_JIRA_PASSWORD
+        def initialize(rooturl=nil, identifier=nil)
+          @rooturl, @identifier = rooturl, identifier
         end
 
         def identifier_regexp
@@ -23,12 +34,17 @@ module MetaProject
         end
 
         def issue(issue_identifier)
-          session = login
           begin
+            session = login
             issue = session.getIssue(issue_identifier)
             Issue.new("#{@rooturl}/browse/#{issue_identifier}", issue["summary"])
-          rescue XMLRPC::FaultException
-            # Probably bad issue number
+          rescue XMLRPC::FaultException => e
+            # Probably bad issue number or failed login
+            STDERR.puts("Couldn't get issue #{issue_identifier}: #{e.message}")
+            nil
+          rescue LoginException => e
+            # Missing env vars
+            STDERR.puts("Couldn't log in to JIRA at #{@rooturl}: #{e.message}")
             nil
           end
         end
@@ -42,12 +58,37 @@ module MetaProject
         end
 
       private
-      
+            
         def login
           client = XMLRPC::Client.new2("#{@rooturl}/rpc/xmlrpc")
-          token = client.call("#{JIRA_API}.login", @username, @password)
+          token = client.call("#{JIRA_API}.login", user, password)
           Session.new(client, token)
         end
+        
+        def user
+          var = "#{login_env_var_prefix}_JIRA_USER"
+          ENV[var] || login_error(var)
+        end
+
+        def password
+          var = "#{login_env_var_prefix}_JIRA_PASSWORD"
+          ENV[var] || login_error(var)
+        end
+        
+        def login_env_var_prefix
+          if(rooturl =~ /http:\/\/([^\/]+)/)
+            $1.gsub(/\./, "_").upcase
+          else
+            raise "Bad root url: #{rooturl}"
+          end
+        end
+
+        def login_error(var)
+          raise LoginException.new("#{var} environment variable not defined")
+        end
+        
+        class LoginException < Exception
+        end
       
         # This wrapper around XMLRPC::Client that allows simpler method calls
         # via method_missing and doesn't require to manage the token

data/lib/meta_project/tracker/trac/trac_tracker.rb

@@ -1,10 +1,12 @@
 module MetaProject
   module Tracker
     module Trac
-      class TracTracker < ::MetaProject::Tracker::Base
-        include ::MetaProject::Tracker::DigitIssues
+      class TracTracker < Base
+        include DigitIssues
 
-        def initialize(trac_base_url)
+        attr_accessor :trac_base_url
+
+        def initialize(trac_base_url=nil)
           @trac_base_url = trac_base_url
         end
         

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

@@ -6,12 +6,12 @@ module MetaProject
   module Tracker
     module XForge
       class XForgeTracker < Base
-        include ::MetaProject::Tracker::DigitIssues
+        include DigitIssues
 
         attr_accessor :overview, :project
 
-        # TODO: don't pass in project!! pass in hostname and id!
-        def initialize(overview, project)
+        # TODO: don't pass in project!! pass in hostname and id! This won't work from DC!!
+        def initialize(overview=nil, project=nil)
           @overview, @project = overview, project
         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.1
-date: 2005-08-22 00:00:00 -04:00
+  version: 0.4.2
+date: 2005-08-23 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: 
   - lib