release-gem 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f829021df7a73c3e93c06b2e4d788f103a1f0ac096d3c472a7b4cfd575122c
-  data.tar.gz: 7c4a3acaa233d7bcff3a1ef308dbdfe3ea7b669f3418d3205072b6b2c5b9ada2
+  metadata.gz: dea9d324f7b793ed225472a24d957dcd38eabb8f713271d2cb524a6f1e5f1923
+  data.tar.gz: 6581b5e4fa0d949871b87392e97f139f30785791d93a6fa040260ba52ab312d3
 SHA512:
-  metadata.gz: e8cc062083ef870fd5ef74eff9b9d8b05072b2348096d10fddab73c8d1ad2cf3ad81ce52dcf5c5447787103429e6c14f970189729a3873293358a432bf83aeb8
-  data.tar.gz: 9ae8f560785f812de5578155547df4ab94deefafa4e741fb2d6b23af13f063c672ae93a75cbce10abc5067d5be7abf640d4aa46f359808ab26f9d66c5327049e
+  metadata.gz: 970ea9b05c234620c01a03193e2a92a1c485e0019ac381ba87b3e09c0a82b6d6ba2e8abd80d911d6250e995d1fc36435000ce4f9491f3c1628b474ec78489c1f
+  data.tar.gz: e45f427d07988e498c13cbcf7cc95eacde6523f5e2551ea7e098f9ad6062f60b7039e24800e0c79f8da3b7010c909d5c517273f28d4d69cdc2b4aa639700feda

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    release-gem (0.1.6)
+    release-gem (0.1.7)
       colorize
       git_cli
       gvcs

data/lib/release/gem/gem_action.rb

@@ -38,8 +38,10 @@ module Release
               block.call(:action_start, :relase_dependencies)
 
               gemdepInst.development_gem.each do |k,v|
-                gemdepInst.infect_gem(v, k, &block)
-                block.call(:block_until_dev_gem_done, { name: k, path: v })
+                res = gemdepInst.infect_gem(v, k, &block)
+                if res != :skip
+                  block.call(:block_until_dev_gem_done, { name: k, path: v })
+                end
               end
               
 

data/lib/release/gem/gem_cli_action.rb

@@ -61,6 +61,7 @@ module Release
                 v[:options].each do |t|
                   m.choice t, t
                 end
+                m.choice "Skip", :skip
               end
 
             when :new_terminal_launching

data/lib/release/gem/gem_engine.rb

@@ -53,14 +53,14 @@ module Release
         end
 
         def method_missing(mtd, *args, &block)
-          if mtd.to_s.start_with?("gem_cli")
+          if mtd.to_s.start_with?("gem_cli_")
             Gem.logger.debug "Passing method '#{mtd}' to gem_cli action"
-            pmtd = mtd.to_s[7..-1].to_sym
+            pmtd = mtd.to_s[8..-1].to_sym
             gem_cli_action_inst.send(pmtd, *args, &block)
 
-          elsif mtd.to_s.start_with?("vcs_cli")
+          elsif mtd.to_s.start_with?("vcs_cli_")
             Gem.logger.debug "Passing method '#{mtd}' to vcs_cli action"
-            pmtd = mtd.to_s[7..-1].to_sym
+            pmtd = mtd.to_s[8..-1].to_sym
             vcs_cli_action_inst.send(pmtd, *args, &block)
  
           elsif mtd.to_s.start_with?("gem_")

data/lib/release/gem/release_infector.rb

@@ -38,16 +38,19 @@ module Release
         poss = tu_possible_terminal
         raise ReleaseInfectorError, "No possible terminal found" if is_empty?(poss)
 
+        terminal = ""
         Bundler.with_clean_env do
 
           cmd = "cd #{@root} && rake gem:release" 
-          terminal = ""
           if block
             terminal = block.call(:select_terminal, name: @name, options: poss)
-            terminal = poss.first if is_empty?(terminal)
+            if terminal != :skip
+              terminal = poss.first if is_empty?(terminal)
+
+              block.call(:new_terminal_launching, name: @name, terminal: terminal)
+              tu_new_terminal(terminal, cmd)
+            end
 
-            block.call(:new_terminal_launching, name: @name, terminal: terminal)
-            tu_new_terminal(terminal, cmd)
           else
             terminal = poss.first
             block.call(:new_terminal_launching, name: @name, terminal: terminal)
@@ -58,6 +61,8 @@ module Release
 
         end
 
+        terminal
+
       end
 
       def is_release_gem_installed?

data/lib/release/gem/vcs_action.rb

@@ -42,6 +42,40 @@ module Release
           instance_eval(&block) if block
         end
 
+        def overview_changes(&block)
+
+          res = :done
+          if block
+
+            loop do
+
+              stgDir, stgFiles = @ws.staged_files
+              modDir, modFiles = @ws.modified_files
+              newDir, newFiles = @ws.new_files
+              delDir, delFiles = @ws.deleted_files
+
+              modFiles.delete_if { |f| stgFiles.include?(f) }
+              modDir.delete_if { |f| stgDir.include?(f) }
+              
+              newFiles.delete_if { |f| stgFiles.include?(f) }
+              newDir.delete_if { |f| stgDir.include?(f) }
+
+              delFiles.delete_if { |f| stgFiles.include?(f) }
+              delDir.delete_if { |f| stgDir.include?(f) }
+
+              # block should call vcs for remove, ignore and diff
+              res = block.call(:select_files_to_manage, { modified: { files: modFiles, dirs: modDir }, new: { files: newFiles, dirs: newDir }, deleted: { files: delFiles, dirs: delDir }, staged: { files: stgFiles, dirs: stgDir }, vcs: self } )
+
+              break if res == :done
+
+            end
+
+          end
+
+          res
+          
+        end
+
         # 
         # Special operation since the gem build will only include files from
         # git ls-files

data/lib/release/gem/vcs_cli_action.rb

@@ -20,6 +20,77 @@ module Release
           instance_eval(&block) if block
         end
 
+        def overview_changes(*args, &block)
+          @inst.overview_changes do |ops, *args|
+            preset = false
+            if block
+              res = block.call(ops, *args)
+              if res.nil?
+                preset = true
+              else
+                res
+              end
+            else
+              preset = true
+            end
+
+            if preset
+              case ops
+              when :select_files_to_manage
+                mfiles = args.first
+
+                sel = @prmt.select pmsg("\n Following are files that could be managed : ") do |m|
+
+                  [:staged, :modified, :new, :deleted].each do |cat|
+                    mfiles[cat].each do |k,v|
+                      v.each do |vv|
+                        m.choice vv, vv
+                      end
+                    end
+
+                  end
+
+                  m.choice "Done", :done
+
+                end
+
+                if sel != :done
+
+                  selOps = @prmt.select pmsg("\n What do you want to do with file '#{sel}'?") do |m|
+
+                    m.choice "Diff", :diff 
+                    m.choice "Ignore", :ignore
+                    m.choice "Remove from staging", :remove_from_staging if sel.is_a?(GitCli::Delta::StagedFile)
+                    m.choice "Done", :done
+                  end
+
+                  case selOps
+                  when :diff
+                    puts @inst.diff_file(sel.path)
+                    STDIN.getc
+                  when :ignore
+                    confirm = @prmt.yes?(pmsg("\n Add file '#{sel.path}' to gitignore file?"))
+                    if confirm
+                      @inst.ignore(sel.path)
+                    end
+                  when :remove_from_staging
+                    confirm = @prmt.yes?(pmsg("\n Remove file '#{sel.path}' from staging?"))
+                    if confirm
+                      @inst.remove_from_staging(sel.path)
+                    end
+                  when :done
+                  end
+
+                end
+
+                sel
+
+              end
+            end
+
+          end
+        end # overview_changes
+
         def commit_new_files(*args, &block)
           res = @inst.commit_new_files do |ops, *args|
             

data/lib/release/gem/version.rb

@@ -2,6 +2,6 @@
 
 module Release
   module Gem
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/templates/standard_cli_flow.rb

@@ -10,12 +10,15 @@ Release::Gem.engine(:gem, root: Dir.getwd) do
     # step 1 : run test
     run_test(:rspec) 
 
+    # to allow user to get a view on what's changed
+    vcs_cli_overview_changes
+
     gem_cli_action do
 
       # step 2 : check dependency
       release_dependencies 
 
-      vcs_commit_new_files
+      vcs_cli_commit_new_files
 
       # step 3 : build the gem
       st, ver = build

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: release-gem
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Chris