shipyrd 0.2.9 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b988c2350fa48044fbef604ad868571d9730c089725062f120b2b22d3da8e02
-  data.tar.gz: 67b6df1cd737d04ac6c73ca7fcc64843d80cfd26b4e4564a54fbb0dd275b225f
+  metadata.gz: 4ca8632fd328d206ba4b724f9bc87cfb1da3c91e4c6ef170417e14dad5e4218c
+  data.tar.gz: c2c0d9a4d1e9f523fbbe9fe1f5c42271a38c806951c0eee95f838ff82ec73748
 SHA512:
-  metadata.gz: 9e9813bafcb8a60628689727aafd84e63c47f3a8f1e3f8e533dd56963e70ef915a2c1f2f4cd9ce9d8cd3e02bc4da36477fb4ccd78930a6e30d9896bd2afb23bb
-  data.tar.gz: 20af02a805bd95be735dac9a66b596294b772606f91c8f0ec9a2e82a49754521105a35cd575d6480f04fd188230d491c0d73980973cd616dd3fbc971baf390cb
+  metadata.gz: df11e4e06c89519193752651d55fe33a4e3f8e96b0199c01e08c779b2533f54be89a5d2a10388d85f9c600d5f22f7d7ff5f23f029c7e6b4da63f02623874255c
+  data.tar.gz: 57a15080c8af612d49fb6f7414ba6f542120a39324f5bd2e6e91bd1115f39f909b09b33cbe350ea78135cf49fa355b9bb196f87f6841cfcc123848f18b0eae27

data/Gemfile

@@ -12,6 +12,6 @@ gem "guard-standardrb", "~> 0.2"
 gem "minitest", "~> 5.20"
 gem "minitest-reporters", "~> 1.3"
 gem "minitest-silence"
-gem "mocha", "~> 2.1.0"
+gem "mocha", "~> 3.1.0"
 gem "rake", "~> 13.0"
 gem "webmock", "~> 3.23"

data/Guardfile

@@ -1,35 +1,11 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
-
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), then you will want to move
-## the Guardfile to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
-
-# guard :standardrb, fix: true, all_on_start: true do
-#   UI.info 'StandardRb is initialized'
-#   watch(/.+\.rb$/)
-# end
-
 guard :standardrb, fix: false, all_on_start: false, progress: true do
   watch(/.+\.rb$/)
 end
 
 guard :minitest, all_on_start: false do
-  # with Minitest::Unit
-  watch(%r{^test/(.*)/?test_(.*)\.rb$})
+  watch(%r{^test/(.*/)?([^/]+)_test\.rb$})
   watch(%r{^lib/(.*/)?([^/]+)\.rb$}) { |m|
-    puts "tests"
-    "test/#{m[1]}test_#{m[2]}.rb"
+    "test/#{m[1]}#{m[2]}_test.rb"
   }
   watch(%r{^test/test_helper\.rb$}) { "test" }
 end

data/README.md

@@ -69,7 +69,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/shipyr
 The `bin/release` command will bump the version in the version.rb file, tag it, and push it up to github & rubygems.
 
 ```
-bin/release 0.2.8
+bin/release 0.2.11
 ```
 
 ## Code of Conduct

data/Rakefile

@@ -6,6 +6,8 @@ require "standard/rake"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task default: %i[test standard]

data/lib/shipyrd/client.rb

@@ -13,9 +13,12 @@ class Shipyrd::Client
     KAMAL_SUBCOMMAND
     KAMAL_VERSION
     SHIPYRD_API_KEY
+    SHIPYRD_COMMIT_MESSAGE
     SHIPYRD_HOST
   ]
 
+  class DestinationBlocked < StandardError; end
+
   def initialize(host: ENV["SHIPYRD_HOST"], api_key: ENV["SHIPYRD_API_KEY"], **options)
     @host = parse_host(host)
     @api_key = api_key
@@ -37,7 +40,7 @@ class Shipyrd::Client
         status: event,
         recorded_at: ENV["KAMAL_RECORDED_AT"],
         performer: performer,
-        commit_message: commit_message,
+        commit_message: ENV["SHIPYRD_COMMIT_MESSAGE"] || commit_message,
         version: ENV["KAMAL_VERSION"],
         service_version: ENV["KAMAL_SERVICE_VERSION"],
         hosts: ENV["KAMAL_HOSTS"],
@@ -61,9 +64,19 @@ class Shipyrd::Client
 
     if response.is_a?(Net::HTTPSuccess)
       logger.info "#{event} triggered successfully for #{details[:deploy][:service_version]}"
+    elsif response.is_a?(Net::HTTPUnprocessableEntity)
+      json_response = JSON.parse(response.body)
+
+      if (lock = json_response.dig("errors", "lock"))
+        raise DestinationBlocked, lock
+      else
+        logger.info "#{event} trigger failed with errors => #{json_response["errors"]}"
+      end
     else
       logger.info "#{event} trigger failed with #{response.code}(#{response.message})"
     end
+  rescue DestinationBlocked
+    raise
   rescue => e
     logger.info "#{event} trigger failed with error => #{e}"
   end

data/lib/shipyrd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shipyrd
-  VERSION = "0.2.9"
+  VERSION = "0.2.11"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: shipyrd
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.11
 platform: ruby
 authors:
 - Nick Hammond
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: The companion gem for Shipyrd, the Kamal deployment dashboard
 email:
@@ -35,7 +34,6 @@ metadata:
   homepage_uri: https://shipyrd.io
   source_code_uri: https://github.com/shipyrd/shipyrd-gem
   changelog_uri: https://github.com/shipyrd/shipyrd-gem/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -50,8 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: The companion gem for Shipyrd, the Kamal deployment dashboard
 test_files: []