dev_metrics 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f7562e3289d9e63952c28d3204862e9096ab36655b86c3feb59d150c6305451
-  data.tar.gz: '0329ed36f933b308443a701ef1407d136f090ffabc5ca8a87af65f94355ce05c'
+  metadata.gz: 61eeda6933db54b48b7f7ca3941b035da3d04f9f9a8e6d414b8ef9db87a265ea
+  data.tar.gz: c2477155037f8f078dc7ffcc044c7cba1767915a0334434af365ddf967fcca06
 SHA512:
-  metadata.gz: 345d1aa1578ad62febbd626899f13e3fe66ac66b9d879d3bc71514f399bbb9239b5e8202b7d30abb0142686efe5f25a0ae5917c9d805920ec92c6793820e5cfa
-  data.tar.gz: b747b37e4fdac8801d4f6758e5ccadeced27c810bda5e643fd0e238af6ed9880bc1e02129446d545a88e507c4e0ab8238e2e735007e5ded3d34683f0e642e511
+  metadata.gz: 3ed77728ffae77e7e4ff2f84affc023902fabbd2c9cd2adce81cc3b40b88eb02d97f1c6ced8e7bf7323452234274b29229f3ea775618ab3324ecc3752f4130e3
+  data.tar.gz: b7d5c47d5d486014d03ab9829b4f325377aa0f5c07c7e64b5f1692d0d308333352f45ea9eaf3b89f6120a374be8ddfec7fb36d7054b037887ee1d8f9c74a5505

data/lib/dev_metrics/client.rb

@@ -3,7 +3,7 @@ require 'uri'
 require 'date'
 require 'json'
 require 'time'
-require 'pry'
+require_relative 'query_builder'
 
 module DevMetrics
   class Client
@@ -14,14 +14,22 @@ module DevMetrics
       @repo_name = config.repo_name
       @bot_accounts = config.bot_accounts || []
       @access_token = config.access_token || ENV.fetch('GITHUB_ACCESS_TOKEN', nil)
+      @fix_branch_names = config.fix_branch_names || %w(hotfix fix rollback)
     end
 
     def process(period: Date.today)
       uri = URI.parse(GITHUB_GRAPHQL_API)
-      request = build_request(uri, period)
-      response = execute_request(uri, request)
+      builder = DevMetrics::QueryBuilder.new(@repo_name)
+
+      auth_request = build_request(uri, builder.access_auth_check)
+      auth_response = execute_request(uri, auth_request)
+      check_auth_errors!(auth_response)
+
+      pr_request = build_request(uri, builder.pull_requests_for(period))
+      pr_response = execute_request(uri, pr_request)
+
+      pr_data = parse_response(pr_response)
 
-      pr_data = parse_response(response)
       filtered_prs = exclude_bots(pr_data)
       correction_pr_count = count_correction_prs(filtered_prs)
 
@@ -31,11 +39,10 @@ module DevMetrics
 
     private
 
-    def build_request(uri, period)
+    def build_request(uri, body)
       request = Net::HTTP::Post.new(uri)
-      request["Authorization"] = "Bearer #{@access_token}"
-      request.body = graphql_query(period)
-
+      request['Authorization'] = "Bearer #{@access_token}"
+      request.body = body
       request
     end
 
@@ -44,12 +51,21 @@ module DevMetrics
       Net::HTTP.start(uri.hostname, uri.port, options) { |http| http.request(request) }
     end
 
+    def check_auth_errors!(response)
+      if response.code.to_i == 403 || response.body.include?('FORBIDDEN')
+        raise "Access denied: ensure the access token has permission to access #{@repo_name}"
+      end
+    end
+
     def parse_response(response)
       unless response.is_a?(Net::HTTPSuccess)
         raise "Failed to fetch data: #{response.message} (#{response.code})"
       end
 
-      JSON.parse(response.body).dig('data', 'search', 'edges')
+      data = JSON.parse(response.body)
+      raise "GraphQL error: #{data['errors']}" if data['errors']
+
+      data.dig('data', 'search', 'edges') || []
     end
 
     def exclude_bots(prs)
@@ -58,7 +74,7 @@ module DevMetrics
     end
 
     def count_correction_prs(prs)
