hub_link 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7393845f06b0f5351385509b348edf549bc06c8e
-  data.tar.gz: ed93dc3da202c40c1b682fb39b4a4c73e7b197f8
+SHA256:
+  metadata.gz: bb5467d077c3a02f7bb755a034997a7df4ead75eedabbad773b5d48725d57446
+  data.tar.gz: 1204105a373f2af9a76f37c9beecc0ef9dc30f377b6344d4b831c187fa1eaaec
 SHA512:
-  metadata.gz: 26a4378f6e71fed9919d5303df7d32c296ab54bbb849f5e1bd0ee5b87168cc249cf8bfc3e807d97f854a8af9c26b5a5ef7aad3d7e6fcb1001f332b60945468db
-  data.tar.gz: 26a50ddbdc5a340b5df5e6271d2dd28fbc982d8813950a35fa9d2deb534c93c7eed6e95b6365d964c8eb9c1314e81303ff9f763bf670fafe8846e77e00a3a811
+  metadata.gz: fa20791e755f899fdb81f8a9166328779ae2223219de2cdbf1008887d7647494f080e5d9a72e8652762cd1e460ba203f49f07605ff93dde29093b3074a1044d4
+  data.tar.gz: 5f42d81a7bc074eb3cccb0970623da01855d2d86624bc193d6039b54198df16ed5342579870c9354efe9d1c70c5107a916be0e8f2c0a07ab74c94e17dedaeb28

data/README.md

@@ -17,7 +17,6 @@ Then you can do:
 stream = HubLink::Stream.new("balvig/hub_link", since: 3.months.ago)
 
 stream.in_batches do |batch|
-  batch.review_requests # => [{ digest: "a45bfa...", reviewer: "balvig", ... }]
   batch.reviews # => [{ id: 54, reviewer: "balvig", approval: true, ... }]
   batch.prs # => [{ id: 34, merge_time: 6400, ... }]
 end

data/hub_link.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday_middleware"
   spec.add_dependency "octokit"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"
 end

data/lib/hub_link/api/issue.rb

@@ -0,0 +1,59 @@
+module HubLink
+  module Api
+    class Issue < SimpleDelegator
+      require "hub_link/slicer"
+      require "hub_link/api/pull_request"
+
+      EXPORT_COLUMNS = %i(
+        id
+        title
+        number
+        created_at
+        updated_at
+        closed_at
+        submitter
+        labels
+        repo
+        html_url
+        state
+      )
+
+      def self.list(repo:, page:, **options)
+        Octokit.list_issues(repo, options.merge(page: page, sort: "updated", direction: "asc", state: "all")).map do |item|
+          item.repo = repo
+          new_from_api(item)
+        end
+      end
+
+      def self.new_from_api(item)
+        if item.respond_to?(:pull_request)
+          PullRequest.new(item)
+        else
+          Issue.new(item)
+        end
+      end
+
+      def pull_request?
+        false
+      end
+
+      def submitter
+        user.login
+      end
+
+      def labels
+        super.map(&:name).join(", ")
+      end
+
+      def to_h
+        Slicer.new(self, columns: export_columns).to_h
+      end
+
+      private
+
+        def export_columns
+          EXPORT_COLUMNS
+        end
+    end
+  end
+end

data/lib/hub_link/api/pull_request.rb

@@ -1,52 +1,24 @@
-require "hub_link/api/review"
-require "hub_link/api/review_request"
-require "hub_link/slicer"
-
 module HubLink
   module Api
-    class PullRequest < SimpleDelegator
-      EXPORT_COLUMNS = %i(
-        id
-        title
-        number
-        created_at
-        updated_at
-        closed_at
+    class PullRequest < Issue
+      require "hub_link/api/review"
+
+      ADDITIONAL_EXPORT_COLUMNS = %i(
         merged_at
         body_size
         additions
         comments_count
         review_comments_count
-        submitter
-        labels
-        repo
-        html_url
-        state
       )
 
-      def self.list(repo:, page:, **options)
-        Octokit.list_issues(repo, options.merge(page: page, sort: "updated", direction: "asc", state: "all")).map do |item|
-          item.repo = repo
-          new(item)
-        end
-      end
-
       def pull_request?
-        respond_to?(:pull_request)
-      end
-
-      def submitter
-        user.login
+        true
       end
 
       def reviews
         @_reviews ||= fetch_reviews
       end
 
-      def review_requests
-        @_review_requests ||= fetch_review_requests
-      end
-
       def additions
         extended_data.additions
       end
@@ -67,26 +39,10 @@ module HubLink
         extended_data.review_comments
       end
 
-      def labels
-        super.map(&:name).join(", ")
-      end
-
-      def to_h
-        Slicer.new(self, columns: EXPORT_COLUMNS).to_h
-      end
-
       private
 
-        def merged?
-          merged_at.present?
-        end
-
-        def fetch_review_requests
-          requests = Octokit.pull_request_review_requests(repo, number)
-
-          requests.users.compact.map do |reviewer|
-            ReviewRequest.new(created_at: created_at, reviewer: reviewer.login, requester: submitter, pull_request_id: id)
-          end
+        def export_columns
+          super + ADDITIONAL_EXPORT_COLUMNS
         end
 
         def fetch_reviews
@@ -99,14 +55,6 @@ module HubLink
           end
         end
 
-        def first_approval
-          reviews.find(&:approval?)
-        end
-
-        def first_review
-          reviews.find(&:submitted?)
-        end
-
         def extended_data
           @_extended_data ||= Octokit.get(pull_request.url)
         end

data/lib/hub_link/batch.rb

@@ -1,4 +1,4 @@
-require "hub_link/api/pull_request"
+require "hub_link/api/issue"
 
 module HubLink
   class Batch
@@ -28,16 +28,16 @@ module HubLink
       end
     end
 
-    def review_requests
-      log "Fetching review requests" do
-        pull_request_results.flat_map(&:review_requests).map(&:to_h)
+    def issues
+      log "Fetching issues" do
+        (results - pull_request_results).map(&:to_h)
       end
     end
 
     private
 
       def pull_request_results
-        results.find_all(&:pull_request?)
+        @_pull_request_results ||= results.find_all(&:pull_request?)
       end
 
       def results
@@ -45,8 +45,8 @@ module HubLink
       end
 
       def fetch_results
-        log "*Getting issues* #{formatted_options}" do
-          Api::PullRequest.list(options)
+        log "*Querying issues* #{formatted_options}" do
+          Api::Issue.list(**options)
         end
       end
 

data/lib/hub_link/version.rb

@@ -1,3 +1,3 @@
 module HubLink
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/lib/hub_link.rb

@@ -12,7 +12,9 @@ module HubLink
   class << self
     attr_accessor :config
 
-    delegate :logger, to: :config
+    def logger
+      config.logger
+    end
   end
 
   self.config = Configuration.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hub_link
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Jens Balvig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - jens@balvig.com
 executables: []
@@ -140,11 +140,10 @@ files:
 - bin/setup
 - hub_link.gemspec
 - lib/hub_link.rb
+- lib/hub_link/api/issue.rb
 - lib/hub_link/api/logging.rb
 - lib/hub_link/api/pull_request.rb
 - lib/hub_link/api/review.rb
-- lib/hub_link/api/review_request.rb
-- lib/hub_link/api_logging.rb
 - lib/hub_link/batch.rb
 - lib/hub_link/configuration.rb
 - lib/hub_link/importer.rb
@@ -158,7 +157,7 @@ homepage: https://github.com/balvig/hub_link
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -173,9 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Fetch raw data from GitHub for metrics
 test_files: []

data/lib/hub_link/api/review_request.rb

@@ -1,31 +0,0 @@
-module HubLink
-  module Api
-    class ReviewRequest
-      require "digest/sha1"
-
-      attr_reader :reviewer, :requester, :created_at, :pull_request_id
-
-      def initialize(reviewer:, requester:, created_at:, pull_request_id:)
-        @reviewer = reviewer
-        @requester = requester
-        @created_at = created_at
-        @pull_request_id = pull_request_id
-      end
-
-      # API doesn't return IDs for review requests https://developer.github.com/v3/pulls/review_requests/#list-review-requests
-      def digest
-        Digest::SHA1.hexdigest(digest_components.join)
-      end
-
-      def to_h
-        Slicer.new(self, columns: %i(digest reviewer requester created_at pull_request_id)).to_h
-      end
-
-      private
-
-        def digest_components
-          [pull_request_id, reviewer]
-        end
-    end
-  end
-end

data/lib/hub_link/api_logging.rb

@@ -1,15 +0,0 @@
-module HubLink
-  class ApiLogging < Faraday::Response::Middleware
-    def call(env)
-      message = "#{env[:method].upcase} #{env[:url]}".sub("https://api.github.com/repos", "")
-      logger.info(UPDATE) { message }
-      super
-    end
-
-    private
-
-      def logger
-        HubLink.logger
-      end
-  end
-end