ruboty-qiita-github 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 428947cc3bc45e068621e716700bfdd3794c4d5bea4e3953484c1fdda04d9c1f
-  data.tar.gz: c5c4a90307f58c85f84b1d27cb087761a9cb195db61b361e006626ebe10cb13c
+  metadata.gz: 883d462281fcd9a4e984d543aa30a52ff3d826c2cadd5bfe0c09c7c8363532b6
+  data.tar.gz: 6d8d9f28e5e09744a29a6a1346be35c104ff885ff74ce6f21b4aec5b8e271eed
 SHA512:
-  metadata.gz: b6290a0ec069f6adc266ddbfeb0a163f14c879174a9d025c02be06a939fc1fef750be03b59aaef7d5192481b6272f22e4fc3699de6f84df8f4904859e2fa64f1
-  data.tar.gz: 0f8306a079bd04e0a92845f661d9ae2509d22a43a15dc8675f0e799579c20f3512d8295121641ef47418760aa70bd1d1de4eb19590dfbac284d93cc2e7e6425c
+  metadata.gz: a06ca29fccd9584d78ddcae8cf08f36556a78873a5106fd2a301ce0b90319547e958c632ecdabbb69147f5922b5d891fb489bd356c0ceb0f4bffc6df95eb65a0
+  data.tar.gz: 21ee13914d6b464d4f81cfb6858141cced3803613e28a0a1d6864a92d1fde42aadf8ac92c79bc54df5a848f9a914b40c87d20eddeb843a55b1ef31ece02e2123

data/.github/CODEOWNERS