-      prs.count { |pr| pr.dig('node', 'headRefName')&.match?(/^hotfix|fix|rollback/) }
+      prs.count { |pr| pr.dig('node', 'headRefName')&.match?(/^#{@fix_branch_names.join('|')}/) }
     end
 
     def calculate_lead_time(prs)
@@ -81,30 +97,6 @@ module DevMetrics
       Time.at(remaining).utc.strftime("#{days}d %H:%M:%S")
     end
 
-    def graphql_query(period)
-      query_string = <<-GRAPHQL
-    {
-      search(query: "repo:#{@repo_name} is:pr merged:#{period}", type: ISSUE, first: 100) {
-        edges {
-          node {
-            ... on PullRequest {
-              url
-              title
-              author {
-                login
-              }
-              mergedAt
-              headRefName
-              publishedAt
-            }
-          }
-        }
-      }
-    }
-      GRAPHQL
-      { "query" => query_string.strip }.to_json
-    end
-
     def output_metrics(period, prs, correction_pr_count)
       formatted_data = format_data(period, prs, correction_pr_count)
 

data/lib/dev_metrics/markdown.rb

@@ -8,12 +8,16 @@ module DevMetrics
     def format_data(period, prs, correction_pr_count)
       output = ""
       output << "| #{period} | #{prs.count} | #{correction_pr_count} | "
-      output << "#{((correction_pr_count.to_f / prs.count) * 100).round(2)}% | "
+      output << "#{correction_calc(correction_pr_count, prs)}% | "
       output << "#{calculate_lead_time(prs)} | "
       output << "[PRs for #{period}](https://github.com/#{@repo_name}/pulls?q=is%3Apr+merged%3A#{period}) |\n"
       output
     end
 
+    def correction_calc(correction_pr_count, prs)
+      return "-" if prs.empty?
+      ((correction_pr_count.to_f / prs.count) * 100).round(2)
+    end
     def output_filename
       "metrics_report.md"
     end

data/lib/dev_metrics/query_builder.rb

@@ -0,0 +1,44 @@
+module DevMetrics
+  class QueryBuilder
+
+    def initialize(repo)
+      @repo = repo
+    end
+    def access_auth_check
+      to_body <<~GRAPHQL
+      {
+         repository(owner: "#{@repo.split('/')[0]}", name: "#{@repo.split('/')[1]}"){
+          id
+        }
+      }
+    GRAPHQL
+    end
+
+    def pull_requests_for(period)
+      to_body <<~GRAPHQL
+      {
+        search(query: "repo:#{@repo} is:pr merged:#{period}", type: ISSUE, first: 100) {
+          edges {
+            node {
+              ... on PullRequest {
+                url
+                title
+                author { login }
+                mergedAt
+                headRefName
+                publishedAt
+              }
+            }
+          }
+        }
+      }
+    GRAPHQL
+    end
+
+    private
+
+    def to_body(query_string)
+      { "query" => query_string.strip }.to_json
+    end
+  end
+end

data/lib/dev_metrics.rb

@@ -2,12 +2,13 @@ require_relative 'dev_metrics/markdown'
 
 module DevMetrics
   class Config
-    attr_accessor :access_token, :repo_name, :bot_accounts
+    attr_accessor :access_token, :repo_name, :bot_accounts, :fix_branch_names
 
     def initialize
       @access_token = nil
       @repo_name = nil
       @bot_accounts = nil
+      @fix_branch_names = nil
     end
   end
 
@@ -21,9 +22,8 @@ module DevMetrics
     yield(configuration)
   end
 
-  def self.run(format, date)
-    # 設定を使用してMarkdownクラスを呼び出す
-    markdown_processor = format.new(@configuration)
-    markdown_processor.process(period: date)
+  def self.run(period:, format:)
+    client = format.new(@configuration)
+    client.process(period: period)
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: dev_metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - sean2121
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-04 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies: []
-description:
-email:
+description: 
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -19,11 +19,12 @@ files:
 - lib/dev_metrics.rb
 - lib/dev_metrics/client.rb
 - lib/dev_metrics/markdown.rb
-homepage:
+- lib/dev_metrics/query_builder.rb
+homepage: 
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -39,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.33
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A RubyGem for tracking and analyzing development metrics from various repositories.
 test_files: []