shipit 0.0.4 → 0.0.5

data/ChangeLog

@@ -1,140 +1,63 @@
-2008-01-06  cho45
+ChangeLog of http://svn.coderepos.org/share/lang/ruby/shipit/trunk
 
-	* [r4147] lib/shipit.rb:
-	  
-	  Ask after show all steps.
+2008-01-19 cho45
 
-	* [r4146] Rakefile:
-	  
-	  Remove skip from Rakefile... This was only for debugging...
+	* [bug][interface] @4959:
+		Remove 3rd argument of Step::ChangeVersion because it is meaningless.
+		Fix bug around checking vers on Step::ChangeVersion.
+		
+		
 
-	* [r4141] README:
-	  
-	  follow removing Step::Ask
+	* [new] @4958:
+		Implement checking VERS constant to avoid trap.
 
-	* [r4140] Rakefile, lib/shipit.rb:
-	  
-	  Remove Step::Ask (is now default)
-	  Add Step::Skip (is skip preceding steps)
+2008-01-07 cho45
 
-	* [r4139] lib/shipit.rb:
-	  
-	  implement state shared with steps.
-	  change spec of arguments of initialize
-
-	* [r4138] README:
-	  
-	  change license to Ruby's
-	  fix checkout uri
-
-	* [r4136] README:
-	  
-	  append development notices to README
-
-	* [r4110] lib/shipit.rb:
-	  
-	  better message
-
-	* [r4105] lib/shipit.rb:
-	  
-	  unexpected return がうざいのでちゃんと条件分岐する
-
-	* [r4104] lib/shipit.rb:
-	  
-	  prepare タスクだけを実行できるように
-	  (Perl の shipit コマンドから shipit gem のタスクをたたきやすいように)
-
-	* [r4101] lib/shipit.rb:
-	  
-	  デバッグコードが残っていた
-
-	* [r4100] Rakefile, lib/shipit.rb:
-	  
-	  term-ansicolor 使ってみやすくなるように
-
-	* [r4099] Rakefile:
-	  
-	  出力がうざいので判定方法を変更
-
-2008-01-05  cho45
-
-	* [r4078] README:
-	  
-	  README のサンプルを更新 (ChangeVersion を変更した)
-
-	* [r4076] ChangeLog, Rakefile:
-	  
-	  Release 0.0.3
-
-	* [r4075] lib/shipit.rb:
-	  
-	  タスクの実行を内部でやらないように (version をよみなおすため)
-	  いろいろやってみたけどこれがいちばん簡単なようだ……
-
-	* [r4073] lib/shipit.rb:
-	  
-	  version のかきかえがうまくいかず、重複してリリースできない問題を修正
-
-	* [r4071] lib/shipit.rb:
-	  
-	  変更が残っている場合にはリリースコミットをできないように
-
-	* [r4070] lib/shipit.rb:
-	  
-	  定数参照の修正漏れ
-
-	* [r4069] lib/shipit.rb:
-	  
-	  run phase 時にエラーがでないように定数参照は prepare 時にするように
-
-	* [r4068] Rakefile, lib/shipit.rb:
-	  
-	  ChangeVersion の仕様をよくあるほうに変更
-	  s.ChangeVersion filename, "VERSION"
-
-	* [r4054] lib/shipit.rb:
-	  
-	  tag のとき -m 追加 (エディタがひらいてしまっていた)
-
-	* [r4052] ChangeLog, Rakefile:
-	  
-	  Release 0.0.2
-
-	* [r4051] ., README:
-	  
-	  svn:ignore の設定と README のサンプルを Rakefile に追従
-
-	* [r4050] README, Rakefile, lib/shipit.rb:
-	  
-	  Step::Tag を追加
-
-	* [r4048] README:
-	  
-	  README を更新
-
-	* [r4047] lib/shipit.rb:
-	  
-	  前回のコミットと同じ問題
-
-	* [r4046] lib/shipit.rb:
-	  
-	  initialize が走るときにはまだVERSは変更されていないので
-	  コミットメッセージが矛盾してしまう
-
-	* [r4045] ChangeLog, Rakefile:
-	  
-	  Release 0.0.0
-
-	* [r4044] Rakefile:
-	  
-	  引数間違い
-
-	* [r4043] README, Rakefile, lib/shipit.rb:
-	  
-	  description とか
-
-	* [r4042] ., ChangeLog, README, Rakefile, lib, lib/shipit.rb, test,
-	  test/shipit_test.rb, test/test_helper.rb:
-	  
-	  import
+	* [interface] @4185:
+		remove dryrun implemented by $SAFE because it is not useful.
+
+	* [interface] @4183:
+		use namespace
+		try to implement dryrun (this is just run on high $SAFE environment)
+
+2008-01-06 cho45
+
+	* [release] @4149:
+		Release 0.0.4
+
+	* [interface] @4140:
+		Remove Step::Ask (is now default)
+		Add Step::Skip (is skip preceding steps)
+
+	* [new] @4139:
+		implement state shared with steps.
+		change spec of arguments of initialize
+
+2008-01-05 cho45
+
+	* [release] @4077:
+		Release 0.0.3
+
+	* [bug] @4075:
+		タスクの実行を内部でやらないように (version をよみなおすため)
+		いろいろやってみたけどこれがいちばん簡単なようだ……
+		([important] Fix bugs around treating VERS.)
+
+	* [bug] @4069:
+		run phase 時にエラーがでないように定数参照は prepare 時にするように
+
+	* [interface] @4068:
+		ChangeVersion の仕様をよくあるほうに変更
+		s.ChangeVersion filename, "VERSION"
+
+	* [release] @4052:
+		Release 0.0.2
+
+	* [bug] @4046:
+		initialize が走るときにはまだVERSは変更されていないので
+		コミットメッセージが矛盾してしまう
+		(Fix discrepancy of commit message in shipit step.)
+
+	* [release] @4045:
+		Release 0.0.0
 

