git_cli 0.2.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09e9787033e0df8ac57d797dc2e81c47696f653eb7c4befdd47978af01ff017c'
-  data.tar.gz: 51b9c28fa10a44f29f395d4816490179dea72e68c1c4f74d04520882d93ac2cc
+  metadata.gz: e5dffcd1329d4979a8b95a99ca22e8243b591a5101e235ccdeff850d43278fc2
+  data.tar.gz: 1a66a75d928f6fef50735465b24535281237ea057481ff8954cac09440daab0b
 SHA512:
-  metadata.gz: ca1b7aa4de0d142bc44fbdebf01afc5b62463a15217f078c644cd80832365ecac50711770b07ed7cac894672103325a1c77caac4a2a33b100e729a40996ce5b4
-  data.tar.gz: a201e767f9ad7726068bd67be08a11915b5b17758ae17342834b1f568246a42555278424fa6ff50859de91d4b1e242b341be5ae846c5f0cf1fa04fe72c07654f
+  metadata.gz: 7dd8f01b20b6ddd46e3edfc2c8c1a61938642b1ccdec73e7941332144d4aba2730dd502a2becd2caaba307a0bcac22cd50f835c4b5d6e262a1bb29892c589dc9
+  data.tar.gz: 72bed6d4950e31b040a5b27ea72bca9597d350a55898efed658748d88e3bbf5d554f8e83e3daeaa3a16d03874396206dd85c86490ee5cfd42869fddcfe8ff4d0

data/.gitignore

@@ -8,3 +8,5 @@
 /tmp/
 Gemfile.lock
 tags
+git_cli-0.1.0.gem
+toolrack.log

data/Rakefile

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

data/git_cli.gemspec

@@ -29,4 +29,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "tlogger", "~> 0.21"
   spec.add_dependency "toolrack", "~> 0.4.0"
+  spec.add_dependency "gvcs", "~> 0.1.0"
+  spec.add_dependency "ptools", "~> 1.4.0"
+
+  spec.add_development_dependency 'devops_helper', "~> 0.2.0"
 end

data/lib/git_cli.rb

@@ -16,6 +16,7 @@
 
 require "git_cli/version"
 
+require 'gvcs'
 require 'toolrack'
 
 require_relative "git_cli/git_core"
@@ -81,7 +82,7 @@ module GitCli
       # version check
       vst, tver = version
       if vst
-        if (tver <=> MIN_GIT_VERSION) -1
+        if (tver <=> MIN_GIT_VERSION) == -1
           log_warn("Min required version of GIT is #{MIN_GIT_VERSION}. System installed GIT is version #{tver}. The output might not be correct.") 
         end
 
@@ -89,7 +90,7 @@ module GitCli
       end
       
     end
-  end
+  end # Gvcs::Vcs
 
   module WsCommon
     def check_vcs

data/lib/git_cli/add_commit.rb

@@ -93,9 +93,11 @@ module GitCli
       
     end # remove_from_vcs
 
-    def commit(message)
+    def commit(message, opts = { })
       check_vcs
 
+      files = opts[:files] || []
+      [files] if not files.is_a?(Array)
       # have to escape the message for command line purposes
       msg = message.gsub("\"","\\\"").gsub("\\","\\\\")
 
@@ -105,6 +107,9 @@ module GitCli
       cmd << "&&"
       cmd << @vcs.exe_path
       cmd << "commit"
+      if not_empty?(files)
+        cmd << files.join(" ")
+      end
       cmd << "-m"
       cmd << "\"#{msg}\""
 
@@ -116,7 +121,7 @@ module GitCli
         [st.success?, res.strip]
       end
 
-    end
+    end # commit
 
     def commit_all(msg)
       check_vcs
@@ -141,7 +146,9 @@ module GitCli
         [st.success?, res.strip]
       end
      
-    end
+    end # commit_all
+
+
 
   end
 end

data/lib/git_cli/delta.rb

@@ -52,6 +52,7 @@ module GitCli
       cmd << @wsPath
       cmd << "&&"
       cmd << @vcs.exe_path
+      # list only non staged modifications
       cmd << "diff --name-only --diff-filter=M"
 
       cmdln = cmd.join(" ")
@@ -183,6 +184,41 @@ module GitCli
      
     end # deleted_files
 
+    def staged_files
+      
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "diff --name-only --cached"
+
+      cmdln = cmd.join(" ")
+      log_debug "New Files : #{cmdln}"
+      dirs = []
+      files = []
+      res = os_exec(cmdln) do |st, res|
+
+        if st.success?
+          res.each_line do |l|
+            l.chomp!
+            if File.directory?(File.join(@wsPath,l))
+              dirs << l	
+            else
+              files << l
+            end
+          end
+
+          [true, dirs.sort, files.sort]
+        else
+          [false, [], []]
+        end
+      end
+
+    end # staged_files
+
     def reset_file_changes(path)
 
       raise_if_empty(path, "Path cannot be empty for reset file changes operation", GitCliException)

data/lib/git_cli/git_core.rb

@@ -17,6 +17,8 @@
 
 require_relative 'global'
 
+require 'ptools'
+
 module GitCli
   module GitCore
 
@@ -58,25 +60,11 @@ module GitCli
     private
     def is_installed?
 
-      if Antrapol::ToolRack::RuntimeUtils.on_linux?
-        require_relative 'os/linux/utils'
-        GitCli::Global.instance.logger.debug "Running on Linux is detected"
-        st, path = GitCli::OS::Linux::Utils.is_installed?("git")
-        GitCli::Global.instance.logger.debug "'git' install check return [#{st},#{path}]"
-
-        [st, path]
-
-      elsif Antrapol::ToolRack::RuntimeUtils.on_mac?
-        GitCli::Global.instance.logger.debug "Running on MacOS is detected"
-        require_relative 'os/macos/utils'
-
-      elsif Antrapol::ToolRack::RuntimeUtils.on_window?
-        GitCli::Global.instance.logger.debug "Running on MS Window is detected"
-        require_relative 'os/win/utils'
-
+      gpath = File.which('git')
+      if is_empty?(gpath) 
+        [false, ""]
       else
-        GitCli::Global.instance.logger.debug "Cannot determine which OS am i running...Confused"
-        raise RuntimeError, "Unknown platform"
+        [true, gpath]
       end
 
     end # is_installed?

data/lib/git_cli/global.rb

@@ -24,8 +24,15 @@ module GitCli
 
     attr_reader :logger
     def initialize
-      @logger = Tlogger.new
+      debug = ENV['GitCli_Debug']
+      debugOut = ENV['GitCli_DebugOut'] || STDOUT
+      if debug.nil?
+        @logger = Tlogger.new('git_cli.log', 5, 1024*1024*10)
+      else
+        @logger = Tlogger.new(debugOut)
+      end
     end
+
   end
 
   class GitCliException < StandardError; 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.2.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,43 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: git_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Chris Liaw
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: tlogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
-  name: tlogger
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
 - !ruby/object:Gem::Dependency
+  name: toolrack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
-  name: toolrack
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: gvcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: devops_helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Interface to GIT via command line interface instead of some sor of library
 email:
 - chrisliaw@antrapol.com
@@ -79,7 +121,7 @@ homepage: https://github.com/chrisliaw/git_cli
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -94,9 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: GIT command line interface
 test_files: []