git_cli 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63fdc22895e48a0005e1fcaf0e5dc2291c6fdc26019ae566f1009424d083292c
-  data.tar.gz: 5e602e81ea3b378e185add93c6d8fb1ea97c48fc600c784c2e22aaa43beb0e21
+  metadata.gz: 77fb6b4308d34a185d9ba1355470893a53b15ee9710953ed0079c4847d8dc59d
+  data.tar.gz: 27d246f6554b2aa688738a38e21a2e985f8cbbb504d702f3ff0c0127ecd48949
 SHA512:
-  metadata.gz: a05ced2c8d7ec7b8efcc69ec6d1f41b80e11fbc5b3f1c1f5e7954800fd594d0d98aae0050ebab902d101ee7a7a653a2a989744f77bb7710aba367a10f3cf8719
-  data.tar.gz: e4a85fb3684d6b2377bf57ccd1e8e9c7c5b931997e22d1052c24de2a9c21d4792ff5c455e72e63d9e79fd9df863470b28bbb9e07dd8e6ea0e8ec5f29164f9901
+  metadata.gz: bfb96c8d437b6df087b875be71c70a8cea9f6d92bf5aac59c4a7fd1eeb3c756bcaccc4850ff1f4caa8e83f4a26a9c24a536122f0b37841ce16613ee571f90f92
+  data.tar.gz: 1cbfb647558fd5d0bb1b0909fb29aa02fe3f668c5796b5097d6d29c3b5f7c72b802a50f0640475a7482e0af379d49240058a1ca1183315f60f3a57645bc31de3

data/.gitignore

@@ -11,3 +11,4 @@ tags
 git_cli-0.1.0.gem
 *.log
 
+.rake_tasks~

data/.release_history.yml

@@ -0,0 +1,4 @@
+---
+git_cli:
+- :version: 0.10.0
+  :timestamp: 1661971875.794398

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.version_history.yml

@@ -0,0 +1,8 @@
+---
+git_cli:
+- :version: 0.7.0
+  :created_at: 2020-12-07 23:01:04.252722927 +08:00
+- :version: 0.8.0
+  :created_at: 2020-12-07 23:14:58.685361227 +08:00
+- :version: 0.9.0
+  :created_at: 2021-10-22 23:01:48.298477606 +08:00

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
+
+gem 'gvcs', git: 'gvcs', branch: 'master'

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-require "devops_helper"
+require "devops_assist"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/git_cli.gemspec

@@ -27,10 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "tlogger"
+  #spec.add_dependency "tlogger"
+  spec.add_dependency 'teLogger'
   spec.add_dependency "toolrack"
   spec.add_dependency "gvcs" 
   spec.add_dependency "ptools", "~> 1.4.0"
 
-  spec.add_development_dependency 'devops_helper' #, ">= 0.2.0"
+  #spec.add_development_dependency 'devops_helper' #, ">= 0.2.0"
+  spec.add_development_dependency 'devops_assist' #, ">= 0.2.0"
 end

data/lib/git_cli/add_commit.rb

@@ -136,7 +136,7 @@ module GitCli
 
     end # commit
 
-    def commit_all(msg)
+    def commit_all(message)
       check_vcs
       
       # have to escape the message for command line purposes
@@ -149,7 +149,7 @@ module GitCli
       cmd << @vcs.exe_path
       cmd << "commit"
       cmd << "-am"
-      cmd << msg
+      cmd << "\"#{msg}\""
 
       cmdln = cmd.join " "
 

data/lib/git_cli/delta.rb

@@ -367,6 +367,41 @@ module GitCli
       
     end # reset all changes
 
+    # If remote is ahead of local
+    # git rev-list HEAD..origin/main --count
+    #
+    # if local is ahead of remote
+    # git rev-list origin/main..HEAD --count
+    #
+    def calculate_distance(from, to) 
+
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "rev-list #{from}..#{to} --count"
+
+      cmdln = cmd.join(" ")
+      log_debug "Calculate distance between two repos : #{cmdln}"
+      res = os_exec(cmdln) do |st, res|
+        [st.success?, res]
+      end
+      
+    end
+
+    def is_local_ahead_of_remote?(remote_name, branch = "main")
+      
+      calculate_distance("#{remote_name}/#{branch}", "HEAD")
+
+    end
+
+    def is_remote_ahead_of_local?(remote_name, branch = "main")
+      
+      calculate_distance("HEAD","#{remote_name}/#{branch}")
+    end
 
   end
 end

data/lib/git_cli/global.rb

@@ -15,9 +15,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-require 'tlogger'
+#require 'tlogger'
+require 'teLogger'
 require 'singleton'
 
+include TeLogger
+
 module GitCli
   class Global
     include Singleton

data/lib/git_cli/ignore.rb

@@ -19,9 +19,12 @@
 module GitCli
   module Ignore
 
-    def ignore(val)
+    def ignore(*val)
       with_ignore_file do |f|
-        f.puts val
+        val.each do |v|
+          f.puts v
+        end
+        #f.puts val
       end 
       log_debug ".gitignore file updated with line '#{val}'"
       [true,".gitignore file updated"]

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.9.0"
+  VERSION = "0.11.0"
 end

data/lib/git_cli.rb

@@ -46,6 +46,9 @@ module GitCli
     include Antrapol::ToolRack::ExceptionUtils
 
     def os_exec(path, &block)
+
+      Gvcs::Config.instance.command_output.puts("Git command : #{path}") if Gvcs::Config.instance.is_show_vcs_command?
+
       # redirect stderr to stdout
       path = "#{path} 2>&1"
       res = Antrapol::ToolRack::ProcessUtilsEngine.exec(path)
@@ -221,6 +224,23 @@ module GitCli
       end
     end
 
+    def repos
+      if @repos.nil? or @repos.empty?
+        load_remote_to_repos
+      end
+      @repos
+    end
+
+    def is_clean?
+      nd, nf = new_files
+      md, mf = modified_files
+      dd, df = deleted_files
+      sd, sf = staged_files
+
+      (nd.length == 0 and nf.length == 0 and md.length == 0 and mf.length == 0 and dd.length == 0 and df.length == 0 and sd.length == 0 and sf.length == 0)
+    end
+    alias_method :clean?, :is_clean?
+
   end # Gvcs::Workspace
 
 
@@ -249,6 +269,7 @@ module GitCli
     def is_fetch_supported?
       @fetch
     end
+    alias_method :can_fetch?, :is_fetch_supported?
 
     def support_push
       @push = true
@@ -256,6 +277,7 @@ module GitCli
     def is_push_supported?
       @push
     end
+    alias_method :can_push?, :is_push_supported?
 
   end # repository
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: git_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Chris Liaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tlogger
+  name: teLogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: devops_helper
+  name: devops_assist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,7 +88,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".release_history.yml"
+- ".rspec"
 - ".travis.yml"
+- ".version_history.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt