gity 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c93ccf96bb60fd989212947809f38159a3c5ccb6c57028674f43a6cd297cb35c
-  data.tar.gz: 8bf176af3ce980d6e12df695485d67ede1cbb5ebe18f542a054392542229742e
+  metadata.gz: 15e5211c909c15e0ca13dc9ce10a06f5ffcdd42583dc4164232f32b823bbe140
+  data.tar.gz: 637dab17aa26d859ff9b53e3048790a217fc1d668008747ced4e20c6d2284d92
 SHA512:
-  metadata.gz: 78a4d1d582e553402dd24ce21fbdcfa9b6adf7fc737ad91d9971c76a39884eaa5b429e36f695fdf5e849c1e826801b668027a7395fa05a286deddf6ed918ff68
-  data.tar.gz: 6b8247cfc6cfd3f8a2bea5a5979e586b6f48cd425558dcfd9c2a187803e2d35b60851fe5c626e371fd62970ba08cc9e536b201b3d118a7fd7c3b46a21c58156b
+  metadata.gz: 514447320f368f96478e494a769dc12e0c77709d2d84a4613a3a489b900a503ec50e55f063e9404b9db7d926cbe704644aff878aac48b447aa333e12918b960c
+  data.tar.gz: 6adaa2ed6281fd130f96ace2a6065874dcf67a11205d00e5f7d3bf3684ca2ab5fa60cfd62a144bc10b27c059a137a3cab0b752abaaf54501bfd10428773fa09a

data/lib/gity/common.rb

@@ -25,6 +25,15 @@ module Gity
         opts.each do |f|
           res = _pastel.send(f, res)
         end
+      elsif msg.is_a?(GitCli::Delta::VCSItem)
+        case msg
+        when GitCli::Delta::ModifiedFile, GitCli::Delta::ModifiedDir
+          res = _pastel.bright_yellow(res)
+        when GitCli::Delta::DeletedFile, GitCli::Delta::DeletedDir
+          res = _pastel.strikethrough(res)
+        when GitCli::Delta::StagedFile, GitCli::Delta::StagedDir
+          res = _pastel.on_yellow(res)
+        end
       end
 
       " #{res}"

data/lib/gity/landing.rb

@@ -4,6 +4,7 @@ require 'git_cli'
 require_relative 'common'
 require_relative 'overview'
 require_relative 'operation'
+require_relative 'push_workspace'
 
 module Gity
   class Landing
@@ -12,6 +13,7 @@ module Gity
     include Overview
     include Operation
     include Common
+    include PushWorkspace
 
     def run(root, opts = {}, &block)
 
@@ -40,6 +42,18 @@ module Gity
       rescue OperationCompleted
       end
 
+      _prmt.puts
+      push = _prmt.yes?(_fmt("Do you want to push the changes to remote repository? ", :cyan))
+      if push
+        begin
+
+          _cls
+          push_workspace(@ws, opts)
+
+        rescue OperationCompleted
+        end
+      end
+
     end
 
     def process_flash

data/lib/gity/operation/add.rb

@@ -11,20 +11,35 @@ module Gity
         _prmt.puts
         print_workspace_items(ws, files, skip_other_files: true)
         _prmt.puts
-        efiles = files.modified[:files] + files.new[:files] + files.deleted[:files]
+        efiles = files.modified[:files] + files.deleted[:files]
+        efiles2 = files.new[:files] + files.new[:dirs]
 
         begin
           sels = _prmt.multi_select(_fmt("Please select all files to add to staging : "), filter: true, per_page: 10) do |m|
-            m.choice "All", "."
+            m.choice _fmt("All"), "."
             efiles.sort.each do |f|
-              m.choice f,f.path
+              m.choice _fmt(f),f.path
             end
+
+            efiles2.sort.each do |f|
+              if f.is_a?(GitCli::Delta::NewDir)
+                m.choice _fmt(f),f.path if f.has_files?
+              else
+                m.choice _fmt(f),f.path
+              end
+            end
+
+            m.choice "Done", :done
           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
+          if sels.length == 0 or (sels.length == 1 and sels.first == :done)
+            # user not selected any files
+          else
+            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
+          end
 
         rescue TTY::Reader::InputInterrupt
         end

data/lib/gity/operation/commit.rb

@@ -18,12 +18,22 @@ module Gity
         _prmt.puts
         print_workspace_items(ws, files, skip_other_files: true)
         _prmt.puts
