meta_project 0.4.7 → 0.4.8

data/CHANGES

@@ -1,5 +1,15 @@
 = MetaProject Changelog
 
+== Version 0.4.8
+
+This release fixes some bugs with XForge (RubyForge) Rake tasks.
+
+* Documented how to avoid parsing of CHANGES.
+* Fixed a bug in interactive modus for user name and password prompts.
+* Fixed a bug in retrieval of package_id when releasing to RubyForge.
+* Fixed bug in open-uri extension that clobbered HTTP request headers failing login.
+* Fixed a bug in the determination of Trac version.
+
 == Version 0.4.7
 
 This release makes HTTP access more robust and improves the Pathname API.

data/README

@@ -1,4 +1,4 @@
-= MetaProject 0.4.7
+= MetaProject 0.4.8
 
 MetaProject (formerly XForge) is a library that allows interaction with various project hosting servers, issue trackers, SCMs and SCM browsers through a common API.
 
@@ -70,15 +70,41 @@ If you're writing an application that interacts with MetaProject, please refer t
 
 ---
 
+== FAQ
+
+=== I don't have a CHANGES file that MetaProject's Rake tasks understands. How do I disable it?
+When using the Rake tasks Rake::XForge::Release and Rake::XForge::NewsPublisher, you can omit parsing
+of the CHANGES file by telling the task to omit it. In this case, you also have to specify +release_notes+
+and +release_changes+ to the task. Example:
+
+  task :release_files => [:gem] do
+    release_files = FileList[
+      "pkg/#{PKG_FILE_NAME}.gem"
+    ]
+
+    Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new('xforge')) do |release|
+      # If you omit user_name and/or password, you'll be prompted at the command line.
+      release.user_name = ENV['RUBYFORGE_USER']
+      release.password = ENV['RUBYFORGE_PASSWORD']
+      release.files = release_files.to_a
+      release.release_name = "MetaProject #{PKG_VERSION}"
+      
+      # The code below is for disabling parsing of CHANGES
+      release.changes_file = nil
+      release.release_notes = "This is release notes. They will show up at the release summary"
+      release.release_changes = ["This is", "a list of String", "and will also show up", "under the release summary"]
+    end
+  end
+
 == Credits
 
 (In alphabetical order)
 
 [<b>Aslak Hellesoy</b>] Maintainer of this project.
 
-[<b>David Heinemeier Hansson</b>] For the HTTP POST code and the idea to parse ids from project pages.
+[<b>David Heinemeier Hansson</b>] For the HTTP POST code and the idea to parse XForge ids from project pages.
 
-[<b>Jim Weirich</b>] For Rake, making XForge easier to use from Ruby build scripts.
+[<b>Jim Weirich</b>] For Rake and feedback on some problems with the Rake tasks.
 
 [<b>Thomas Leitner</b>] For Freshmeat and RAA support.
 

data/Rakefile

@@ -6,7 +6,7 @@
 # This file is may be distributed under an MIT style license.  See
 # MIT-LICENSE for details.
 
-# $:.unshift('lib')
+$:.unshift('lib')
 require 'meta_project'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
