rake-gem-maintenance 0.1.7 → 0.2.0

data/lib/rake/gem/maintenance/version_bump_task.rb

@@ -4,110 +4,112 @@ require "rake"
 require "rake/tasklib"
 
 module Rake
-  module GemMaintenance
-    # Defines Rake tasks for version bumping with gem-release.
-    #
-    # Creates: version:bump[type] and bump[type] (alias)
-    class VersionBumpTask < ::Rake::TaskLib
-      VALID_TYPES = %w[patch minor major].freeze
-
-      attr_accessor :namespace_name, :default_type, :commit_message_template,
-                    :create_alias, :amend_with_gemfile_lock
-
-      def initialize
-        super
-        @namespace_name = :version
-        @default_type = "patch"
-        @commit_message_template = "chore(release): %<version>s"
-        @create_alias = true
-        @amend_with_gemfile_lock = true
-
-        yield self if block_given?
-
-        define_tasks
-      end
+  module Gem
+    module Maintenance
+      # Defines Rake tasks for version bumping with gem-release.
+      #
+      # Creates: version:bump[type] and bump[type] (alias)
+      class VersionBumpTask < ::Rake::TaskLib
+        VALID_TYPES = %w[patch minor major].freeze
+
+        attr_accessor :namespace_name, :default_type, :commit_message_template,
+                      :create_alias, :amend_with_gemfile_lock
+
+        def initialize
+          super
+          @namespace_name = :version
+          @default_type = "patch"
+          @commit_message_template = "chore(release): %<version>s"
+          @create_alias = true
+          @amend_with_gemfile_lock = true
+
+          yield self if block_given?
+
+          define_tasks
+        end
 
-      private
+        private
 
-      def define_tasks
-        define_version_bump_task
-        define_alias_task if create_alias
-      end
+        def define_tasks
+          define_version_bump_task
+          define_alias_task if create_alias
+        end
 
-      def define_version_bump_task
-        task_instance = self
-        bump_desc = "Bump version (patch, minor, major) and update Gemfile.lock. Default: #{default_type}"
+        def define_version_bump_task
+          task_instance = self
+          bump_desc = "Bump version (patch, minor, major) and update Gemfile.lock. Default: #{default_type}"
 
-        namespace namespace_name do
-          desc bump_desc
-          task :bump, [:type] do |_t, args|
-            task_instance.send(:run_bump, args)
+          namespace namespace_name do
+            desc bump_desc
+            task :bump, [:type] do |_t, args|
+              task_instance.send(:run_bump, args)
+            end
           end
         end
-      end
 
-      def define_alias_task
-        ns = namespace_name
+        def define_alias_task
+          ns = namespace_name
 
-        desc "Alias for #{ns}:bump"
-        task :bump, [:type] => ["#{ns}:bump"]
-      end
+          desc "Alias for #{ns}:bump"
+          task :bump, [:type] => ["#{ns}:bump"]
+        end
 
-      def run_bump(args)
-        args.with_defaults(type: default_type)
+        def run_bump(args)
+          args.with_defaults(type: default_type)
 
-        validate_version_type(args.type)
-        execute_version_bump(args.type)
+          validate_version_type(args.type)
+          execute_version_bump(args.type)
 
-        return unless amend_with_gemfile_lock
+          return unless amend_with_gemfile_lock
 
-        update_gemfile_lock
-        amend_commit_to_include_gemfile_lock_changes
-      end
+          update_gemfile_lock
+          amend_commit_to_include_gemfile_lock_changes
+        end
 
-      def validate_version_type(type)
-        return if VALID_TYPES.include?(type)
+        def validate_version_type(type)
+          return if VALID_TYPES.include?(type)
 
-        abort "Error: Version type must be one of: #{VALID_TYPES.join(', ')}"
-      end
+          abort "Error: Version type must be one of: #{VALID_TYPES.join(', ')}"
+        end
 
-      def execute_version_bump(type)
-        puts "Bumping #{type} version..."
-        version_file = detect_version_file
-        cmd = "bundle exec gem bump --version #{type}"
-        cmd += " --file #{version_file}" if version_file
-        bump_result = system("#{cmd} --message '#{commit_message_template}'")
-        return if bump_result
+        def execute_version_bump(type)
+          puts "Bumping #{type} version..."
+          version_file = detect_version_file
+          cmd = "bundle exec gem bump --version #{type}"
+          cmd += " --file #{version_file}" if version_file
+          bump_result = system("#{cmd} --message '#{commit_message_template}'")
+          return if bump_result
 
