git_cli 0.1.0

data/lib/git_cli/delta.rb

@@ -0,0 +1,229 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+module GitCli
+  module Delta
+
+    def status
+      
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "status"
+
+      cmdln = cmd.join(" ")
+      log_debug "Status : #{cmdln}"
+      res = os_exec(cmdln) do |st, res|
+
+        if st.success?
+          [true, res]
+        else
+          [false, res]
+        end
+      end
+      
+    end # status
+
+    def modified_files
+      
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "diff --name-only --diff-filter=M"
+
+      cmdln = cmd.join(" ")
+      log_debug "Modified 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 # modified files
+
+    def conflicted_files
+      
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "diff --name-only --diff-filter=U"
+
+      cmdln = cmd.join(" ")
+      log_debug "Conflicted 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 # conflicted files
+
+    def new_files
+      
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "ls-files --others --exclude-standard --directory"
+
+      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 # new_files
+
+    def deleted_files
+      
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "ls-files -d"
+
+      cmdln = cmd.join(" ")
+      log_debug "Deleted 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 # deleted_files
+
+    def reset_file_changes(path)
+
+      raise_if_empty(path, "Path cannot be empty for reset file changes operation", GitCliException)
+
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "checkout --"
+      cmd << path
+
+      cmdln = cmd.join(" ")
+      log_debug "Reset file changes local changes (given file permanent) : #{cmdln}"
+      res = os_exec(cmdln) do |st, res|
+        [st.success?, res]
+      end
+      
+    end # reset file changes
+
+    def reset_all_changes
+
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "reset --hard"
+
+      cmdln = cmd.join(" ")
+      log_debug "Reset all local changes (permanent) : #{cmdln}"
+      res = os_exec(cmdln) do |st, res|
+        [st.success?, res]
+      end
+      
+    end # reset all changes
+
+
+  end
+end

data/lib/git_cli/diff.rb

@@ -0,0 +1,88 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+module GitCli
+  module Diff
+
+    def diff
+      diff_branch("","")
+    end
+
+    def diff_file_with_last_commit(file)
+
+      diff_common({ args: "#{file}", log_tag: "Diff file compare with last commit" })
+      
+    end # diff_file_with_last_commit
+    alias :diff_file :diff_file_with_last_commit
+
+    # head_to_head = true == "git diff b1..b2" -> compare head-to-head of the given two branches
+    def diff_branch(b1, b2, opts = { head_to_head: true })
+
+      if not ((b1.nil? or b1.empty?) and (b2.nil? or b2.empty?))
+        diff_common({ args: "#{b1}..#{b2}", log_tag: "Diff against head of two branches" })
+      else
+        diff_common({ args: "", log_tag: "Diff workspace with last commit" })
+      end
+       
+    end # diff_branch
+
+    # changes to push to repos if 'git commit -a' is run
+    def diff_working_with_last_commit
+
+      diff_common({ args: "HEAD^ HEAD", log_tag: "Diff working with last commit" })
+       
+    end # diff_working_with_last_commit
+
+    # this show different for item already put inside 'git add'
+    def diff_index_with_last_commit
+     
+      diff_common({ args: "--cached", log_tag: "Diff index (file added with 'git add') with last commit" }) 
+      
+    end # diff_index_with_last_commit
+
+    def diff_common(opts = { })
+
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "diff"
+
+      if not (opts[:args].nil? or opts[:args].empty?)
+        cmd << opts[:args]
+      end
+
+      cmdln = cmd.join(" ")
+      log_debug "#{opts[:log_tag]} : #{cmdln} "
+
+      res = os_exec(cmdln) do |st, res|
+        
+        if st.success?
+          [true, res.strip!]
+        else
+          [false, res]
+        end
+      end
+      
+    end
+
+  end
+end

data/lib/git_cli/git_core.rb

@@ -0,0 +1,85 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+require_relative 'global'
+
+module GitCli
+  module GitCore
+
+    include Antrapol::ToolRack::ConditionUtils
+    #extend Antrapol::ToolRack::ConditionUtils
+   
+    def exe_path
+      if @gitPath.nil? or @gitPath.empty?
+        st, path = is_installed?
+        @gitPath = path.strip if st
+      end
+
+      @gitPath
+    end # exe_path
+
+    def version
+      
+      if @version.nil? or @version.empty?
+        path = exe_path
+        cmd = "#{path} version"
+        log_debug "version : #{cmd}"
+        os_exec(cmd) do |st, res|
+          # as current dev version
+          if st.success?
+            res.strip!
+            # based on version 2.25.1
+            @version = res.split(" ")[-1]
+            [true,@version]
+          else
+            [false,""]
+          end
+        end
+      else
+        [true, @version]
+      end
+
+    end # version
+
+    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'
+
+      else
+        GitCli::Global.instance.logger.debug "Cannot determine which OS am i running...Confused"
+        raise RuntimeError, "Unknown platform"
+      end
+
+    end # is_installed?
+
+  end
+end

data/lib/git_cli/global.rb

@@ -0,0 +1,33 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+require 'tlogger'
+require 'singleton'
+
+module GitCli
+  class Global
+    include Singleton
+
+    attr_reader :logger
+    def initialize
+      @logger = Tlogger.new
+    end
+  end
+
+  class GitCliException < StandardError; end
+
+end

data/lib/git_cli/ignore.rb

@@ -0,0 +1,79 @@
+# Copyright (C) 2020  Chris Liaw <chrisliaw@antrapol.com>
+# Author: Chris Liaw <chrisliaw@antrapol.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+module GitCli
+  module Ignore
+
+    def ignore(val)
+      with_ignore_file do |f|
+        f.puts val
+      end 
+      log_debug ".gitignore file updated with line '#{val}'"
+      [true,".gitignore file updated"]
+    end
+
+    def ignore_rules
+      st, root = workspace_root
+      root.strip!
+      if st
+        rulesFile = File.join(root,".gitignore")
+        if File.exist?(rulesFile)
+          File.open(rulesFile,"r") do |f|
+            @cont = f.read
+          end
+          @cont
+        else
+          ""
+        end
+      else
+        ""
+      end
+    end
+
+    def update_ignore_rules(rules)
+      st, root = workspace_root
+      root.strip!
+      if st
+        rulesFile = File.join(root,".gitignore")
+        File.open(rulesFile,"w") do |f|
+          f.write rules
+        end
+      end
+      log_debug ".gitignore files is updated!"
+      [true,".gitignore file is updated"]
+    end
+
+    private
+    def with_ignore_file(&block)
+      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|
+            block.call(f)
+          end
+        else
+          raise GitCliException, "Cannot get workspace root. Probably not a GIT workspace?"
+        end
+      end
+    end
+
+  end
+end