devops_helper 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4fc54242594840ac413c5431e5867e3b37ac514a020735e075b1fd5e60e1bd1
-  data.tar.gz: 625297ea80c5a5befefdbd4075d20dc0bf0f7c1af9839b5d913995b4fab30890
+  metadata.gz: c0c94b8d8e6d6447e4986ca70a523e2f82989e2a3d96b88f08c3c2b6a0db23a0
+  data.tar.gz: c7d72d4570e5a82aad8fbab0764f24b01c74ac78856358cf2b0edf12a2a4f053
 SHA512:
-  metadata.gz: 414d816eabb612c05c250e8070c551c5e9e7219288e40a4438c8392eab7352cac06d8f688ddde0eb9a598130d140b7ad5ea9e0ad8e8f1c987cfa434d3e24a1a2
-  data.tar.gz: e3f747b40600a60a6e2be43cafdff4caab9ce03a77d9a72877f62c98d439991e8b0baffad2224ec43bf46a254d0b4855f0381041e1c61299f05cfc6257cf63fc
+  metadata.gz: 3385755ce5d4349a73c2075845ff1ed7620481c9fe2adb80dd18cc628337396f1806984b8bfcb0afe8393239b875eb644799a00a237d02aab67a6d79e9665ec4
+  data.tar.gz: a328ce96d2be7bdd05cfb62c029486442ffa5f6b26fe63f1c65adb376e6fd1e7208d8af9c6eef9f7ea4f277be6dc6f6584d608ce6eac888a754708aba56eaac5

data/.version_history.yml

@@ -0,0 +1,14 @@
+---
+devops_helper:
+- :version: 0.1.0
+  :created_at: 2020-11-21 21:38:03.537785964 +08:00
+- :version: 0.2.0
+  :created_at: 2020-12-07 15:19:19.158479582 +08:00
+- :version: 0.2.0
+  :created_at: 2020-12-07 15:31:59.119617443 +08:00
+- :version: 0.3.0
+  :created_at: 2020-12-07 23:21:14.961100811 +08:00
+- :version: 0.3.1
+  :created_at: 2020-12-07 23:22:49.479627995 +08:00
+- :version: 0.4.0
+  :created_at: 2021-10-21 11:46:03.352835295 +08:00

data/devops_helper.gemspec

@@ -27,12 +27,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'toolrack', '>= 0.4.0'
-  spec.add_dependency 'tlogger', '>= 0.22.0'
+  spec.add_dependency 'toolrack' 
+  spec.add_dependency 'tlogger' 
   spec.add_dependency 'tty-prompt', '0.22.0'
 
-  spec.add_dependency 'gvcs', '>= 0.1.0'
-  spec.add_dependency 'git_cli', '>= 0.6.0'
+  spec.add_dependency 'gvcs' #, '>= 0.1.0'
+  spec.add_dependency 'git_cli' #, '>= 0.6.0'
 
   #spec.add_dependency 'rubygems-tasks'
 

data/lib/devops_helper/gem_publish_helper.rb