-        abort "Error: Failed to bump version"
-      end
+          abort "Error: Failed to bump version"
+        end
 
-      def detect_version_file
-        gemspec_path = Dir.glob("*.gemspec").first
-        return nil unless gemspec_path
+        def detect_version_file
+          gemspec_path = Dir.glob("*.gemspec").first
+          return nil unless gemspec_path
 
-        gem_name = Gem::Specification.load(gemspec_path).name
-        version_rb = File.join("lib", gem_name.tr("-", "/"), "version.rb")
-        return version_rb if File.exist?(version_rb)
+          gem_name = ::Gem::Specification.load(gemspec_path).name
+          version_rb = File.join("lib", gem_name.tr("-", "/"), "version.rb")
+          return version_rb if File.exist?(version_rb)
 
-        version_rb = File.join("lib", gem_name.split("-").first, gem_name.split("-")[1..].join("_"), "version.rb")
-        return version_rb if File.exist?(version_rb)
+          version_rb = File.join("lib", gem_name.split("-").first, gem_name.split("-")[1..].join("_"), "version.rb")
+          return version_rb if File.exist?(version_rb)
 
-        nil
-      end
+          nil
+        end
 
-      def update_gemfile_lock
-        puts "Updating Gemfile.lock..."
-        bundle_result = system("bundle install")
-        return if bundle_result
+        def update_gemfile_lock
+          puts "Updating Gemfile.lock..."
+          bundle_result = system("bundle install")
+          return if bundle_result
 
-        abort "Error: Failed to update Gemfile.lock"
-      end
+          abort "Error: Failed to update Gemfile.lock"
+        end
 
-      def amend_commit_to_include_gemfile_lock_changes
-        puts "Amending commit to include Gemfile.lock update..."
-        system("git add .")
-        system("git commit --amend --no-edit")
+        def amend_commit_to_include_gemfile_lock_changes
+          puts "Amending commit to include Gemfile.lock update..."
+          system("git add .")
+          system("git commit --amend --no-edit")
+        end
       end
     end
   end

data/lib/rake/gem/maintenance/woodpecker_secret_store.rb

@@ -1,88 +1,90 @@
 # frozen_string_literal: true
 
 module Rake
-  module GemMaintenance
-    # Creates or updates an org-level secret in a Woodpecker CI server.
-    # SSL verification is disabled because Woodpecker is typically served
-    # on an internal network with a private CA.
-    class WoodpeckerSecretStore
-      def initialize(server:, org:, token:)
-        @server = server
-        @org = org
-        @token = token
-      end
+  module Gem
+    module Maintenance
+      # Creates or updates an org-level secret in a Woodpecker CI server.
+      # SSL verification is disabled because Woodpecker is typically served
+      # on an internal network with a private CA.
+      class WoodpeckerSecretStore
+        def initialize(server:, org:, token:)
+          @server = server
+          @org = org
+          @token = token
+        end
 
-      def store(secret_name, value, events: %w[push tag manual])
-        org_id = find_org_id
-        abort "[ERROR] Woodpecker org '#{@org}' not found on #{@server}." unless org_id
+        def store(secret_name, value, events: %w[push tag manual])
+          org_id = find_org_id
+          abort "[ERROR] Woodpecker org '#{@org}' not found on #{@server}." unless org_id
 
-        if secret_exists?(org_id, secret_name)
-          patch("/api/orgs/#{org_id}/secrets/#{secret_name}",
-                { value: value, events: events, images: [] })
-        else
-          post("/api/orgs/#{org_id}/secrets",
-               { name: secret_name, value: value, events: events, images: [] })
+          if secret_exists?(org_id, secret_name)
+            patch("/api/orgs/#{org_id}/secrets/#{secret_name}",
+                  { value: value, events: events, images: [] })
+          else
+            post("/api/orgs/#{org_id}/secrets",
+                 { name: secret_name, value: value, events: events, images: [] })
+          end
         end
-      end
 
-      private
+        private
 
-      def find_org_id
-        orgs = get("/api/orgs")
-        orgs&.find { |o| o["name"] == @org }&.fetch("id", nil)
-      end
+        def find_org_id
+          orgs = get("/api/orgs")
+          orgs&.find { |o| o["name"] == @org }&.fetch("id", nil)
+        end
 
