release-gem 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3f43d3c0b887a2346a0ee9b126a6f7a2edd0715f77b910762caeec3056bd76
-  data.tar.gz: 937d525b33b1695c16ddd1ff3edd77a554ea8be086832cc1052d27e468d4b7a0
+  metadata.gz: dea9d324f7b793ed225472a24d957dcd38eabb8f713271d2cb524a6f1e5f1923
+  data.tar.gz: 6581b5e4fa0d949871b87392e97f139f30785791d93a6fa040260ba52ab312d3
 SHA512:
-  metadata.gz: ca0da466583bf5191772d82a08507acaca1db045a6e93c6dc9573ed5a445f58a31570328f73a0f1840fcc328bfadf92fc40b03696a46086628ebfe1a99d828ea
-  data.tar.gz: b2a5f5d9ec4d3bda1fb86bed8b001b85ca7b1e12fefe585dba8297dcda51cd76f7b9acccddd63192c6119bb0237ba671dd0cb7662847c9d7cf9960f0e0b74b91
+  metadata.gz: 970ea9b05c234620c01a03193e2a92a1c485e0019ac381ba87b3e09c0a82b6d6ba2e8abd80d911d6250e995d1fc36435000ce4f9491f3c1628b474ec78489c1f
+  data.tar.gz: e45f427d07988e498c13cbcf7cc95eacde6523f5e2551ea7e098f9ad6062f60b7039e24800e0c79f8da3b7010c909d5c517273f28d4d69cdc2b4aa639700feda

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    release-gem (0.1.5)
+    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
               
 
@@ -329,7 +331,7 @@ module Release
         end
 
         def method_missing(mtd, *args, &block)
-          if not @engine.nil? and @engine.respond_to?(mtd)
+          if not @engine.nil? 
             @engine.send(mtd, *args, &block)
           else
             super

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

@@ -0,0 +1,184 @@
+
+
+module Release
+  module Gem
+    
+    class ReleaseInfectorError < StandardError; end
+
+    # 
+    # Setup the release-gem into other gem project automatically!
+    #
+    class ReleaseInfector
+      include TR::CondUtils
+      include TR::TerminalUtils
+
+      def initialize(root, name)
+        @root = root
+        @name = name
+        @backupFiles = {}
+      end
+
+      def infect(&block)
+        if not is_release_gem_installed?
+          add_to_gemspec(&block)
+          Bundler.with_clean_env do
+            res = `cd #{@root} && bundle`
+          end
+        end
+
+        if not is_rakefile_activated?
+          activate_rakefile(&block)
+        end
+      end
+
+      def trigger_release_gem(&block)
+
+        block.call(:triggering_release_gem) if block
+
+        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" 
+          if block
+            terminal = block.call(:select_terminal, name: @name, options: poss)
+            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
+
+          else
+            terminal = poss.first
+            block.call(:new_terminal_launching, name: @name, terminal: terminal)
+            tu_new_terminal(terminal, cmd)
+          end
+
+          block.call(:new_terminal_launched, name: @name, terminal: terminal) if block
+
+        end
+
+        terminal
+
+      end
+
+      def is_release_gem_installed?
+        #Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
+
+          res = `cd #{@root} && bundle 2>&1`
+
+          puts res
+
+          if $?.success?
+            found = false
+            res.each_line do |l|
+              if l =~ / release-gem /
+                found = true
+                break
+              end
+            end
+
+            found
+          else
+            raise ReleaseInfectorError, "Error running bundle in '#{@root}'. Error was :\n#{res}"
+          end
+
+        end
+      end # is_release_gem_installed?
+
+      def add_to_gemspec(&block)
+        
+
+        gs = Dir.glob(File.join(@root,"*.gemspec"))
+        raise ReleaseInfectorError, "gemspec not found at '#{@root}'" if is_empty?(gs)
+        
+        block.call(:adding_to_gemspec, gemspec: gs) if block
+
+        if gs.length > 1
+          if block
+            gs = block.call(:multiple_gemspecs, gs)
+          else
+            raise ReleaseInfectorError, "There are more than 1 gemspec file found (#{gs.length} found). Since no block to filter out the required one, this will be an error condition"
+          end
+
+        else
+          gs = gs.first
+        end
+
+        cont = File.read(gs) 
+        lastEnd = cont.rindex("end")
+
+        FileUtils.mv(gs, "#{gs}.bak")
+        @backupFiles[gs] = "#{gs}.bak"
+
+        File.open(gs, "w") do |f|
+          f.write cont[0...lastEnd]
+          f.puts "  spec.add_development_dependency 'release-gem'"
+          f.puts "end"
+        end
+        block.call(:gemspec_updated, name: @name, gemspec: gs )
+
+      end # add_to_gemspec
+
+      def activate_rakefile(&block)
+
+        rf = File.join(@root,"Rakefile")
+        if not File.exist?(rf)
+          rfCont <<-END
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+require "release/gem"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec
+          END
+          block.call(:creating_new_rakefile, rakefile: rf )
+          File.open(rf,"w") do |f|
+            f.write rfCont
+          end
+        else
+          
+          block.call(:adding_to_rakefile, rakefile: rf )
+         
+          cont = File.read(rf)
+          FileUtils.mv(rf, "#{rf}.bak")
+          @backupFiles[rf] = "#{rf}.bak"
+
+          File.open(rf,"w") do |f|
+            f.puts cont
+            f.puts "require 'release/gem'"
+          end
+
+          block.call(:rakefile_updated, name: @name, rakefile: rf) if block
+
+        end
+      end
+
+      def is_rakefile_activated?
+        rf = File.join(@root,"Rakefile")
+        if not File.exist?(rf)
+          false
+        else
+          cont = File.read(rf)
+          found = false
+          cont.each_line do |l|
+            if l =~ /require ('|")(release\/gem)("|')/
+              found = true
+              break
+            end
+          end
+          found
+        end
+      end
+
+    end
+  end
+end

data/lib/release/gem/vcs_action.rb

@@ -42,6 +42,106 @@ 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
+        #
+        def commit_new_files(msg = nil, &block)
+
+          res = :value
+          if block
+
+            loop do
+
+              stgDir, stgFiles = @ws.staged_files
+              newDir, newFiles = @ws.new_files
+
+              if is_empty?(newFiles)
+                res = :skip
+                break
+              end
+
+              newFiles.delete_if { |f| stgFiles.include?(f) }
+              newDir.delete_if { |f| stgDir.include?(f) }
+
+              res = block.call(:select_files_to_commit, { new: { files: newFiles, dirs: newDir }, staged: { files: stgFiles, dirs: stgDir }, vcs: self } )
+
+              break if res == :skip or res == :done
+
+            end
+
+            if res == :done
+
+              stgDir, stgFiles = @ws.staged_files
+              block.call(:staged_elements_of_commit, { files: stgFiles, dirs: stgDir })
+
+              msg = block.call(:commit_message) if is_empty?(msg) 
+              raise VcsActionError, "Commit message is empty" if is_empty?(msg)
+
+              cp "Commit with user message : #{msg}"
+              st, res = @ws.commit(msg)
+              if st
+                block.call(:commit_successful, res) if block
+              else
+                block.call(:commit_failed, res) if block
+              end
+              [st, res]
+
+            end
+
+
+          elsif not_empty?(msg)
+
+            newDir, newFiles = @ws.new_files
+            add_to_staging(*newFiles)
+
+            cp "Commit with user message : #{msg}"
+            st, res = @ws.commit(msg)
+            if st
+              block.call(:commit_successful, res) if block
+            else
+              block.call(:commit_failed, res) if block
+            end
+            [st, res]
+
+          end
+
+        end
+
         def commit(msg = nil, &block)
 
           res = :value
@@ -57,6 +157,12 @@ module Release
 
               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 add, remove, ignore and other operations
               res = block.call(:select_files_to_commit, { modified: { files: modFiles, dirs: modDir }, new: { files: newFiles, dirs: newDir }, deleted: { files: delFiles, dirs: delDir }, staged: { files: stgFiles, dirs: stgDir }, vcs: self, counter: counter } )

data/lib/release/gem/vcs_cli_action.rb

