gity 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d759aad76467ded2633edabaea4c77a4b0c81992dc5a01d5b3194665419642
-  data.tar.gz: b001c69f4ea53f7651702c355ab3cc038d0f90848e63b42bead2cc27f0b90c43
+  metadata.gz: 8ad3e13e041d3318b74c725c85b3e54ba508e8137339e3f2ca2ef1510360363d
+  data.tar.gz: 7bc3e2fd3dc5a4b62e32cdb3c5a8f83cf63a225b7516a38c84de7d9d934c85c2
 SHA512:
-  metadata.gz: 2a0a18d09953679b1ab908419988e6b57bda938dc258c8df20ebd760f78e1f56303ecbb6aac60377195cfc7eadf606efe2512827d54cc15c8155c4f41b340e45
-  data.tar.gz: fbac989ab76565cfe87eba0c22c64c5ff4af538238dc47ff4f035f521fe0710fd0f6b4896143f43dc7604eaec4a208353f8dcf12ce0f863204bb0737d1ff6557
+  metadata.gz: d3573cbd151944bc04fc435929f59ac27d165016122fe03a38ef3318299a96fe0ca164a17aaa8eea96e6de45c700765fa14f41ec353e350c668deedb2610577e
+  data.tar.gz: 47ada26af980984dac10826dcac61bf5b310d8a02ca6c0f4df595fce432467e99b95016c42d06c04d205dd33f058e1af731fc2510cc1d2d65ab9bd6f7758bc5a

data/lib/gity/common.rb

@@ -29,6 +29,15 @@ module Gity
       " #{res}"
     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/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,18 +21,21 @@ 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
+            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

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

@@ -8,7 +8,7 @@ module Gity
     module Commit
       include Common
 
-      def commit(ws, files)
+      def commit(ws, files, &block)
 
         _cls
         print_header
@@ -25,7 +25,9 @@ module Gity
           end
 
           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
 
@@ -41,7 +43,11 @@ module Gity
               end
             end
 
+            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

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]
@@ -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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gity
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 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.1
 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