@@ -0,0 +1,101 @@
+
+require 'toolrack'
+require_relative 'global'
+
+module DevopsHelper
+  module GemPublishHelper
+    include TR::CondUtils
+
+    class GemPublisherError < StandardError; end
+
+    def publish_gem(version, opts = { }, &block)
+
+      cred = find_rubygems_api_key
+
+      selAcct = cred.keys.first
+      if cred.keys.length > 1
+        logger.tdebug :pubgem, "Multiple rubygems account detected."
+        # multiple account configured...
+        selAcct = block.call(:multiple_rubygems_account, cred)
+        raise GemPublisherError, "No rubygems account is selected." if is_empty?(selAcct)
+      end
+
+      # find the package
+      root = opts[:root] || Dir.getwd
+      foundGem = Dir.glob("**/*-#{version}.gem")
+      if foundGem.length == 0
+        raise DevopsHelper::Error, "No built gem found."
+      elsif foundGem.length > 1
+        if block
+          targetGem = block.call(:multiple_built_gems, foundGem)
+        else
+          raise DevopsHelper::Error, "Multiple versions of gem found : #{foundGem}. Please provide a block for selection"
+        end
+      else
+        targetGem = foundGem.first
+      end
+
+      cmd = "cd #{root} && gem push #{targetGem} -k #{selAcct}"
+      logger.tdebug :pubgem, "Command to publish gem : #{cmd}"  
+      `#{cmd}`
+      [$?, targetGem]
+
+    end
+
+    def publish_gem_file(gemfile, opts = { }, &block)
+
+      cred = find_rubygems_api_key
+
+      selAcct = cred.keys.first
+      if cred.keys.length > 1
+        logger.tdebug :pubgemfile, "Multiple rubygems account detected."
+        # multiple account configured...
+        selAcct = block.call(:multiple_rubygems_account, cred)
+        raise GemPublisherError, "No rubygems account is selected." if is_empty?(selAcct)
+      end
+
+      if File.exist?(gemfile)
+        root = File.dirname(gemfile)
+        targetGem = File.basename(gemfile)
+
+        cmd = "cd #{root} && gem push #{targetGem} -k #{selAcct}"
+        logger.tdebug :pubgemfile, "Command to publish gem : #{cmd}"  
+        res = `#{cmd}`
+        [$?, res, targetGem]
+      else
+        raise GemPublisherError, "Given Gemfile '#{gemfile}' not found"
+      end
+
+    end
+
+
+    private
+    def logger
+      if @logger.nil?
+        @logger = DevopsHelper::Global.instance.logger
+      end
+      @logger
+    end
+
+    def find_rubygems_api_key
+      if TR::RTUtils.on_windows?
+        credFile = File.join(ENV['USERPROFILE'],".gem","credentials")
+      else
+        credFile = File.join(Dir.home,".local","share","gem","credentials")
+      end
+
+      raise GemPublisherError, "Credential file not found at '#{credFile}'" if not File.exist?(credFile)
+
+      cred = nil
+      File.open(credFile,"r") do |f|
+        cred = YAML.load(f.read)
+      end
+
+      raise GemPublisherError, "Credential file is empty" if is_empty?(cred)
+      raise GemPublisherError, "No credential created yet for rubygems." if is_empty?(cred.keys)
+
+      cred
+    end
+
+  end
+end

data/lib/devops_helper/gem_rake_helper.rb

@@ -14,27 +14,29 @@ module DevopsHelper
       execute_build_task(t)
     end
 
-    def publish_gem(version, opts = { },&block)
-      # find the package
-      root = opts[:root] || Dir.getwd
-      foundGem = Dir.glob("**/*-#{version}.gem")
-      if foundGem.length == 0
-        raise DevopsHelper::Error, "No built gem found."
-      elsif foundGem.length > 1
-        if block
-          targetGem = block.call(:multiple_built_gems, foundGem)
-        else
-          raise DevopsHelper::Error, "Multiple versions of gem found : #{foundGem}. Please provide a block for selection"
-        end
-      else
-        targetGem = foundGem.first
-      end
-
-      cmd = "cd #{root} && gem push #{targetGem}"
-      DevopsHelper::Global.instance.logger.tdebug :gem_rake_helper, "Command to publish gem : #{cmd}"  
-      `#{cmd}`
-      [$?, targetGem]
-    end
+    #def publish_gem(version, opts = { },&block)
+    #  # find the package
+    #  root = opts[:root] || Dir.getwd
+    #  foundGem = Dir.glob("**/*-#{version}.gem")
+    #  if foundGem.length == 0
+    #    raise DevopsHelper::Error, "No built gem found."
+    #  elsif foundGem.length > 1
+    #    if block
+    #      targetGem = block.call(:multiple_built_gems, foundGem)
+    #    else
+    #      raise DevopsHelper::Error, "Multiple versions of gem found : #{foundGem}. Please provide a block for selection"
+    #    end
+    #  else
+    #    targetGem = foundGem.first
+    #  end
+
+    #  
+
+    #  cmd = "cd #{root} && gem push #{targetGem}"
+    #  DevopsHelper::Global.instance.logger.tdebug :gem_rake_helper, "Command to publish gem : #{cmd}"  
+    #  `#{cmd}`
+    #  [$?, targetGem]
+    #end
 
     private
     def find_build_task

data/lib/devops_helper/tasks/release/gem.rake

