gity 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ad3e13e041d3318b74c725c85b3e54ba508e8137339e3f2ca2ef1510360363d
-  data.tar.gz: 7bc3e2fd3dc5a4b62e32cdb3c5a8f83cf63a225b7516a38c84de7d9d934c85c2
+  metadata.gz: a7b88428dddbf037a5df49d58554541add9012728a718fb0af4f746915d7f329
+  data.tar.gz: 1f9f993d3c332212a3e2e2e3d2a18447c98ae6cced9bea174ad3b9d80b77bf9e
 SHA512:
-  metadata.gz: d3573cbd151944bc04fc435929f59ac27d165016122fe03a38ef3318299a96fe0ca164a17aaa8eea96e6de45c700765fa14f41ec353e350c668deedb2610577e
-  data.tar.gz: 47ada26af980984dac10826dcac61bf5b310d8a02ca6c0f4df595fce432467e99b95016c42d06c04d205dd33f058e1af731fc2510cc1d2d65ab9bd6f7758bc5a
+  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,10 @@ 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

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

@@ -28,6 +28,8 @@ module Gity
           print_header
           _prmt.puts
           res = print_overview(@ws, opts) do |ws, files, optts|
+            _prmt.puts
+            process_flash
             _prmt.puts
             prompt_operation(ws, files, optts, &block)
           end
@@ -40,5 +42,27 @@ module Gity
 
     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/commit.rb

@@ -3,10 +3,13 @@ require_relative '../common'
 
 require_relative '../overview'
 
+require_relative '../status'
+
 module Gity
   module Operation
     module Commit
       include Common
+      include Status
 
       def commit(ws, files, &block)
 
@@ -22,8 +25,14 @@ 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)
@@ -31,29 +40,36 @@ module Gity
             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
 
-            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
+              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.rb

@@ -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

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.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gity
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris
@@ -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