shipit 0.0.1 → 0.0.3

data/ChangeLog

@@ -1,5 +1,64 @@
 2008-01-05  cho45
 
+	* [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:
 	  
 	  引数間違い

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.1"
+VERS              = "0.0.3"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -122,7 +122,7 @@ Rake::ShipitTask.new do |s|
 	}.and {
 		system("svn2cl.sh --break-before-msg=2 --group-by-day  --include-rev --separate-daylogs")
 	}
-	s.ChangeVersion
+	s.ChangeVersion __FILE__, "VERS"
 	s.Commit
 	s.Task :clean, :package
 	s.RubyForge

data/lib/shipit.rb

@@ -81,16 +81,20 @@ class Rake::ShipitTask::Step::Twitter
 		})
 		@client = Twitter::Client.new(@config)
 		raise "Twitter::Client auth failed" unless @client.authenticate?(@config["login"], @config["password"])
+
+		@description = DESCRIPTION
+		@name        = NAME
+		@vers        = VERS
 	end
 
 	def run
-		@msg ||= "Released #{NAME} #{VERS} (#{DESCRIPTION})"
+		@msg ||= "Released %s %s (%s)" % [@name, @vers, @description]
 		@client.status(:post, @msg)
 	end
 end
 
 class Rake::ShipitTask::Step::ChangeVersion
-	def initialize(file="Rakefile", name="VERS", vers=VERS)
+	def initialize(file, name="VERSION", vers=VERS)
 		@file = file
 		@name = name
 		@vers = vers
@@ -98,17 +102,18 @@ class Rake::ShipitTask::Step::ChangeVersion
 
 	def prepare
 		require "pathname"
-		@rakefile = Pathname.new(@file)
-		@content  = @rakefile.read
-		@match    = @content.match(/#{@name}\s*=\s*"(\d+\.\d+\.\d+)"/)
+		@file     = Pathname.new(@file)
+		@content  = @file.read
+		@match    = @content.match(/#{@name}\s*=\s*['"](\d+\.\d+\.\d+)['"]/)
 		@new_version = @match[1].succ
-		raise "Can't find version string in Rakefile." if @match.nil?
+		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
 	end
 
 	def run
 		puts "Changing version to #{@new_version}"
-		@vers.replace @new_version
-		@rakefile.open("w") do |f|
+		@file.open("w") do |f|
 			f.print @content[0..@match.begin(1)-1]
 			f.print @new_version
 			f.print @content[@match.end(1)..-1]
@@ -122,10 +127,17 @@ class Rake::ShipitTask::Step::Commit
 	end
 
 	def prepare
+		@vers = VERS
+		st = `svn st`
+		unless st.empty?
+			puts "Any changes remain?"
+			puts st
+			exit
+		end
 	end
 
 	def run
-		system "svn", "ci", "-m", @msg || "Release #{VERS}"
+		system "svn", "ci", "-m", @msg || "Release #{@vers}"
 	end
 end
 
@@ -136,52 +148,53 @@ class Rake::ShipitTask::Step::Task
 	end
 
 	def prepare
-		@names.each do |name|
-			@tasks << Rake.application[name.to_sym]
-			raise "Unknown task: #{name}" if @tasks.last.nil?
+		tasks = `rake -T`.scan(/^rake ([^\s]+)/).flatten
+		@names.each do |t|
+			raise "Unknown task #{t}" unless tasks.include? t.to_s
 		end
 	end
 
 	def run
-		@tasks.each do |t|
-			t.invoke
+		@names.each do |t|
+			system("rake", t.to_s)
 		end
 	end
 end
 
 class Rake::ShipitTask::Step::RubyForge
 	def initialize(group_id=RUBYFORGE_PROJECT)
-		@group_id = group_id
+		@group_id    = group_id
+		@description = DESCRIPTION
+		@name        = NAME
+		@vers        = VERS
 	end
 
 	def prepare
 		require 'rubyforge'
-		pkg = "pkg/#{NAME}-#{VERS}"
-		puts "pkg"
+		p @vers
 
 		@rf = RubyForge.new
 		puts "Logging in"
 		@rf.login
 		@c = @rf.userconfig
 		@c["preformatted"] = true
-		@files = [
-			"#{pkg}.tgz",
-			"#{pkg}.gem"
-		].compact
 		unless @rf.autoconfig["group_ids"].keys.include?(@group_id)
 			raise "Unknown group: #{@group_id}"
 		end
-		unless @rf.autoconfig["package_ids"].keys.include?(NAME)
-			@rf.create_package(@group_id, NAME)
+		unless @rf.autoconfig["package_ids"].keys.include?(@name)
+			@rf.create_package(@group_id, @name)
 		end
-
-		@description = DESCRIPTION
 	end
 
 	def run
-		puts "Releasing #{NAME} #{VERS}"
-		@rf.add_release @group_id, NAME, VERS, *@files
-		@rf.post_news @group_id, "#{NAME} #{VERS} released.", "#{@description}"
+		pkg = "pkg/#{@name}-#{@vers}"
+		@files = [
+			"#{pkg}.tgz",
+			"#{pkg}.gem"
+		].compact
+		puts "Releasing #{@name} #{@vers}"
+		@rf.add_release @group_id, @name, @vers, *@files
+		@rf.post_news @group_id, "#{@name} #{@vers} released.", "#{@description}"
 	end
 end
 
@@ -209,41 +222,15 @@ class Rake::ShipitTask::Step::Tag
 		else
 			raise "Run at trunk!"
 		end
+		@vers = VERS
 	end
 
 	def run
 		trunk = @url + "trunk"
-		tag   = @url + ("tags/#{@format}" % VERS)
-		command = ["svn", "cp", trunk, tag].map {|i| i.to_s }
+		tag   = @url + ("tags/#{@format}" % @vers)
+		msg   = "Release %s" % @vers
+		command = ["svn", "cp", "-m", msg, trunk, tag].map {|i| i.to_s }
 		system(*command)
 	end
 end
 
-
-__END__
-require "shipit"
-
-Rake::ShipitTask.new do |s|
-	s.Ask
-	s.Step.new {
-		puts "prepare phase"
-	}.and {
-		puts "run phase"
-	}
-	s.Twitter "Test phase"
-end
-
-Rake::ShipitTask.new do |s|
-	s.Ask
-	s.Task :test
-	s.ChangeVersion
-	s.Commit
-	s.Task :clean, :package
-	s.RubyForge
-	s.Step.new {
-
-	}.and {
-	}
-	s.Twitter
-end
-

metadata

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