-        efiles = files.modified[:files] + files.modified[:dirs] + files.new[:files] + files.new[:dirs] + files.deleted[:files] + files.deleted[:dirs]
+        efiles = files.modified[:files] + files.modified[:dirs] + files.deleted[:files] + files.deleted[:dirs]
+        efiles2 = files.new[:files] + files.new[:dirs]
 
         begin
           sels = _prmt.multi_select(_fmt("Please select all files to be committed in this session : "), filter: true, per_page: 10) do |m|
             efiles.sort.each do |f|
-              m.choice f,f.path
+              m.choice _fmt(f),f.path
+            end
+
+            efiles2.sort.each do |f|
+              case f
+              when GitCli::Delta::NewDir
+                m.choice _fmt(f),f.path if f.has_files?
+              else
+                m.choice _fmt(f),f.path
+              end
             end
 
             # allow to exit without selecting any files

data/lib/gity/operation/delete.rb

@@ -11,15 +11,23 @@ module Gity
         _prmt.puts
         print_workspace_items(ws, files, skip_other_files: true)
         _prmt.puts
-        efiles = files.modified[:files] + files.new[:files] + files.staged[:files]
+        efiles = files.modified[:files] + files.staged[:files]
 
         begin
           sels = _prmt.multi_select(_fmt("Please select all applicable files to be deleted : "), filter: true, per_page: 10) do |m|
             efiles.sort.each do |f|
-              m.choice f,f
+              m.choice _fmt(f),f
             end
+
+            files.new[:files].each do |f|
+              m.choice _fmt(f),f
+            end
+
+            m.choice "Done", :done
           end
 
+          sels.delete_if { |e| e == :done }
+
           sels.each do |s|
 
             if s.is_a?(GitCli::Delta::NewFile)

data/lib/gity/operation/diff.rb

@@ -11,23 +11,29 @@ module Gity
         _prmt.puts
         print_workspace_items(ws, files, skip_other_files: true)
         _prmt.puts
-        efiles = files.modified[:files] + files.staged[:files] + files.deleted[:files]
+        efiles = files.modified[:files] + files.staged[:files] #+ files.deleted[:files]
 
         begin
           sel = _prmt.select(_fmt("Please select file to diff : "), filter: true, per_page: 10) do |m|
             efiles.sort.each do |f|
               m.choice f,f.path
             end
+            
+            m.choice "Done", :done
           end
 
-          st, res = ws.diff_file(sel)
-          raise OperationError, "Diff file '#{sel}' failed with error : #{res}" if not st
+          if is_empty?(sel) or sel != :done
 
-          _prmt.puts _fmt "Diff file result for '#{sel}'"
-          _prmt.puts _fmt res, :bright_blue
-          _prmt.puts
-          _prmt.puts _fmt "[Enter to close]", :inverse
-          STDIN.gets
+            st, res = ws.diff_file(sel)
+            raise OperationError, "Diff file '#{sel}' failed with error : #{res}" if not st
+
+            _prmt.puts _fmt "Diff file result for '#{sel}'"
+            _prmt.puts _fmt res, :bright_blue
+            _prmt.puts
+            _prmt.puts _fmt "[Enter to close]", :inverse
+            STDIN.gets
+
+          end
 
         rescue TTY::Reader::InputInterrupt
         end

data/lib/gity/operation/ignore.rb

@@ -18,12 +18,16 @@ module Gity
             efiles.sort.each do |f|
               m.choice f,f.path
             end
+
+            m.choice "Done", :done
           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
+          if sels.length > 0 or (sels.length == 1 and sels.first != :done)
+            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
+          end
         rescue TTY::Reader::InputInterrupt
         end
         

data/lib/gity/operation.rb

@@ -29,9 +29,9 @@ module Gity
       defOps.each do |o|
         case o
         when :commit_all
-          selOpts["Commit all"] = o if files.has_staged? or files.has_modified? or files.has_deleted?
+          selOpts["Commit all modified and deleted files"] = o if files.has_staged? or files.has_modified? or files.has_deleted?
         when :commit