data/README

@@ -53,9 +53,11 @@ See more example at Rakefile[http://svn.coderepos.org/share/lang/ruby/shipit/tru
 
 Some constants are currently hard-coded.
 
-* NAME -> name of the library
+* 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.
 
 If you use different constants, please assign the value to above constants.
 

data/Rakefile

@@ -19,7 +19,7 @@ DESCRIPTION       = "Automated release tasks."
 RUBYFORGE_PROJECT = "lowreal"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.0.4"
+VERS              = "0.0.5"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -116,13 +116,13 @@ Rake::ShipitTask.new do |s|
 	s.Step.new {
 		system("svn", "up")
 	}.and {}
-	s.Task :rubyforge
 	s.Step.new {
-		raise "svn2cl.sh is not found" unless `svn2cl.sh --version`[/svn2cl.sh/]
+		raise "changelog-with-hatenastar.rb is not found" unless system("which", "changelog-with-hatenastar.rb")
 	}.and {
-		system("svn2cl.sh --break-before-msg=2 --group-by-day  --include-rev --separate-daylogs")
+		system("changelog-with-hatenastar.rb > ChangeLog")
 	}
-	s.ChangeVersion __FILE__, "VERS"
+	s.Task :rubyforge
+	s.ChangeVersion "Rakefile", "VERS"
 	s.Commit
 	s.Task :clean, :package
 	s.RubyForge

data/lib/shipit.rb

@@ -2,6 +2,7 @@ require "rubygems"
 require "rake"
 require "rake/tasklib"
 require "term/ansicolor"
+require "fileutils"
 
 class Rake::ShipitTask < Rake::TaskLib
 	attr_reader :name
@@ -40,7 +41,7 @@ class Rake::ShipitTask < Rake::TaskLib
 				s.prepare if s.respond_to? :prepare
 			end
 			puts green { "done." }
-			unless t.name =~ /_prepare$/
+			unless t.name =~ /:prepare$/
 				puts
 				puts green { "Steps: #{steps.map{|i| i.class.name.sub(/.+::/, "")}.join(", ")}" }
 				puts "Really run? Cancel to press Ctrl+C."
@@ -54,10 +55,12 @@ class Rake::ShipitTask < Rake::TaskLib
 		end
 		desc "Shipit: Automated Release"
 		task @name, &t
-		desc "Shipit: Automated Release (Only run prepare phase)"
-		task "#{@name}_prepare", &t
-		#desc "Shipit: Automated Release (dry run)"
-		#task "#{@name}_dryrun", &t
+		namespace @name do
+			desc "Shipit: Automated Release (Only run prepare phase)"
+			task :prepare, &t
+#			desc "Shipit: Automated Release (Dry run)"
+#			task :dryrun, &t
+		end
 	end
 end
 
@@ -115,10 +118,9 @@ class Rake::ShipitTask::Step::Twitter
 end
 
 class Rake::ShipitTask::Step::ChangeVersion
-	def initialize(step, file, name="VERSION", vers=VERS)
+	def initialize(step, file, name="VERSION")
 		@file = file
 		@name = name
-		@vers = vers
 	end
 
 	def prepare
@@ -127,17 +129,29 @@ class Rake::ShipitTask::Step::ChangeVersion
 		@content  = @file.read
 		@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}"
-		@vers.replace @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 @new_version == m.const_get(:VERS)
+
+		VERS.replace @new_version
 	end
 
 	def run
 		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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shipit
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - cho45
@@ -9,7 +9,7 @@ autorequire: shipit
 bindir: bin
 cert_chain: []
 
-date: 2008-01-07 00:00:00 +09:00
+date: 2008-01-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency