shipit 0.0.6 → 0.0.7

data/ChangeLog

@@ -1,4 +1,16 @@
-ChangeLog of http://svn.coderepos.org/share/lang/ruby/shipit/trunk
+2008-06-14  cho45
+
+	* [new]:
+		Supported git.
+
+	* [release]:
+		Release 0.0.7
+
+2008-01-29  cho45
+
+	* [release]:
+		Release 0.0.6
+
 
 2008-01-19 cho45
 
@@ -11,8 +23,6 @@ ChangeLog of http://svn.coderepos.org/share/lang/ruby/shipit/trunk
 	* [bug][interface] @4959:
 		Remove 3rd argument of Step::ChangeVersion because it is meaningless.
 		Fix bug around checking vers on Step::ChangeVersion.
-		
-		
 
 	* [new] @4958:
 		Implement checking VERS constant to avoid trap.

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.6"
+VERS              = "0.0.7"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -116,11 +116,6 @@ Rake::ShipitTask.new do |s|
 	s.Step.new {
 		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.ChangeVersion "Rakefile", "VERS"
 	s.Commit

data/lib/shipit/vc.rb

@@ -0,0 +1,135 @@
+#!/usr/bin/env ruby
+
+
+require "shipit"
+require "tempfile"
+
+module Rake::ShipitTask::VC
+	def self.new
+		constants.map {|c| const_get(c) }.find {|c|
+			c.accept?
+		}.new
+	end
+
+	class Git
+		def self.accept?
+			File.exist? ".git"
+		end
+
+		def commit(msg)
+			temp = Tempfile.open("COMMIT_MESSAGE")
+			temp << msg
+			temp.close
+
+			system "git", "commit", "-a", "-F", temp.path
+		end
+
+		def precommit
+			unknown = `git ls-files -z --others --exclude-per-directory=.gitignore --exclude-from=.git/info/exclude`
+			if unknown.gsub!(/\0/, "\n")
+				raise unknown
+			end
+		end
+
+		def exists_tagged_version(ver)
+			!`git tag -l #{ver}`.empty?
+		end
+
+
+		def tag_version(ver, msg=nil)
+			msg = "Tagging version #{ver}." unless msg
+
+			temp = Tempfile.open("COMMIT_MESSAGE")
+			temp << msg
+			temp.close
+
+			tag = ver
+
+			system "git", "tag", "-a", "-F", temp.path, tag
+		end
+
+		def local_diff(file)
+			`git diff --no-color HEAD '#{file}'`
+		end
+
+		def are_local_diffs(ver)
+			`git diff --no-color #{ver}`.match(/\S/)
+		end
+	end
+
+	class SVN
+		def self.accept?
+			File.exist? ".svn"
+		end
+
+		def commit(msg)
+			temp = Tempfile.open("svn-commit")
+			temp << msg
+			temp.close
+
+			system "svn", "ci", "--file", temp.path
+		end
+
+		def precommit
+			unknown = []
+			changes = false
+			`svn st`.split(/\n/).each do |l|
+				changes = true
+				next unless l =~ /^\?/
+				unknown << l
+			end
+
+			unless unknown.empty?
+				raise unknown.join("\n")
+			end
+
+			unless changes
+				warn "No locally changed files. skipping commit"
+				return
+			end
+		end
+
+		def exists_tagged_version(ver)
+			!!`svn info '#{tag_url(ver)}'`[/Node Kind: directory/]
+		end
+
+		def tag_version(ver, msg)
+			temp = Tempfile.open("svn-commit")
+			temp << msg
+			temp.close
+
+			system 'svn', 'copy', '--file', temp.path, trunk_url.to_s, tag_url(ver).to_s
+		end
+
+		def local_diff(file)
+			`svn diff #{file}`
+		end
+
+		def are_local_diffs(ver)
+			`svn diff`.match(/\S/)
+		end
+
+		private
+		def tag_url(ver)
+			require "uri"
+			ENV["LANG"] = "C"
+			url = `svn info`[/^URL: (.+)/, 1]
+			@url = trunk_url + "."
+			unless `svn info '#{(@url + "tags")}'`[/Node Kind: directory/]
+				raise "tags directory is not found"
+			end
+			@url + "tags/#{ver}"
+		end
+
+		def trunk_url
+			url = `svn info`[/^URL: (.+)/, 1]
+			if url =~ /trunk$/
+				URI(url)
+			else
+				raise "Run at trunk! Here is #{url}"
+			end
+		end
+	end
+end
+
+

data/lib/shipit.rb

@@ -1,3 +1,6 @@
+
+$LOAD_PATH.unshift "lib"
+
 require "rubygems"
 require "rake"
 require "rake/tasklib"
@@ -5,6 +8,8 @@ require "term/ansicolor"
 require "fileutils"
 
 class Rake::ShipitTask < Rake::TaskLib
+	require "shipit/vc"
+
 	attr_reader :name
 	attr_reader :steps
 
@@ -172,17 +177,13 @@ class Rake::ShipitTask::Step::Commit
 	end
 
 	def prepare
+		@vc = Rake::ShipitTask::VC.new
 		@vers = VERS
-		st = `svn st`
-		unless st.empty?
-			puts "Any changes remain?"
-			puts st
-			exit
-		end
+		@vc.precommit
 	end
 
 	def run
-		system "svn", "ci", "-m", @msg || "Release #{@vers}"
+		@vc.commit(@msg || "Release #{@vers}")
 	end
 end
 
@@ -192,26 +193,16 @@ class Rake::ShipitTask::Step::Tag
 	end
 
 	def prepare
-		require "uri"
-		ENV["LANG"] = "C"
-		url = `svn info`[/^URL: (.+)/, 1]
-		if url =~ /trunk$/
-			@url = URI(url) + "."
-			unless `svn info '#{(@url + "tags")}'`[/Node Kind: directory/]
-				raise "tags directory is not found"
-			end
-		else
-			raise "Run at trunk! Here is #{url}"
-		end
+		@vc = Rake::ShipitTask::VC.new
 		@vers = VERS
+		@msg  = "Release %s" % @vers
+		if @vc.exists_tagged_version(@vers)
+			raise "#{@tag} is already exists"
+		end
 	end
 
 	def run
-		trunk = @url + "trunk"
-		tag   = @url + ("tags/#{@format}" % @vers)
-		msg   = "Release %s" % @vers
-		command = ["svn", "cp", "-m", msg, trunk, tag].map {|i| i.to_s }
-		system(*command)
+		@vc.tag_version(@vers, @msg)
 	end
 end
 
@@ -247,6 +238,7 @@ class Rake::ShipitTask::Step::RubyForge
 	def prepare
 		require 'rubyforge'
 		@rf = RubyForge.new
+		@rf.configure {}
 		puts "Logging in"
 		@rf.login
 		@c = @rf.userconfig

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shipit
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - cho45
@@ -9,7 +9,7 @@ autorequire: shipit
 bindir: bin
 cert_chain: []
 
-date: 2008-01-29 00:00:00 +09:00
+date: 2008-06-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,9 +43,11 @@ files:
 - README
 - ChangeLog
 - Rakefile
-- test/shipit_test.rb
 - test/test_helper.rb
+- test/shipit_test.rb
 - lib/shipit.rb
+- lib/shipit
+- lib/shipit/vc.rb
 has_rdoc: true
 homepage: http://lowreal.rubyforge.org
 post_install_message: 
@@ -79,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lowreal
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Automated release tasks.