release-gem 0.1.29 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f42d97fbc8fff6f263e782576d772d581b3b2ce2d3bed06e73a6b8c3ab328d
-  data.tar.gz: 25ac79dd9038c5ac19975bd22fe651add1f8304464cab77370493374cb93601c
+  metadata.gz: 9fa0f7de3f5def10b5829328b5409fd5236adc500a851ce291c24c80b5c3266e
+  data.tar.gz: 16f704d586405286e753f7cf3046c6604126d9dfb168ec6aca97cf9c3684282f
 SHA512:
-  metadata.gz: 8c6b3f34b02a1f89275215a3f518966f67eaf03083fd0f83c67d8118551f2cc8af2a9520f258adb8d736d96c954f1d05bb23ad6dd81289641f6a3650fa08fabf
-  data.tar.gz: 7c0895ab232d4f6f316f242c80de190ced0f00ae9400f5c44150963e39ae99021c8724341cbeea89e81ca1632aaaa998b715d13d0ed490a95df2abc491da4a84
+  metadata.gz: c23655648823e1de3d485a420afb73a5645a371618c47f0a0fabca3996fc849b60c33bc9613d178e9b9a4dc7e6d323baeaf6a1135bd48d3159e6d414dc1dbf85
+  data.tar.gz: c21d2a999a56b8778e1e8c061532f5aced2c0408fcf6317010070b63ada86135bfc4270c33bd50eebf9af0228da37c024ad97e98bb7cba125debe3e276f9ea02

data/Gemfile.lock

@@ -1,23 +1,24 @@
 PATH
   remote: .
   specs:
-    release-gem (0.1.29)
-      colorize
-      git_cli
-      teLogger
-      toolrack
-      tty-command
-      tty-prompt
+    release-gem (0.3.0)
+      colorize (~> 1.1)
+      git_cli (~> 0.13)
+      pastel (~> 0.8)
+      teLogger (~> 0.2)
+      toolrack (~> 0.23)
+      tty-command (~> 0.10)
+      tty-prompt (~> 0.23)
 
 GEM
   remote: https://rubygems.org/
   specs:
     colorize (1.1.0)
     diff-lcs (1.5.0)
-    git_cli (0.13.2)
+    git_cli (0.13.6)
       ptools (~> 1.4.0)
-      teLogger
-      toolrack
+      teLogger (> 0.2)
+      toolrack (> 0.23)
     pastel (0.8.0)
       tty-color (~> 0.5)
     ptools (1.4.3)

data/lib/release/gem/cli.rb

@@ -0,0 +1,16 @@
+
+
+module Release
+  module Gem
+    module Cli
+      def self.cls
+        print "\e[2J\e[f"
+      end
+
+      def self.print_header(path = Dir.getwd)
+        puts Gem.pastel.bright_yellow("\n Standard GEM CLI release flow version #{Release::Gem::VERSION}")
+        puts Gem.pastel.bright_yellow(" Rubygems location : #{path}\n")
+      end
+    end
+  end
+end

data/lib/release/gem/gem_action.rb

@@ -35,7 +35,7 @@ module Release
 
             if block
 
-              block.call(:action_start, :relase_dependencies)
+              block.call(:action_start, :release_dependencies)
 
               gemdepInst.development_gem.each do |k,v|
                 res = gemdepInst.infect_gem(v, k, &block)
@@ -45,7 +45,8 @@ module Release
               end
               
 
-              keys = gemdepInst.development_gem.keys
+              #keys = gemdepInst.development_gem.keys
+              keys = gemdepInst.development_gem
               loop do
                 begin
                   conf = block.call(:define_gem_prod_config, { gems: keys })
@@ -59,7 +60,7 @@ module Release
                     block.call(:invalid_gem_prod_config, "Expected return from :define_gem_prod_config is a hash of \"gem name\" => { type: [:runtime | :dev], version: \">= 1.2.0\" }. Note version can be empty")
                   end
                 rescue GemDepError => ex
-                  block.call(:invlid_gem_prod_config, ex.message)
+                  block.call(:invalid_gem_prod_config, ex.message)
                 end
               end
 
@@ -86,7 +87,7 @@ module Release
         end
 
         def dependency_restore
-          puts "restoring dependency"
+          #puts "restoring dependency"
           gemdepInst.restore_dev_gem 
         end
 
@@ -127,7 +128,14 @@ module Release
 
           cp "Gem version updated. Start building the gem"
           begin
