Changeset 4958

Timestamp:

01/19/08 19:46:30 (5 years ago)

Author:

cho45

Message:

lang/ruby/shipit/trunk/Rakefile,
lang/ruby/shipit/trunk/lib/shipit.rb,
lang/ruby/shipit/trunk/README:

Implement checking VERS constant to avoid trap.

Location:

lang/ruby/shipit/trunk

Files:

• README (modified) (1 diff)
• Rakefile (modified) (1 diff)
• lib/shipit.rb (modified) (3 diffs)

lang/ruby/shipit/trunk/README

@@ -55 +55 @@
 
 * NAME -> name of the library.
+* DESCRIPTION -> description of the library
+* VERS -> version of the library
           This is MUST reference to version string of ChangeVersion step, or
           the package task will fail and RubyForge step release wrong version.
-* DESCRIPTION -> description of the library
-* VERS -> version of the library
 
 If you use different constants, please assign the value to above constants.

lang/ruby/shipit/trunk/Rakefile

@@ -117 +117 @@
                 system("svn", "up")
         }.and {}
+        s.Step.new {
+                raise "changelog-with-hatenastar.rb is not found" unless system("which", "changelog-with-hatenastar.rb")
+        }.and {
+                system("changelog-with-hatenastar.rb > ChangeLog")
+        }
         s.Task :rubyforge
-        s.Step.new {
-                raise "svn2cl.sh is not found" unless `svn2cl.sh --version`[/svn2cl.sh/]
-        }.and {
-                system("svn2cl.sh --break-before-msg=2 --group-by-day  --include-rev --separate-daylogs")
-        }
-        s.ChangeVersion __FILE__, "VERS"
+        s.ChangeVersion "Rakefile", "VERS"
         s.Commit
         s.Task :clean, :package

lang/ruby/shipit/trunk/lib/shipit.rb

@@ -3 +3 @@
 require "rake/tasklib"
 require "term/ansicolor"
+require "fileutils"
 
 class Rake::ShipitTask < Rake::TaskLib
@@ -130 +131 @@
                 @match    = @content.match(/#{@name}\s*=\s*['"](\d+\.\d+\.\d+)['"]/)
                 @new_version = @match[1].succ
+                @newcont  = @content[0..@match.begin(1)-1] + @new_version + @content[@match.end(1)..-1]
                 raise "Can't find version string in #{@file}." if @match.nil?
                 puts "Find version string #{@match[1]} and will change to #{@new_version}"
+
+                # check content of Rakefile
+                @org = @file.parent + "#{@file.basename}.org"
+                FileUtils.cp @file, @org
+                @file.open("w") do |f|
+                        f.print @newcont
+                end
+                m = Module.new
+                m.module_eval(File.read("Rakefile"))
+
+                FileUtils.mv @org, @file
+                raise "Constant VERS in Rakefile must be same as 3rd argument of ChangeVersion step." unless @vers == m.const_get(:VERS)
+
                 @vers.replace @new_version
         end
@@ -138 +153 @@
                 puts "Changing version to #{@new_version}"
                 @file.open("w") do |f|
-                        f.print @content[0..@match.begin(1)-1]
-                        f.print @new_version
-                        f.print @content[@match.end(1)..-1]
+                        f.print @newcont
                 end
         end