@@ -2,7 +2,7 @@
 require 'toolrack'
 include Antrapol::ToolRack::ConditionUtils
 
-require 'devops_helper'
+require_relative '../../../devops_helper' #'devops_helper'
 
 # include task like 'rake build'
 require 'bundler/gem_tasks'
@@ -11,138 +11,218 @@ require 'bundler/gem_tasks'
 
 require 'fileutils'
 
-desc "Some simple rake tasks to assist gem developer in releasing new version of gem"
-
 namespace :devops do
 
-  task :gem_release do
-    
-    STDOUT.puts "Managed gem release V#{DevopsHelper::VERSION}" 
+  namespace :gem do
 
-    wd = Dir.getwd
-    tp = TTY::Prompt.new
+    desc "Some simple rake tasks to assist gem developer in releasing new version of gem"
+    task :release do
 
-    vh = DevopsHelper::VcsHelper.new(wd)
-    if vh.is_workspace?
-      # check if workspace has pending changes
-      begin
-        if vh.has_pending_changes? or vh.has_new_changes?
-          cc = tp.yes?("There are pending changes not yet commit. Commit first? ")
-          if cc
-            STDOUT.puts "Commit the changes first before release"
-            exit(0)
+      STDOUT.puts "Managed gem release V#{DevopsHelper::VERSION}" 
+
+      wd = Dir.getwd
+      tp = TTY::Prompt.new
+
+      vh = DevopsHelper::VcsHelper.new(wd)
+      if vh.is_workspace?
+        # check if workspace has pending changes
+        begin
+          if vh.has_pending_changes? or vh.has_new_changes?
+            cc = tp.yes?("There are pending changes not yet commit. Commit first? ")
+            if cc
+              STDOUT.puts "Commit the changes first before release"
+              exit(0)
+            end
           end
+        rescue TTY::Reader::InputInterrupt
+          STDOUT.puts "\n\nAborted"
+          exit(1)
         end
-      rescue TTY::Reader::InputInterrupt
-        STDOUT.puts "\n\nAborted"
-        exit(1)
+
+      end # is_workspace?
+
+      rh = DevopsHelper::GemReleaseHelper.new
+      spec = rh.find_gemspec(wd) 
+
+      # find version file
+      vf = rh.find_gem_version_file(wd) 
+      if vf.length > 1
+        # more then one. User has to select
+        svf = vf.first
+      else
+        svf = vf.first 
       end
 
-    end # is_workspace?
+      if not_empty?(spec) #and not_empty?(svf)
 
-    rh = DevopsHelper::GemReleaseHelper.new
-    spec = rh.find_gemspec(wd) 
+        vs = rh.get_version_record(wd) 
+        gs = Gem::Specification.load(spec)
+        lstVer = vs.last_version(gs.name)
+        if not is_empty?(lstVer)
+          targetVersion = rh.prompt_version(gs.name, lstVer[:version], lstVer[:created_at])
+        else
+          targetVersion = rh.prompt_version(gs.name, "", nil)
+        end 
 
-    # find version file
-    vf = rh.find_gem_version_file(wd) 
-    if vf.length > 1
-      # more then one. User has to select
-      svf = vf.first
-    else
-      svf = vf.first 
-    end
+        if targetVersion == -1
+          STDERR.puts "Aborted"
+          exit(1)
+        end
 
-    if not_empty?(spec) #and not_empty?(svf)
-      
-      vs = rh.get_version_record(wd) 
-      gs = Gem::Specification.load(spec)
-      lstVer = vs.last_version(gs.name)
-      if not is_empty?(lstVer)
-        targetVersion = rh.prompt_version(gs.name, lstVer[:version], lstVer[:created_at])
-      else
-        targetVersion = rh.prompt_version(gs.name, "", nil)
-      end 
+        if not_empty?(svf)
+          rh.rewrite_gem_version_file(svf,targetVersion) 
+          STDOUT.puts "Gem version file rewritten"
 
-      if targetVersion == -1
-        STDERR.puts "Aborted"
-        exit(1)
-      end
+          if vh.is_workspace?
+            # commit changes of the new version file before tagging
+            vh.add(svf)
+            vh.commit("Automated commit by DevOps Helper during release process", { files: [svf] })
+          end
 