@@ -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.7"
+PKG_VERSION = "0.4.8"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -34,6 +34,7 @@ PKG_FILES = FileList[
 
 task :default => [:gem]
 
+desc "Execute RSpec specifications (rspec gem must be installed)"
 task :spec do
   ruby 'behaviours/suite.rb'
 end

data/lib/meta_project/core_ext/open_uri.rb

@@ -2,15 +2,15 @@ require 'open-uri'
 
 # Wrapper around Kernel.open from open-uri
 # that can retry and report better errors
-def better_open(url, retries=2, &block)
+def better_open(url, headers=nil, retries=2, &block)
   begin
     # open-uri's open
-    Kernel.open(url, &block)
+    headers.nil? ? Kernel.open(url, &block) : Kernel.open(url, headers, &block)
   rescue Errno::ECONNREFUSED, EOFError => e
     if(retries > 0)
       STDERR.puts "Connection refused to #{url} - retrying in 1 sec."
       sleep 1
-      better_open(url, retries-1, &block)
+      better_open(url, headers, retries-1, &block)
     else
       e.message << " (URL:#{url})"
       raise e

data/lib/meta_project/project/trac/trac_project.rb

@@ -10,7 +10,7 @@ module MetaProject
           @tracker = ::MetaProject::Tracker::Trac::TracTracker.new(@trac_base_url)
         end
         
-        TRAC_VERSION_PATTERN = /<strong>Trac ([\d\.]+)\w*<\/strong>/
+        TRAC_VERSION_PATTERN = /<strong>Trac ([\d\.]+)[^<]*<\/strong>/
         
         def scm_web
           unless @scm_web
@@ -18,9 +18,9 @@ module MetaProject
             front_page = better_open(@trac_base_url).read
             if(front_page =~ TRAC_VERSION_PATTERN)
               version = $1
-              version = "#{version}.0" if version =~ /[\d]+\.[\d]+\.$/              
+              # If there is no minor version part, add 0
+              version = "#{version}.0" if version =~ /^[\d]+\.[\d]+$/              
               version = version.gsub(/\./, "").to_i
-
               if(version >= 90)
                 html      = "#{@trac_base_url}/browser/#{@svn_path}/\#{path}?rev=\#{revision}"
                 raw       = "#{@trac_base_url}/browser/#{@svn_path}/\#{path}?rev=\#{revision}&format=txt"

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

@@ -68,7 +68,6 @@ module MetaProject
           xfiles.each_with_index do |xfile, i|
             first_file = i==0
             puts "Releasing #{xfile.basename}..."
-
             release_response = Net::HTTP.start(@host, 80) do |http|
               query_hash = if first_file then
                 {

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

@@ -3,6 +3,8 @@ module MetaProject
     module XForge
       class XForgeBase < Base
 
+        attr_reader :host, :unix_name
+
         def initialize(host, unix_name, cvs_mod)
           @host = host
           @unix_name = unix_name

data/lib/meta_project/version_parser.rb

@@ -30,9 +30,13 @@ module MetaProject
       end
   
       release_notes = lines[release_notes_first..changes_first-1].join("")
+      raise "Release notes for #{version} couldn't be parsed from #{changes_file}" if release_notes.strip == ""
+
       release_changes = lines[changes_first..changes_last].collect do |line| 
         line.length >= 2 ? line[2..-1].chomp : line
       end
+      raise "Release changes for #{version} couldn't be parsed from #{changes_file}" if release_changes.length == 0
+
       Version.new(release_notes, release_changes)
     end
   end

data/lib/rake/contrib/xforge/base.rb

@@ -3,15 +3,17 @@ module Rake
   
     # Base class for XForge tasks
     class Base
-      attr_writer :user_name, :password
+      attr_accessor :user_name, :password, :changes_file
 
       def initialize(project)
         @project = project
 
-        set_defaults
+        @changes_file = "CHANGES"
+        @version = PKG_VERSION if defined? PKG_VERSION
   
         if(block_given?)
           yield self
+          set_defaults
           execute
         end
       end
@@ -23,7 +25,7 @@ module Rake
       
       def user_name
         if(@user_name.nil?)
-          print "#{@host.name} user: "
+          print "#{@project.host} user: "
           @user_name = STDIN.gets.chomp
         end
         @user_name
@@ -31,7 +33,7 @@ module Rake
 
       def password
         if(@password.nil?)
-          print "#{@host.name} password: "
+          print "#{@project.host} password: "
           @password = STDIN.gets.chomp
         end
         @password

data/lib/rake/contrib/xforge/news_publisher.rb

@@ -11,20 +11,24 @@ module Rake
     protected
 
       def set_defaults
-        @subject = "#{PKG_NAME}-#{PKG_VERSION} released"
+        @subject = "#{PKG_NAME}-#{PKG_VERSION} released" unless @subject
 
-        begin
-          vp = ::MetaProject::VersionParser.new
-          version = vp.parse("CHANGES", PKG_VERSION)
-          @details = version.release_notes
-        rescue => e
-          STDERR.puts("Couldn't parse release info from CHANGES")
-          STDERR.puts(e.message)
-          STDERR.puts(e.backtrace.join("\n"))
+        if(@changes_file && @version)
+          begin
+            vp = ::MetaProject::VersionParser.new
+            version = vp.parse(@changes_file, @version)
+            @details = version.release_notes unless @details
+          rescue => e
+            STDERR.puts("Couldn't parse release info from #{@changes_file}")
+            STDERR.puts(e.message)
+            STDERR.puts(e.backtrace.join("\n"))
+          end
         end
       end
 
       def execute
+        raise "'details' not defined." unless @details
+        raise "'subject' not defined." unless @subject
         session = @project.login(user_name, password)
         session.publish_news(@subject, @details)
       end

data/lib/rake/contrib/xforge/release.rb

@@ -53,22 +53,33 @@ module Rake
     protected
     
       def set_defaults
-        @files = ["pkg/#{PKG_FILE_NAME}.gem"] if defined? PKG_FILE_NAME
-        @release_name = "#{PKG_NAME}-#{PKG_VERSION}" if (defined? PKG_NAME && defined? PKG_VERSION)
+        if(@files.nil?)
+          @files = ["pkg/#{PKG_FILE_NAME}.gem"] if defined? PKG_FILE_NAME 
+        end
+        
+        if(@release_name.nil?)
+          @release_name = "#{PKG_NAME}-#{PKG_VERSION}" if (defined? PKG_NAME && defined? PKG_VERSION)
+        end
         
-        begin
-          vp = ::MetaProject::VersionParser.new
-          version = vp.parse("CHANGES", PKG_VERSION)
-          @release_notes = version.release_notes
-          @release_changes = "* " + version.release_changes.join("\n* ")
-        rescue => e
-          STDERR.puts("Couldn't parse release info from CHANGES")
-          STDERR.puts(e.message)
-          STDERR.puts(e.backtrace.join("\n"))
+        if(@changes_file && @version)
+          begin
+            vp = ::MetaProject::VersionParser.new
+            version = vp.parse(@changes_file, @version)
+            @release_notes = version.release_notes unless @release_notes
+            @release_changes = "* " + version.release_changes.join("\n* ") unless @release_changes
+          rescue => e
+            STDERR.puts("Couldn't parse release info from #{@changes_file}")
+            STDERR.puts(e.message)
+            STDERR.puts(e.backtrace.join("\n"))
+          end
         end
       end
       
       def execute
+        raise "'release_name' not defined." unless @release_name
+        raise "'files' not defined." unless @files
+        raise "'release_notes' not defined." unless @release_notes
+        raise "'release_changes' not defined." unless @release_changes
         session = @project.login(user_name, password)
         session.release(@release_name, @files, @release_notes, @release_changes)
       end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: meta_project
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 date: 2005-09-06 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: