git_cli 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2137f01ad23cca0e4c523417ac601e30bb46f3eeeafd04d6e359b2d812452c9d
-  data.tar.gz: 7127ecfaf5f42a8fdd311864003c92529ce86dffc30211d212872ac23d92d92b
+  metadata.gz: 63fdc22895e48a0005e1fcaf0e5dc2291c6fdc26019ae566f1009424d083292c
+  data.tar.gz: 5e602e81ea3b378e185add93c6d8fb1ea97c48fc600c784c2e22aaa43beb0e21
 SHA512:
-  metadata.gz: fa62792074ef5f323dea781ca32dd2ae81e76775b8943c6eb5c6cf3310ad0a4506a72ecbf23f05f53803648ed29d4afc811e92e93d2b233353eb6cc3ee0dea08
-  data.tar.gz: 0b178d8eb671e405e16d5e6ba521d7aceb6765eaaa5c77e625e94465c1872def522a6aaf90304864c2910f5d8190236bb4eff5bbc75e0406ecbb83341b27662b
+  metadata.gz: a05ced2c8d7ec7b8efcc69ec6d1f41b80e11fbc5b3f1c1f5e7954800fd594d0d98aae0050ebab902d101ee7a7a653a2a989744f77bb7710aba367a10f3cf8719
+  data.tar.gz: e4a85fb3684d6b2377bf57ccd1e8e9c7c5b931997e22d1052c24de2a9c21d4792ff5c455e72e63d9e79fd9df863470b28bbb9e07dd8e6ea0e8ec5f29164f9901

data/git_cli.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "tlogger", ">= 0.21"
-  spec.add_dependency "toolrack", ">= 0.4.0"
-  spec.add_dependency "gvcs", ">= 0.1.0"
+  spec.add_dependency "tlogger"
+  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"
 end

data/lib/git_cli/add_commit.rb

@@ -18,6 +18,8 @@
 module GitCli
   module AddCommit
 
+    class CommitError < StandardError; end
+
     def add_to_staging(paths)
       check_vcs
 
@@ -37,7 +39,13 @@ module GitCli
       log_debug "Add : #{cmdln}"
 
       os_exec(cmdln) do |st, res|
-        [st.success?, res.strip]
+        res.strip!
+        if not st.success?
+          raise CommitError, res
+        else
+          res
+        end
+        #[st.success?, res.strip]
       end
     end # add_to_staging
     alias :add :add_to_staging
@@ -118,7 +126,12 @@ module GitCli
       log_debug "Commit : #{cmdln}"
 
       os_exec(cmdln) do |st, res|
-        [st.success?, res.strip]
+        res.strip!
+        if not st.success?
+          raise CommitError, res
+        else
+          res
+        end
       end
 
     end # commit
@@ -143,7 +156,12 @@ module GitCli
       log_debug "Commit All : #{cmdln}"
 
       os_exec(cmdln)  do |st, res|
-        [st.success?, res.strip]
+        res.strip!
+        if not st.success?
+          raise CommitError, res
+        else
+          res.strip
+        end
       end
      
     end # commit_all

data/lib/git_cli/branch.rb

@@ -18,6 +18,8 @@
 
 module GitCli
   module Branch
+    
+    class BranchError < StandardError; end
 
     def current_branch
 
@@ -50,9 +52,11 @@ module GitCli
           #  end
           #end
 
-          [true, res.strip!]
+          res.strip
+          #[true, res.strip!]
         else
-          [false, res]
+          raise BranchError, res.strip
+          #[false, res]
         end
       end
       
@@ -70,7 +74,8 @@ module GitCli
         br.concat(rb)
       end
 
-      [true, br]
+      br
+      #[true, br]
        
     end # all_branches
 
@@ -95,9 +100,11 @@ module GitCli
           res.each_line do |l|
             b << l.strip
           end
-          [true, b]
+          b
+          #[true, b]
         else
-          [false, res]
+          raise BranchError, res.strip
+          #[false, res]
         end
       end
        
@@ -125,9 +132,11 @@ module GitCli
             b << l.strip
           end
           
-          [true, b]
+          #[true, b]
+          b
         else
-          [false, res]
+          raise BranchError, res.strip
+          #[false, res]
         end
       end
       
@@ -151,9 +160,11 @@ module GitCli
       log_debug "Switch branch : #{cmdln}"
       res = os_exec(cmdln) do |st, res|
         if st.success?
-          [true, res.strip]
+          res.strip
+          #[true, res.strip]
         else
-          [false, res]
+          raise BranchError, res.strip
+          #[false, res]
         end
       end
 
@@ -180,9 +191,11 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          [true, res.strip]
+          res.strip
+          #[true, res.strip]
         else
-          [false, res]
+          raise BranchError, res.strip
+          #[false, res]
         end
       end
       