-            Rake::Task["build"].execute
+          
+            cmd = "cd #{@root} && rake build"
+            Gem.logger.debug "Command to build gem : #{cmd}"  
+            res = `#{cmd} 2>&1`
+            block.call(:gem_building, $?, res) if block
+
+            #Dir.chdir(@root)
+            #Rake::Task["build"].execute
 
             if $?
               cp "Gem build successfully at #{Gem.format_dt(Time.now)}"
@@ -167,39 +175,45 @@ module Release
 
           raise GemActionError, "No version given to push. Push aborted" if is_empty?(version)
 
-          cred = find_rubygems_api_key
+          proceed = block.call(:confirm_proceed, name, version)
+          if proceed
 
-          selAcct = cred.keys.first
-          if cred.keys.length > 1
-            Gem.logger.debug "Multiple rubygems account detected."
-            # multiple account configured...
-            if block
-              selAcct = block.call(:multiple_rubygems_account, cred)
-              raise GemActionError, "No rubygems account is selected." if is_empty?(selAcct)
+            cred = find_rubygems_api_key
+
+            selAcct = cred.keys.first
+            if cred.keys.length > 1
+              Gem.logger.debug "Multiple rubygems account detected."
+              # multiple account configured...
+              if block
+                selAcct = block.call(:multiple_rubygems_account, cred)
+                raise GemActionError, "No rubygems account is selected." if is_empty?(selAcct)
+              end
             end
-          end
 
 
-          # find the package
-          foundGem = Dir.glob(File.join(@root,"**/#{name}-#{version}*.gem"))
-          if foundGem.length == 0
-            raise GemActionError, "No built gem with version '#{version}' found."
-          elsif foundGem.length > 1
-            if block
-              targetGem = block.call(:multiple_built_gems, foundGem)
+            # find the package
+            foundGem = Dir.glob(File.join(@root,"**/#{name}-#{version}*.gem"))
+            if foundGem.length == 0
+              raise GemActionError, "No built gem with version '#{version}' found."
+            elsif foundGem.length > 1
+              if block
+                targetGem = block.call(:multiple_built_gems, foundGem)
+              else
+                raise GemActionError, "#{foundGem.length} versions of gem found. Please provide a block for selection"
+              end
             else
-              raise GemActionError, "#{foundGem.length} versions of gem found. Please provide a block for selection"
+              targetGem = foundGem.first
             end
-          else
-            targetGem = foundGem.first
-          end
 
-          cmd = "cd #{@root} && gem push #{targetGem} -k #{selAcct}"
-          Gem.logger.debug "Command to publish gem : #{cmd}"  
-          res = `#{cmd} 2>&1`
-          block.call(:gem_push_output, $?, res) if block
-          [$?, res]
+            cmd = "cd #{@root} && gem push #{targetGem} -k #{selAcct}"
+            Gem.logger.debug "Command to publish gem : #{cmd}"  
+            res = `#{cmd} 2>&1`
+            block.call(:gem_push_output, $?, res) if block
+            [$?, res]
 
+          else
+            block.call(:gem_push_skipped, name, version)
+          end
         end
 
         def install(*args, &block)

data/lib/release/gem/gem_cli_action.rb

@@ -1,6 +1,7 @@
 
 require 'tty/prompt'
 require_relative 'gem_action'
+require_relative 'cli'
 
 module Release
   module Gem
@@ -20,16 +21,17 @@ module Release
           instance_eval(&block) if block
         end
 
+        # proxy method for Action::GemAction#release_dependencies
         def release_dependencies
           @inst.release_dependencies do |ops, *args|
-            case ops
+           case ops
             when :action_start
               @pmt.say pmsg("\n Release dependencies starting...\n")
 
             ## from release_infector
             when :multiple_gemspec
               v = args.first
-              @pmt.select(pmsg("\n There are multiple gemspecs found. Please select one to proceed : ")) do |m|
+              @pmt.select(pmsg("\n There are multiple gemspecs found. Please select one to proceed : "), filter: true) do |m|
                 v.each do |vv|
                   m.choice vv, vv
                 end
@@ -42,6 +44,10 @@ module Release
             when :gemspec_updated
               v = args.first
               @pmt.say pmsg("\n Gemspec file of GEM '#{v[:name]}' updated with release-gem gem")
