confgit 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/etc/tools/update_version.rb

@@ -1,5 +1,7 @@
 def update_version(path)
-	version = `git describe --tags --dirty`.chomp
+	version = `git describe --dirty 2>/dev/null`.chomp
+	version = `git describe --tags --dirty`.chomp if version.empty?
+	version[0, 1] = '' if version =~ /^v[0-9]/
 	version.gsub!(/-([a-z0-9]+(-dirty)?)$/) { |m| "(#{$1})" }
 
 	begin

data/lib/confgit/cli.rb

@@ -1,5 +1,4 @@
-# coding: UTF-8
-
+# -*- encoding: utf-8 -*-
 
 require 'optparse'
 require 'rubygems'
@@ -83,7 +82,7 @@ class CLI
 			OptionParser.new { |opts|
 				begin
 					opts.banner = banner(opts, command, *banner)
-					block.call(opts, argv, options)
+					instance_exec(opts, argv, options, &block)
 				rescue => e
 					abort e.to_s
 				end

data/lib/confgit/repo.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# -*- encoding: utf-8 -*-
 
 require 'fileutils'
 require 'pathname'
@@ -281,10 +281,13 @@ class Repo
 				File.unlink(to)
 			end
 
-			FileUtils.copy(from, to)
+			FileUtils.copy_entry(from, to)
 			stat = File.stat(from)
-			File.utime(stat.atime, stat.mtime, to)
-			File.chmod(stat.mode, to)
+
+			unless File.symlink?(to)
+				File.utime(stat.atime, stat.mtime, to)
+				File.chmod(stat.mode, to)
+			end
 
 			return true
 		rescue => e
@@ -478,23 +481,25 @@ class Repo
 				next
 			end
 
-			if File.directory?(path)
+			if File.directory?(path) && ! File.symlink?(path)
 				dir_each(path) { |file|
 					next if File.directory?(file)
 	
 					from = File.join(path, file)
-					to = File.join(repo, relative_path(from))
+					rel = relative_path(from)
+					to = File.join(repo, rel)
 
 					if filecopy(from, to)
-						git('add', to)
+						git('add', rel)
 					end
 				}
 			else
 				from = path
-				to = File.join(repo, relative_path(from))
+				rel = relative_path(from)
+				to = File.join(repo, rel)
 
 				if filecopy(from, to)
-					git('add', to)
+					git('add', rel)
 				end
 			end
 		}
@@ -508,7 +513,7 @@ class Repo
 		repo = File.realpath(@repo_path)
 
 		files = args.collect { |from|
-			File.join(repo, relative_path(expand_path(from)))
+			relative_path(expand_path(from))
 		}
 
 		git('rm', *(options + files), :interactive => false)

data/lib/confgit/version.rb

@@ -1,4 +1,4 @@
 module Confgit
 	LONG_VERSION = File.read(File.expand_path('../../../VERSION', __FILE__)).chomp
-	VERSION = LONG_VERSION.gsub(/-.*$/, '')
+	VERSION = LONG_VERSION.gsub(/(-.*|\(.*)$/, '')
 end

data/lib/confgit/with_color.rb

@@ -1,4 +1,4 @@
-# coding: UTF-8
+# -*- encoding: utf-8 -*-
 
 module Confgit
 

data/spec/confgit_spec.rb

@@ -1,10 +1,24 @@
-# coding: UTF-8
+# -*- encoding: utf-8 -*-
 
 require File.expand_path('../spec_helper', __FILE__)
 require 'confgit'
 
 
 describe Confgit do
+	class String
+		# １行目のインデントだけ全体のインデントを削除する
+		def cut_indent(prefix = '')
+			prefix = Regexp.escape(prefix)
+
+			if self =~ /^(\s+#{prefix})/
+				indent = Regexp.escape($1)
+				self.gsub(/^#{indent}/,'')
+			else
+				self
+			end
+		end
+	end
+
 	# 引数の最後が Hash ならオプションとして取出す
 	def arg_last_options(args)
 		if args.last && args.last.kind_of?(Hash)
@@ -77,7 +91,7 @@ describe Confgit do
 			proc {
 				confgit 'repo', name
 				confgit 'repo'
-			}.must_output <<-EOD.gsub(/^\t+/,'')
+			}.must_output <<-EOD.cut_indent
 				* #{name}
 				  #{@hostname}
 			EOD
@@ -91,7 +105,7 @@ describe Confgit do
 				confgit 'repo', name2
 				confgit 'repo', '-d', name1
 				confgit 'repo'
-			}.must_output <<-EOD.gsub(/^\t+/,'')
+			}.must_output <<-EOD.cut_indent
 				* #{name2}
 				  #{@hostname}
 			EOD