-      def secret_exists?(org_id, secret_name)
-        secrets = get("/api/orgs/#{org_id}/secrets")
-        secrets&.any? { |s| s["name"] == secret_name }
-      end
+        def secret_exists?(org_id, secret_name)
+          secrets = get("/api/orgs/#{org_id}/secrets")
+          secrets&.any? { |s| s["name"] == secret_name }
+        end
 
-      def get(path)
-        require "json"
-        response = request(Net::HTTP::Get, path)
-        JSON.parse(response.body) if response.is_a?(Net::HTTPSuccess)
-      end
+        def get(path)
+          require "json"
+          response = request(Net::HTTP::Get, path)
+          JSON.parse(response.body) if response.is_a?(Net::HTTPSuccess)
+        end
 
-      def post(path, body)
-        request(Net::HTTP::Post, path, body)
-      end
+        def post(path, body)
+          request(Net::HTTP::Post, path, body)
+        end
 
-      def patch(path, body)
-        request(Net::HTTP::Patch, path, body)
-      end
+        def patch(path, body)
+          request(Net::HTTP::Patch, path, body)
+        end
 
-      def request(klass, path, body = nil)
-        require "net/http"
-        require "json"
-        require "openssl"
+        def request(klass, path, body = nil)
+          require "net/http"
+          require "json"
+          require "openssl"
 
-        uri = URI("#{@server}#{path}")
-        http.request(build_req(klass, uri, body))
-      end
+          uri = URI("#{@server}#{path}")
+          http.request(build_req(klass, uri, body))
+        end
 
-      def http
-        uri = URI(@server)
-        h = Net::HTTP.new(uri.hostname, uri.port)
-        h.use_ssl = (uri.scheme == "https")
-        h.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        h
-      end
+        def http
+          uri = URI(@server)
+          h = Net::HTTP.new(uri.hostname, uri.port)
+          h.use_ssl = (uri.scheme == "https")
+          h.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          h
+        end
 
-      def build_req(klass, uri, body)
-        req = klass.new(uri)
-        req["Authorization"] = "Bearer #{@token}"
-        if body
-          req["Content-Type"] = "application/json"
-          req.body = JSON.generate(body)
+        def build_req(klass, uri, body)
+          req = klass.new(uri)
+          req["Authorization"] = "Bearer #{@token}"
+          if body
+            req["Content-Type"] = "application/json"
+            req.body = JSON.generate(body)
+          end
+          req
         end
-        req
-      end
 
-      def build_http(uri)
-        http = Net::HTTP.new(uri.hostname, uri.port)
-        http.use_ssl = (uri.scheme == "https")
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        http
+        def build_http(uri)
+          http = Net::HTTP.new(uri.hostname, uri.port)
+          http.use_ssl = (uri.scheme == "https")
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          http
+        end
       end
     end
   end

data/scripts/ci_publish_rubygems.rb

@@ -9,8 +9,8 @@
 $LOAD_PATH.unshift File.join(__dir__, "..", "lib")
 require "rake/gem/maintenance"
 
-Rake::GemMaintenance::Repos.rubygems_api_key_env_var = "GEM_HOST_API_KEY"
-Rake::GemMaintenance::Repos.rubygems_otp_seed_env_var = "RUBYGEMS_OTP_SEED"
+Rake::Gem::Maintenance::Repos.rubygems_api_key_env_var = "GEM_HOST_API_KEY"
+Rake::Gem::Maintenance::Repos.rubygems_otp_seed_env_var = "RUBYGEMS_OTP_SEED"
 
 gemspec_file = Dir["*.gemspec"].first
 abort "ERROR: No gemspec found in #{Dir.pwd}" unless gemspec_file
@@ -21,7 +21,7 @@ gem_file = Dir["*.gem"].max_by { |f| File.mtime(f) }
 abort "ERROR: No .gem file found after build" unless gem_file
 
 puts "Publishing #{gem_file} to rubygems.org..."
-publisher = Rake::GemMaintenance::GemPublisher.new(Rake::GemMaintenance::Repos.rubygems)
+publisher = Rake::Gem::Maintenance::GemPublisher.new(Rake::Gem::Maintenance::Repos.rubygems)
 publisher.publish(gem_file)
 
 abort "ERROR: Failed to publish #{gem_file} to rubygems.org" if publisher.successful_repos.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-gem-maintenance
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Christophe Broult