release-gem 0.1.22 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b6148ea6854b0af11edd1afc39b4d12b760d1b693d5888df7a16d91369d1cf
-  data.tar.gz: ffd66cbcfde12c1726f4fde3f8b47ce73dd0c36eb1ebef7de2a109afc5f62815
+  metadata.gz: b8cc16c62b759b319b58033ee7678d1767aa098f9190c50f38aeaa429694da3d
+  data.tar.gz: 76da97ad501ca7828a7c0b2bd84de02d50bd9d9933b2c1ea47830cb5f3a54b15
 SHA512:
-  metadata.gz: 6e9f3ab7772900fbcda08a306309327c5c7d30807d9970f0cef1e5c69a82740ef2508f484ae24e6a0d0f6b8706460795e940526b68652dba78f7ce3db004aa87
-  data.tar.gz: 899baac946060716d44ccf74d0db1acab58ed9b7d1a4cf19f9ef13d26c6a2f93b7e1ed6e682aac6a476957a3b406f08b690f30a13aea24c12a4c8fb9ad585ead
+  metadata.gz: 8585884b1b10d700ed6f913a40776ba50b98f58905ba83611e9cef0dece134f2aba5c9c831e1515902f98a0b9f40b6104dbbcf35f5f472270702bc9c421177e1
+  data.tar.gz: 2a4ed2747d026f60da0e6e45c0f969d5baac20492659030cb78b6839074f74df4ca8e631c2772a72bdc3593246c1ad70b2c5dea3a8679a10aa8371e784c6c040

data/Gemfile

@@ -9,4 +9,5 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
+#gem "git_cli", git: "git_cli", branch: "master"
 

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    release-gem (0.1.22)
+    release-gem (0.1.30)
       colorize
       git_cli
-      gvcs
       teLogger
       toolrack
       tty-command
@@ -13,13 +12,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    colorize (0.8.1)
+    colorize (1.1.0)
     diff-lcs (1.5.0)
-    git_cli (0.12.0)
+    git_cli (0.13.6)
       ptools (~> 1.4.0)
-      teLogger
-      toolrack
-    gvcs (0.1.2)
+      teLogger (> 0.2)
+      toolrack (> 0.23)
     pastel (0.8.0)
       tty-color (~> 0.5)
     ptools (1.4.3)
@@ -28,17 +26,17 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     teLogger (0.2.2)
-    toolrack (0.22.1)
+    toolrack (0.23.2)
     tty-color (0.6.0)
     tty-command (0.10.1)
       pastel (~> 0.8)

data/lib/release/gem/gem_action.rb

@@ -362,15 +362,15 @@ module Release
             credFile = File.join(Dir.home,".local","share","gem","credentials")
           end
 
-          raise GemActionError, "Credential file not found at '#{credFile}'" if not File.exist?(credFile)
+          raise GemActionError, "Credential file not found at '#{credFile}'. Please at least perform an 'gem push' at command line to setup the credential file." if not File.exist?(credFile)
 
           cred = nil
           File.open(credFile,"r") do |f|
             cred = YAML.load(f.read)
           end
 
-          raise GemActionError, "Credential file is empty" if is_empty?(cred)
-          raise GemActionError, "No credential created yet for rubygems." if is_empty?(cred.keys)
+          raise GemActionError, "Credential file is empty. Please at least perform an 'gem push' at command line to setup the credential file." if is_empty?(cred)
+          raise GemActionError, "No credential created yet for rubygems. Please at least perform an 'gem push' at command line to setup the credential file." if is_empty?(cred.keys)
 
           cred
         end

data/lib/release/gem/gem_cli_action.rb

@@ -42,6 +42,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

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)

data/lib/release/gem/vcs_action.rb

@@ -1,5 +1,4 @@
 
-require 'gvcs'
 require 'git_cli'
 
 module Release
@@ -15,29 +14,14 @@ module Release
 
         def initialize(root, opts = {  })
           raise VcsActionError, "root cannot be null" if is_empty?(root)
-          @ws = Gvcs::Workspace.new(root) 
+          @ws = GitCli::Workspace.new(root) 
 
           oopts = opts || {}
           @ui = oopts[:ui]
           @engine = oopts[:engine]
-          st, path = @ws.workspace_root
-
-          #@gitDir = File.join(path.strip,".git")
-          #p @gitDir
-          #@gitBack = File.join(path.strip,".git_bak")
-          #p @gitBack
+          path = @ws.workspace_root
         end
 
-        #def enable_dev_mode
-        #  FileUtils.cp_r(@gitDir,@gitBack, remove_destination: true)
-        #end
-
-        #def dev_mode_end
-        #  if File.exist?(@gitBack)
-        #    FileUtils.mv(@gitBack, @gitDir)
-        #  end
-        #end
-
         def exec(&block)
           instance_eval(&block) if block
         end

data/lib/release/gem/vcs_cli_action.rb

@@ -544,7 +544,7 @@ module Release
                 val = args.first
                 sel = @prmt.select(pmsg("\n Please select one of the remote config below : ")) do |m|
                   val.each do |k,v|
-                    m.choice k, k
+                    m.choice "#{k} [#{v["push"]}]", k
                   end
                   m.choice "Skip pushing source code", :skip
                   m.choice "Abort", :abort

data/lib/release/gem/version.rb

@@ -2,6 +2,6 @@
 
 module Release
   module Gem
-    VERSION = "0.1.22"
+    VERSION = "0.1.30"
   end
 end

data/templates/standard_cli_flow.rb

@@ -27,18 +27,33 @@ Release::Gem.engine(:gem, root: Dir.getwd) do
 
     if st
       # step 4, push the gem to rubygems
-      gem_cli_push(version: ver)
-      gem_cli_install(version: ver)
+      # rescue here because if it failed, still should proceed
+      begin
+        gem_cli_push(version: ver)
+      rescue Exception => ex
+        STDERR.puts "\n -- Failed pushing Gem. Error was : #{ex.message}".red
+      end
+      
+      # rescue here because if it failed, still should proceed
+      begin
+        gem_cli_install(version: ver)
+      rescue Exception => ex
+        STDERR.puts "\n -- Failed install the Gem onto local system. Error was : #{ex.message}".red
+      end
     end
 
-    vcs_add_to_staging_if_commit_before("Gemfile.lock")
-    vcs_add_to_staging(value(:version_file_path))
-
-    vcs_commit("Commit after gem version #{ver} built")
+    # This is another block of work that can resume even failed
+    begin
+      vcs_add_to_staging_if_commit_before("Gemfile.lock")
+      vcs_add_to_staging(value(:version_file_path))
+      vcs_commit("Commit after gem version #{ver} built")
+    rescue Exception => ex
+      STDERR.puts "\n -- Failed to perform post commit after gem built. Error was : #{ex.message}".red
+    end
 
+    # If tagging error no need to push
     # step 7 : tag the source code
     vcs_cli_tag( tag: ver )      
-
     # step 8 : Push the source code
     vcs_cli_push
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: release-gem
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.30
 platform: ruby
 authors:
 - Chris
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gvcs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: git_cli
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +125,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []