git_cli_prompt 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e0baf03b1eff4fcce89d777a0701742d9a87d8ca42a9e2b420b78fcafda4d8c
-  data.tar.gz: e40cf5b3951335cc9472bac286323d784605711bdbe9e96395892dabc7f384f7
+  metadata.gz: 80add3df91c6cc3b90064e63b37a50997b2cea41773cb7f638414de890e5a0fa
+  data.tar.gz: 0223e5f621299a44dfd3e16a1f7764b008ab5cd174fdd5151fa6002fd20ade2b
 SHA512:
-  metadata.gz: 6b673ef6d30fa03773bf530162a9cc383c4035858126da8aa3c778357b120e252a1cea1e17ef8b638e4603cffc27326e3ad55b33d625b0cabbb2902fb6f692c2
-  data.tar.gz: bd5e2adb046a397c84aa20d8dc287d679d6411c392f7b4e1524c7981d14ee97d00dba825df84584efb0f6f39e2c8503d8e2ed26390695416935a299a0f78541c
+  metadata.gz: 3d534ae9e6274ee88dd7bfdd7f1b9ce165505a0cc7bf6952adbc834a92572610b22898dfb2ca5cf1cf0849e4c058cee64b28eea28aa870ecf699b029ee97995e
+  data.tar.gz: 1c18a1ef138052a4c8faa913b9110a076c0be6c933c0e9e9d694ebafeebec2c94d01331a091ea833712928a701d7f7f42c71263f7dce5d2bbe757c1bb7d23512

data/Gemfile.lock

@@ -0,0 +1,69 @@
+PATH
+  remote: .
+  specs:
+    git_cli_prompt (0.1.0)
+      tlogger
+      toolrack
+      tty-prompt
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    base58 (0.2.3)
+    devops_helper (0.5.0)
+      git_cli
+      gvcs
+      tlogger
+      toolrack
+      tty-prompt (= 0.22.0)
+    diff-lcs (1.4.4)
+    git_cli (0.9.0)
+      gvcs
+      ptools (~> 1.4.0)
+      tlogger
+      toolrack
+    gvcs (0.1.0)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    ptools (1.4.2)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    tlogger (0.26.1)
+    toolrack (0.16.0)
+      base58
+      tlogger
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.22.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    wisper (2.0.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  devops_helper
+  git_cli_prompt!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.2.28

data/lib/commit.rb

@@ -0,0 +1,231 @@
+
+require 'gvcs'
+require 'git_cli'
+
+require_relative 'git_cli_prompt/logger'
+
+module GitCliPrompt
+  module Commit
+    include TR::CondUtils
+    include CliPrompt
+    include GitCliPrompt::Logger
+
+    class CommitError < StandardError; end
+
+    def commit(root,&block)
+     
+      #logger.debug "Commit operation root : #{root}"
+      ws = Gvcs::Workspace.new(root)
+      raise CommitError, "Given path '#{File.expand_path(root)}' is not a VCS workspace" if not ws.is_workspace?
+
+      begin
+
+        modDir, modFiles = ws.modified_files
+        newDir, newFiles = ws.new_files
+        delDir, delFiles = ws.deleted_files
+        stDir, stFiles = ws.staged_files
+
+        pending = false
+        pending = true if not_empty?(modDir) or not_empty?(modFiles) or not_empty?(newDir) or not_empty?(newFiles) or not_empty?(delDir) or not_empty?(delFiles)
+
+        if not_empty?(stDir) or not_empty?(stFiles)
+          say "  Item(s) already staged for commit: \n"
+          stDir.each do |md|
+            say "  #{md.path}"
+          end
+          stFiles.each do |md|
+            say "  #{md.path}"
+          end
+        end
+
+        if pending
+
+          say "\n\n  Items could be add to version control:\n"
+          cnt = 1
+          [modDir, modFiles, newDir, newFiles, delDir, delFiles].each do |cont|
+            cont.each do |md|
+              say "  #{'%2s' % cnt}. #{md.to_s}\n"
+              cnt += 1
+            end
+          end
+
+        end
+
+        puts
+
+        if not pending
+          pmt.say("\n  Workspace is clean. No changes or unstage files or directory is found.\n", color: :green) 
+          "Workspace is clean. No changes or unstage files or directory is found"
+
+        else
+
+          ops = pmt.select("  Please select desired operation:") do |menu|
+            menu.default 1
+
+            menu.choice "  Add", :add if pending
+            if not_empty?(stDir) or not_empty?(stFiles)
+              menu.choice "  Remove file from staged", :remove_staged 
+              menu.choice "  Commit staged", :commit
+            end
+            menu.choice "  Ignore changes", :ignore
+            menu.choice "  Quit", :quit
+          end
+
+          case ops
+          when :add
+            choices = []
+            choices += mark_modified_choice(modDir)
+            choices += mark_modified_choice(modFiles)
+            choices += mark_new_choice(newDir)
+            choices += mark_new_choice(newFiles)
+            choices += mark_del_choice(delDir)
+            choices += mark_del_choice(delFiles)
+
+            prompt_add_selection(ws, choices, &block)
+            commit_staged(ws, &block)
+
+          when :ignore
+            pmt.ok "\n  Changes are ignored for this release", color: :yellow
+
+          when :quit
+            raise UserChangedMind
+
+          when :remove_staged
+
+            choices = []
+            choices += stDir.map { |v| [v.path,v] }
+            choices += stFiles.map { |v| [v.path,v] }
+
+            sel = prompt_remove_staging(choices)
+            ws.remove_from_staging(sel)
+
+          when :commit
+
+            commit_staged(ws, &block)
+
+          end
+        end
+
+
+      rescue TTY::Reader::InputInterrupt
+        ok "\n\n  Aborted"
+
+      #rescue UserChangedMind
+      #  ok "\n  Noted. Please retry the process again\n"
+
+      #rescue UserSelectNone
+      #  ok "\n  Nothing is selected. Process halted\n"
+
+      #rescue Exception => ex
+      #  error(ex.message)
+      #  logger.error ex.message
+      #  logger.error ex.backtrace.join('\n')
+
+      end
+    end
+
+    def prompt_remove_staging(choices)
+      
+      sel = pmt.select("  Please select which item(s) to remove from staging:") do |menu|
+        
+        choices.each do |c|
+          menu.choice c[0], c[1]
+        end
+
+      end
+
+      raise UserSelectNone, "  No selection of staged item(s) were made" if is_empty?(sel)
+      if confirm_selection(sel)
+        sel
+      else
+        raise UserChangedMind, "  User aborted"
+      end
+
+    end
+
+    def prompt_add_selection(ws, choices, &block)
+      
+      sel = multi_select("  Please select which items to add to this commit session:") do |menu|
+        choices.each do |c|
+          menu.choice c[0], c[1]
+        end
+      end
+
+      raise UserSelectNone, "  No selection of unversioned item(s) was made" if is_empty?(sel)
+      if confirm_selection(sel)
+        psel = vcs_items_to_path_array(sel)
+        ws.add_to_staging(psel)
+      else
+        raise UserChangedMind, "  User aborted"
+      end
+
+    end
+
+    def confirm_selection(sel)
+      
+      sel = [sel] if not sel.is_a?(Array)
+      cs = []
+      cnt = 1
+      sel.each do |s|
+        cs << "#{"%2s" % cnt.to_s}. #{s}"
+        cnt += 1
+      end
+
+      yes?("  You've selected the following item(s). Proceed?\n#{cs.join("\n")}\n")
+
+    end
+
+    def prompt_commit_message(&block)
+
+      if block
+        defMsg = block.call(:default_commit_message)
+      end
+
+      msg = pmt.ask("  Commit Message :", required: true) do |m|
+        m.default = defMsg if not_empty?(defMsg)
+      end
+
+      msg
+    end
+
+    def commit_staged(ws, &block)
+      msg = prompt_commit_message(&block)
+      output = ws.commit(msg)
+      block.call(:changes_commited, msg, output) if block
+      output
+    end
+
+    private
+    def mark_new_choice(arr)
+      res = []
+      arr.each do |a| 
+        res << [a.to_s,a]
+      end
+      res
+    end
+
+    def mark_modified_choice(arr)
+      res = []
+      arr.each do |a| 
+        res << [a.to_s,a]
+      end
+      res
+    end
+
+    def mark_del_choice(arr)
+      res = []
+      arr.each do |a| 
+        res << [a.to_s,a]
+      end
+      res
+    end
+
+    def vcs_items_to_path_array(array)
+      array.map do |v|
+        v.path
+      end
+    end
+
+
+  end
+end

data/lib/git_cli_prompt/cli_prompt.rb

@@ -0,0 +1,24 @@
+
+require 'tty/prompt'
+
+module GitCliPrompt
+  module CliPrompt
+
+    def method_missing(mtd, *args, &block)
+      if pmt.respond_to?(mtd)
+        pmt.send(mtd, *args, &block)
+      else
+        super
+      end
+    end
+
+    private
+    def pmt
+      if @pmt.nil?
+        @pmt = TTY::Prompt.new
+      end
+      @pmt
+    end
+
+  end
+end

data/lib/git_cli_prompt/logger.rb

@@ -0,0 +1,15 @@
+
+require 'tlogger'
+
+module GitCliPrompt
+  module Logger
+    
+    def logger
+      if @logger.nil?
+        @logger = Tlogger.new
+      end
+      @logger
+    end
+
+  end
+end

data/lib/git_cli_prompt/version.rb

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

data/lib/push.rb

@@ -0,0 +1,82 @@
+
+module GitCliPrompt
+  module Push
+    include TR::CondUtils
+    include CliPrompt
+    
+    def push(root, &block)
+    
+      raise PushError, "Root is empty" if is_empty?(root)
+
+      begin
+
+        ws = Gvcs::Workspace.new(root)
+
+        raise PushError, "#{root} is not a workspace" if not ws.is_workspace?
+
+        conf = ws.remote_config
+        if is_empty?(conf)
+          res = pmt.yes?("  There is no remote repository configured for workspace at '#{File.expand_path(root)}'. Do you want to add one?")
+          raise UserAborted if not res 
+          name, url = prompt_new_remote
+
+          ws.add_remote(name, url)
+
+          conf = ws.remote_config
+        end
+
+        branch = block.call(:push_to_branch) if block
+        branch = ws.current_branch if is_empty?(branch)
+
+        if conf.keys.length == 1
+          # direct push
+          name = conf.keys.first
+          url = conf.values.first["push"]
+          if confirm_push(name, url)
+            ws.push_changes_with_tags(name, branch)
+            block.call(:push_info, { name: name }) if block
+          else
+            raise UserAborted
+          end
+        else
+          raise UserChangedMind
+        end
+
+      rescue TTY::Reader::InputInterrupt
+      end
+    end
+
+    def confirm_push(name, url)
+      
+      pmt.yes?("  Confirm push to repository '#{name}' [#{url}]?")
+
+    end
+
+
+    def prompt_new_remote
+      
+      name = pmt.ask("  Please provide a name of this remote config :", required: true)
+      url = pmt.ask("  Please provide the URL:", required: true)
+
+      if confirm_input(name, url)
+        [name, url]
+      else
+        raise UserChangedMind
+      end
+
+    end
+
+    def confirm_input(name, url)
+     
+      cont = []
+      cont << ""
+      cont << "  Name : #{name}"
+      cont << "  URL  : #{url}"
+      cont << ""
+
+      pmt.yes?("  You've provided the following info. Proceed?\n#{cont.join("\r\n")}")
+
+    end
+
+  end
+end

data/lib/tag.rb

@@ -0,0 +1,58 @@
+
+
+module GitCliPrompt
+  module Tag
+    include TR::CondUtils
+    include CliPrompt
+    include TR::VerUtils
+
+    class TagError < StandardError; end
+
+    def tag(root, version, &block)
+    
+      raise TagError, "Workspace root cannot be empty" if is_empty?(root)
+      raise TagError, "Version name cannot be empty" if is_empty?(version)
+
+      ws = Gvcs::Workspace.new(root)
+
+      if ws.is_workspace?
+        vers = possible_versions(currentVersion)
+
+        vers << "Custom"
+        vers << [
+          "Not feeling to tag now" \
+          ,"Maybe not now..." \
+          ,"Nah, forget it..." \
+        ].sample
+
+        sel = pmt.select("Please select one of the options below:") do |menu|
+          vers.each do |v|
+            menu.choice v
+          end
+        end
+
+        case sel
+        when "Custom"
+          sel = pmt.ask("Please provide custom version no:", required: true) 
+        when vers[-1]
+          raise UserChangedMind
+        end
+
+        defTagMsg = block.call(:default_tag_message) if block
+        if is_empty?(defTagMsg)
+          defTagMsg = "Automated tagging of source code of release version #{sel}" 
+        end
+
+        msg = pmt.ask("Message for this tag : ", default: defTagMsg)
+
+        ws.create_tag(sel, msg)
+
+      else
+        raise TagError, "Given path '#{root}' is not a workspace"
+      end
+
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_cli_prompt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Liaw
@@ -75,13 +75,19 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - git_cli_prompt.gemspec
+- lib/commit.rb
 - lib/git_cli_prompt.rb
+- lib/git_cli_prompt/cli_prompt.rb
+- lib/git_cli_prompt/logger.rb
 - lib/git_cli_prompt/version.rb
+- lib/push.rb
+- lib/tag.rb
 homepage: ''
 licenses: []
 metadata: {}