@@ -205,9 +218,11 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          [true, res.strip]
+          res.strip
+          #[true, res.strip]
         else
-          [false, res]
+          raise BranchError, res.strip
+          #[false, res]
         end
       end
       
@@ -232,9 +247,11 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          [true, res.strip]
+          res.strip
+          #[true, res.strip]
         else
-          [false, res]
+          raise BranchError, res.strip
+          #[false, res]
         end
       end
      
@@ -260,9 +277,11 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          [true, res.strip]
+          res.strip
+          #[true, res.strip]
         else
-          [false, res]
+          raise BranchError, res.strip
+          #[false, res]
         end
 
       end

data/lib/git_cli/delta.rb

@@ -19,6 +19,102 @@
 module GitCli
   module Delta
 
+    class GitDeltaError < StandardError; end
+    class VCSItem
+      attr_reader :path, :full, :type
+      def initialize(type, path, full)
+        @type = type
+        @path = path
+        @full = full
+      end
+
+      # support sort
+      def <=>(val)
+        @path <=> val.path 
+      end
+    end
+    class NewDir < VCSItem
+      def initialize(path, full)
+        super(:dir, path, full)
+      end
+      def to_s
+        "[N] #{@path}"
+      end
+    end
+    class NewFile < VCSItem
+      def initialize(path, full)
+        super(:file, path, full)
+      end
+      def to_s
+        "[N] #{@path}"
+      end
+    end
+    class ModifiedDir < VCSItem
+      def initialize(path, full)
+        super(:dir, path, full)
+      end
+      def to_s
+        "[M] #{@path}"
+      end
+    end
+    class ModifiedFile < VCSItem
+      def initialize(path, full)
+        super(:file, path, full)
+      end
+      def to_s
+        "[M] #{@path}"
+      end
+    end
+    class DeletedDir < VCSItem
+      def initialize(path, full)
+        super(:dir, path, full)
+      end
+      def to_s
+        "[D] #{@path}"
+      end
+    end
+    class DeletedFile < VCSItem
+      def initialize(path, full)
+        super(:file, path, full)
+      end
+      def to_s
+        "[D] #{@path}"
+      end
+    end
+    class StagedDir < VCSItem
+      def initialize(path, full)
+        super(:dir, path, full)
+      end
+      def to_s
+        "[S] #{@path}"
+      end
+    end
+    class StagedFile < VCSItem
+      def initialize(path, full)
+        super(:file, path, full)
+      end
+      def to_s
+        "[S] #{@path}"
+      end
+    end
+    class ConflictedDir < VCSItem
+      def initialize(path, full)
+        super(:dir, path, full)
+      end
+      def to_s
+        "[C] #{@path}"
+      end
+    end
+    class ConflictedFile < VCSItem
+      def initialize(path, full)
+        super(:file, path, full)
+      end
+      def to_s
+        "[C] #{@path}"
+      end
+    end
+
+
     def status
       
       check_vcs
@@ -34,11 +130,16 @@ module GitCli
       log_debug "Status : #{cmdln}"
       res = os_exec(cmdln) do |st, res|
 
-        if st.success?
-          [true, res]
+        if not st.success?
+          raise GitDeltaError, res
         else
-          [false, res]
+          res
         end
+        #if st.success?
+        #  [true, res]
+        #else
+        #  [false, res]
+        #end
       end
       
     end # status
@@ -61,19 +162,21 @@ module GitCli
       files = []
       res = os_exec(cmdln) do |st, res|
 
-        if st.success?
+        if not st.success?
+          raise GitDeltaError, res
+        else
           res.each_line do |l|
             l.chomp!
-            if File.directory?(File.join(@wsPath,l))
-              dirs << l	
+            full = File.join(@wsPath,l)
+            if File.directory?(full)
+              dirs << ModifiedDir.new(l,full)	
             else
-              files << l
+              files << ModifiedFile.new(l,full)
             end
           end
 
-          [true, dirs.sort, files.sort]
-        else
-          [false, [], []]
+          #[true, dirs.sort, files.sort]
+          [dirs.sort, files.sort]
         end
 
       end
@@ -96,19 +199,20 @@ module GitCli
       files = []
       res = os_exec(cmdln) do |st, res|
 
-        if st.success?
+        if not st.success?
+          raise GitDeltaError, res
+        else
           res.each_line do |l|
             l.chomp!
-            if File.directory?(File.join(@wsPath,l))
-              dirs << l	
+            full = File.join(@wsPath,l)
+            if File.directory?(full)
+              dirs << ConflictedDir.new(l, full)	
             else
-              files << l
+              files << ConflictedFile.new(l, full)
             end
           end
 
-          [true, dirs.sort, files.sort]
-        else
-          [false, [], []]
+          [dirs.sort, files.sort]
         end
 
       end