@@ -104,7 +118,7 @@ describe Confgit do
 				confgit 'repo', '-d', name
 				@abort == "'#{name}' is current repository!\n"
 				confgit 'repo'
-			}.must_output <<-EOD.gsub(/^\t+/,'')
+			}.must_output <<-EOD.cut_indent
 				* #{name}
 				  #{@hostname}
 			EOD
@@ -145,7 +159,7 @@ describe Confgit do
 		it "add FILE" do
 			chroot('README') { |root, file|
 				confgit 'add', file
-				proc { confgit 'status' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'status' }.must_output <<-EOD.cut_indent
 					# On branch master
 					#
 					# Initial commit
@@ -164,7 +178,7 @@ describe Confgit do
 
 			chroot(File.join(dir, 'README')) { |root, file|
 				confgit 'add', dir
-				proc { confgit 'status' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'status' }.must_output <<-EOD.cut_indent
 					# On branch master
 					#
 					# Initial commit
@@ -177,6 +191,27 @@ describe Confgit do
 				EOD
 			}
 		end
+
+		it "add SYMLINK" do
+			dir = 'misc'
+			dummy = 'misc_symlink'
+
+			chroot(File.join(dir, 'README')) { |root, file|
+				File.symlink(dir, dummy)
+				confgit 'add', dummy
+				proc { confgit 'status' }.must_output <<-EOD.cut_indent
+					# On branch master
+					#
+					# Initial commit
+					#
+					# Changes to be committed:
+					#   (use "git rm --cached <file>..." to unstage)
+					#
+					#	new file:   #{dummy}
+					#
+				EOD
+			}
+		end
 	end
 
 	describe "rm" do
@@ -186,7 +221,7 @@ describe Confgit do
 
 				capture_io { confgit 'commit', '-m', "add #{file}" }
 				proc { confgit 'rm', file }.must_output "rm '#{file}'\n"
-				proc { confgit 'status' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'status' }.must_output <<-EOD.cut_indent
 					# On branch master
 					# Changes to be committed:
 					#   (use "git reset HEAD <file>..." to unstage)
@@ -202,7 +237,7 @@ describe Confgit do
 				confgit 'add', file
 
 				proc { confgit 'rm', '-f', file }.must_output "rm '#{file}'\n"
-				proc { confgit 'status' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'status' }.must_output <<-EOD.cut_indent
 					# On branch master
 					#
 					# Initial commit
@@ -220,7 +255,7 @@ describe Confgit do
 
 				capture_io { confgit 'commit', '-m', "add #{dir}" }
 				proc { confgit 'rm', '-r', dir }.must_output "rm '#{file}'\n"
-				proc { confgit 'status' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'status' }.must_output <<-EOD.cut_indent
 					# On branch master
 					# Changes to be committed:
 					#   (use "git reset HEAD <file>..." to unstage)
@@ -238,7 +273,26 @@ describe Confgit do
 				confgit 'add', dir
 
 				proc { confgit 'rm', '-rf', dir }.must_output "rm '#{file}'\n"
-				proc { confgit 'status' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'status' }.must_output <<-EOD.cut_indent
+					# On branch master
+					#
+					# Initial commit
+					#
+					nothing to commit (create/copy files and use "git add" to track)
+				EOD
+			}
+		end
+
+		it "rm -f SYMLINK" do
+			dir = 'misc'
+			dummy = 'misc_symlink'
+
+			chroot(File.join(dir, 'README')) { |root, file|
+				File.symlink(dir, dummy)
+				confgit 'add', dummy
+
+				proc { confgit 'rm', '-f', dummy }.must_output "rm '#{dummy}'\n"
+				proc { confgit 'status' }.must_output <<-EOD.cut_indent
 					# On branch master
 					#
 					# Initial commit
@@ -263,7 +317,7 @@ describe Confgit do
 
 		it "backup -n" do
 			chroot { |root, *files|
-				proc { confgit 'backup', '-n' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'backup', '-n' }.must_output <<-EOD.cut_indent
 					\e[34m--> #{@mod_file}\e[m
 					# On branch master
 					nothing to commit (working directory clean)
@@ -273,7 +327,7 @@ describe Confgit do
 
 		it "backup -y" do
 			chroot { |root, *files|
-				proc { confgit 'backup', '-y' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'backup', '-y' }.must_output <<-EOD.cut_indent
 					\e[34m--> VERSION\e[m
 					# On branch master
 					# Changes not staged for commit:
@@ -291,7 +345,7 @@ describe Confgit do
 			chroot { |root, *files|
 				File.delete @mod_file
 
-				proc { confgit 'backup', '-fn' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'backup', '-fn' }.must_output <<-EOD.cut_indent
 					\e[34m--> LICENSE.txt\e[m
 					\e[34m--> README\e[m
 					\e[31m[?] #{@mod_file}\e[m
@@ -318,7 +372,7 @@ describe Confgit do
 				open(@mod_file, 'w') { |f| f.puts @data }
 
 				modfile(@mod_file) { |prev|
-					proc { confgit 'restore', '-n' }.must_output <<-EOD.gsub(/^\t+/,'')
+					proc { confgit 'restore', '-n' }.must_output <<-EOD.cut_indent
 						\e[34m<-- #{@mod_file}\e[m
 					EOD
 					open(@mod_file).read.must_equal prev
@@ -331,7 +385,7 @@ describe Confgit do
 				modfile(@mod_file) { |prev|
 					open(@mod_file, 'w') { |f| f.puts @data }
 
-					proc { confgit 'restore', '-y' }.must_output <<-EOD.gsub(/^\t+/,'')
+					proc { confgit 'restore', '-y' }.must_output <<-EOD.cut_indent
 						\e[34m<-- #{@mod_file}\e[m
 					EOD
 					open(@mod_file).read.must_equal prev
@@ -343,7 +397,7 @@ describe Confgit do
 			chroot { |root, *files|
 				File.delete @mod_file
 
-				proc { confgit 'restore', '-fn' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'restore', '-fn' }.must_output <<-EOD.cut_indent
 					\e[34m<-- LICENSE.txt\e[m
 					\e[34m<-- README\e[m
 					\e[35m<-- #{@mod_file}\e[m
@@ -359,10 +413,10 @@ describe Confgit do
 				out, err, status = capture_io { confgit 'commit', '-m', "add #{file}" }
 				err.must_be_empty
 				status.must_be_nil
-				out.must_match <<-EOD.gsub(/^\t+/,'')
-
-					 0 files changed
-					 create mode 100644 #{file}
+				out.must_match <<-EOD.cut_indent('|')
+					|
+					| 0 files changed
+					| create mode 100644 #{file}
 				EOD
 			}
 		end
@@ -379,7 +433,7 @@ describe Confgit do
 		it "list" do
 			chroot { |root, *files|
 				out, err, status = capture_io { confgit 'list' }
-				out.must_match Regexp.new <<-EOD.gsub(/^\t+/,'')
+				out.must_match Regexp.new <<-EOD.cut_indent
 					-rw-r--r--	.+	.+	#{root}/LICENSE\.txt
 					-rw-r--r--	.+	.+	#{root}/README
 					-rw-r--r--	.+	.+	#{root}/VERSION
@@ -390,7 +444,7 @@ describe Confgit do
 		it "list -8" do
 			chroot { |root, *files|
 				out, err, status = capture_io { confgit 'list', '-8' }
-				out.must_match Regexp.new <<-EOD.gsub(/^\t+/,'')
+				out.must_match Regexp.new <<-EOD.cut_indent
 					100644	.+	.+	#{root}/LICENSE\.txt
 					100644	.+	.+	#{root}/README
 					100644	.+	.+	#{root}/VERSION
@@ -409,7 +463,7 @@ describe Confgit do
 
 		it "tree" do
 			chroot { |root, *files|
-				proc { confgit 'tree' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'tree' }.must_output <<-EOD.cut_indent
 					.
 					├── README
 					├── VERSION
@@ -423,7 +477,7 @@ describe Confgit do
 
 		it "tree -a" do
 			chroot { |root, *files|
-				proc { confgit 'tree', '-a' }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'tree', '-a' }.must_output <<-EOD.cut_indent
 					.
 					├── .version
 					├── README
@@ -438,7 +492,7 @@ describe Confgit do
 
 		it "tree DIR" do
 			chroot { |root, *files|
-				proc { confgit 'tree', @dir }.must_output <<-EOD.gsub(/^\t+/,'')
+				proc { confgit 'tree', @dir }.must_output <<-EOD.cut_indent
 					#{@dir}
 					└── LICENSE.txt
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confgit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-20 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.3/etc/bash_completion.d/confgit $BASH_COMPLETION_DIR\n\n
+  \     $ cp `gem env gemdir`/gems/confgit-0.0.4/etc/bash_completion.d/confgit $BASH_COMPLETION_DIR\n\n
   \   ==================\n  "
 rdoc_options: []
 require_paths: