hub_store 0.10.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f201ad7494f23bab6f9eb1938dad969bc434e0d5de26da14cab920414eb9ddae
-  data.tar.gz: 23ed79127208c4a9db714970302bb9c979cdc225fac2482d8a43e7d10d00c687
+  metadata.gz: b28b4357b1bd0d79b8dda3ac19b4d3ee599ff1897fbf228e76b8690e2fb5655d
+  data.tar.gz: aa81352822f572d4efc74c5db9b19d2c15613754991e57e5f2c93986f5b0c3b2
 SHA512:
-  metadata.gz: e9c54eb576bc9f1739c3be646e200352e3ba77fb73361d4a2f34196c324863fc2f1709212c178273abf2940e3f1956633204441edf85f46610ebe76864a71a24
-  data.tar.gz: 7e06dd0634abbcf883c8f1ee064e7b219ab9d3b3edf562638f73b9de6e2053015fe3b80a4a509616f4a9a9b47d9c434ba7137f9a989b091c840476c9b2a36392
+  metadata.gz: 721377665ae7ee2800d21f03a9bc7080e12db94a6ed8cef0970ae82d76e39994d3686f687cd28f51fedcdc9cc53ddb0137f533e7c7c74e0df6a367cfa9fa758c
+  data.tar.gz: 0e2319f46da0b74b80c220b385a9de9071e961029f58ac84cc7516f5c7e1f7d033e361b3d69970a56e12f3c6310d6ae16b48a01d36902a47639d6e1ccc8870ed

data/exe/hub_store

@@ -2,4 +2,5 @@
 
 require "hub_store"
 
+HubStore::Storage::Database.new.setup
 HubStore::Cli.run(ARGV)

data/hub_store.gemspec

@@ -26,8 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
 
   spec.add_dependency "activerecord"
   spec.add_dependency "dotenv"

data/lib/hub_store/cli.rb

@@ -1,18 +1,9 @@
 require "hub_store/exporter"
-
-require "hub_store/storage/database"
 require "hub_store/storage/import"
-
 require "hub_store/ui"
 
 module HubStore
   class Cli
-    RESOURCES = {
-      review_requests: Storage::ReviewRequest,
-      reviews: Storage::Review,
-      pull_requests: Storage::PullRequest
-    }.freeze
-
     def self.run(*args)
       new(*args).run
     end
@@ -22,7 +13,7 @@ module HubStore
     end
 
     def run
-      setup_database
+      link_logger_to_ui
       import_data
       export_csv
     end
@@ -31,27 +22,13 @@ module HubStore
 
       attr_reader :argv
 
-      def setup_database
-        ui.start("Preparing database")
-        Storage::Database.new.setup
-        ui.stop("Done.")
+      def link_logger_to_ui
+        HubLink.config.logger = ui
       end
 
       def import_data
         repos.each do |repo|
-          Storage::Import.new(repo: repo, resources: RESOURCES, start_date: start_date).run do |on|
-            on.init do |query|
-              ui.log "\n-- #{query} --"
-            end
-
-            on.start do |resource|
-              ui.start("Importing #{resource}")
-            end
-
-            on.finish do |count|
-              ui.stop("Total: #{count}")
-            end
-          end
+          Storage::Import.new(repo: repo, since: since).run
         end
       end
 
@@ -75,8 +52,8 @@ module HubStore
         argv[0].presence || stop
       end
 
-      def start_date
-        ENV["START_DATE"]
+      def since
+        ENV["SINCE"]
       end
 
       def stop

data/lib/hub_store/storage/database.rb

@@ -23,17 +23,22 @@ module HubStore::Storage
         ActiveRecord::Schema.define do
           unless ActiveRecord::Base.connection.table_exists?("pull_requests")
             create_table "pull_requests", force: :cascade do |t|
+              t.string "title"
               t.string "submitter"
               t.string "number"
               t.string "labels"
               t.string "repo"
+              t.string "state"
+              t.string "html_url"
               t.integer "approval_time"
               t.integer "time_to_first_review"
               t.integer "merge_time"
               t.integer "additions"
-              t.integer "review_count"
+              t.integer "comments_count"
+              t.integer "review_comments_count"
               t.boolean "straight_approval"
               t.datetime "closed_at"
+              t.datetime "merged_at"
               t.datetime "created_at", null: false
               t.datetime "updated_at", null: false
             end
@@ -45,7 +50,10 @@ module HubStore::Storage
               t.datetime "submitted_at"
               t.string "reviewer"
               t.string "state"
+              t.boolean "reply"
+              t.string "html_url"
               t.boolean "approval"
+              t.text "body"
             end
           end
 

data/lib/hub_store/storage/import.rb

@@ -1,26 +1,25 @@
 require "hub_link/importer"
-require "hub_store/storage/pull_request"
-require "hub_store/storage/review"
-require "hub_store/storage/review_request"
+require "hub_store/storage/database"
 
-module HubStore::Storage
-  class Import
-    def initialize(repo:, resources:, start_date: nil)
-      @repo = repo
-      @resources = resources
-      @start_date = start_date
-    end
+module HubStore
+  module Storage
+    class Import
+      def initialize(repo:, since: nil)
+        @repo = repo
+        @since = since
+      end
 
-    def run(&block)
-      HubLink::Importer.run(repo: repo, start_date: start_date, resources: resources, &block)
-    end
+      def run(&block)
+        HubLink::Importer.run(repo: repo, since: since, resources: RESOURCES, &block)
+      end
 
-    private
+      private
 
-      attr_reader :repo, :resources
+        attr_reader :repo, :resources
 
-      def start_date
-        @start_date.presence || PullRequest.for(repo).latest_update
-      end
+        def since
+          @since.presence || PullRequest.for(repo).latest_update
+        end
+    end
   end
 end

data/lib/hub_store/ui.rb

@@ -2,17 +2,39 @@ require "tty/spinner"
 
 module HubStore
   class Ui
+    FORMAT = ":spinner :title :status"
+
+    def initialize
+      @spinner = TTY::Spinner.new(FORMAT, format: :dots_3, hide_cursor: true, interval: 20)
+    end
+
+    def info(progname, &block)
+      case progname
+      when HubLink::START
+        start block.call
+      when HubLink::FINISH
+        stop block.call
+      else
+        update block.call
+      end
+    end
+
     def start(msg)
-      @spinner = TTY::Spinner.new(":spinner #{msg}...", format: :dots_3)
-      @spinner.auto_spin
+      spinner.update(title: msg, status: nil)
+      spinner.auto_spin
     end
 
-    def stop(msg)
-      @spinner.success("(#{msg})")
+    def update(msg)
+      spinner.update(status: msg)
     end
 
-    def log(msg)
-      puts msg
+    def stop(msg)
+      spinner.update(status: nil)
+      spinner.success("(#{msg})")
     end
+
+    private
+
+      attr_reader :spinner
   end
 end

data/lib/hub_store/version.rb

@@ -1,3 +1,3 @@
 module HubStore
-  VERSION = "0.10.0"
+  VERSION = "0.13.0"
 end

data/lib/hub_store.rb

@@ -1,6 +1,14 @@
 require "dotenv/load"
 require "hub_store/version"
 require "hub_store/cli"
+require "hub_store/storage/pull_request"
+require "hub_store/storage/review"
+require "hub_store/storage/review_request"
 
 module HubStore
+  RESOURCES = {
+    review_requests: Storage::ReviewRequest,
+    reviews: Storage::Review,
+    pull_requests: Storage::PullRequest
+  }.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hub_store
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  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
-    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: activerecord
   requirement: !ruby/object:Gem::Requirement