githelp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6224d4653f7848cf6b964cfecf7cb9cc2c812831
-  data.tar.gz: 00b553cad0ca0c3e671b3f8179d7a690bf92a299
+  metadata.gz: e1b462f001e8cba0fede1763f9bc76caad5f505d
+  data.tar.gz: 4d4e917946e0b816336dbed35cce2d98d6519404
 SHA512:
-  metadata.gz: 45534e1d22236e18abf1da8cd100ea46a359b60176443e2d7ba95445cbec40425a951563b05873f8b67fc23e416c1a7d231b01a0afb5430845dd5b3dd3fc0db8
-  data.tar.gz: 7e82020186ac0e32232e02a3a92067e37e974186bdd02d4d47174e949b509e9ef636ffa142da854df50645c4f0453f746984b245eeb743f1a6ba453316d586e8
+  metadata.gz: 3c30ecf1924f95e8116c73741056425c3798f85b428b4e867dc4399dcfe88d4c44fef4c1b5473e9c23dc8653284b656b35d08e33f9b47613040030f530297401
+  data.tar.gz: 08d0e031d4b99b1d1f6fb7537920ebe3f1b94f7a2f9b1f5ee35acbc72e7b841343c3da2e4604650b962ac2b4a735f7abb28dd022a94e10c2244d3e8369f4fbae

data/exe/githelp

@@ -15,6 +15,11 @@ require "githelp"
 
 include Githelp
 
+unless git_check
+  STDERR.puts "Use 'githelp' in a Git repository."
+  exit
+end
+
 progpath = $0
 if File.symlink?(progpath)
   progpath = File.readlink(progpath)

data/githelp.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib", "data", "bin"]
+  # spec.executables = ["githelp", "githelp-changed"]
+  spec.require_paths = ["lib", "data"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/githelp/branches.rb

@@ -1,21 +1,39 @@
 # coding: utf-8
 
 module Githelp
+  def git_branch
+    begin
+      `git branch`
+    rescue
+      nil
+    end
+  end
+  
   def branches
-    `git branch`.split(/\n/).map { |line|
-      line.chomp!
-      line.sub(/^../,'')
-    }
+    b = git_branch
+    if b
+      b.split(/\n/).map { |line|
+        line.chomp!
+        line.sub(/^../,'')
+      }
+    else
+      [ '##BRANCH##' ]
+    end
   end
   
   def branch
-    `git branch`.split(/\n/).map { |line|
-      line.chomp!
-      if line =~ /^\* (.*)$/ then
-        return $1
-      end
-    }
-    ''
+    b = git_branch
+    if b
+      b.split(/\n/).map { |line|
+        line.chomp!
+        if line =~ /^\* (.*)$/ then
+          return $1
+        end
+      }
+      ''
+    else
+      ''
+    end
   end
 end
 

data/lib/githelp/changes.rb

@@ -1,19 +1,36 @@
 # coding: utf-8
 
 module Githelp
+  def git_log_wc(since,file)
+    begin
+      `git log --oneline --since='#{since}' #{file} | wc`
+    rescue
+      nil
+    end
+  end
+  
   def changed(since)
     files(true).find_all { |file|
-      `git log --oneline --since='#{since}' #{file} | wc` !~ /  0  /
+      wc = git_log_wc(since,file)
+      if wc
+        wc !~ /  0  /
+      else
+        false
+      end
     }
   end
   
   def unchanged(since)
     files(true).find_all { |file|
-      `git log --oneline --since='#{since}' #{file} | wc` =~ /  0  /
+      wc = git_log_wc(since,file)
+      if wc
+        wc =~ /  0  /
+      else
+        false
+      end
     }
   end
 end
-
   
 
 

data/lib/githelp/files.rb

@@ -7,7 +7,11 @@ def files(force=false, argv=ARGV)
   #
   # 引数の中にファイル名とマッチするものがあればファイルリストを取得
   #
-  list = `git ls-files`.split(/\n/)
+  list = begin
+           `git ls-files`.split(/\n/)
+         rescue
+           []
+         end
   matched = false
   list.each { |file|
     args.each { |arg|

data/lib/githelp/git_check.rb

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+module Githelp
+  def git_check
+    res = nil
+    begin
+      res = `git log`
+    rescue
+    end
+    res != ''
+  end
+end
+  
+
+

data/lib/githelp/tags.rb

@@ -8,7 +8,11 @@ module Githelp
     #
     # 引数の中にタグ名とマッチするものがあればタグリストを取得
     #
-    list = `git tag`.split(/\n/)
+    list = begin
+             `git tag`.split(/\n/)
+           rescue
+             []
+           end
     matched = false
     list.each { |tag|
       args.each { |arg|

data/lib/githelp/version.rb

@@ -1,3 +1,3 @@
 module Githelp
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/githelp.rb

@@ -12,6 +12,7 @@ require "githelp/numbers"
 require "githelp/branches"
 require "githelp/changes"
 require "githelp/glossary"
+require "githelp/git_check"
 
 module Githelp
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: githelp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Toshiyuki Masui
@@ -116,6 +116,7 @@ files:
 - lib/githelp/branches.rb
 - lib/githelp/changes.rb
 - lib/githelp/files.rb
+- lib/githelp/git_check.rb
 - lib/githelp/glossary.rb
 - lib/githelp/numbers.rb
 - lib/githelp/params.rb
@@ -131,7 +132,6 @@ rdoc_options: []
 require_paths:
 - lib
 - data
-- bin
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="