freshli-commons 0.6.4 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d95cfbbcfd1f22a42fd6d51c485eba7d06fe0a92a813df113de230a53983c9b8
-  data.tar.gz: 87fd47d927a2c0a9eadd6d9a2f1fea52ddeca1e825fad10c7f5237b0b7da5472
+  metadata.gz: d240b4214d3146f9ac2a850f8bbec234cc081e730ccf2e404c1d230e4c7d31b2
+  data.tar.gz: 2307b0714f44f51a154e9d74ae73f0b88cac082e0f2e25b9898b8c9a763991e2
 SHA512:
-  metadata.gz: 999ee8589980e249c8c6f7eb8f0abd35979dc6c9b5401de2276542f8dade867f140bf608f4c55b10ca16799abe69f66b81ee3e19ab426af70e947005069fa66f
-  data.tar.gz: fe6e596e37061fae93c278aff9b7d2974e365f65cd15751a9261f18618d7ddde8a584b3d92547d4af3661679ec268fe0dac5c87fcbb5c08e7296fed1a5118529
+  metadata.gz: 6db1d2dc787cc06685ab40d62cc2bee3ebd97f419778f020761c049218e2cf5e7aa9732d91c809f1719063d2f256b90bd823f797fdd5a769e1946868168a0cae
+  data.tar.gz: da480f259e5248d35807e37cc52a9044ee6f0218d69a53e5083a0d42b640fcdf9c94bda1ad1c163dfbdce827e46c0118ab102bfd73562fcc17be762b81dc5d99

data/Rakefile

@@ -3,6 +3,8 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
+require 'git-version-bump'
+
 require 'fileutils'
 
 # TODO: Copy the `freshli_agent.proto` from the `corgibytes/freshli` repository
@@ -70,7 +72,57 @@ require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 
+namespace :version do
+  desc "Persist the the current version number as #{GVB.version}"
+  task :persist do
+    version_file = File.expand_path(File.join(File.dirname(__FILE__), 'lib', 'corgibytes', 'freshli', 'commons', 'version.rb'))
+    version_file_contents = <<~VERSION_FILE
+    module Corgibytes
+      module Freshli
+        module Commons
+          VERSION = '#{GVB.version}'
+        end
+      end
+    end
+    VERSION_FILE
+    File.write(version_file, version_file_contents)
+  end
+end
+
 # Ensure that the grpc files are generated before the build runs
-Rake::Task['build'].enhance(['grpc'])
+Rake::Task['build'].enhance(['grpc', 'version:bump:patch', 'version:persist'])
 
 task default: %i[grpc spec rubocop]
+
+# Copied from https://github.com/mpalmer/git-version-bump/blob/c1af65cd82c131cb541fa717b3d24a9247973049/lib/git-version-bump/rake-tasks.rb
+# to avoid an issue that was causing the version number of the `git-version-bump` gem to be used instead
+# of this gem's version. That's because of how the `GVB.version` method determines the calling file.
+namespace :version do
+	namespace :bump do
+   	desc "bump major version (x.y.z -> x+1.0.0)"
+   	task :major do
+			GVB.tag_version "#{GVB.major_version + 1}.0.0"
+
+			puts "Version is now #{GVB.version}"
+		end
+
+   	desc "bump minor version (x.y.z -> x.y+1.0)"
+   	task :minor do
+			GVB.tag_version "#{GVB.major_version}.#{GVB.minor_version+1}.0"
+
+			puts "Version is now #{GVB.version}"
+		end
+
+    desc "bump patch version (x.y.z -> x.y.z+1)"
+		task :patch do
+			GVB.tag_version "#{GVB.major_version}.#{GVB.minor_version}.#{GVB.patch_version+1}"
+
+			puts "Version is now #{GVB.version}"
+		end
+
+		desc "Print current version"
+		task :show do
+			puts GVB.version
+		end
+	end
+end

data/lib/corgibytes/freshli/commons/execute.rb

@@ -8,7 +8,6 @@ module Corgibytes
     module Commons
       # Contains utility methods for executing commands and working with their output.
       module Execute
-
         def msbuild_dll_path
           dotnet_exe_path = File.realpath(find_executable('dotnet'))
           dotnet_dir = File.dirname(dotnet_exe_path)

data/lib/corgibytes/freshli/commons/grpc_client.rb

@@ -104,11 +104,15 @@ module Corgibytes
         # rubocop:disable Metrics/MethodLength
         def wait_until_running!
           Timeout.timeout(5) do
+            attempts = 0
             loop do
+              attempts += 1
+              yield(attempts) if block_given?
+
               status = nil
               begin
                 status = health_check
-              rescue GRPC::Unavailable
+              rescue GRPC::Unavailable, GRPC::NotFound
                 status = nil
               end
 

data/lib/corgibytes/freshli/commons/step_definitions/grpc.rb

@@ -15,7 +15,9 @@ Then('the freshli_agent.proto gRPC service is running on port {int}') do |port|
 end
 
 When('I wait for the freshli_agent.proto gRPC service to be running on port {int}') do |port|
-  GrpcClient.new(port).wait_until_running!
+  GrpcClient.new(port).wait_until_running! do |attempts|
+    log("Checking gRPC service health. Attempt ##{attempts}.")
+  end
 end
 
 When('the gRPC service on port {int} is sent the shutdown command') do |port|
@@ -23,7 +25,10 @@ When('the gRPC service on port {int} is sent the shutdown command') do |port|
 end
 
 Then('there are no services running on port {int}') do |port|
-  expect(Ports.available?(port) { |attempts| log(attempts) }).to be_truthy
+  is_port_available = Ports.available?(port) do |attempts|
+    log("Checking port availability. Attempt ##{attempts}.")
+  end
+  expect(is_port_available).to be_truthy
 end
 
 test_services = TestServices.new
@@ -106,6 +111,10 @@ Then('the ProcessManifest response contains the following file paths expanded be
   expect([@process_manifest_result]).to eq(expected_paths)
 end
 
+Then('the ProcessManifest response is empty') do
+  expect(@process_manifest_result).to be_empty
+end
+
 When('I call RetrieveReleaseHistory with {string} on port {int}') do |package_url, port|
   @retrieve_release_history_results = GrpcClient.new(port).retrieve_release_history(package_url)
 end

data/lib/corgibytes/freshli/commons/version.rb

@@ -0,0 +1,7 @@
+module Corgibytes
+  module Freshli
+    module Commons
+      VERSION = '0.6.7'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freshli-commons
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.7
 platform: ruby
 authors:
 - M. Scott Ford
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -91,7 +91,6 @@ files:
 - ".editorconfig"
 - ".rspec"
 - ".rubocop.yml"
-- ".semver"
 - CODE_OF_CONDUCT.md
 - LICENSE
 - README.md
@@ -113,6 +112,7 @@ files:
 - lib/corgibytes/freshli/commons/step_definitions/grpc/health_pb.rb
 - lib/corgibytes/freshli/commons/step_definitions/grpc/health_services_pb.rb
 - lib/corgibytes/freshli/commons/test_services.rb
+- lib/corgibytes/freshli/commons/version.rb
 - protos/corgibytes/freshli/agent/grpc/freshli_agent.proto
 - sig/corgibytes/freshli/commons.rbs
 homepage: https://github.com/corgibytes/freshli-commons

data/.semver

@@ -1,6 +0,0 @@
----
-:major: 0
-:minor: 6
-:patch: 4
-:special: ''
-:metadata: ''