-      if not_empty?(svf)
-        rh.rewrite_gem_version_file(svf,targetVersion) 
-        STDOUT.puts "Gem version file rewritten"
+        end
 
+        # tagging start here. Any new changes has to be done before this stage
         if vh.is_workspace?
-          # commit changes of the new version file before tagging
-          vh.add(svf)
-          vh.commit("Automated commit by DevOps Helper during release process", { files: [svf] })
+          begin
+            tagSrc = tp.yes?("\nTag the source code for this release? ")
+            if tagSrc
+              msg = tp.ask("Please provide message for this tag (optional) : ", default: "Tagged version '#{targetVersion}' by DevOps Helper")
+              msg = "Automated tagging version '#{targetVersion}' by DevOps Helper" if is_empty?(msg)
+              vh.create_tag(targetVersion, msg)
+            end
+          rescue TTY::Reader::InputInterrupt
+            STDERR.puts "\n\nAborted"
+            exit(1)
+          end
         end
+        # done tagging source code
 
-      end
+        # build the gem
+        res = rh.build_gem
+        STDOUT.puts "Gem '#{gs.name}' built"
+        # gem built
 
-      # tagging start here. Any new changes has to be done before this stage
-      if vh.is_workspace?
+        vs.register_version(gs.name, targetVersion)
+        vs.save(wd)
+        STDOUT.puts "Version '#{targetVersion}' registered"
+
+        # push gem? Optional anyway
         begin
-          tagSrc = tp.yes?("\nTag the source code for this release? ")
-          if tagSrc
-            msg = tp.ask("Please provide message for this tag (optional) : ", default: "Tagged version '#{targetVersion}' by DevOps Helper")
-            msg = "Automated tagging version '#{targetVersion}' by DevOps Helper" if is_empty?(msg)
-            vh.create_tag(targetVersion, msg)
+          pub = tp.yes?("Do you want to publish the generated Gem file? ")
+          if pub
+            res, gemFile = rh.publish_gem(targetVersion) do |ops, vers|
+              case ops
+              when :multiple_rubygems_account
+                acct = vers.keys
+                acct << "Don't publish yet"
+                selAcct = tp.select("There are multiple Rubygems account configured inside this machine. Please select the account to push:", acct)
+                if selAcct == acct.last
+                  STDOUT.puts "Noted. Publishing of gem file is aborted."
+                  exit(0)
+                else
+                  selAcct
+                end
+              when :multiple_built_gems
+                sel = vers
+                sel << "Don't publish yet"
+                selGem = tp.select("There are multiple Gems with the same version number found. Please select one of the following to publish: ", sel)
+                if selGem == sel.last
+                  STDOUT.puts "Noted. Publishing of gem file is aborted."
+                  exit(0)
+                else
+                  selGem
+                end
+              end
+            end
+
+            if not res.success?
+              STDERR.puts "Failed to publish the Gem."
+            else
+              STDOUT.puts "Gem '#{gemFile}' published"
+            end
+          else
+            STDOUT.puts "Gem will not be published. Please manually publish the gem."
           end
+        rescue DevopsHelper::GemPublishHelper::GemPublisherError => e
+          STDERR.puts "Error while publishing gem: #{e.message}"
+          exit(1)
         rescue TTY::Reader::InputInterrupt
           STDERR.puts "\n\nAborted"
           exit(1)
         end
+
+        # end push gem
+
+        # push source code?
+        #pushSrc = tp.no?("Do you want to push the source code to remote?")
+
+      elsif is_empty?(spec)
+        STDERR.puts "gemspec file not found at '#{wd}'"
+        exit(2)
+      elsif is_empty?(svf)
+        STDERR.puts "Cannot find version.rb to update GEM version"
+        exit(2)
+      end 
+
+    end # gem_release
+
+    desc "Task just to publish the generated gem file to Rubygems"
+    task :publish do
+
+      tp = TTY::Prompt.new
+
+      foundGems = []
+      Dir.glob(File.join(Dir.getwd, "**/*.gem")) do |f|
+        foundGems << f 
+      end
+
+      selGem = tp.select("Please select which Gem file to publish:") do |menu|
+        foundGems.sort.reverse.each do |f|
+          menu.choice File.basename(f), f
+        end
       end
