release-gem 0.1.30 → 0.3.0

data/lib/release/gem/vcs_cli_action.rb

@@ -1,16 +1,20 @@
 
 
 require 'tty/prompt'
+
 require_relative 'vcs_action'
+require_relative 'cli'
 
 module Release
   module Gem
     module Cli
       class VcsAction
+        
         def initialize(root, opts = {  })
           opts = {} if opts.nil?
           opts[:ui] = TTY::Prompt.new
           @inst = Action::VcsAction.new(root,opts)
+          @root = root
           @prmt = TTY::Prompt.new
           @color = opts[:msgColor] || :yellow
           @discardColor = opts[:discardColor] || false
@@ -24,14 +28,39 @@ module Release
          
           loop do
 
-            ops = @prmt.select(pmsg("\n Please select a VCS workspace operation : ")) do |m|
+            Cli.cls
+            Cli.print_header(@root)
+
+            # workspace overview
+            overview 
+
+            ops = @prmt.select(pmsg("\n Please select a VCS workspace operation : "), filter: true) do |m|
+
+              if @inst.has_staged_files? or @inst.has_modified_files? or @inst.has_deleted_files?
+                m.choice "Commit all changes", :commit_all
+              end
+
+              if @inst.has_staged_files?
+                m.choice "Commit staged changes", :commit
+              end
+
+              if @inst.has_new_files?
+                m.choice "Add", :add
+                m.choice "Ignore a file", :ignore
+              end
+
+              if @inst.has_staged_files?
+                m.choice "Remove staged file", :remove_staged
+              end
+
+              if @inst.has_modified_files?
+                m.choice "Diff a file", :diff
+              end
+
+              if @inst.has_staged_files? or @inst.has_modified_files? or @inst.has_deleted_files? or @inst.has_new_files?
+                m.choice "Delete file", :del
+              end
 
-              m.choice "Add", :add
-              m.choice "Ignore", :ignore
-              m.choice "Diff", :diff
-              m.choice "Remove staged file", :remove_staged
-              m.choice "Delete file", :del
-              m.choice "Commit", :commit
               m.choice "Done", :done
               m.choice "Abort", :abort
 
@@ -53,6 +82,9 @@ module Release
             when :commit
               commit
               break
+            when :commit_all
+              commit_all
+              break
             when :done
               break
             end
@@ -61,6 +93,14 @@ module Release
 
         end
 
+        def overview
+          @inst.overview do |ops, val|
+
+            print_workspace_items(val)
+
+          end
+        end
+
         def add(*input, &block)
           @inst.add do |ops, *args|
             preset = false
@@ -79,13 +119,17 @@ module Release
               case ops
               when :select_files_to_add
 
+                Cli.cls
+                Cli.print_header(@root)
                 mfiles = args.first
-                @prmt.puts pmsg("\n Files already added to staging : ")
-                mfiles[:staged].each do |k,v|
-                  v.each do |vv|
-                    @prmt.puts " * #{vv}"
-                  end
-                end
+                print_workspace_items(mfiles)
+
+                #@prmt.puts pmsg("\n Files already added to staging : ")
+                #mfiles[:staged].each do |k,v|
+                #  v.each do |vv|
+                #    @prmt.puts " * #{vv}"
+                #  end
+                #end
 
                 @prmt.puts ""
                 res = []
@@ -97,13 +141,12 @@ module Release
                   end
                 end
 
-                sel = @prmt.multi_select pmsg("\n Following are files that could be added to version control : ") do |m|
+                sel = @prmt.multi_select(pmsg("\n Following are files that could be added to version control : "), filter: true) do |m|
 
                   res.sort.each do |f|
                     m.choice f, f.path
                   end
 
-                  m.choice "Done", :done
                   m.choice "Abort", :abort
                 end
 
@@ -156,13 +199,12 @@ module Release
                   end
                 end
 
-                sel = @prmt.multi_select pmsg("\n Select files for diff operation : ") do |m|
+                sel = @prmt.multi_select(pmsg("\n Select files for diff operation : "), filter: true) do |m|
 
                   res.sort.each do |f|
                     m.choice f, f.path
                   end
 
-                  m.choice "Done", :done
                   m.choice "Abort", :abort
                 end
 
@@ -175,7 +217,9 @@ module Release
               when :diff_file_result
                 v = args.first
                 @prmt.puts "Diff result for file '#{v[:file]}'"
-                puts v[:output].light_blue
+                puts pastel.bright_blue(v[:output])
+                puts ""
+                puts pastel.inverse("[Enter to close]")
                 STDIN.gets
 
               when :diff_file_error
@@ -208,14 +252,12 @@ module Release
               when :select_files_to_ignore
 
                 mfiles = args.first
-                sel = @prmt.multi_select pmsg("\n Following are files that could be ignored : ") do |m|
+                sel = @prmt.multi_select(pmsg("\n Following are files that could be ignored : "), filter: true) do |m|
 
                   mfiles[:files].sort.each do |v|
                     m.choice v, v.path
                   end
 
-
-                  m.choice "Done", :done
                   m.choice "Abort", :abort
                 end
 
@@ -260,14 +302,12 @@ module Release
 
                 mfiles = args.first
 
-                sel = @prmt.multi_select pmsg("\n Following are files that could be removed from staging : ") do |m|
+                sel = @prmt.multi_select(pmsg("\n Following are files that could be removed from staging : "), filter: true) do |m|
 
                   mfiles[:files].sort.each do |v|
                     m.choice v, v.path
                   end
 
-
-                  m.choice "Done", :done
                   m.choice "Abort", :abort
                 end
 
@@ -325,7 +365,7 @@ module Release
                 end
 
 
-                sel = @prmt.multi_select pmsg("\n Following are files that could be deleted : ") do |m|
+                sel = @prmt.multi_select(pmsg("\n Following are files that could be deleted : "), filter: true) do |m|
                   files.sort do |f|
                     m.choice f, f
                   end
@@ -370,9 +410,42 @@ module Release
 
         end # delete_file
 
+        def commit_all(*args, &block)
+          st, res = @inst.commit_all do |ops, *args|
+            case ops
+            when :commit_message
+
+              mfiles = args.first
+              @prmt.puts pmsg("\n Files eligible to be committed : ")
+              [:staged, :modified, :deleted].each do |cat|
+                mfiles[cat].each do |k,v|
+                  v.each do |vv|
+                    @prmt.puts pastel.magenta(" #{vv}")
+                  end
+                end
+
+              end
+
+              msg = ""
+              loop do
+                msg = @prmt.ask(pmsg("\n Commit message : "), required: true)
+                confirm = @prmt.yes?(pmsg(" Commit message : #{msg}\n Proceed? No to provide a new commit message "))
+                if confirm
+                  break
+                end
+              end
+
+              msg
+            end
+
+          end
 
+          res
+
+        end
 
         def commit(*args, &block)
+
           res = @inst.commit do |ops, *args|
             
             preset = false
@@ -391,58 +464,48 @@ module Release
 
               case ops
               when :select_files_to_commit
+
                 mfiles = args.first
-                @prmt.puts pmsg("\n Files already added to staging : ")
-                mfiles[:staged].each do |k,v|
-                  v.each do |vv|
-                    @prmt.puts " * #{vv}"
-                  end
-                end
+                print_workspace_items(mfiles)
+                
+                #@prmt.puts pmsg("\n Files already added to staging : ")
+                #mfiles[:staged].each do |k,v|
+                #  v.each do |vv|
+                #    @prmt.puts " * #{vv}"
+                #  end
+                #end
 
-                @prmt.puts ""
+                #@prmt.puts ""
 
                 files = []
                 [:modified, :new, :deleted].each do |cat|
                   mfiles[cat].each do |k,v|
                     v.each do |vv|
                       files << vv
-                      #m.choice vv, vv.path
                     end
                   end
 
                 end
 
-
-                sel = @prmt.multi_select pmsg("\n Following are files that could be added to version control : ") do |m|
+                sel = @prmt.multi_select(pmsg("\n Following are files that could be added to version control : "), filter: true) do |m|
                   
                   files.sort.each do |f|
                     m.choice f, f.path
                   end
 
                   m.choice "Skip", :skip #if mfiles[:counter] == 0
-                  m.choice "Done", :done
                   m.choice "Abort", :abort
                 end
 
                 if sel.include?(:abort)
                   raise Release::Gem::Abort, "User aborted"
-                elsif sel.include?(:skip)
-                  :skip 
-                else
-                  res = :done if sel.include?(:done)
-                  s = sel.clone
-                  s.delete_if { |e| e == :done }
-                  if not_empty?(s)
-                    st, cres = add_to_staging(*s) if not_empty?(s)
-                    if st
-                      @prmt.puts pmsg("\n Files added successfully", :green)
-                    else
-                      @prmt.puts pmsg("\n Files failed to be added. Message was : #{cres}", :red)
-                    end
-                  end
 
-                  res
+                elsif sel.include?(:skip)
+                  []
 
+                else
+                  # done
+                  sel
                 end
 
               when :commit_message
@@ -542,7 +605,7 @@ module Release
               case ops
               when :select_remote
                 val = args.first
-                sel = @prmt.select(pmsg("\n Please select one of the remote config below : ")) do |m|
+                sel = @prmt.select(pmsg("\n Please select one of the remote config below : "), filter: true) do |m|
                   val.each do |k,v|
                     m.choice "#{k} [#{v["push"]}]", k
                   end
@@ -566,6 +629,11 @@ module Release
                   else
                     raise Release::Gem::Abort, "Failed to add remote configuration. Error was : #{res}"
                   end
+
+                else
+                  # no add... cannot sing already so exit
+                  @prmt.puts pmsg("\n No remote configuration defined. Push operation skipped.", :green)
+                  
                 end
 
               when :push_successful
@@ -595,7 +663,8 @@ module Release
               msg
             else
               if not_empty?(color)
-                msg.send(color)
+                pastel.send(color, msg)
+                #msg.send(color)
               elsif not_empty?(@msgColor)
                 msg.send(@msgColor)
               else
@@ -605,6 +674,43 @@ module Release
           end
         end
 
+        def print_workspace_items(itm, opts= {})
+
+          opts = {} if opts.nil?
+          title = opts[:title] || "Workspace Status : "
+          @prmt.puts pmsg(" #{title}")
+
+          mfiles = itm
+
+          mfiles[:staged].each do |k,v|
+            v.each do |vv|
+              @prmt.puts pastel.on_yellow(" * #{vv}")
+            end
+          end
+
+          @prmt.puts ""
+          res = []
+          [:modified, :deleted, :new].each do |cat|
+            mfiles[cat].each do |k,v|
+              v.each do |vv|
+                case cat
+                when :new
+                  @prmt.puts vv
+                when :modified
+                  @prmt.puts pastel.bright_yellow(vv)
+                when :deleted
+                  @prmt.puts pastel.strikethrough(vv)
+                end
+              end
+            end
+          end
+
+        end # print_workspace_items
+
+        def pastel
+          Gem.pastel
+        end
+
       end
     end
   end

data/lib/release/gem/version.rb

@@ -2,6 +2,6 @@
 
 module Release
   module Gem
-    VERSION = "0.1.30"
+    VERSION = "0.3.0"
   end
 end

data/lib/release/gem.rb

@@ -6,21 +6,24 @@ require 'teLogger'
 require 'tty/prompt'
 require 'colorize'
 require 'tty/command'
-
+require 'pastel'
 
 require_relative "gem/version"
 require_relative 'gem/gem_engine'
 require_relative 'gem/release_infector'
 
+require_relative 'gem/cli'
 
 module Release
   module Gem
+    include TR::CondUtils
+
     class Error < StandardError; end
     class Abort < StandardError; end
     # Your code goes here...
 
     def self.q(msg)
-      "\n #{msg}\n".yellow
+      pastel.yellow("\n #{msg}\n")
     end
 
     def self.engine(eng, *args, &block)
@@ -44,14 +47,44 @@ module Release
       dt.strftime("%d %b %Y (%a), %H:%M:%S:%L")
     end
 
-    def self.logger
+    def self.diff_only(a1, a2)
+      Set.new(a1)^a2
+    end
+
+    def self.logger(tag = nil, &block)
       if @_logger.nil?
-        @_logger = TeLogger::Tlogger.new
-        @_logger.tag = :gem_rel
+        if ENV['RELGEM_LOG_TO_STDOUT'] == "true"
+          @_logger = TeLogger::Tlogger.new
+        else
+          @_logger = TeLogger::Tlogger.new("relgem.log",5, 5*1024*1024)
+        end
       end
-      @_logger
-    end
 
+      if block
+        if not_empty?(tag)
+          @_logger.with_tag(tag, &block)
+        else
+          @_logger.with_tag(@_logger.tag, &block)
+        end
+      else
+        if is_empty?(tag)
+          @_logger.tag = :rel_gem
+          @_logger
+        else
+          # no block but tag is given? hmm
+          @_logger.tag = tag
+          @_logger
+        end
+      end
+
+    end # logger
+
+    def self.pastel
+      if @_pastel.nil?
+        @_pastel = Pastel.new
+      end
+      @_pastel
+    end
 
   end
 end

data/templates/standard_cli_flow.rb

@@ -2,10 +2,13 @@
 
 require 'release/gem'
 
-puts "\n Standard GEM CLI release flow version #{Release::Gem::VERSION}".yellow
-puts " Current location : #{Dir.getwd}\n".yellow
+ARGV.delete_if { |e| e == "gem:release" }
+path = ARGV.first || Dir.getwd
+path = File.expand_path(path)
 
-Release::Gem.engine(:gem, root: Dir.getwd) do
+Release::Gem::Cli.print_header(path)
+
+Release::Gem.engine(:gem, root: path) do
 
   begin
     # step 1 : run test

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: release-gem
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-01 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: teLogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: git_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 description: ''
 email:
 - chris@antrapol.com
@@ -110,6 +124,7 @@ files:
 - exe/release-gem-infect
 - lib/release/Rakefile
 - lib/release/gem.rb
+- lib/release/gem/cli.rb
 - lib/release/gem/gem_action.rb
 - lib/release/gem/gem_cli_action.rb
 - lib/release/gem/gem_engine.rb