confgit 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/confgit/repo.rb

@@ -247,9 +247,16 @@ class Repo
 	# ファイルの hash値を求める
 	def hash_object(file)
 		path = File.expand_path(file)
-		open("| git hash-object \"#{path}\"") {|f|
-			return f.gets.chomp
-		}
+
+		if File.symlink?(path)
+			mode = '120000'
+			hash = `readlink "#{path}" | git hash-object --stdin`.chomp
+		else
+			mode = File.executable?(path) ? '100755' : '100644'
+			hash = `git hash-object "#{path}"`.chomp
+		end
+
+		"#{mode} #{hash}"
 	end
 
 	# 確認プロンプトを表示する
@@ -270,21 +277,42 @@ class Repo
 		y
 	end
 
+	# ファイルが存在するか？（シンボリックリンクの場合も対象にする）
+	def file_exist?(path)
+		File.exist?(path) || File.symlink?(path)
+	end
+
+	# ファイルがディレクトリか？（シンボリックリンクの場合は対象外）
+	def file_directory?(path)
+		File.directory?(path) && ! File.symlink?(path)
+	end
+
+	# ファイルが書込み可能か？（シンボリックリンクの場合はわからないのでとりあえず true を返す）
+	def file_writable_real?(path)
+		return true if File.symlink?(path)
+		return File.writable_real?(File.dirname(path)) unless File.exist?(path)
+
+		File.writable_real?(path)
+	end
+
 	# ファイルのコピー（属性は維持する）
 	def filecopy(from, to, exiting = false)
 		begin
 			to_dir = File.dirname(to)
 			FileUtils.mkpath(to_dir)
 
-			if File.exist?(to) && ! File.writable_real?(to)
+			if File.symlink?(to)
+				# シンボリックリンクの場合は削除する
+				File.unlink(to)
+			elsif File.exist?(to) && ! File.writable_real?(to)
 				# 書込みできない場合は削除を試みる
 				File.unlink(to)
 			end
 
 			FileUtils.copy_entry(from, to)
-			stat = File.stat(from)
 
-			unless File.symlink?(to)
+			unless File.symlink?(from) || File.symlink?(to)
+				stat = File.stat(from)
 				File.utime(stat.atime, stat.mtime, to)
 				File.chmod(stat.mode, to)
 			end
@@ -327,7 +355,7 @@ class Repo
 
 #					file = line.chomp
 					next if /^\.git/ =~ file
-					next if File.directory?(file)
+					next if file_directory?(file)
 
 					yield(file, hash)
 				end
@@ -386,7 +414,7 @@ class Repo
 
 	# ファイルの更新チェック
 	def modfile?(from, to)
-		! File.exist?(to) || hash_object(from) != hash_object(to)
+		! file_exist?(to) || hash_object(from) != hash_object(to)
 	end
 
 	# ファイル属性を文字列にする
@@ -481,7 +509,7 @@ class Repo
 				next
 			end
 