-      # done tagging source code
- 
-      # build the gem
-      res = rh.build_gem
-      STDOUT.puts "Gem '#{gs.name}' built"
-      # gem built
-
-      vs.register_version(gs.name, targetVersion)
-      vs.save(wd)
-      STDOUT.puts "Version '#{targetVersion}' registered"
-
-      # push gem? Optional anyway
-      pub = tp.yes?("Do you want to publish the generated Gem file? ")
-      if pub
-        res, gemFile = rh.publish_gem(targetVersion) do |ops, vers|
+
+      rh = DevopsHelper::GemReleaseHelper.new
+      begin
+        res, cmdOut, gemFile = rh.publish_gem_file(selGem) do |ops, vers|
           case ops
+          when :multiple_rubygems_account
+            acct = vers.keys
+            acct << "Don't publish yet"
+            selAcct = tp.select("There are multiple Rubygems account configured inside this machine. Please select the account to push:", acct)
+            if selAcct == acct.last
+              STDOUT.puts "Noted. Publishing of gem file is aborted."
+              exit(0)
+            else
+              selAcct
+            end
           when :multiple_built_gems
             sel = vers
-            sel << "Quit"
+            sel << "Don't publish yet"
             selGem = tp.select("There are multiple Gems with the same version number found. Please select one of the following to publish: ", sel)
-            if selGem == "Quit"
-              STDOUT.puts "No built gem shall be published."
+            if selGem == sel.last
+              STDOUT.puts "Noted. Publishing of gem file is aborted."
+              exit(0)
             else
               selGem
             end
           end
+        rescue DevopsHelper::GemPublishHelper::GemPublisherError => e
+          STDERR.puts "Error while publishing gem: #{e.message}"
+          exit(1)
+        rescue TTY::Reader::InputInterrupt
+          STDERR.puts "\n\nAborted"
+          exit(1)
         end
+      end
 
-        if not res.success?
-          STDERR.puts "Failed to publish the Gem."
-        else
-          STDOUT.puts "Gem '#{gemFile}' published"
-        end
+      if not res.success?
+        STDERR.puts "Failed to publish the Gem. Output was : \r\n#{cmdOut}"
       else
-        STDOUT.puts "Gem will not be published. Please manually publish the gem."
+        STDOUT.puts "Gem '#{gemFile}' published"
       end
-      # end push gem
 
-      # push source code?
-      #pushSrc = tp.no?("Do you want to push the source code to remote?")
-
-    elsif is_empty?(spec)
-      STDERR.puts "gemspec file not found at '#{wd}'"
-      exit(2)
-    elsif is_empty?(svf)
-      STDERR.puts "Cannot find version.rb to update GEM version"
-      exit(2)
-    end 
-
-  end # gem_release
+    end
+  end
 
 end # devops

data/lib/devops_helper/version.rb

@@ -1,3 +1,3 @@
 module DevopsHelper
-  VERSION = "0.3.1"
+  VERSION = "0.5.0"
 end

data/lib/devops_helper.rb

@@ -4,6 +4,7 @@ require "devops_helper/gem_core_helper"
 require "devops_helper/gem_version_helper"
 require "devops_helper/gem_rake_helper"
 require "devops_helper/vcs_helper"
+require "devops_helper/gem_publish_helper"
 
 module DevopsHelper
   class Error < StandardError; end
@@ -13,6 +14,7 @@ module DevopsHelper
     include GemCoreHelper
     include GemVersionHelper
     include GemRakeHelper
+    include GemPublishHelper
   end
 
   class VcsHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devops_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tlogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
 description: " "
 email:
 - chrisliaw@antrapol.com
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- ".version_history.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -100,6 +101,7 @@ files:
 - lib/Rakefile
 - lib/devops_helper.rb
 - lib/devops_helper/gem_core_helper.rb
+- lib/devops_helper/gem_publish_helper.rb
 - lib/devops_helper/gem_rake_helper.rb
 - lib/devops_helper/gem_version_helper.rb
 - lib/devops_helper/global.rb
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: DevOps Helper to assist in DevOps operation