@@ -131,19 +235,20 @@ module GitCli
       files = []
       res = os_exec(cmdln) do |st, res|
 
-        if st.success?
+        if not st.success?
+          raise GitDeltaError, res
+        else
           res.each_line do |l|
             l.chomp!
-            if File.directory?(File.join(@wsPath,l))
-              dirs << l	
+            full = File.join(@wsPath,l)
+            if File.directory?(full)
+              dirs << NewDir.new(l,full)
             else
-              files << l
+              files << NewFile.new(l,full)
             end
           end
 
-          [true, dirs.sort, files.sort]
-        else
-          [false, [], []]
+          [dirs.sort, files.sort]
         end
       end
 
@@ -166,19 +271,20 @@ module GitCli
       files = []
       res = os_exec(cmdln) do |st, res|
 
-        if st.success?
+        if not st.success?
+          raise GitDeltaError, res
+        else
           res.each_line do |l|
             l.chomp!
-            if File.directory?(File.join(@wsPath,l))
-              dirs << l	
+            full = File.join(@wsPath,l)
+            if File.directory?(full)
+              dirs << DeletedDir.new(l,full)	
             else
-              files << l
+              files << DeletedFile.new(l,full)
             end
           end
 
-          [true, dirs.sort, files.sort]
-        else
-          [false, [], []]
+          [dirs.sort, files.sort]
         end
       end
      
@@ -196,24 +302,25 @@ module GitCli
       cmd << "diff --name-only --cached"
 
       cmdln = cmd.join(" ")
-      log_debug "New Files : #{cmdln}"
+      log_debug "Staged Files : #{cmdln}"
       dirs = []
       files = []
       res = os_exec(cmdln) do |st, res|
 
-        if st.success?
+        if not st.success?
+          raise GitDeltaError, res
+        else
           res.each_line do |l|
             l.chomp!
-            if File.directory?(File.join(@wsPath,l))
-              dirs << l	
+            full = File.join(@wsPath,l)
+            if File.directory?(full)
+              dirs << StagedDir.new(l,full)	
             else
-              files << l
+              files << StagedFile.new(l,full)
             end
           end
 
-          [true, dirs.sort, files.sort]
-        else
-          [false, [], []]
+          [dirs.sort, files.sort]
         end
       end
 
@@ -221,7 +328,7 @@ module GitCli
 
     def reset_file_changes(path)
 
-      raise_if_empty(path, "Path cannot be empty for reset file changes operation", GitCliException)
+      raise_if_empty(path, "Path cannot be empty for reset file changes operation", GitDeltaError)
 
       check_vcs
 

data/lib/git_cli/repos.rb

@@ -18,6 +18,7 @@
 
 module GitCli
   module Repos
+    class ReposError < StandardError; end
 
     def remote_config
       check_vcs
@@ -32,21 +33,26 @@ module GitCli
       cmdln = cmd.join(" ")
       log_debug "Remote config : #{cmdln}"
       res = os_exec(cmdln) do |st, res|
-        
+       
         if st.success?
 
           remotes = { }
           res.each_line do |l|
             ls = l.split("\t")
             lss = ls[1].split(" ")
-            if not remotes.keys.include?(ls[0])
-              remotes[ls[0]] = lss[0]
-            end
+
+            remotes[ls[0]] = { } if is_empty?(remotes[ls[0]])
+            rem = remotes[ls[0]]
+            type = lss[-1]
+            type.gsub!("(","").gsub!(")","")
+            rem[type] = lss[0]
           end
 
-          [true, remotes]
+          #[true, remotes]
+          remotes
         else
-          [false, res]
+          raise ReposError, res.strip
+          #[false, res]
         end
       end
       
@@ -74,9 +80,11 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          [true, res.strip]
+          #[true, res.strip]
+          res.strip
         else
-          [false, res.strip]
+          raise ReposError, res.strip
+          #[false, res.strip]
         end
       end
 
@@ -103,13 +111,16 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          [true, res.strip]
+          #[true, res.strip]
+          res.strip
         else
-          [false, res.strip]
+          raise ReposError, res.strip
+          #[false, res.strip]
         end
       end
 
     end # remove_remote
+    alias_method :remove_del, :remove_remote
 
 
  

data/lib/git_cli/tags.rb

@@ -19,6 +19,8 @@
 module GitCli
   module Tags
 
+    class TagError < StandardError; end
+
     def all_tags
 
       check_vcs
@@ -35,9 +37,11 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          [true, res.strip!]
+          res.strip
+          #[true, res.strip!]
         else
-          [false, res]
+          raise TagError, res
+          #[false, res]
         end
       end
       
@@ -144,9 +148,11 @@ module GitCli
       log_debug "New tag : #{cmdln}"
       res = os_exec(cmdln) do |st, res|
         if st.success?
-          [true, res.strip!]
+          #[true, res.strip!]
+          res.strip
         else
