confgit 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 73dda3c2ee34cd11e5554113fc2dbd45c1fddc55
+  data.tar.gz: 77574be9d13538ae74ad71394f1c0ae1f2799d26
+SHA512:
+  metadata.gz: e0ba03a7151f4741552315b8df6cd4070dd071483ba8591f9f95041fed83808f28915e7607b09161e870c741a8946c93c38cab979d555e158efd01a18cdcbf2a
+  data.tar.gz: 827912809248b458f99d0ae09cb5f03e6ef6084883f010b2b29c8122994d20a0f21c7a662fb427ecf2e89122207d33f41ae87d666679232b64c28f16b5356525

data/.gitignore

@@ -1,4 +1,4 @@
-/VERSION
+/REVISION
 *.gem
 *.rbc
 .bundle
@@ -16,6 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor
 
 # editor noise
 *~

data/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path('../etc/tools/update_version', __FILE__)
+require File.expand_path('../etc/tools/update_revision', __FILE__)
 require "bundler/gem_tasks"
 
 # Spec

data/VERSION

@@ -0,0 +1 @@
+0.0.6

data/confgit.gemspec

@@ -11,8 +11,9 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Config files management tool with git}
   gem.summary       = %q{Config files management tool with git}
   gem.homepage      = "https://github.com/gnue/confgit"
+  gem.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($/) + %w(VERSION)
+  gem.files         = `git ls-files`.split($/) + %w(REVISION)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
@@ -21,10 +22,10 @@ Gem::Specification.new do |gem|
 
   # dependency
   gem.add_dependency('i18n')
-  gem.add_dependency('json')
 
   # for development
-  gem.add_development_dependency('minitest')
+  gem.add_development_dependency('rake')
+  gem.add_development_dependency('minitest', '~> 4.7') if Gem.ruby_version < Gem::Version.create('2.0')
   gem.add_development_dependency('turn')
 
   gem.post_install_message = %Q{

data/etc/tools/update_revision.rb

@@ -0,0 +1,14 @@
+def update_revision(path = 'REVISION')
+	rev = `git describe --dirty --long 2>/dev/null`.chomp
+	rev = `git describe --dirty --long --tags --always`.chomp if rev.empty?
+	rev.gsub!(/^v([0-9])/, '\1')
+	rev.gsub!(/(^|-)([a-z0-9]+(-dirty)?)$/, '/\2')
+	rev.gsub!(/^([0-9.]+)-0\//, '\1/')
+
+	return if File.exists?(path) && rev == open(path).read.chomp
+
+	open(path, 'w') { |f| f.puts rev }
+end
+
+
+update_revision

data/lib/confgit/cli.rb

@@ -45,6 +45,7 @@ class CLI
 	def i18n_init
 		I18n.load_path = Dir[File.expand_path('../locales/*.yml', __FILE__)]
 		I18n.backend.load_translations
+		I18n.enforce_available_locales = false
 
 		locale = ENV['LANG'][0, 2].to_sym if ENV['LANG']
 		I18n.locale = locale if I18n.available_locales.include?(locale)

data/lib/confgit/repo.rb

@@ -290,7 +290,11 @@ class Repo
 	# ファイルが書込み可能か？（シンボリックリンクの場合はわからないのでとりあえず true を返す）
 	def file_writable_real?(path)
 		return true if File.symlink?(path)
-		return File.writable_real?(File.dirname(path)) unless File.exist?(path)
+		unless File.exist?(path)
+			dir = File.dirname(path)
+			dir = File.dirname(dir) until File.exist?(dir)
+			return File.writable_real?(dir)
+		end
 
 		File.writable_real?(path)
 	end

data/lib/confgit/version.rb

@@ -1,4 +1,24 @@
 module Confgit
-	LONG_VERSION = File.read(File.expand_path('../../../VERSION', __FILE__)).chomp
-	VERSION = LONG_VERSION.gsub(/(-.*|\(.*)$/, '')
+	begin
+		dir = File.expand_path('../../..', __FILE__)
+		version  = File.read(File.join(dir, 'VERSION')).chomp
+		revision = File.read(File.join(dir, 'REVISION')).chomp.split('/')
+
+		case revision.first
+		when /^#{version}(-|$)/
+			ver, rev = revision
+		else
+			version += 'dev'
+			ver = version
+
+			revision.delete('')
+			rev = revision.join('/')
+		end
+
+	rescue
+		ver = version
+	end
+
+	VERSION = version
+	LONG_VERSION = ver + (rev ? "(#{rev})" : '')
 end

data/spec/confgit_spec.rb

@@ -332,11 +332,11 @@ describe Confgit do
 
 		it "backup -n" do
 			chroot { |root, *files|
-				proc { confgit 'backup', '-n' }.must_output <<-EOD.cut_indent
+				out, err, status = capture_io { confgit 'backup', '-n' }
+				out.must_match <<-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
 			}
 		end
@@ -363,7 +363,8 @@ describe Confgit do
 			chroot { |root, *files|
 				File.delete @mod_file
 
-				proc { confgit 'backup', '-fn' }.must_output <<-EOD.cut_indent
+				out, err, status = capture_io { confgit 'backup', '-fn' }
+				out.must_match <<-EOD.cut_indent
 					\e[34m--> LICENSE.txt\e[m
 					\e[34m--> README\e[m
 					\e[31m[?] #{@mod_file}\e[m
@@ -372,7 +373,6 @@ describe Confgit do
 					\e[34m--> misc/README\e[m
 					\e[34m--> mod_link\e[m
 					# On branch master
-					nothing to commit (working directory clean)
 				EOD
 			}
 		end
@@ -382,6 +382,7 @@ describe Confgit do
 		def udpate_data
 			open(@mod_file, 'w') { |f| f.puts @data }
 			File.delete @del_file
+			FileUtils.remove_entry_secure(@deep_file.split('/').first)
 
 			@symlinks.each { |key, value|
 				old, file = value
@@ -396,10 +397,11 @@ describe Confgit do
 			dir = 'misc'
 			@mod_file = 'VERSION'
 			@del_file = 'LICENSE.txt'
+			@deep_file = 'a/b/c.txt'
 			@data = '0.0.1'
 			@symlinks = {'dir_link' => dir, 'file_link' => 'VERSION', 'mod_link' => ['README', 'LICENSE.txt']}
 
-			chroot(@mod_file, @del_file, 'README', File.join(dir, 'README')) { |root, *files|
+			chroot(@mod_file, @del_file, @deep_file, 'README', File.join(dir, 'README')) { |root, *files|
 				@symlinks.each { |key, value|
 					file, = value
 					File.symlink(file, key)
@@ -418,6 +420,7 @@ describe Confgit do
 					proc { confgit 'restore', '-n' }.must_output <<-EOD.cut_indent
 						\e[34m<-- #{@del_file}\e[m
 						\e[34m<-- #{@mod_file}\e[m
+						\e[34m<-- #{@deep_file}\e[m
 						\e[34m<-- mod_link\e[m
 					EOD
 					open(@mod_file).read.must_equal prev
@@ -433,6 +436,7 @@ describe Confgit do
 					proc { confgit 'restore', '-y' }.must_output <<-EOD.cut_indent
 						\e[34m<-- #{@del_file}\e[m
 						\e[34m<-- #{@mod_file}\e[m
+						\e[34m<-- #{@deep_file}\e[m
 						\e[34m<-- mod_link\e[m
 					EOD
 					open(@mod_file).read.must_equal prev
@@ -448,6 +452,7 @@ describe Confgit do
 					\e[34m<-- #{@del_file}\e[m
 					\e[34m<-- README\e[m
 					\e[34m<-- #{@mod_file}\e[m
+					\e[34m<-- #{@deep_file}\e[m
 					\e[34m<-- dir_link\e[m
 					\e[34m<-- file_link\e[m
 					\e[34m<-- misc/README\e[m
@@ -465,8 +470,6 @@ describe Confgit do
 				err.must_be_empty
 				status.must_be_nil
 				out.must_match <<-EOD.cut_indent('|')
-					|
-					| 0 files changed
 					| create mode 100644 #{file}
 				EOD
 			}

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'minitest/spec'
 require 'minitest/autorun'
+require 'minitest/spec'
 
 begin
 	require 'turn'

metadata

@@ -1,78 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: confgit
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - gnue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Config files management tool with git
@@ -83,15 +60,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
+- REVISION
 - Rakefile
+- VERSION
 - bin/confgit
 - confgit.gemspec
 - etc/bash_completion.d/confgit
-- etc/tools/update_version.rb
+- etc/tools/update_revision.rb
 - lib/confgit.rb
 - lib/confgit/cli.rb
 - lib/confgit/locales/en.yml
@@ -101,35 +80,33 @@ files:
 - lib/confgit/with_color.rb
 - spec/confgit_spec.rb
 - spec/spec_helper.rb
-- VERSION
 homepage: https://github.com/gnue/confgit
-licenses: []
-post_install_message: ! "\n    ==================\n    This software requires 'git'.\n
+licenses:
+- MIT
+metadata: {}
+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.5/etc/bash_completion.d/confgit $BASH_COMPLETION_DIR\n\n
+  \     $ cp `gem env gemdir`/gems/confgit-0.0.6/etc/bash_completion.d/confgit $BASH_COMPLETION_DIR\n\n
   \   ==================\n  "
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Config files management tool with git
 test_files:
 - spec/confgit_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/etc/tools/update_version.rb

@@ -1,16 +0,0 @@
-def update_version(path)
-	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
-		return if version == open(path).read.chomp
-		return if version.empty?
-	rescue
-	end
-
-	open(path, 'w') { |f| f.puts version }
-end
-
-update_version 'VERSION'