+            
+            when :gemspec_already_has_gem
+              v = args.first
+              @pmt.say pmsg("\n Gemspec file of GEM '#{v[:name]}' already has release-gem gem included. Skipped")
 
             when :adding_to_rackfile
               v = args.first
@@ -57,7 +63,7 @@ module Release
 
             when :select_terminal
               v = args.first
-              @pmt.select(pmsg("\n Please select a terminal for development GEM '#{v[:name]}' release : ")) do |m|
+              @pmt.select(pmsg("\n Please select a terminal for development GEM '#{v[:name]}' release : "), filter: true) do |m|
                 v[:options].each do |t|
                   m.choice t, t
                 end
@@ -81,13 +87,13 @@ module Release
             when :define_gem_prod_config
 
               config = {}
-              selections = args.first[:gems]
+              selections = args.first[:gems].clone
 
               loop do
 
-                sel = @pmt.select(pmsg("\n The following development gems requires configuration. Please select one to configure ")) do |m|
-                  selections.each do |g|
-                    m.choice g, g
+                sel = @pmt.select(pmsg("\n The following development gems requires configuration. Please select one to configure "), filter: true) do |m|
+                  selections.each do |key, val|
+                    m.choice key, key
                   end
                 end
 
@@ -100,7 +106,15 @@ module Release
 
                 config[sel][:type] = type
 
-                ver = @pmt.ask(pmsg("\n Is there specific version pattern (including the ~>/>/>=/= of gemspec) for the gem in production? (Not mandatory) : "))
+                gemAct = Action::GemAction.new(selections[sel])
+                currentVersion = gemAct.find_gem_version do |ops, *val|
+                  case ops
+                  when :multiple_version_files_found
+                    # abort. Expected only 1 version files exist
+                  end
+                end
+
+                ver = @pmt.ask(pmsg("\n Is there specific version pattern (including the ~>/>/>=/= of gemspec) for the gem in production? (Not mandatory) : "), value: currentVersion)
                 config[sel][:version] = ver if not_empty?(ver)
 
                 @pmt.puts pmsg(" ** Done configure for gem #{sel}")
@@ -117,6 +131,9 @@ module Release
             when :no_development_gems_found
               @pmt.puts pmsg("\n No development gem(s) in used found")
 
+            when :invalid_gem_prod_config
+              @pmt.puts pastel.red(pmsg("\n #{args.first}"))
+
             end
           end
 
@@ -144,7 +161,7 @@ module Release
               if preset
 
                 opts = args.first
-                res = @pmt.select(pmsg("\n Please select new gem version : \n")) do |m|
+                res = @pmt.select(pmsg("\n Please select new gem version : \n"), filter: true) do |m|
                   opts[:proposed_next].reverse.each do |v|
                     m.choice v,v
                   end
@@ -210,6 +227,11 @@ module Release
         def push(*pargs, &block)
           @inst.push(*pargs) do |ops, *args|
             case ops
+            when :confirm_proceed
+              name = args.first
+              ver = args[1]
+              @pmt.yes?(" Push gem '#{name}' version #{ver} to Rubygems? ")
+
             when :multiple_rubygems_account
               creds = args.first
               res = @pmt.select(pmsg("\n Multiple rubygems account detected. Please select one : ")) do |m|
@@ -227,10 +249,13 @@ module Release
               st = pargs.first
               res = pargs[1]
               if st
-                @pmt.puts pmsg("\n Gem push successful.", :green)
+                @pmt.puts pmsg("\n Gem push successful. #{res}", :green)
               else
                 @pmt.puts pmsg("\n Gem push failed. Error was :\n #{res}", :red)
               end
+
+            when :gem_push_skipped
+
             end
           end
 
@@ -287,6 +312,10 @@ module Release
           end
         end
 
+        def pastel
+          Gem.pastel
+        end
+
       end
     end
   end

data/lib/release/gem/release_infector.rb

@@ -111,18 +111,24 @@ module Release
         end
 
         cont = File.read(gs) 
-        lastEnd = cont.rindex("end")
 
-        FileUtils.mv(gs, "#{gs}.bak")
-        @backupFiles[gs] = "#{gs}.bak"
+        if (cont =~ /spec.add_development_dependency 'release-gem'/) == nil
+          lastEnd = cont.rindex("end")
 
-        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 ) if block
+          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 ) if block
 
+        else 
+          block.call(:gemspec_already_has_gem, name: @name, gemspec: gs) if block
+        end
+        
       end # add_to_gemspec
 
       def activate_rakefile(&block)