gity 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d759aad76467ded2633edabaea4c77a4b0c81992dc5a01d5b3194665419642
-  data.tar.gz: b001c69f4ea53f7651702c355ab3cc038d0f90848e63b42bead2cc27f0b90c43
+  metadata.gz: a7b88428dddbf037a5df49d58554541add9012728a718fb0af4f746915d7f329
+  data.tar.gz: 1f9f993d3c332212a3e2e2e3d2a18447c98ae6cced9bea174ad3b9d80b77bf9e
 SHA512:
-  metadata.gz: 2a0a18d09953679b1ab908419988e6b57bda938dc258c8df20ebd760f78e1f56303ecbb6aac60377195cfc7eadf606efe2512827d54cc15c8155c4f41b340e45
-  data.tar.gz: fbac989ab76565cfe87eba0c22c64c5ff4af538238dc47ff4f035f521fe0710fd0f6b4896143f43dc7604eaec4a208353f8dcf12ce0f863204bb0737d1ff6557
+  metadata.gz: 4f9c78b33bc01121878c0424f7b7755154719fd801e1a334f889372b5694d27df9207a4a8e7bb064390a5ba60b861fb98c6b3f225b41cd0c11337617fc226aef
+  data.tar.gz: c67f13bb05a7f2c157e495d07ea1d68f99022b360da5479ad8cf6eeab69b5b51c9c621828824995c3f7fbe3bf56e186d27c704a63ea5b28c26ca906155990ccb

data/lib/gity/common.rb

@@ -1,4 +1,5 @@
 
+require_relative 'flash'
 
 module Gity
   module Common
@@ -29,6 +30,19 @@ module Gity
       " #{res}"
     end
 
+    def _flash
+      Flash.instance
+    end
+
+    def _operation_done(no_exit = false)
+      no_exit = false if no_exit.nil?
+      if no_exit
+        raise OperationCompleted
+      else
+        exit(0)
+      end
+    end
+
     def _cls
       print "\e[2J\e[f"
     end

data/lib/gity/flash.rb

@@ -0,0 +1,59 @@
+
+require 'singleton'
+
+module Gity
+  class Flash
+    include Singleton
+    include TR::CondUtils
+
+    def add_info(msg)
+      info_msg << msg if not_empty?(msg) 
+    end
+
+    def add_error(msg)
+      error_msg << msg if not_empty?(msg) 
+    end
+
+    def add_warning(msg)
+      warning_msg << msg if not_empty?(msg) 
+    end
+
+    def has_messages?
+      not_empty?(info_msg) or not_empty?(error_msg) or not_empty?(warning_msg)
+    end
+
+    def has_info_msg?
+      not_empty?(info_msg)
+    end
+
+    def has_err_msg?
+      not_empty?(error_msg)
+    end
+
+    def has_warning_msg?
+      not_empty?(warning_msg)
+    end
+
+    def info_msg
+      if @_infoMsg.nil?
+        @_infoMsg = []
+      end
+      @_infoMsg
+    end
+
+    def error_msg
+      if @_errMsg.nil?
+        @_errMsg = []
+      end 
+      @_errMsg
+    end
+
+    def warning_msg
+      if @_warnMsg.nil?
+        @_warnMsg = []
+      end
+      @_warnMsg
+    end
+
+  end
+end

data/lib/gity/git_log.rb

@@ -28,7 +28,7 @@ module Gity
         entry.id = ll[0]
         entry.timestamp = ll[1]
         by = ll[2].split(",")
-        entry.commit_by = "#{by[0]} <#{by[1]}>" 
+        entry.commit_by = "#{by[0]} <#{by[1].strip}>" 
         entry.commit_notes = ll[3]
         entries << entry
       end

data/lib/gity/landing.rb

@@ -13,7 +13,7 @@ module Gity
     include Operation
     include Common
 