@@ -20,6 +20,176 @@ 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|
+            
+            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_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
+
+                @prmt.puts ""
+
+                sel = @prmt.multi_select pmsg("\n Following are new files that could be added to version control : ") do |m|
+
+                  mfiles[:new].each do |k,v|
+                    v.each do |vv|
+                      m.choice vv, vv.path
+                    end
+                  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
+
+                end
+
+              when :commit_message
+                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
+
+              when :staged_elements_of_commit
+
+                elements = args.first
+                @prmt.puts pmsg("\n Following new files/directories shall be committed in this session : ")
+                elements.each do |k,v|
+                  v.each do |vv|
+                    @prmt.puts " * #{vv}"
+                  end
+                end
+
+              when :commit_successful
+                @prmt.puts pmsg("\n Changes committed",:green)
+                @prmt.puts args.first
+
+              when :commit_failed
+                @prmt.puts pmsg("\n Changes failed to be committed. Error was : #{args.first}")
+
+              end
+            end
+          end # commit_new_files block
+
+        end # commit_new_files
+
+
         def commit(*args, &block)
           res = @inst.commit do |ops, *args|
             
@@ -60,7 +230,7 @@ module Release
 
                   end
 
-                  m.choice "Skip", :skip if mfiles[:counter] == 0
+                  m.choice "Skip", :skip #if mfiles[:counter] == 0
                   m.choice "Done", :done
                   m.choice "Abort", :abort
                 end

data/lib/release/gem/version.rb

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

data/templates/standard_cli_flow.rb

@@ -10,11 +10,16 @@ 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_cli_commit_new_files
+
       # step 3 : build the gem
       st, ver = build
 

data/templates/standard_flow.rb

@@ -59,6 +59,87 @@ Release::Gem.engine(:gem, root: Dir.getwd, ui: STDOUT) do
         end
       end
 
+      ## Check in NEW file first or else the gem build will not pick up by the git ls-files
+      vcs_commit_new_files do |ops, *args|
+
+        case ops
+        when :select_files_to_commit
+          mfiles = args.first
+          pmt.puts "\n Files already added to staging : ".yellow
+          mfiles[:staged].each do |k,v|
+            v.each do |vv|
+              pmt.puts " * #{vv}"
+            end
+          end
+
+          pmt.puts ""
+
+          sel = pmt.multi_select "\n Following are new files that could be added to version control : ".yellow do |m|
+
+            [:modified, :new, :deleted].each do |cat|
+              mfiles[cat].each do |k,v|
+                v.each do |vv|
+                  m.choice vv, vv.path
+                end
+              end
+
+            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
+                pmt.puts "\n Files added successfully".green
+              else
+                pmt.puts "\n Files failed to be added. Message was : #{cres}".red
+              end
+            end
+
+            res
+          end
+
+        when :commit_message
+          msg = ""
+          loop do
+            msg = pmt.ask("\n Commit message : ".yellow, required: true)
+            confirm = pmt.yes?(" Commit message : #{msg}\n Proceed? No to provide a new commit message ".yellow)
+            if confirm
+              break
+            end
+          end
+          msg
+
+        when :staged_elements_of_commit
+          elements = args.first
+          pmt.puts "\n Following files/directories shall be committed in this session : ".yellow
+          elements.each do |k,v|
+            v.each do |vv|
+              pmt.puts " * #{vv}"
+            end
+          end
+
+        when :commit_successful
+          pmt.puts "\n Changes committed".green
+
+        when :commit_failed
+          pmt.puts "\n Changes failed to be committed. Error was : #{args.first}"
+
+        end
+
+      end
+
       # step 3 : build the gem
       st, ver = build do |ops, *args|
         case ops

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: release-gem
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Chris
@@ -126,6 +126,7 @@ files:
 - lib/release/gem/gem_cli_action.rb
 - lib/release/gem/gem_engine.rb
 - lib/release/gem/gemdep.rb
+- lib/release/gem/release_infector.rb
 - lib/release/gem/vcs_action.rb
 - lib/release/gem/vcs_cli_action.rb
 - lib/release/gem/version.rb