devops_assist 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9bb15c3e0a551f56d09d20da1e5a3ae5ca617a9886b5c75fbb882063e0e9e4d
-  data.tar.gz: fde7a2ee5487e9e3a1888474902951b0476000cc255c37fbaa9bff2c0c0e15b7
+  metadata.gz: baa4f3b3891cdbf45d1c4e2b95c3d515c9e6c0fa72ce01d66c2201b841638c75
+  data.tar.gz: 1d5279835de5d13f743d6c659d7d19dcce7ae3e3bafb0f8125be8cf128c21be1
 SHA512:
-  metadata.gz: 4741f1ae4fd772f5bed1c35e2bc4e60c8e7e7f17937a8302e14b2638e6c7c57c6499e3bff8215665befb732ed0df4eb82e5678ab703db624e19a7b027c051746
-  data.tar.gz: a68e0ce4b74520eabc5e418e575237251a923719e5c712dc617f8225d3ba7c9c2e7ba0f8d013e1b461a343b14650937738f202f3487520d73b96f91ae7897799
+  metadata.gz: 551d286841c46209940a868c645cdc5d403bccca54312a2349f16b42f97572e88c6bb6d73b6c15e13dee5af188a6c99af4983d2db90cd5108828372639477bcc
+  data.tar.gz: 882ef893631d5333a4c304f699d60233584699696e0507564829b9139ad09761bf3344976237a97e31d6fa466a23659db6c03d09e27e82290c73f3c03366f44d

data/.release_history.yml

@@ -34,3 +34,5 @@ devops_assist:
   :timestamp: 1679896577.1906195
 - :version: 0.3.8
   :timestamp: 1679896754.9692261
+- :version: 0.3.9
+  :timestamp: 1679897047.3892941

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    devops_assist (0.3.9)
+    devops_assist (0.3.11)
       git_cli
-      git_cli_prompt
+      git_cli_prompt (~> 0.3.3)
       gvcs
       teLogger
       toolrack
@@ -19,7 +19,7 @@ GEM
       ptools (~> 1.4.0)
       teLogger
       toolrack
-    git_cli_prompt (0.3.2)
+    git_cli_prompt (0.3.3)
       teLogger
       toolrack
       tty-prompt

data/devops_assist.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'gvcs'
   spec.add_dependency 'git_cli'
-  spec.add_dependency 'git_cli_prompt'
+  spec.add_dependency 'git_cli_prompt', "~> 0.3.3"
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"

data/lib/devops_assist/gem/gem_utils.rb

@@ -106,7 +106,8 @@ module DevopsAssist
         cmd = "cd #{root} && gem push #{targetGem} -k #{selAcct}"
         logger.tdebug :pubgemfile, "Command to publish gem : #{cmd}"  
         res = `#{cmd}`
-        $stdin.gets while $stdin.ready? # to clear out any remaining input entry in the event publish operation failed
+        #$stdin.gets while $stdin.ready? # to clear out any remaining input entry in the event publish operation failed
+        $stdin.iflush
         [$?, res, targetGem]
       else
         raise GemError, "Given Gemfile '#{gemfile}' not found"

data/lib/devops_assist/version.rb

@@ -1,5 +1,5 @@
 
 
 module DevopsAssist
-  VERSION = "0.3.9"
+  VERSION = "0.3.11"
 end

data/tasks/devops_assist.rake

@@ -37,6 +37,9 @@ namespace :devops do
     gu = GemUtils.new(root)
     begin
 
+      ws = Gvcs::Workspace.new(root)
+      raise DevopsAssist::Error, "Given path '#{root}' is not a git workspace" if not ws.is_workspace?
+
       pmt = TTY::Prompt.new
 
       # let's mark the session to allow automated context switching
@@ -67,7 +70,7 @@ namespace :devops do
       miscFiles << selVerFile  # version.rb
       miscFiles << DevopsAssist::ReleaseLogger::LOG_NAME  # release_history.yml
       #miscFiles << 'Gemfile.lock'
-      Rake::Task["devops:vcs:checkin_misc_files"].execute({ root: root, files: miscFiles, version: ver })
+      Rake::Task["devops:vcs:checkin_misc_files"].execute({ root: root, files: miscFiles, version: ver, workspace: ws, pmt: pmt })
       #pmt.say "  Updated files during release prep have committed into version control", color: :yellow
 
 
@@ -80,49 +83,52 @@ namespace :devops do
       pmt.say "  Workspace check in done\n\n", color: :yellow
 
       proceed = pmt.yes?(" Proceed to build the gem? ", color: :yellow) 
-      raise GitCliPrompt::UserAborted if not proceed
-
-
-      # test build the gem, make sure there is no error
-      # If error expected the scripts stops here
-      Rake::Task["build"].execute
-
-      # Record the version number in the log files 
-      # for reporting traceability
-      rl = DevopsAssist::ReleaseLogger.load
-      rl.log_release(gemName, ver)
-      #pmt.say "  Release version number is logged after successful test built", color: :yellow
-
-      ## If successfully built, following files shall be changed
-      #miscFiles = []
-      #miscFiles << selVerFile  # version.rb
-      #miscFiles << DevopsAssist::ReleaseLogger::LOG_NAME  # release_history.yml
-      #miscFiles << 'Gemfile.lock'
-      #Rake::Task["devops:vcs:checkin_misc_files"].execute({ root: root, files: miscFiles, version: ver })
-      #pmt.say "  Updated files during release prep have committed into version control", color: :yellow
-
-      ## check in source code
-      #res = Rake::Task["devops:vcs:checkin_changes"].execute
-      #pmt.say "  Workspace check in done\n", color: :yellow
-
-      #proceed = pmt.yes?(" Proceed with release? ") 
       #raise GitCliPrompt::UserAborted if not proceed
 
-      # 
-      # Actual building the real gems build the gem
-      # Any possible reasons here error but not the one above?
-      #
-      # Main reason to do double build is to avoid to generate
-      # 2 log entries in Git for each build, which the 2nd (latest) 
-      # log is just about the version updates (version pre 0.4.x way)
-      #
-      #Rake::Task["build"].execute
-
-      #rl.log_release(gemName, ver)
-      #pmt.say "  Release version number is logged", color: :yellow
+      if proceed
+
+        # test build the gem, make sure there is no error
+        # If error expected the scripts stops here
+        Rake::Task["build"].execute
+
+        # Record the version number in the log files 
+        # for reporting traceability
+        rl = DevopsAssist::ReleaseLogger.load
+        rl.log_release(gemName, ver)
+        #pmt.say "  Release version number is logged after successful test built", color: :yellow
+
+        ## If successfully built, following files shall be changed
+        #miscFiles = []
+        #miscFiles << selVerFile  # version.rb
+        #miscFiles << DevopsAssist::ReleaseLogger::LOG_NAME  # release_history.yml
+        #miscFiles << 'Gemfile.lock'
+        #Rake::Task["devops:vcs:checkin_misc_files"].execute({ root: root, files: miscFiles, version: ver })
+        #pmt.say "  Updated files during release prep have committed into version control", color: :yellow
+
+        ## check in source code
+        #res = Rake::Task["devops:vcs:checkin_changes"].execute
+        #pmt.say "  Workspace check in done\n", color: :yellow
+
+        #proceed = pmt.yes?(" Proceed with release? ") 
+        #raise GitCliPrompt::UserAborted if not proceed
+
+        # 
+        # Actual building the real gems build the gem
+        # Any possible reasons here error but not the one above?
+        #
+        # Main reason to do double build is to avoid to generate
+        # 2 log entries in Git for each build, which the 2nd (latest) 
+        # log is just about the version updates (version pre 0.4.x way)
+        #
+        #Rake::Task["build"].execute
+
+        #rl.log_release(gemName, ver)
+        #pmt.say "  Release version number is logged", color: :yellow
+
+        # publish gem
+        Rake::Task["devops:gem:publish_gem"].execute({ version: ver, pmt: pmt })
 
