hub_link 0.15.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d6145c12843d700957a88926acba9b90bb56044
-  data.tar.gz: 503ddec7c82a283f13c45da8b6f9ad7c2c679314
+  metadata.gz: 7393845f06b0f5351385509b348edf549bc06c8e
+  data.tar.gz: ed93dc3da202c40c1b682fb39b4a4c73e7b197f8
 SHA512:
-  metadata.gz: 2f1048505951653140943e01bbd4353d8f9400dd15e7b618efdd6943bee6701af483e026188acd10a4c9a577c1844ecc14df9a9b60409e6617ce6ea90efde8a5
-  data.tar.gz: d205a888fee916b2017a66248fa31dce76c0ed425cf400a3db118dd0ba4d41fba541864a571db1540ab260aef9f628448acdea211831235d779c569395a4381e
+  metadata.gz: 26a4378f6e71fed9919d5303df7d32c296ab54bbb849f5e1bd0ee5b87168cc249cf8bfc3e807d97f854a8af9c26b5a5ef7aad3d7e6fcb1001f332b60945468db
+  data.tar.gz: 26a50ddbdc5a340b5df5e6271d2dd28fbc982d8813950a35fa9d2deb534c93c7eed6e95b6365d964c8eb9c1314e81303ff9f763bf670fafe8846e77e00a3a811

data/hub_link.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dotenv"
   spec.add_dependency "faraday_middleware"
   spec.add_dependency "octokit"
-  spec.add_dependency "pastel"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/hub_link/api/pull_request.rb

@@ -1,4 +1,3 @@
-require "hub_link/core_ext/float"
 require "hub_link/api/review"
 require "hub_link/api/review_request"
 require "hub_link/slicer"
@@ -14,15 +13,11 @@ module HubLink
         updated_at
         closed_at
         merged_at
-        approval_time
-        time_to_first_review
-        merge_time
         body_size
         additions
         comments_count
         review_comments_count
         submitter
-        straight_approval?
         labels
         repo
         html_url
@@ -33,7 +28,7 @@ module HubLink
         Octokit.list_issues(repo, options.merge(page: page, sort: "updated", direction: "asc", state: "all")).map do |item|
           item.repo = repo
           new(item)
-        end.find_all(&:pull_request?)
+        end
       end
 
       def pull_request?
@@ -60,28 +55,6 @@ module HubLink
         body.to_s.size
       end
 
-      def merge_time
-        return unless merged?
-
-        (merged_at - created_at).in_hours
-      end
-
-      def time_to_first_review
-        return if first_review.blank?
-
-        (first_review.submitted_at - created_at).in_hours
-      end
-
-      def approval_time
-        return if first_approval.blank?
-
-        (first_approval.submitted_at - created_at).in_hours
-      end
-
-      def straight_approval?
-        reviews.all?(&:approval?)
-      end
-
       def merged_at
         extended_data.merged_at
       end
@@ -118,6 +91,7 @@ module HubLink
 
         def fetch_reviews
           Octokit.pull_request_reviews(repo, number).map do |data|
+            data.repo = repo
             data.pull_request_id = id
             data.number = number
             data.submitter = submitter

data/lib/hub_link/api/review.rb

@@ -6,41 +6,45 @@ module HubLink
         pull_request_id
         submitted_at
         reviewer
-        approval?
         reply?
         state
         html_url
         body
+        review_comments_count
       )
 
       def reviewer
         user&.login
       end
 
-      def approval?
-        state == "APPROVED"
-      end
-
       def reply?
         reviewer == submitter
       end
 
-      def submitted?
-        !draft?
-      end
-
       def submitted_at
         if submitted?
           super
         end
       end
 
+      def review_comments_count
+        review_comments.size
+      end
+
       def to_h
         Slicer.new(self, columns: EXPORT_COLUMNS).to_h
       end
 
       private
 
+        def review_comments
+          @_review_comments ||= Octokit.pull_request_review_comments(repo, number, id)
+        end
+
+        def submitted?
+          !draft?
+        end
+
         def draft?
           state == "PENDING"
         end

data/lib/hub_link/batch.rb

@@ -1,4 +1,3 @@
-require "pastel"
 require "hub_link/api/pull_request"
 
 module HubLink
@@ -19,39 +18,43 @@ module HubLink
 
     def pull_requests
       log "Fetching pull requests" do
-        results.map(&:to_h)
+        pull_request_results.find_all(&:pull_request?).map(&:to_h)
       end
     end
 
     def reviews
       log "Fetching reviews" do
-        results.flat_map(&:reviews).map(&:to_h)
+        pull_request_results.flat_map(&:reviews).map(&:to_h)
       end
     end
 
     def review_requests
       log "Fetching review requests" do
-        results.flat_map(&:review_requests).map(&:to_h)
+        pull_request_results.flat_map(&:review_requests).map(&:to_h)
       end
     end
 
     private
 
+      def pull_request_results
+        results.find_all(&:pull_request?)
+      end
+
       def results
         @_results ||= fetch_results
       end
 
+      def fetch_results
+        log "*Getting issues* #{formatted_options}" do
+          Api::PullRequest.list(options)
+        end
+      end
+
       def log(title, &block)
         logger.info(START) { title }
 
         block.call.tap do |results|
-          logger.info(FINISH) { pastel.green("Found #{results.size}") }
-        end
-      end
-
-      def fetch_results
-        log pastel.bold("Getting PRs: #{formatted_options}") do
-          Api::PullRequest.list(options)
+          logger.info(FINISH) { "Found #{results.size}" }
         end
       end
 
@@ -62,9 +65,5 @@ module HubLink
       def logger
         HubLink.logger
       end
-
-      def pastel
-        @_pastel ||= Pastel.new
-      end
   end
 end

data/lib/hub_link/configuration.rb

@@ -6,6 +6,7 @@ require "hub_link/api/logging"
 
 module HubLink
   class Configuration
+    RETRY_ON = Faraday::Request::Retry::DEFAULT_EXCEPTIONS + [Octokit::BadGateway, Octokit::TooManyRequests]
     attr_accessor :logger
 
     def initialize
@@ -20,8 +21,8 @@ module HubLink
 
       def middleware
         Faraday::RackBuilder.new do |builder|
+          builder.request :retry, exceptions: RETRY_ON
           builder.use Api::Logging
-          builder.request :retry
           builder.use Octokit::Response::RaiseError
           builder.adapter Faraday.default_adapter
         end

data/lib/hub_link/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hub_link
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-02 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pastel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +147,6 @@ files:
 - lib/hub_link/api_logging.rb
 - lib/hub_link/batch.rb
 - lib/hub_link/configuration.rb
-- lib/hub_link/core_ext/float.rb
 - lib/hub_link/importer.rb
 - lib/hub_link/insert.rb
 - lib/hub_link/simple_logger.rb

data/lib/hub_link/core_ext/float.rb

@@ -1,5 +0,0 @@
-class Float
-  def in_hours
-    (self / 60 / 60).round
-  end
-end