core_ex 0.5.1.1 → 0.5.5.0

data/NEWS

@@ -1,4 +1,4 @@
-= New in 0.5, 2006-02-24:
+= New in 0.5, 2006-02-26:
 
   This release makes CoreEx compatible with ruby 1.8.4!
 

data/SPEC.yml

@@ -1,9 +1,9 @@
 ---
 Author: The Uttk Team.
 License: Ruby License
-Revision: '$Id: /w/fey/ruby_ex/trunk/core_ex/SPEC.yml 22200 2006-02-23T23:21:04.354576Z pouillar  $'
+Revision: '$Id: /w/fey/ruby_ex/trunk/core_ex/SPEC.yml 22217 2006-02-24T09:12:17.325948Z pouillar  $'
 
-version: !feydakins.org,2006/version dev-ruby/core_ex-0.5_alpha1
+version: !feydakins.org,2006/version dev-ruby/core_ex-0.5
 
 title: CoreEx -- A proposal for a standard library extension.
 summary: CoreEx is a proposal for a standard library extension.
@@ -23,6 +23,7 @@ root_test_suite: test/check-pkg-core_ex.yml
 rdoc_dir: doc/html
 trunk_url: svn://svn.feydakins.org/ruby_ex/trunk/core_ex
 tags_url: svn://svn.feydakins.org/ruby_ex/tags
+version_path: !path lib/core_ex/version.rb
 
 rdoc_files: !filelist
   - README

data/lib/core_ex/rakefile_base.rf

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: /w/fey/ruby_ex/trunk/core_ex/lib/core_ex/rakefile_base.rf 22216 2006-02-24T09:02:54.402257Z pouillar  $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/core_ex/lib/core_ex/rakefile_base.rf 22249 2006-02-26T12:51:58.028558Z pouillar  $
 
 DEFAULT_RUBY_EX_VERSION = ENV['DEFAULT_RUBY_EX_VERSION'] || '~> 0.3'
 DEFAULT_UTTK_VERSION    = ENV['DEFAULT_UTTK_VERSION']    || '~> 0.3'
@@ -290,6 +290,11 @@ clean_task :gem_spec do
 end
 
 
+task :edit_news do
+  edit 'NEWS'
+end
+
+
 task :commit do
   default = "svn commit -m 'Bump to #{SPEC.version}'"
   $commit_cmd ||= ask "Type the command that you use to commit,
@@ -308,7 +313,7 @@ task :tag => [ :spec ] do
   tags = SPEC.tags_url.to_s + "/#{tag_name}"
   trunk = SPEC.trunk_url || SPEC.vcs_url
   say "Make the SVN tag (#{trunk} -> #{tags})"
-  sh 'svn', 'copy', trunk.to_s, tags.to_s, '-m', "'Releasing #{tag_name}'"
+  sh 'svn', 'copy', trunk.to_s, tags.to_s, '-m', "Releasing #{tag_name}"
 end
 
 
@@ -347,15 +352,23 @@ module Rake
           contents = SPEC_YML.read.gsub(/^(version\s*:\s+)(.*)\s*$/) { $1 + SPEC.version.to_yaml.gsub(/^---\s*/, '') }
           SPEC_YML.mv(bak)
           SPEC_YML.overwrite(contents)
-          begin
-            task_loop :clobber, :check, :doc, :package, :distcheck, :commit
-          rescue Exception => ex
-            bak.mv(SPEC_YML)
-            raise ex
+          version_path = SPEC.version_path.to_path
+          TempPath.new('version.rb.bak') do |vbak|
+            contents = version_path.read.gsub(/Version.parse\(.*\)$/,
+                                    "Version.parse(#{SPEC.version.to_s.dump})")
+            version_path.mv(vbak)
+            version_path.overwrite(contents)
+            begin
+              task_loop :clobber, :edit_news, :check, :doc,
+                        :package, :distcheck, :commit
+            rescue Exception => ex
+              bak.mv(SPEC_YML)
+              vbak.mv(version_path)
+              raise ex
+            end
           end
-          bak.rm_f
-          task_loop :"after_commit_#@name"
         end
+        Rake::Task[:"after_commit_#@name"].invoke
       end
       task :"after_commit_#@name" => [ :spec ] do
         task_loop :tag, :publish_doc, :publish_package
@@ -374,11 +387,12 @@ module Rake
           choose do |menu|
             menu.prompt = 'Retry, skip, or abort?  '
 
-            menu.choice :retry do end
+            menu.choice :retry do
+              Rake::Task[tasks.first].instance_eval { @already_invoked = false }
+            end
             menu.choice :skip  do tasks.shift end
-            menu.choice :abort do tasks.clear end
+            menu.choice :abort do raise ex end
           end
-          raise ex
         end
       end
     end
@@ -391,7 +405,8 @@ releases = [ :major_release,
              :release_candidate,
              :alpha_release,
              :beta_release,
-             :pre_release ]
+             :pre_release,
+             :official_release ]
 
 for release in releases do
   Rake::ReleaseTask.new release
@@ -409,7 +424,7 @@ task :publish_package => [ :spec, :package ] do
 
   rubyforge_user = SPEC.rubyforge_user || SPEC.user || ENV['USER']
   rubyforge_project = SPEC.rubyforge_project || SPEC.version.name
-  release_name = SPEC.version.short_string
+  release_name = SPEC.version.pretty_version
 
   require 'net/http'
   require 'open-uri'
@@ -434,6 +449,9 @@ task :publish_package => [ :spec, :package ] do
     say "Releasing #{path.basename}..."
     next unless agree 'Agree?  (y/n)', true
 
+    cmd = "rubyforge add_release '#{group_id}' '#{package_name}' " +
+          "'#{release_name}' '#{path}' --release_notes '#{release_notes}' " +
+          "--release_changes '#{release_changes}' --preformatted"
     unless release_id then
       release = { :notes => release_notes, :changes => release_changes }
       [:notes, :changes].each do |x|
@@ -448,11 +466,10 @@ task :publish_package => [ :spec, :package ] do
           break if agree 'Agree? (y/n)  ', true
         end
       end
-      res = `rubyforge add_release #{group_id} #{package_name} #{release_name} #{path} -n #{release_notes} -a #{release_changes} -f`
-      release_id = res[/release_id: (\d+)/, 1]
+      release_id = `#{cmd} --show_release_id`[/release_id: (\d+)/, 1]
       puts "release_id: #{release_id}"
     else
-      system "rubyforge add_release #{group_id} #{package_name} #{release_name} #{path} -R #{release_id} -n #{release_notes} -a #{release_changes} -f"
+      system "#{cmd} --release_id '#{release_id}'"
     end
 
   end
@@ -460,7 +477,7 @@ end
 
 clean_task :publish_package do
   [release_notes, release_changes].each do |x|
-    x.rm_f
+    x.rm_f if x.exist? and agree "Remove #{x}? (y/n) "
   end
 end
 

data/lib/core_ex/version.rb

@@ -0,0 +1,10 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: /w/fey/ruby_ex/trunk/core_ex/lib/core_ex/lazy_loading.rb 21865 2006-02-18T17:13:28.680350Z pouillar  $
+
+module CoreEx
+
+  Version = Version.parse("dev-ruby/core_ex-0.5")
+
+end # module CoreEx

data/lib/core_ex.rb

@@ -324,6 +324,10 @@ test_section __FILE__ do
       assert_kind_of Module, CoreEx::EmbeddedTests
     end
 
+    def test_version
+      assert_match(/dev-ruby\/core_ex-\d+.\d+/, CoreEx::Version.to_s)
+    end
+
   end # class TestCoreEx
 
 end

data/lib/version.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2004  Nicolas Despres. All rights reserved.
 # Author::    Nicolas Despres  <polrop@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: /w/fey/ruby_ex/trunk/core_ex/lib/version.rb 22190 2006-02-23T17:21:00.661381Z pouillar  $
+# Revision::  $Id: /w/fey/ruby_ex/trunk/core_ex/lib/version.rb 22251 2006-02-26T13:07:53.356882Z pouillar  $
 
 
 class Version
@@ -110,10 +110,10 @@ class Version
     end
   end
 
-  def pp
+  def pretty_version
     more = ''
     more << " #@release_name" unless @release_name.empty?
-    "#{@tag.pp}: #{major_minor}#{more}"
+    "#{@tag.pretty_string}: #{major_minor}#{more}"
   end
 
   def to_a
@@ -210,8 +210,8 @@ class Version
       @name, @descr, @rank, @offset = name, descr, rank, offset
     end
     
-    def pp
-      (offset.zero?)? descr : "#{descr} ##{offset}"
+    def pretty_string
+      (offset.zero?)? descr : "#{descr} #{offset}"
     end
 
     def <=> ( other )
@@ -342,14 +342,14 @@ class VersionTest < Test::Unit::TestCase
     assert_equal `1.0_alpha2`, `1.0_alpha1`.alpha_release
   end
 
-  def test_pp
-    assert_equal 'Revision #462: 0.1', `0.1_r462`.pp
-    assert_equal 'Official Release: 0.1', @a.pp
-    assert_equal 'Official Release: 2.0', @b.pp
-    assert_equal 'Official Release: 0.0', @c.pp
-    assert_equal 'Alpha Release: 0.1', @a_alpha.pp
-    assert_equal 'Official Release Patch Level #3: 2.0', @b_p3.pp
-    assert_equal 'Pre Release #4: 1.2 bar', `dev-util/foo-1.2_pre4#bar`.pp
+  def test_pretty_version
+    assert_equal 'Revision 462: 0.1', `0.1_r462`.pretty_version
+    assert_equal 'Official Release: 0.1', @a.pretty_version
+    assert_equal 'Official Release: 2.0', @b.pretty_version
+    assert_equal 'Official Release: 0.0', @c.pretty_version
+    assert_equal 'Alpha Release: 0.1', @a_alpha.pretty_version
+    assert_equal 'Official Release Patch Level 3: 2.0', @b_p3.pretty_version
+    assert_equal 'Pre Release 4: 1.2 bar', `dev-util/foo-1.2_pre4#bar`.pretty_version
   end
 
   def test_to_s

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: core_ex
 version: !ruby/object:Gem::Version 
-  version: 0.5.1.1
-date: 2006-02-24 00:00:00 +01:00
+  version: 0.5.5.0
+date: 2006-02-26 00:00:00 +01:00
 summary: CoreEx is a proposal for a standard library extension.
 require_paths: 
 - lib
@@ -51,6 +51,7 @@ files:
 - lib/core_ex/require.rb
 - lib/core_ex/exception.rb
 - lib/core_ex/enumerable.rb
+- lib/core_ex/version.rb
 - lib/core_ex/pathname.rb
 - lib/core_ex/proc.rb
 - lib/core_ex/module/attr_once.rb