git_cli 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0aee5685cf56c36288182240355094917487d664010a6caa90e3d78421450d4
-  data.tar.gz: 33f3358634f113136a64c5452a07df9ecb19c81970d19aa6c773e5ce6e4990f0
+  metadata.gz: bc750608285dcc1362ed54813744bc70765f74a808dc3a6f833fa2b846cdf93e
+  data.tar.gz: 9a686f33dc16a654fc534999098ef7e8981c8ebf5264429ffd837e62cfabd175
 SHA512:
-  metadata.gz: 7ff51d738b56ce0ff39e7b1477b66a3d517724f4a6a9a6c9c0ba1f552d205c7f39e3955f1e1ddee666ad3cb75657b4ebe8a0f104986c280c4c44913235b4973c
-  data.tar.gz: a27a52eb0b278877a8118f6233d053ddb0d7dcbb3c9c798e8009a61ce336d9647f06fba955b38a7c484c6430085ed93e5cd9a843781bfa38e0e01dfc7c8dbe9d
+  metadata.gz: 1912f145438b920f90efc5cf42b78fe2d2bb163d240ffd5a67124d541529bb7e02e740bf9d5c1ab85e5a94230532739cd5cbe3a05637fd7b9b07a8e5f4a41cb3
+  data.tar.gz: '060151482263dc869181d9ad369cd8e5b1aec32b126dd67e03a5365d59e45834751a21065ae9e725c2e1b8a977cddc75094d4b1917aa8cf1117c424d4b1e859d'

data/.gitignore

@@ -11,3 +11,4 @@ tags
 *.log
 
 .rake_tasks~
+Gemfile.lock_

data/.release_history.yml

@@ -6,3 +6,5 @@ git_cli:
   :timestamp: 1676968140.9885945
 - :version: 0.11.1
   :timestamp: 1676968358.595788
+- :version: 0.11.2
+  :timestamp: 1676968433.2215726

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_cli (0.11.0)
+    git_cli (0.11.2)
       gvcs
       ptools (~> 1.4.0)
       teLogger
@@ -10,44 +10,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    base58 (0.2.3)
-    devops_assist (0.3.1)
-      git_cli
-      git_cli_prompt
-      gvcs
-      teLogger
-      toolrack
-      tty-prompt
-    git_cli_prompt (0.3.1)
-      teLogger
-      toolrack
-      tty-prompt
+    gem-release (2.2.2)
     gvcs (0.1.1)
     minitest (5.17.0)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
     ptools (1.4.3)
     rake (12.3.3)
     teLogger (0.2.2)
-    toolrack (0.20.0)
-      base58
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.1)
-    wisper (2.0.1)
+    toolrack (0.21.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  devops_assist
+  gem-release
   git_cli!
   minitest (~> 5.0)
   rake (~> 12.0)

data/git_cli.gemspec

@@ -34,5 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ptools", "~> 1.4.0"
 
   #spec.add_development_dependency 'devops_helper' #, ">= 0.2.0"
-  spec.add_development_dependency 'devops_assist' #, ">= 0.2.0"
+  #spec.add_development_dependency 'devops_assist' #, ">= 0.2.0"
+  spec.add_development_dependency 'gem-release'
 end

data/lib/git_cli/add_commit.rb

@@ -20,7 +20,7 @@ module GitCli
 
     class CommitError < StandardError; end
 
-    def add_to_staging(paths)
+    def add_to_staging(*paths)
       check_vcs
 
       raise_if_empty(paths, "Given path to add is empty", GitCliException)
@@ -33,7 +33,7 @@ module GitCli
       cmd << "&&"
       cmd << @vcs.exe_path
       cmd << "add"
-      cmd.append(paths)
+      cmd.append(paths.join(" "))
       cmdln = cmd.join " "
 
       log_debug "Add : #{cmdln}"
@@ -126,12 +126,13 @@ module GitCli
       log_debug "Commit : #{cmdln}"
 
       os_exec(cmdln) do |st, res|
-        res.strip!
-        if not st.success?
-          raise CommitError, res
-        else
-          res
-        end
+        [st.success?, res.strip!]
+        #res.strip!
+        #if not st.success?
+        #  raise CommitError, res
+        #else
+        #  res
+        #end
       end
 
     end # commit

data/lib/git_cli/delta.rb

@@ -32,6 +32,10 @@ module GitCli
       def <=>(val)
         @path <=> val.path 
       end
+
+      def ==(val)
+        @path == val.path
+      end
     end
     class NewDir < VCSItem
       def initialize(path, full)
@@ -394,13 +398,25 @@ module GitCli
 
     def is_local_ahead_of_remote?(remote_name, branch = "main")
       
-      calculate_distance("#{remote_name}/#{branch}", "HEAD")
+      st, res = calculate_distance("#{remote_name}/#{branch}", "HEAD")
+      if st
+        res.to_i > 0
+      else
+        # not push before
+        true
+      end
 
     end
 
     def is_remote_ahead_of_local?(remote_name, branch = "main")
       
-      calculate_distance("HEAD","#{remote_name}/#{branch}")
+      st, res = calculate_distance("HEAD","#{remote_name}/#{branch}")
+      if st
+        res.to_i > 0
+      else
+        # never pull before?
+        true
+      end
     end
 
   end

data/lib/git_cli/diff.rb

@@ -74,12 +74,12 @@ module GitCli
       log_debug "#{opts[:log_tag]} : #{cmdln} "
 
       res = os_exec(cmdln) do |st, res|
-        
-        if st.success?
-          [true, res.strip!]
-        else
-          [false, res]
-        end
+        [st.success?, res.strip!]        
+        #if st.success?
+        #  [true, res.strip!]
+        #else
+        #  [false, res]
+        #end
       end
       
     end

data/lib/git_cli/ignore.rb

@@ -20,9 +20,10 @@ module GitCli
   module Ignore
 
     def ignore(*val)
-      with_ignore_file do |f|
+      with_ignore_file("a+") do |f|
+        cont = f.read
         val.each do |v|
-          f.puts v
+          f.puts(v) if (cont =~ /^#{v}\Z/) == nil
         end
         #f.puts val
       end 
@@ -62,14 +63,15 @@ module GitCli
     end
 
     private
-    def with_ignore_file(&block)
+    def with_ignore_file(mode = "a", &block)
+      mode = "a" if is_empty?(mode)
       if block
         st, root = workspace_root
         root.strip!
         if st
           igPath = File.join(root,".gitignore")
           FileUtils.touch(igPath) if not File.exist?(igPath)
-          File.open(igPath,"a") do |f|
+          File.open(igPath,mode) do |f|
             block.call(f)
           end
         else

data/lib/git_cli/tags.rb

@@ -347,5 +347,32 @@ module GitCli
       
     end # checkout_tag
 
+    def tag_points_at?(dest = "HEAD")
+      
+      #raise_if_empty(tag, "Tag name cannot be empty", GitCliException)
+
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "tag"
+      cmd << "--points-at"
+      cmd << dest
+
+      cmdln = cmd.join(" ")
+      log_debug "Check if current tag is pointing to #{dest}"
+      res = os_exec(cmdln) do |st, res|
+        if st.success?
+          not_empty?(res.strip)
+        else
+          raise TagError, res
+        end
+      end
+      
+    end # is_tag_points_at?
+
   end
 end

data/lib/git_cli/version.rb

@@ -15,5 +15,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module GitCli
-  VERSION = "0.11.2"
+  VERSION = "0.11.3"
 end

data/lib/git_cli.rb

@@ -51,14 +51,18 @@ module GitCli
 
       # redirect stderr to stdout
       path = "#{path} 2>&1"
-      res = Antrapol::ToolRack::ProcessUtilsEngine.exec(path)
-      if block
-        # $?.exitstatus => error codes
-        # $?.success? => true / false
-        # $?.pid => child PID
-        block.call($?, res)
+      if dry_run
+        block.call(:dry_run_command, path) if block
       else
-        res.strip
+        res = Antrapol::ToolRack::ProcessUtilsEngine.exec(path)
+        if block
+          # $?.exitstatus => error codes
+          # $?.success? => true / false
+          # $?.pid => child PID
+          block.call($?, res)
+        else
+          res.strip
+        end
       end
     end
 
@@ -73,6 +77,14 @@ module GitCli
     def log_warn(str)
       GitCli::Global.instance.logger.warn(str)
     end
+
+    def dry_run=(val)
+      @dry_run = val if not_empty?(val) and is_bool?(val)
+    end
+
+    def dry_run
+      @dry_run.nil? ? false : @dry_run
+    end
   end # common operations
 
   class Gvcs::Vcs
@@ -202,9 +214,9 @@ module GitCli
         res = os_exec(cmdln) do |st, res|
 
           if st.success?
-            @wsRoot = [true, res]
+            @wsRoot = [true, res.strip]
           else
-            @wsRoot = [false, res]
+            @wsRoot = [false, res.strip]
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_cli
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Chris Liaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: teLogger
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: devops_assist
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: GIT command line interface