-      # publish gem
-      Rake::Task["devops:gem:publish_gem"].execute({ version: ver, pmt: pmt })
+      end
 
       # following files shall change when gem is built
       #miscFiles = []
@@ -132,7 +138,7 @@ namespace :devops do
       #Rake::Task["devops:vcs:checkin_misc_files"].execute({ root: root, files: miscFiles, version: ver })
       #pmt.say "  Updated files during release prep have committed into version control", color: :yellow
 
-      Rake::Task["devops:vcs:tag_source_code"].execute({ root: root, version: ver })
+      Rake::Task["devops:vcs:tag_source_code"].execute({ root: root, version: ver, workspace: ws, pmt: pmt })
       pmt.say "  Source code is tagged as version #{ver}", color: :yellow
 
       Rake::Task["devops:vcs:push_source_code"].execute({ root: root, pmt: pmt })

data/tasks/vcs.rake

@@ -21,13 +21,19 @@ namespace :devops do
       root = args[:root]
       files = args[:files]
       ver = args[:version]
+      ws = args[:workspace]
+      pmt = args[:pmt]
 
-      ws = Gvcs::Workspace.new(root)
-      if ws.is_workspace?
+      begin
+      #ws = Gvcs::Workspace.new(root)
+      #if ws.is_workspace?
         ws.add_to_staging(files)
         ws.commit("  Committing file changed during release version '#{ver}'")
-      else
-        raise DevopsAssist::Error, "  Given path '#{root}' is not a repository"
+      #else
+      #  raise DevopsAssist::Error, "  Given path '#{root}' is not a repository"
+      #end
+      rescue Exception => ex
+        pmt.say "\n Error during checking in misc files. Error waas : #{ex.message}", color: :red
       end
 
     end
@@ -37,14 +43,14 @@ namespace :devops do
   
       root = args[:root]
       ver = args[:version]
+      ws = args[:workspace]
+      pmt = args[:pmt]
 
-      pmt = TTY::Prompt.new
-      msg = pmt.ask("  Tagging message : ", default: "Automated tagging of source code release version #{ver} by DevOps Assist")
-      ws = Gvcs::Workspace.new(root)
-      if ws.is_workspace?
+      begin
+        msg = pmt.ask("  Tagging message : ", default: "Automated tagging of source code release version #{ver} by DevOps Assist")
         ws.create_tag(ver, msg)
-      else
-        raise DevopsAssist::Error, "Given path '#{root}' is not a repository"
+      rescue Exception => ex
+        pmt.say "\n Error while tagging source code. Error was : #{ex.message}"
       end
 
     end
@@ -55,12 +61,16 @@ namespace :devops do
       root = args[:root]
       pmt = args[:pmt]
 
-      cli = DevopsAssist::Vcs::Git::CliPrompt.new
-      cli.push(root) do |ops, val|
-        case ops
-        when :push_info
-          pmt.say "  Source code push to remote repository '#{val[:name]}'", color: :yellow
+      begin
+        cli = DevopsAssist::Vcs::Git::CliPrompt.new
+        cli.push(root) do |ops, val|
+          case ops
+          when :push_info
+            pmt.say "  Source code push to remote repository '#{val[:name]}'", color: :yellow
+          end
         end
+      rescue Exception => ex
+        pmt.say "\n Error while pushing source code. Error was : #{ex.message}", color: :red
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devops_assist
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.11
 platform: ruby
 authors:
 - Chris Liaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -84,16 +84,16 @@ dependencies:
   name: git_cli_prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.3
 description: ''
 email:
 - chrisliaw@antrapol.com
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: ''