-    def run(root, opts = {})
+    def run(root, opts = {}, &block)
 
       @ws = GitCli::Workspace.new(root)
       raise Error, "Given path '#{root}' is not a workspace" if not @ws.is_workspace?
@@ -21,21 +21,48 @@ module Gity
       opts = {} if opts.nil?
       opts[:loop] = true if is_empty?(opts[:loop])
 
-      loop do
+      begin
+        loop do
 
-        _cls
-        print_header
-        _prmt.puts
-        res = print_overview(@ws, opts) do |ws, files, optts|
+          _cls
+          print_header
           _prmt.puts
-          prompt_operation(ws, files, optts)
-        end
+          res = print_overview(@ws, opts) do |ws, files, optts|
+            _prmt.puts
+            process_flash
+            _prmt.puts
+            prompt_operation(ws, files, optts, &block)
+          end
 
 
-        break if not opts[:loop] or res.clean?
+          break if not opts[:loop] or res.clean?
+        end
+      rescue OperationCompleted
       end
 
     end
 
+    def process_flash
+      if Flash.instance.has_messages?
+        if Flash.instance.has_info_msg?
+          while Flash.instance.has_info_msg?
+            _prmt.puts _fmt Flash.instance.info_msg.pop, :magenta
+          end
+        end
+
+        if Flash.instance.has_err_msg?
+          while Flash.instance.has_err_msg?
+            _prmt.puts _fmt Flash.instance.err_msg.pop, :red
+          end
+        end
+
+        if Flash.instance.has_warning_msg?
+          while Flash.instance.has_warning_msg?
+            _prmt.puts _fmt Flash.instance.warning_msg.pop, :bright_yellow
+          end
+        end
+      end
+    end
+
   end
 end

data/lib/gity/operation/add.rb

@@ -5,7 +5,7 @@ module Gity
     module Add
       include Common
 
-      def add(ws, files)
+      def add(ws, files, &block)
         _cls
         print_header
         _prmt.puts
@@ -21,7 +21,9 @@ module Gity
             end
           end
 
+          block.call(:before_add_to_staging, sels) if block
           st, res = ws.add_to_staging(*sels)
+          block.call(:after_add_to_staging, st, res) if block
           raise OperationError, "Add to staging failed with error : #{res}" if not st
 
         rescue TTY::Reader::InputInterrupt

data/lib/gity/operation/commit.rb

@@ -3,12 +3,15 @@ require_relative '../common'
 
 require_relative '../overview'
 
+require_relative '../status'
+
 module Gity
   module Operation
     module Commit
       include Common
+      include Status
 
-      def commit(ws, files)
+      def commit(ws, files, &block)
 
         _cls
         print_header
@@ -22,32 +25,51 @@ module Gity
             efiles.sort.each do |f|
               m.choice f,f.path
             end
+
+            # allow to exit without selecting any files
+            m.choice "Done", :done
           end
 
+          sels.delete(:done)
+
+          # possible no files available to be add to staging as all files already in staging
           if not_empty?(sels)
+            block.call(:before_add_to_staging, sels) if block
             st, res = ws.add_to_staging(*sels)
+            block.call(:after_add_to_staging, st, res) if block
             raise OperationError, "Adding files to staging failed with error #{res}" if not st
           end
 
-          _cls
-          print_overview(ws, skip_other_files: true) do |ws, files, opts|
+          st = status(ws)
+          if st.has_staged?
+
+            _cls
+            print_overview(ws, skip_other_files: true) do |ws, files, opts|
 
-            msg = ""
-            loop do
-              msg = _prmt.ask(_fmt("\n Commit message (Ctrl-c to go back) : "), required: true)
-              confirm = _prmt.yes?(_fmt(" Commit message : #{msg}\n Proceed? No to provide a new commit message "))
-              if confirm
-                break
+              msg = ""
+              loop do
+                msg = _prmt.ask(_fmt("\n Commit message (Ctrl-c to go back) : "), required: true)
+                confirm = _prmt.yes?(_fmt(" Commit message : #{msg}\n Proceed? No to provide a new commit message "))
+                if confirm
+                  break
+                end
               end