-			if File.directory?(path) && ! File.symlink?(path)
+			if file_directory?(path)
 				dir_each(path) { |file|
 					next if File.directory?(file)
 	
@@ -522,12 +550,12 @@ class Repo
 	# バックアップする
 	def confgit_backup(options, *args)
 		git_each(*args) { |file, hash|
-			next if File.directory?(file)
+			next if file_directory?(file)
 
 			from = File.join(root, file)
 			to = File.join(@repo_path, file)
 
-			unless File.exist?(from)
+			unless file_exist?(from)
 				with_color(:fg_red) { print "[?] #{file}" }
 				puts
 				next
@@ -554,19 +582,19 @@ class Repo
 	# リストアする
 	def confgit_restore(options, *args)
 		git_each(*args) { |file, hash|
-			next if File.directory?(file)
+			next if file_directory?(file)
 
 			from = File.join(@repo_path, file)
 			to = File.join(root, file)
 
-			unless File.exist?(from)
+			unless file_exist?(from)
 				with_color(:fg_red) { print "[?] #{file}" }
 				puts
 				next
 			end
 
 			if options[:force] || modfile?(from, to)
-				color = File.writable_real?(to) ? :fg_blue : :fg_magenta
+				color = file_writable_real?(to) ? :fg_blue : :fg_magenta
 				with_color(color) { print "<-- #{file}" }
 				write = options[:yes]
 
@@ -585,12 +613,16 @@ class Repo
 	# 一覧表示する
 	def confgit_list(options, *args)
 		git_each(*args) { |file, hash|
-			next if File.directory?(file)
+			next if file_directory?(file)
 
 			from = File.join(root, file)
 			to = File.join(@repo_path, file)
 
-			if File.exist?(from)
+			if File.symlink?(from)
+				mode = options[:octal] ? '120000' : 'l---------'
+				user = '-'
+				group = '-'
+			elsif File.exist?(from)
 				stat = File.stat(from)
 				mode = options[:octal] ? stat.mode.to_s(8) : mode2str(stat.mode)
 				user = Etc.getpwuid(stat.uid).name

data/spec/confgit_spec.rb

@@ -305,13 +305,28 @@ describe Confgit do
 
 	describe "backup" do
 		before do
+			dir = 'misc'
 			@mod_file = 'VERSION'
 			@data = '0.0.1'
+			@symlinks = {'dir_link' => dir, 'file_link' => 'VERSION', 'mod_link' => ['README', 'LICENSE.txt']}
 
-			chroot(@mod_file, 'README', 'LICENSE.txt') { |root, *files|
-				confgit 'add', *files
+			chroot(@mod_file, 'README', 'LICENSE.txt', File.join(dir, 'README')) { |root, *files|
+				@symlinks.each { |key, value|
+					file, = value
+					File.symlink(file, key)
+				}
+
+				confgit 'add', *(files + @symlinks.keys)
 				capture_io { confgit 'commit', '-m', "add #{files}" }
 				open(@mod_file, 'w') { |f| f.puts @data }
+
+				@symlinks.each { |key, value|
+					old, file = value
+					next unless file
+
+					File.delete(key)
+					File.symlink(file, key)
+				}
 			}
 		end
 
@@ -319,6 +334,7 @@ describe Confgit do
 			chroot { |root, *files|
 				proc { confgit 'backup', '-n' }.must_output <<-EOD.cut_indent
 					\e[34m--> #{@mod_file}\e[m
+					\e[34m--> mod_link\e[m
 					# On branch master
 					nothing to commit (working directory clean)
 				EOD
@@ -329,12 +345,14 @@ describe Confgit do
 			chroot { |root, *files|
 				proc { confgit 'backup', '-y' }.must_output <<-EOD.cut_indent
 					\e[34m--> VERSION\e[m
+					\e[34m--> mod_link\e[m
 					# On branch master
 					# Changes not staged for commit:
 					#   (use "git add <file>..." to update what will be committed)
 					#   (use "git checkout -- <file>..." to discard changes in working directory)
 					#
 					#	modified:   #{@mod_file}
+					#	modified:   mod_link
 					#
 					no changes added to commit (use "git add" and/or "git commit -a")
 				EOD
@@ -349,6 +367,10 @@ describe Confgit do
 					\e[34m--> LICENSE.txt\e[m
 					\e[34m--> README\e[m
 					\e[31m[?] #{@mod_file}\e[m
+					\e[34m--> dir_link\e[m
+					\e[34m--> file_link\e[m
+					\e[34m--> misc/README\e[m
+					\e[34m--> mod_link\e[m
 					# On branch master
 					nothing to commit (working directory clean)
 				EOD
@@ -357,23 +379,46 @@ describe Confgit do
 	end
 
 	describe "restore" do
+		def udpate_data
+			open(@mod_file, 'w') { |f| f.puts @data }
+			File.delete @del_file
+
+			@symlinks.each { |key, value|
+				old, file = value
+				next unless file
+
+				File.delete(key)
+				File.symlink(file, key)
+			}
+		end
+
 		before do
+			dir = 'misc'
 			@mod_file = 'VERSION'
+			@del_file = 'LICENSE.txt'
 			@data = '0.0.1'
+			@symlinks = {'dir_link' => dir, 'file_link' => 'VERSION', 'mod_link' => ['README', 'LICENSE.txt']}
 
-			chroot(@mod_file, 'README', 'LICENSE.txt') { |root, *files|
-				confgit 'add', *files
+			chroot(@mod_file, @del_file, 'README', File.join(dir, 'README')) { |root, *files|
+				@symlinks.each { |key, value|
+					file, = value
+					File.symlink(file, key)
+				}
+
+				confgit 'add', *(files + @symlinks.keys)
 				capture_io { confgit 'commit', '-m', "add #{files}" }
 			}
 		end
 
 		it "restore -n" do
 			chroot { |root, *files|
-				open(@mod_file, 'w') { |f| f.puts @data }
+				udpate_data
 
 				modfile(@mod_file) { |prev|
 					proc { confgit 'restore', '-n' }.must_output <<-EOD.cut_indent
+						\e[34m<-- #{@del_file}\e[m
 						\e[34m<-- #{@mod_file}\e[m
+						\e[34m<-- mod_link\e[m
 					EOD
 					open(@mod_file).read.must_equal prev
 				}
@@ -383,10 +428,12 @@ describe Confgit do
 		it "restore -y" do
 			chroot { |root, *files|
 				modfile(@mod_file) { |prev|
-					open(@mod_file, 'w') { |f| f.puts @data }
+					udpate_data
 
 					proc { confgit 'restore', '-y' }.must_output <<-EOD.cut_indent
+						\e[34m<-- #{@del_file}\e[m
 						\e[34m<-- #{@mod_file}\e[m
+						\e[34m<-- mod_link\e[m
 					EOD
 					open(@mod_file).read.must_equal prev
 				}
@@ -395,12 +442,16 @@ describe Confgit do
 
 		it "restore -fn" do
 			chroot { |root, *files|
-				File.delete @mod_file
+				udpate_data
 
 				proc { confgit 'restore', '-fn' }.must_output <<-EOD.cut_indent
-					\e[34m<-- LICENSE.txt\e[m
+					\e[34m<-- #{@del_file}\e[m
 					\e[34m<-- README\e[m
-					\e[35m<-- #{@mod_file}\e[m
+					\e[34m<-- #{@mod_file}\e[m
+					\e[34m<-- dir_link\e[m
+					\e[34m<-- file_link\e[m
+					\e[34m<-- misc/README\e[m
+					\e[34m<-- mod_link\e[m
 				EOD
 			}
 		end
@@ -424,8 +475,16 @@ describe Confgit do
 
 	describe "list" do
 		before do
-			chroot('VERSION', 'README', 'LICENSE.txt') { |root, *files|
-				confgit 'add', *files
+			dir = 'misc'
+			symlinks = {'dir_link' => dir, 'file_link' => 'VERSION', 'mod_link' => ['README', 'LICENSE.txt']}
+
+			chroot('VERSION', 'README', 'LICENSE.txt', File.join(dir, 'README')) { |root, *files|
+				symlinks.each { |key, value|
+					file, = value
+					File.symlink(file, key)
+				}
+
+				confgit 'add', *(files + symlinks.keys)
 				capture_io { confgit 'commit', '-m', "add #{files}" }
 			}
 		end
@@ -437,6 +496,10 @@ describe Confgit do
 					-rw-r--r--	.+	.+	#{root}/LICENSE\.txt
 					-rw-r--r--	.+	.+	#{root}/README
 					-rw-r--r--	.+	.+	#{root}/VERSION
+					l---------	.+	.+	#{root}/dir_link
+					l---------	.+	.+	#{root}/file_link
+					-rw-r--r--	.+	.+	#{root}/misc/README
+					l---------	.+	.+	#{root}/mod_link
 				EOD
 			}
 		end
@@ -448,6 +511,10 @@ describe Confgit do
 					100644	.+	.+	#{root}/LICENSE\.txt
 					100644	.+	.+	#{root}/README
 					100644	.+	.+	#{root}/VERSION
+					120000	.+	.+	#{root}/dir_link
+					120000	.+	.+	#{root}/file_link
+					100644	.+	.+	#{root}/misc/README
+					120000	.+	.+	#{root}/mod_link
 				EOD
 			}
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confgit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -106,7 +106,7 @@ homepage: https://github.com/gnue/confgit
 licenses: []
 post_install_message: ! "\n    ==================\n    This software requires 'git'.\n
   \   Also optional softwares 'tree' and 'tig'.\n\n    If you are using the bash-completion\n\n
-  \     $ cp `gem env gemdir`/gems/confgit-0.0.4/etc/bash_completion.d/confgit $BASH_COMPLETION_DIR\n\n
+  \     $ cp `gem env gemdir`/gems/confgit-0.0.5/etc/bash_completion.d/confgit $BASH_COMPLETION_DIR\n\n
   \   ==================\n  "
 rdoc_options: []
 require_paths: