release-gem 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f829021df7a73c3e93c06b2e4d788f103a1f0ac096d3c472a7b4cfd575122c
-  data.tar.gz: 7c4a3acaa233d7bcff3a1ef308dbdfe3ea7b669f3418d3205072b6b2c5b9ada2
+  metadata.gz: ed5f60168ae7d89802f6c0f5a18ff62bb055a66aef8ba9af2c87c6f10ecba99a
+  data.tar.gz: dd3c409579297a14c397fb3e874a7da49856544b05a687727e4ae4f74f1be6e7
 SHA512:
-  metadata.gz: e8cc062083ef870fd5ef74eff9b9d8b05072b2348096d10fddab73c8d1ad2cf3ad81ce52dcf5c5447787103429e6c14f970189729a3873293358a432bf83aeb8
-  data.tar.gz: 9ae8f560785f812de5578155547df4ab94deefafa4e741fb2d6b23af13f063c672ae93a75cbce10abc5067d5be7abf640d4aa46f359808ab26f9d66c5327049e
+  metadata.gz: 40e7a44d4694335fed765e3d96caffbbfd1d1b1a130f2ea9b8eec35268394b0d2eb4427c112b9e8fd369b05de9505f9c8d0765616bf4fc197733644b2bcd3db0
+  data.tar.gz: cd3679b3878d822c8f4b1768f4ceafaa6fa7274030f928660ccdef78a438dd509f92d6234b93a3cfcdc8d537acce188e5e5b6517bfa69e27e7c94e453f8cb04d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    release-gem (0.1.6)
+    release-gem (0.1.8)
       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
               
 
@@ -61,7 +63,9 @@ module Release
                 end
               end
 
+              Gem.logger.debug "About to transfer gem"
               gemdepInst.transfer_gem
+              Gem.logger.debug "GEM transfer!"
 
               block.call(:development_gem_temporary_promoted)
             end
@@ -122,6 +126,8 @@ module Release
             if $?
               cp "Gem build successfully at #{Gem.format_dt(Time.now)}"
 
+              register(:version_file_path, verfile)
+
               if block
                 block.call(:gem_build_successfully, @selVersion)
               else

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/gemdep.rb

@@ -65,7 +65,7 @@ module Release
         remove_dev_gem_from_gemfile
         add_gem_to_gemspec(@gemConfig)
 
-      end
+      end # transfer_gem
 
       def all_dev_gems_has_config?
         not_configured_gem.length == 0   
@@ -76,6 +76,7 @@ module Release
       end
 
       def restore_dev_gem
+        Gem.logger.debug "restore_dev_gem : #{@fileHistory.inspect}"
         @fileHistory.each do |k,v|
           FileUtils.mv(k,"#{k}.prod")
           FileUtils.cp(v,k)
@@ -89,6 +90,9 @@ module Release
         ri.trigger_release_gem(&block)
       end
 
+      #### 
+      # Private section
+      ####
       private
       def remove_dev_gem_from_gemfile
         if has_development_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 not res.is_a?(GitCli::Delta::VCSItem) and res == :done
+
+            end
+
+          end
+
+          res
+          
+        end
+
         # 
         # Special operation since the gem build will only include files from
         # git ls-files
@@ -256,6 +290,30 @@ module Release
           @ws.add_to_staging(*files) 
         end
 
+        def add_to_staging_if_commit_before(*files)
+
+          stgDir, stgFiles = @ws.staged_files
+          modDir, modFiles = @ws.modified_files
+          #newDir, newFiles = @ws.new_files
+          delDir, delFiles = @ws.deleted_files
+
+          mFiles = modFiles.map { |e| e.path }
+          sFiles = stgFiles.map { |e| e.path }
+          dFiles = delFiles.map { |e| e.path }
+
+          res = []
+          files.each do |f|
+            if (mFiles.include?(f) or dFiles.include?(f)) and not sFiles.include?(f)
+              res << f
+            end
+          end
+
+          if not_empty?(res)
+            @ws.add_to_staging(*res)
+          end
+
+        end
+
         def ignore(*files)
           @ws.ignore(*files) 
         end

data/lib/release/gem/vcs_cli_action.rb

@@ -20,6 +20,84 @@ 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.is_a?(GitCli::Delta::VCSItem)
+
+                  selOps = @prmt.select pmsg("\n What do you want to do with file '#{sel.path}'?") do |m|
+
+                    m.choice "Diff", :diff  if not (sel.is_a?(GitCli::Delta::NewFile) or sel.is_a?(GitCli::Delta::NewDir)) 
+                    m.choice "Ignore", :ignore
+                    m.choice "Remove from staging", :remove_from_staging if sel.is_a?(GitCli::Delta::StagedFile)
+                    m.choice "Delete", :delete if (sel.is_a?(GitCli::Delta::NewFile) or sel.is_a?(GitCli::Delta::NewDir)) 
+                    m.choice "Done", :done
+                  end
+
+                  case selOps
+                  when :diff
+                    st, res = @inst.diff_file(sel.path)
+                    puts res
+                    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 :delete
+                    skip = @prmt.no?(pmsg("\n Delete the file '#{sel.path}' from file system? NOTE THIS CANNOT BE UNDONE! "))
+                    if not skip
+                      FileUtils.rm(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|
             
@@ -49,7 +127,7 @@ module Release
 
                 @prmt.puts ""
 
-                sel = @prmt.multi_select pmsg("\n Following are new files that could be added to version control : ") do |m|
+                sel = @prmt.multi_select pmsg("\n Following are new files that could be added to version control.\n Don't worry if you found not all changed files are here. There will be another commit session after the build : ") do |m|
 
                   mfiles[:new].each do |k,v|
                     v.each do |vv|

data/lib/release/gem/version.rb

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

data/templates/standard_cli_flow.rb

@@ -10,40 +10,45 @@ Release::Gem.engine(:gem, root: Dir.getwd) do
     # step 1 : run test
     run_test(:rspec) 
 
-    gem_cli_action do
+    # to allow user to get a view on what's changed
+    # and allow user to ignore or remove file from staging
+    vcs_cli_overview_changes
 
-      # step 2 : check dependency
-      release_dependencies 
+    # Reason to put it here is because gem build shall
+    # only consider files already inside git system via
+    # git ls-files command. Anything new that is not yet
+    # check in will not be packup by the gem build process
+    vcs_cli_commit
 
-      vcs_commit_new_files
+    # step 2 : check dependency
+    gem_cli_release_dependencies 
 
-      # step 3 : build the gem
-      st, ver = build
+    # step 3 : build the gem
+    st, ver = gem_cli_build
 
-      dependency_restore
+    gem_cli_dependency_restore
 
-      if st
-        # step 4, push the gem to rubygems
-        push(version: ver)
-        install(version: ver)
-      end
+    if st
+      # step 4, push the gem to rubygems
+      gem_cli_push(version: ver)
+      gem_cli_install(version: ver)
+    end
 
-    end # gem_cli_action
+    puts "version : #{ver}"
 
+    @selVer = value(:selected_version)
 
-    vcs_cli_action do
-      @selVer = value(:selected_version)
+    vcs_add_to_staging_if_commit_before("Gemfile.lock")
+    vcs_add_to_staging(value(:version_file_path))
 
-      # step 6 : commit vcs
-      commit
+    vcs_commit("Commit after gem version #{@selVer} built")
 
-      # step 7 : tag the source code
-      tag( tag: @selVer )      
+    # step 7 : tag the source code
+    vcs_cli_tag( tag: @selVer )      
 
-      # step 8 : Push the source code
-      push
+    # step 8 : Push the source code
+    vcs_cli_push
 
-    end # vcs_action block
   rescue Release::Gem::Abort => ex
     STDERR.puts "\n -- Aborted by user. Message was : #{ex.message}\n".red
   rescue TTY::Reader::InputInterrupt => ex

metadata

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