-          selOpts["Commit"] = o if files.has_staged? or files.has_new? or files.has_modified?
+          selOpts["Add and 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
@@ -45,6 +45,7 @@ module Gity
         end
       end
 
+      selOpts["Done"] = :done
       selOpts["Quit"] = :quit
 
       begin
@@ -90,6 +91,9 @@ module Gity
           _prmt.puts
           delete(ws, files, &block)
 
+        when :done
+          _operation_done(true)
+
         when :quit
           block.call(:before_quit) if block
           _operation_done(opts[:no_exit])

data/lib/gity/overview.rb

@@ -38,7 +38,7 @@ module Gity
       files = mfiles.staged[:dirs] + mfiles.staged[:files]
       if files.length > 0
         files.sort.each do |v|
-          _prmt.puts _fmt("* #{v}", :on_yellow)
+          _prmt.puts _fmt("* #{v}")
         end
       else
         _prmt.puts _fmt "** No staged file found", :yellow
@@ -50,17 +50,27 @@ module Gity
 
         _prmt.puts ""
         _prmt.puts _fmt "Other Files : ", :bold, :underline
-        res = mfiles.modified[:dirs].sort + mfiles.modified[:files].sort + mfiles.deleted[:dirs].sort + mfiles.deleted[:files].sort + mfiles.new[:dirs].sort + mfiles.new[:files].sort
+        #res = mfiles.modified[:dirs].sort + mfiles.modified[:files].sort + mfiles.deleted[:dirs].sort + mfiles.deleted[:files].sort + mfiles.new[:dirs].sort + mfiles.new[:files].sort
+        res = mfiles.modified[:dirs] + mfiles.modified[:files] + mfiles.deleted[:dirs] + mfiles.deleted[:files]
+        res2 = mfiles.new[:dirs] + mfiles.new[:files]
 
-        if res.length > 0
-          res.each do |vv|
+        if res.length > 0 or res2.length > 0
+          res.sort.each do |vv|
+            case vv
+            when GitCli::Delta::ModifiedFile, GitCli::Delta::ModifiedDir
+              _prmt.puts _fmt(vv)
+            when GitCli::Delta::DeletedFile, GitCli::Delta::DeletedDir
+              _prmt.puts _fmt(vv)
+            end
+          end
+
+          _prmt.puts "\n ******** Untracked Files & Directories ******** "
+          res2.sort.each do |vv|
             case vv
             when GitCli::Delta::NewFile
               _prmt.puts _fmt(vv)
-            when GitCli::Delta::ModifiedFile
-              _prmt.puts _fmt(vv, :bright_yellow)
-            when GitCli::Delta::DeletedFile
-              _prmt.puts _fmt(vv, :strikethrough)
+            when GitCli::Delta::NewDir
+              _prmt.puts _fmt(vv) if vv.has_files?
             end
           end
 

data/lib/gity/push_workspace.rb

@@ -0,0 +1,51 @@
+
+
+
+module Gity
+  module PushWorkspace
+    include TR::CondUtils
+
+    def push_workspace(ws, opts = {})
+
+      _prmt.puts
+      if not ws.has_remote_repos?
+        _prmt.puts(_fmt("There is no remote repository defined."))
+        add = _prmt.yes?(_fmt("Add new repository? "))
+
+        while(add) 
+
+          return if not add
+
+          name = _prmt.ask("Name of the repository : ", required: true, value: "origin")
+          path = _prmt.ask("Path to the repository : ", required: true)
+
+          ws.add_remote(name, path)
+
+          add = _prmt.yes?("Done adding remote? ")
+
+        end
+
+      end
+
+
+      selRepos = _prmt.select(_fmt("Please select a repository to push : "), filter: true) do |m|
+        
+        ws.repos.each do |re|
+          m.choice "#{re.name} - #{re.url}", re
+        end
+
+        m.choice "Abort", :abort
+
+      end
+
+      if selRepos != :abort
+        ws.push_changes_with_tags(selRepos.name)
+        _prmt.puts _fmt("\nChanges push to remote repository '#{selRepos.name}'.\n Have a good day.\n", :bright_green)
+      else
+        _prmt.puts _fmt("\nPush aborted\n", :bright_yellow)
+      end
+
+    end
+    
+  end
+end

data/lib/gity/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gity
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.9
 - !ruby/object:Gem::Dependency
   name: release-gem
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - lib/gity/operation/ignore.rb
 - lib/gity/operation/remove_staged.rb
 - lib/gity/overview.rb
+- lib/gity/push_workspace.rb
 - lib/gity/status.rb
 - lib/gity/status_list.rb
 - lib/gity/version.rb
@@ -141,7 +142,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ''
 test_files: []