-          [false, res]
+          raise TagError, res
+          #[false, res]
         end
       end
 
@@ -186,9 +192,11 @@ module GitCli
       log_debug "New tag from commit ID : #{cmdln}"
       res = os_exec(cmdln) do |st, res|
         if st.success?
-          [true, res.strip!]
+          res.strip
+          #[true, res.strip!]
         else
-          [false, res]
+          raise TagError, res
+          #[false, res]
         end
       end
       
@@ -211,9 +219,11 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          [true, res.strip!]
+          #[true, res.strip!]
+          res.strip
         else
-          [false, res]
+          raise TagError, res
+          #[false, res]
         end
       end
       
@@ -241,9 +251,11 @@ module GitCli
       log_debug "Show tag '#{tag}' #{not_empty?(format) ? "[#{format}]" : ""} : #{cmdln}"
       res = os_exec(cmdln) do |st, res|
         if st.success?
-          [true, res.strip!]
+          res.strip
+          #[true, res.strip!]
         else
-          [false, res]
+          raise TagError, res
+          #[false, res]
         end
       end
       
@@ -266,9 +278,11 @@ module GitCli
       log_debug "Delete tag '#{tag}' : #{cmdln}"
       res = os_exec(cmdln) do |st, res|
         if st.success?
-          [true, res.strip!]
+          res.strip
+          #[true, res.strip!]
         else
-          [false, res]
+          raise TagError, res
+          #[false, res]
         end
       end
       
@@ -293,9 +307,11 @@ module GitCli
       log_debug "Delete remote tag '#{tag}' at '#{repos}': #{cmdln}"
       res = os_exec(cmdln) do |st, res|
         if st.success?
-          [true, res.strip!]
+          res
+          #[true, res.strip!]
         else
-          [false, res]
+          raise TagError, res
+          #[false, res]
         end
       end
       
@@ -321,9 +337,11 @@ module GitCli
       log_debug "Checkout tag '#{tag}' into branch '#{branch}': #{cmdln}"
       res = os_exec(cmdln) do |st, res|
         if st.success?
-          [true, res.strip!]
+          res.strip
+          #[true, res.strip!]
         else
-          [false, res]
+          raise TagError, res
+          #[false, res]
         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.8.0"
+  VERSION = "0.9.0"
 end

data/lib/git_cli.rb

@@ -118,13 +118,21 @@ module GitCli
     include GitCli::Repos
     include GitCli::Stash
 
+    include TR::CondUtils
+
     attr_accessor :repos
-    def initialize(vcs, path)
+    def initialize(path, vcs = nil)
 
-      raise_if_empty(vcs , "VCS cannot be empty", GitCliException)
+      #raise_if_empty(vcs , "VCS cannot be empty", GitCliException)
       raise_if_empty(path, "Workspace path cannot be empty", GitCliException)
-      
-      @vcs = vcs
+
+      if is_empty?(vcs)
+        @vcs = Gvcs::Vcs.new
+      else
+        @vcs = vcs
+      end
+
+      #@vcs = vcs
       @givenPath = path
 
       @wsPath = File.expand_path(@givenPath)
@@ -151,6 +159,7 @@ module GitCli
 
     def is_repos_exist?(name)
       found = false
+      load_remote_to_repos
       @repos.each do |re|
         if re.name == name
           found = true
@@ -161,8 +170,15 @@ module GitCli
     end # is_repos_exist?
 
     def is_workspace?
-      st, res = status
-      st 
+      begin
+        status
+        true
+      rescue GitDeltaError => ex
+        log_debug ex.message
+        false
+      end
+      #st, res = status
+      #st 
     end
 
     def workspace_root
@@ -195,6 +211,16 @@ module GitCli
       
     end # workspace_root
 
+    def load_remote_to_repos
+      conf = remote_config
+      conf.each do |k,v|
+        repo = Gvcs::Repository.new(k, v.values.first)
+        repo.support_fetch if v.keys.include?("fetch")
+        repo.support_push if v.keys.include?("push")
+        add_repos(repo)
+      end
+    end
+
   end # Gvcs::Workspace
 
 
@@ -208,12 +234,29 @@ module GitCli
       @url = url
       #@branches = branches
       @sslVerify = true  
+
+      @fetch = false
+      @push = false
     end
 
     def ssl_verify(bool)
       @sslVerify = bool
     end
 
+    def support_fetch
+      @fetch = true
+    end
+    def is_fetch_supported?
+      @fetch
+    end
+
+    def support_push
+      @push = true
+    end
+    def is_push_supported?
+      @push
+    end
+
   end # repository
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_cli
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Chris Liaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tlogger
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: toolrack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gvcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ptools
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 description: Interface to GIT via command line interface instead of some sor of library
 email:
 - chrisliaw@antrapol.com
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: GIT command line interface