@@ -0,0 +1,6 @@
+# package-ecosystem: bundler, directories: /
+/*.gemspec @increments/shared-dev-group
+/Gemfile @increments/shared-dev-group
+
+# package-ecosystem: github-actions, directories: /
+/.github/workflows @increments/shared-dev-group

data/.github/dependabot.yml

@@ -5,7 +5,11 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    cooldown:
+      default-days: 7
   - package-ecosystem: "bundler"
     directory: "/"
     schedule:
       interval: "weekly"
+    cooldown:
+      default-days: 7

data/.github/workflows/release.yml

@@ -0,0 +1,22 @@
+name: Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    environment: release
+
+    permissions:
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: ruby/setup-ruby@bb6434c747fa7022e12fa1cae2a0951fcffcff26 # v1.253.0
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+      - uses: rubygems/release-gem@6317d8d1f7e28c24d28f6eff169ea854948bd9f7 # v1.2.0

data/.github/workflows/test.yml

@@ -15,12 +15,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["3.2", "3.3", "3.4"]
     runs-on: "ubuntu-latest"
     continue-on-error: false
     steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
@@ -29,9 +29,24 @@ jobs:
   rubocop:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314.0
         with:
-          ruby-version: "3.1"
+          ruby-version: "3.2"
           bundler-cache: true
       - run: bundle exec rubocop
+
+  qlty:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314.0
+        with:
+          ruby-version: '3.2'
+          bundler-cache: true
+      - name: Test
+        run: bundle exec rspec
+      - uses: qltysh/qlty-action/coverage@fd52dc852530a708d68c3b7342f8d33d1df4cd55 # v2.2.1
+        with:
+          token: ${{ secrets.QLTY_COVERAGE_TOKEN }}
+          files: ./coverage/coverage.json

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+## 0.3.5
+- Fix ISSUE_PATTERN to handle Slack app (Events API) URL formats
+- Add GitHub Actions workflow for gem release via Trusted Publishing
+
+## 0.3.4
+- Fix bug of v0.3.3
+
 ## 0.3.3
 - Bump actions/checkout from 3 to 4
 - Enable to change after merge custom message

data/README.md

@@ -1,5 +1,8 @@
 # Ruboty::Github
-[![Gem Version](https://badge.fury.io/rb/ruboty-qiita-github.svg)](https://badge.fury.io/rb/ruboty-qiita-github) [![Test](https://github.com/increments/ruboty-qiita-github/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/increments/ruboty-qiita-github/actions/workflows/test.yml) [![Maintainability](https://api.codeclimate.com/v1/badges/764bf9dc5796f0d3bef3/maintainability)](https://codeclimate.com/github/increments/ruboty-qiita-github/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/764bf9dc5796f0d3bef3/test_coverage)](https://codeclimate.com/github/increments/ruboty-qiita-github/test_coverage)
+[![Gem Version](https://badge.fury.io/rb/ruboty-qiita-github.svg)](https://badge.fury.io/rb/ruboty-qiita-github)
+[![Test](https://github.com/increments/ruboty-qiita-github/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/increments/ruboty-qiita-github/actions/workflows/test.yml)
+[![Maintainability](https://qlty.sh/gh/increments/projects/ruboty-qiita-github/maintainability.svg)](https://qlty.sh/gh/increments/projects/ruboty-qiita-github)
+[![Code Coverage](https://qlty.sh/gh/increments/projects/ruboty-qiita-github/coverage.svg)](https://qlty.sh/gh/increments/projects/ruboty-qiita-github)
 
 Manage GitHub via Ruboty.
 This gem adds `deploy pull request` command to original ruboty-github plugin.

data/lib/ruboty/github/actions/merge_pull_request.rb

@@ -21,7 +21,7 @@ module Ruboty
           custom_message = ENV.fetch('AFTER_MERGE_MESSAGE', nil)
           target_repository = ENV.fetch('AFTER_MERGE_MESSAGE_TARGET_REPOSITORY', '')
 
-          return unless (repository == target_repository) && custom_message
+          return true unless (repository == target_repository) && custom_message
 
           message.reply(custom_message)
         end

data/lib/ruboty/github/version.rb

@@ -2,6 +2,6 @@
 
 module Ruboty
   module Github
-    VERSION = '0.3.3'
+    VERSION = '0.3.5'
   end
 end

data/lib/ruboty/handlers/github.rb

@@ -3,7 +3,7 @@
 module Ruboty
   module Handlers
     class Github < Base
-      ISSUE_PATTERN = %r{(?:https?://[^/]+/)?(?<repo>.+)(?:#|/pull/|/issues/)(?<number>\d+) ?}.freeze
+      ISSUE_PATTERN = %r{<?(?:https?://[^/]+/|[^/]+\.[^/]+/)?(?<repo>[^/]+/[^/]+)(?:#|/pull/|/issues/)(?<number>\d+)>? ?}.freeze
 
       env :GITHUB_BASE_URL, 'Pass GitHub URL if needed (e.g. https://github.example.com)', optional: true
 

data/ruboty-github.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov_json_formatter'
   spec.add_development_dependency 'webmock'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/spec/ruboty/handlers/github_spec.rb

@@ -81,7 +81,7 @@ describe Ruboty::Handlers::Github do
       %(ruboty create issue "#{title}" on #{user}/#{repository})
     end
 
-    include_examples 'requires access token without access token'
+    it_behaves_like 'requires access token without access token'
 
     context 'with access token' do
       it 'creates a new issue with given title on given repository' do
@@ -115,7 +115,7 @@ describe Ruboty::Handlers::Github do
       %(ruboty search issues "#{query}")
     end
 
-    include_examples 'requires access token without access token'
+    it_behaves_like 'requires access token without access token'
 
     context 'with access token' do
       it 'search an issue with given query' do
@@ -125,6 +125,55 @@ describe Ruboty::Handlers::Github do
     end
   end
 
+  describe 'ISSUE_PATTERN' do
+    subject(:match) { described_class::ISSUE_PATTERN.match(input) }
+
+    context 'with owner/repo#number format' do
+      let(:input) { 'alice/test#123' }
+
+      it 'extracts repo and number' do
+        expect(match[:repo]).to eq('alice/test')
+        expect(match[:number]).to eq('123')
+      end
+    end
+
+    context 'with full URL using /issues/' do
+      let(:input) { 'https://github.com/alice/test/issues/123' }
+
+      it 'extracts repo and number' do
+        expect(match[:repo]).to eq('alice/test')
+        expect(match[:number]).to eq('123')
+      end
+    end
+
+    context 'with full URL using /pull/' do
+      let(:input) { 'https://github.com/alice/test/pull/123' }
+
+      it 'extracts repo and number' do
+        expect(match[:repo]).to eq('alice/test')
+        expect(match[:number]).to eq('123')
+      end
+    end
+
+    context 'with protocol-stripped URL (Slack display text)' do
+      let(:input) { 'github.com/alice/test/pull/123' }
+
+      it 'extracts repo and number' do
+        expect(match[:repo]).to eq('alice/test')
+        expect(match[:number]).to eq('123')
+      end
+    end
+
+    context 'with angle-bracketed URL' do
+      let(:input) { '<https://github.com/alice/test/pull/123>' }
+
+      it 'extracts repo and number' do
+        expect(match[:repo]).to eq('alice/test')
+        expect(match[:number]).to eq('123')
+      end
+    end
+  end
+
   describe '#close_issue' do
     before do
       stub_request(:get, "https://api.github.com/repos/#{user}/#{repository}/issues/#{issue_number}")
@@ -169,7 +218,7 @@ describe Ruboty::Handlers::Github do
       1
     end
 
-    include_examples 'requires access token without access token'
+    it_behaves_like 'requires access token without access token'
 
     context 'with closed issue' do
       it 'replies so' do
@@ -183,6 +232,39 @@ describe Ruboty::Handlers::Github do
         call
       end
     end
+
+    context 'with full URL format' do
+      let(:body) do
+        "@ruboty close https://github.com/#{user}/#{repository}/issues/#{issue_number}"
+      end
+
+      it 'closes specified issue' do
+        expect(robot).to receive(:say).with(hash_including(body: "Closed #{html_url}"))
+        call
+      end
+    end
+
+    context 'with protocol-stripped URL format (Slack display text)' do
+      let(:body) do
+        "@ruboty close github.com/#{user}/#{repository}/issues/#{issue_number}"
+      end
+
+      it 'closes specified issue' do
+        expect(robot).to receive(:say).with(hash_including(body: "Closed #{html_url}"))
+        call
+      end
+    end
+
+    context 'with angle-bracketed URL format' do
+      let(:body) do
+        "@ruboty close <https://github.com/#{user}/#{repository}/issues/#{issue_number}>"
+      end
+
+      it 'closes specified issue' do
+        expect(robot).to receive(:say).with(hash_including(body: "Closed #{html_url}"))
+        call
+      end
+    end
   end
 
   describe '#remember' do

data/spec/spec_helper.rb

@@ -1,7 +1,16 @@
 # frozen_string_literal: true
 
 require 'simplecov'
-SimpleCov.start
+require 'simplecov_json_formatter'
+
+SimpleCov.start do
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::JSONFormatter,
+    SimpleCov::Formatter::HTMLFormatter
+  ]
+
+  add_filter '/spec/'
+end
 
 require 'ruboty/github'
 require 'webmock/rspec'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-qiita-github
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Ryo Nakamura
 - Seigo Uchida
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -165,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov_json_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - r7kamura@gmail.com
 - spesnova@gmail.com
@@ -187,7 +199,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".github/dependabot.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -217,7 +231,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -232,8 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Manage GitHub via Ruboty.
 test_files: []