-            end
 
-            st, res = ws.commit(msg)
-            raise OperationError, "Commit all failed with error : #{res}" if not st
+              oldMsg = msg.clone
+              msg = block.call(:before_commit_message, msg) if block
+              _logger.debug "Commit message changed by listener. Old '#{oldMsg}' / New '#{msg}' "
+              st, res = ws.commit(msg)
+              block.call(:after_commit_message, st, res) if block
+              raise OperationError, "Commit all failed with error : #{res}" if not st
+
+            end
 
+          else
+            _flash.add_info "No staged file(s) to be committed"
           end
 
         rescue TTY::Reader::InputInterrupt
-          _prmt.puts _fmt "Commit aborted"
+          _flash.add_info "Commit aborted"
         end
 
       end

data/lib/gity/operation/commit_all.rb

@@ -6,7 +6,7 @@ module Gity
     module CommitAll
       include Common
 
-      def commit_all(ws, files)
+      def commit_all(ws, files, &block)
         _prmt.puts _fmt("Files eligible to be committed : ")
         [:staged, :modified, :deleted].each do |cat|
           files.send(cat).each do |k,v|
@@ -26,7 +26,11 @@ module Gity
             end
           end
 
+          oldMsg = msg.clone
+          msg = block.call(:before_commit_all_message, msg) if block
+          _logger.debug "Commit all message changed by listener. Old '#{oldMsg}' / New '#{msg}' "
           st, res = ws.commit_all(msg)
+          block.call(:after_commit_all_message, st, res) if block
           raise OperationError, "Commit all failed with error : #{res}" if not st
         rescue TTY::Reader::InputInterrupt
           _prmt.puts _fmt "Commit all aborted"

data/lib/gity/operation/delete.rb

@@ -5,7 +5,7 @@ module Gity
     module Delete
       include Common
 
-      def delete(ws, files)
+      def delete(ws, files, &block)
         _cls
         print_header
         _prmt.puts
@@ -25,19 +25,25 @@ module Gity
             if s.is_a?(GitCli::Delta::NewFile)
               skip = _prmt.no? _fmt "Proceed to delete regular file '#{s}'? "
               if not skip
+                block.call(:before_delete_new_file, s) if block
                 FileUtils.rm(s.path)
+                block.call(:after_delete_new_file, s) if block
               end
 
             elsif s.is_a?(GitCli::Delta::ModifiedFile)
               # not staged
               skip = _prmt.no? _fmt "Proceed to delete modified file '#{s}'? "
               if not skip
+                block.call(:before_delete_modified_file, s) if block
                 ws.remove_from_vcs(s.path)
+                block.call(:after_delete_modified_file, s) if block
               end
             elsif s.is_a?(GitCli::Delta::StagedFile)
               skip = _prmt.no? "Proceed to delete staged file '#{s}'? "
               if not skip
+                block.call(:before_delete_staged_file, s) if block
                 ws.remove_from_staging(s.path)
+                block.call(:after_delete_staged_file, s) if block
               end
             end
 

data/lib/gity/operation/ignore.rb

@@ -5,7 +5,7 @@ module Gity
     module Ignore
       include Common
 
-      def ignore(ws, files)
+      def ignore(ws, files, &block)
         _cls
         print_header
         _prmt.puts
@@ -20,7 +20,9 @@ module Gity
             end
           end
 
+          block.call(:before_ignore_file, sels) if block
           st, res = ws.ignore(*sels)
+          block.call(:after_ignore_file, sels) if block
           raise OperationError, "Ignore operation failed with error : #{res}" if not st
         rescue TTY::Reader::InputInterrupt
         end

data/lib/gity/operation/remove_staged.rb

@@ -5,7 +5,7 @@ module Gity
     module RemoveStaged
       include Common
 
-      def remove_staged(ws, files)
+      def remove_staged(ws, files, &block)
         _cls
         print_header
         _prmt.puts
@@ -19,7 +19,9 @@ module Gity
           end
         end
 
+        block.call(:before_remove_staged_file, sels) if block
         st, res = ws.remove_from_staging(*sels)
+        block.call(:after_remove_staged_file, sels) if block
         raise OperationError, "Remove from staging failed with error : #{res}" if not st
         
       end

data/lib/gity/operation.rb

@@ -20,7 +20,7 @@ module Gity
     include Diff
     include Delete
 
-    def prompt_operation(ws, files, opts = {})
+    def prompt_operation(ws, files, opts = {}, &block)
       
       opts = {} if opts.nil?
       defOps = [:commit_all, :commit, :add, :ignore, :remove_staged, :diff, :delete]
@@ -31,7 +31,7 @@ module Gity
         when :commit_all
           selOpts["Commit all"] = o if files.has_staged? or files.has_modified? or files.has_deleted?
         when :commit
-          selOpts["Commit staged"] = o if files.has_staged?
+          selOpts["Commit"] = o if files.has_staged? or files.has_new? or files.has_modified?
         when :add
           selOpts["Add"] = o if files.has_new?
         when :ignore
@@ -58,27 +58,27 @@ module Gity
         when :commit_all
           _cls
           _prmt.puts
-          commit_all(ws, files)
+          commit_all(ws, files, &block)
 
         when :commit
           _cls
           _prmt.puts
-          commit(ws, files)
+          commit(ws, files, &block)
 
         when :add
           _cls
           _prmt.puts
-          add(ws, files)
+          add(ws, files, &block)
 
         when :ignore
           _cls
           _prmt.puts
-          ignore(ws, files)
+          ignore(ws, files, &block)
 
         when :remove_staged
           _cls
           _prmt.puts
-          remove_staged(ws, files)
+          remove_staged(ws, files, &block)
 
         when :diff
           _cls
@@ -88,10 +88,13 @@ module Gity
         when :delete
           _cls
           _prmt.puts
-          delete(ws, files)
+          delete(ws, files, &block)
 
         when :quit
-          exit(0)
+          block.call(:before_quit) if block
+          _operation_done(opts[:no_exit])
+          # no_exit will reach here
+          block.call(:after_quit) if block
         end
 
       rescue TTY::Reader::InputInterrupt
@@ -99,7 +102,7 @@ module Gity
         _prmt.puts
         _prmt.puts _fmt "Operation aborted", :bright_yellow
         _prmt.puts
-        exit(0)
+        _operation_done(opts[:no_exit])
       end
 
     end

data/lib/gity/overview.rb

@@ -75,8 +75,8 @@ module Gity
         en = GitLogParser.new(logs)
         _prmt.puts _fmt "Last 3 last commit : " 
         en.entries.each do |e|
-          _prmt.puts _fmt "#{e.commit_by}\n #{e.timestamp}\n #{e.commit_notes}"
-          _prmt.puts _fmt "**** ****"
+          _prmt.puts _fmt "#{e.commit_by} @ #{e.timestamp}\n\n #{e.commit_notes}"
+          _prmt.puts _fmt "\n**** ****"
         end
         _prmt.puts 
         true

data/lib/gity/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gity
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/gity.rb

@@ -15,6 +15,7 @@ module Gity
 
   class Error < StandardError; end
   class OperationError < Error; end
+  class OperationCompleted < Error; end
   # Your code goes here...
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gity
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -122,6 +122,7 @@ files:
 - exe/gity
 - lib/gity.rb
 - lib/gity/common.rb
+- lib/gity/flash.rb
 - lib/gity/git_log.rb
 - lib/gity/landing.rb
 - lib/gity/operation.rb