hub_link 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62273454a4669abde1d3907ba432c300459c86b
-  data.tar.gz: f4241576d1e46588f13929827085ef9691c6cb31
+  metadata.gz: 3d6145c12843d700957a88926acba9b90bb56044
+  data.tar.gz: 503ddec7c82a283f13c45da8b6f9ad7c2c679314
 SHA512:
-  metadata.gz: 50afd523badb77a74b116530b7755b4d1c992e5bf7322e9319c3446ff8b38c3838142720ceb63371a2fcc72ef48673fb868a3b87868d37ad37498cdd0f7c4097
-  data.tar.gz: aa338de1ba9957f245c45327fa07438f2c25f41bd1474c39062b01c83c65a842ac96f3722014a3c1495a1a4797e4c93dc8ab1d9e4db154ac6091fc2b6ccc50f8
+  metadata.gz: 2f1048505951653140943e01bbd4353d8f9400dd15e7b618efdd6943bee6701af483e026188acd10a4c9a577c1844ecc14df9a9b60409e6617ce6ea90efde8a5
+  data.tar.gz: d205a888fee916b2017a66248fa31dce76c0ed425cf400a3db118dd0ba4d41fba541864a571db1540ab260aef9f628448acdea211831235d779c569395a4381e

data/hub_link.gemspec

@@ -22,6 +22,7 @@ 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/logging.rb

@@ -0,0 +1,17 @@
+module HubLink
+  module Api
+    class Logging < 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
+end

data/lib/hub_link/api/pull_request.rb

@@ -1,4 +1,3 @@
-require "octokit"
 require "hub_link/core_ext/float"
 require "hub_link/api/review"
 require "hub_link/api/review_request"

data/lib/hub_link/batch.rb

@@ -1,3 +1,6 @@
+require "pastel"
+require "hub_link/api/pull_request"
+
 module HubLink
   class Batch
     attr_reader :options
@@ -42,18 +45,26 @@ module HubLink
         logger.info(START) { title }
 
         block.call.tap do |results|
-          logger.info(FINISH) { "Found #{results.size}" }
+          logger.info(FINISH) { pastel.green("Found #{results.size}") }
         end
       end
 
       def fetch_results
-        log "Getting page: #{options.values.join(', ')}" do
+        log pastel.bold("Getting PRs: #{formatted_options}") do
           Api::PullRequest.list(options)
         end
       end
 
+      def formatted_options
+        options.values.join(", ")
+      end
+
       def logger
         HubLink.logger
       end
+
+      def pastel
+        @_pastel ||= Pastel.new
+      end
   end
 end

data/lib/hub_link/configuration.rb

@@ -1,8 +1,8 @@
+require "octokit"
 require "faraday_middleware"
 require "active_support"
 require "hub_link/simple_logger"
-require "hub_link/api_logging"
-
+require "hub_link/api/logging"
 
 module HubLink
   class Configuration
@@ -20,7 +20,7 @@ module HubLink
 
       def middleware
         Faraday::RackBuilder.new do |builder|
-          builder.use ApiLogging
+          builder.use Api::Logging
           builder.request :retry
           builder.use Octokit::Response::RaiseError
           builder.adapter Faraday.default_adapter

data/lib/hub_link/importer.rb

@@ -1,4 +1,3 @@
-require "hub_link"
 require "hub_link/insert"
 
 module HubLink
@@ -15,7 +14,6 @@ module HubLink
 
     def run
       stream.in_batches do |batch|
-
         resources.each do |source, target|
           import batch.fetch(source), to: target
         end
@@ -26,21 +24,14 @@ module HubLink
 
       attr_reader :repo, :since, :resources
 
-      def import(records, to:)
-        logger.info(START) { "Storing #{records.size} record(s) " }
-
-        records.each do |row|
-          Insert.new(row: row, target: to).run
-        end
-        logger.info(FINISH) { "Total: #{to.count}" }
-      end
-
       def stream
         @_stream ||= Stream.new(repo, since: since)
       end
 
-      def logger
-        HubLink.logger
+      def import(records, to:)
+        records.each do |row|
+          Insert.new(row: row, target: to).run
+        end
       end
   end
 end

data/lib/hub_link/insert.rb

@@ -1,7 +1,5 @@
 module HubLink
   class Insert
-    delegate :primary_key, to: :target
-
     def initialize(row:, target:)
       @row = row
       @target = target
@@ -21,6 +19,10 @@ module HubLink
         row[primary_key]
       end
 
+      def primary_key
+        target.primary_key
+      end
+
       def importable_attributes
         row.slice(*target_columns)
       end

data/lib/hub_link/simple_logger.rb

@@ -2,7 +2,7 @@ module HubLink
   class SimpleLogger < SimpleDelegator
     def initialize(output = "hub_link.log")
       logger = Logger.new(output)
-      logger.formatter = ->(_, datetime, _, msg) { "#{datetime.to_s(:db)} - #{msg}\n" }
+      logger.formatter = ->(_, datetime, _, msg) { "#{datetime} - #{msg}\n" }
       __setobj__(logger)
     end
   end

data/lib/hub_link/stream.rb

@@ -1,4 +1,3 @@
-require "hub_link/api/pull_request"
 require "hub_link/batch"
 
 module HubLink

data/lib/hub_link/version.rb

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

data/lib/hub_link.rb

@@ -1,6 +1,7 @@
 require "dotenv/load"
 require "hub_link/configuration"
 require "hub_link/stream"
+require "hub_link/importer"
 require "hub_link/version"
 
 module HubLink

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub_link
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jens Balvig
@@ -66,6 +66,20 @@ 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
@@ -140,6 +154,7 @@ files:
 - bin/setup
 - hub_link.gemspec
 - lib/hub_link.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