hubstats 0.11.1 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911665087e0ee0d8773ce4bae6aed402795e6c2d
-  data.tar.gz: 18461da00b85d04ab4e8aca618788eb137289894
+  metadata.gz: 3fc079b6e63d5a5fc7ee4503e35820ea54e09424
+  data.tar.gz: 46597aad8e5b14d15754cd6e4e04285e479f6b41
 SHA512:
-  metadata.gz: ffd6cf82367d1086e2a243f59225ccb3e0e1e7afa310b58066e61ab976e79c95e07891db84b4cb75c190584ec4e22183c4e679c84188989c03f8501d6885f927
-  data.tar.gz: 8bfeff211c2d84125ed45f72d32fa092c0840a2aca02f8243fe478289a02cccd8c1c682ba27974a4bb6927cc19d3ae034650dc6ef693e66ef1f5672f24bbca7b
+  metadata.gz: 353bd5e9cea0e12d4fd12b28fda94093936c854638ecf660f1f854651ce9a82ea3f5693eb5cb29771b995209953a6bad131004946268a700709db3554b76cc06
+  data.tar.gz: 5da5b406669dff022fab684b6f9cef6098793176f2b423ffa77ced20580accf6609555389fa47a72a3791a7629095f009b26d69520ffad11f9e2bbcf9681a105

data/CHANGELOG.markdown

@@ -1,21 +1,3 @@
-#### v0.11.1
-* Removing places for Client IDs and Client secrets
-
-  > Emma Sax: Unknown User: https://github.com/sportngin/hubstats/pull/123
-
-#### v0.11.0
-* Hubstats does not need to show data for deployments
-
-  > Emma Sax: Unknown User: https://github.com/sportngin/hubstats/pull/121
-
-#### v0.10.0
-* Show list of QA Signoffs on User's show page
-
-  > Emma Sax: Unknown User: https://github.com/sportngin/hubstats/pull/120
-
-#### v0.9.5
-* Linking Today button in Hubstats datepicker
-
-  > Emma Sax: Unknown User: https://github.com/sportngin/hubstats/pull/116
-
-#### v0.9.4
+#### v0.11.4
+#### v0.11.3
+#### v0.11.2

data/app/controllers/hubstats/teams_controller.rb

@@ -33,7 +33,7 @@ module Hubstats
       @team = Hubstats::Team.where(id: params[:id]).first
       @pull_requests = Hubstats::PullRequest.belonging_to_team(@team.id).merged_in_date_range(@start_date, @end_date).order("updated_at DESC").limit(20)
       @pull_count = Hubstats::PullRequest.belonging_to_team(@team.id).merged_in_date_range(@start_date, @end_date).count(:all)
-      @users = @team.users.where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"]).order("login ASC").distinct
+      @users = @team.users.where.not(login: Hubstats.config.github_config["ignore_users_list"] || []).order("login ASC").distinct
       @active_user_count = @users.length
       @comment_count = Hubstats::Comment.belonging_to_team(@users.pluck(:id)).created_in_date_range(@start_date, @end_date).count(:all)
       repos_pr = @pull_requests.pluck(:repo_id)

data/app/controllers/hubstats/users_controller.rb

@@ -14,7 +14,7 @@ module Hubstats
         @users = Hubstats::User.where(id: params[:id].split(",")).order("login ASC")
       else
         @users = Hubstats::User.with_all_metrics(@start_date, @end_date)
-          .where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"])
+          .where.not(login: Hubstats.config.github_config["ignore_users_list"] || [])
           .with_id(params[:users])
           .custom_order(params[:order])
           .paginate(:page => params[:page], :per_page => 15)

data/app/models/hubstats/comment.rb

@@ -5,7 +5,7 @@ module Hubstats
 
     # Various checks that can be used to filter and find info about comments.
     scope :created_in_date_range, lambda {|start_date, end_date| where("hubstats_comments.created_at BETWEEN ? AND ?", start_date, end_date)}
-    scope :ignore_comments_by, lambda {|user_ids| where("user_id NOT IN (?)", user_ids) if user_ids}
+    scope :ignore_comments_by, lambda {|user_ids| where.not(user_id: user_ids || []) if user_ids}
     scope :belonging_to_pull_request, lambda {|pull_request_id| where(pull_request_id: pull_request_id)}
     scope :belonging_to_user, lambda {|user_id| where(user_id: user_id)}
     scope :belonging_to_team, lambda {|user_ids| where(user_id: user_ids) if user_ids}
@@ -32,6 +32,11 @@ module Hubstats
     def self.create_or_update(github_comment)
       github_comment = github_comment.to_h.with_indifferent_access if github_comment.respond_to? :to_h
 
+      unless github_comment[:user_id]
+        Rails.logger.warn "Found comment with no user, ignoring. GitHub comment ID: #{github_comment[:id]}"
+        return nil
+      end
+
       user = Hubstats::User.create_or_update(github_comment[:user])
       github_comment[:user_id] = user.id
       

data/app/models/hubstats/pull_request.rb

@@ -7,9 +7,9 @@ module Hubstats
     scope :closed_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.closed_at BETWEEN ? AND ?", start_date, end_date)}
     scope :updated_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.updated_at BETWEEN ? AND ?", start_date, end_date)}
     scope :created_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.created_at BETWEEN ? AND ?", start_date, end_date)}
-    scope :merged_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.merged").where("hubstats_pull_requests.merged_at BETWEEN ? AND ?", start_date, end_date)}
+    scope :merged_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.merged = ?", true).where("hubstats_pull_requests.merged_at BETWEEN ? AND ?", start_date, end_date)}
     scope :created_since, lambda {|days| where("hubstats_pull_requests.created_at > ?", Date.today - days)}
-    scope :ignore_pulls_by, lambda {|user_ids| where("user_id NOT IN (?)", user_ids) if user_ids}
+    scope :ignore_pulls_by, lambda {|user_ids| where.not(user_id: user_ids || []) if user_ids}
     scope :belonging_to_repo, lambda {|repo_id| where(repo_id: repo_id)}
     scope :belonging_to_team, lambda {|team_id| where(team_id: team_id)}
     scope :belonging_to_user, lambda {|user_id| where(user_id: user_id)}

data/app/models/hubstats/repo.rb

@@ -42,7 +42,7 @@ module Hubstats
     scope :pull_requests_count, lambda {|start_date, end_date|
       select("hubstats_repos.id as repo_id")
       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.id),0) AS pull_request_count")
-      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.repo_id = hubstats_repos.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date]))
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.repo_id = hubstats_repos.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = ?", start_date, end_date, true]))
       .group("hubstats_repos.id")
     }
 
@@ -56,7 +56,7 @@ module Hubstats
       select("hubstats_repos.id as repo_id")
       .select("ROUND(IFNULL(AVG(hubstats_pull_requests.additions),0)) AS average_additions")
       .select("ROUND(IFNULL(AVG(hubstats_pull_requests.deletions),0)) AS average_deletions")
-      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.repo_id = hubstats_repos.id AND hubstats_pull_requests.merged = '1' AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?)", start_date, end_date]))
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.repo_id = hubstats_repos.id AND hubstats_pull_requests.merged = ? AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?)", true, start_date, end_date]))
       .group("hubstats_repos.id")
     }
 

data/app/models/hubstats/team.rb

@@ -28,7 +28,7 @@ module Hubstats
     scope :pull_requests_count, lambda {|start_date, end_date|
       select("hubstats_teams.id as team_id")
       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.id),0) AS pull_request_count")
-      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.team_id = hubstats_teams.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date]))
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.team_id = hubstats_teams.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = ?", start_date, end_date, true]))
       .group("hubstats_teams.id")
     }
 

data/app/models/hubstats/user.rb

@@ -3,11 +3,12 @@ module Hubstats
 
     # Various checks that can be used to filter and find info about users.
     scope :with_id, lambda {|user_id| where(id: user_id.split(',')) if user_id}
-    scope :only_active, -> { where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"]).having("comment_count > 0 OR pull_request_count > 0 OR deploy_count > 0") }
-    scope :is_developer, -> { where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"]).having("pull_request_count > 0") }
-    scope :is_reviewer, -> { where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"]).having("comment_count > 0") }
+    scope :only_active, -> { not_ignored.having("comment_count > 0 OR pull_request_count > 0 OR deploy_count > 0") }
+    scope :is_developer, -> { not_ignored.having("pull_request_count > 0") }
+    scope :is_reviewer, -> { not_ignored.having("comment_count > 0") }
     scope :with_contributions, lambda {|start_date, end_date, repo_id| with_all_metrics_repos(start_date, end_date, repo_id) if repo_id}
-    scope :ignore_users_ids, -> { where("login IN (?)", Hubstats.config.github_config["ignore_users_list"]).pluck(:id) }
+    scope :ignore_users_ids, -> { where(login: Hubstats.config.github_config["ignore_users_list"] || []).pluck(:id) }
+    scope :not_ignored, -> { where.not(login: Hubstats.config.github_config["ignore_users_list"] || []) }
 
     # Public - Counts all of the deploys for selected user that occurred between the start_date and end_date.
     # 
@@ -57,7 +58,7 @@ module Hubstats
     scope :pull_requests_count, lambda {|start_date, end_date|
       select("hubstats_users.id as user_id")
       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.id),0) AS pull_request_count")
-      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date]))
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = ?", start_date, end_date, true]))
       .group("hubstats_users.id")
     }
 
@@ -124,7 +125,7 @@ module Hubstats
     scope :pull_requests_count_by_repo, lambda {|start_date, end_date, repo_id|
       select("hubstats_users.id as user_id")
       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.id),0) AS pull_request_count")
-      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND (hubstats_pull_requests.repo_id LIKE ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date, repo_id]))
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND (hubstats_pull_requests.repo_id LIKE ?) AND hubstats_pull_requests.merged = ?", start_date, end_date, repo_id, true]))
       .group("hubstats_users.id")
     }
 
@@ -155,7 +156,7 @@ module Hubstats
       select("hubstats_users.id as user_id")
       .select("SUM(IFNULL(hubstats_pull_requests.additions, 0)) AS additions")
       .select("SUM(IFNULL(hubstats_pull_requests.deletions, 0)) AS deletions")
-      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date]))
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = ?", start_date, end_date, true]))
       .group("hubstats_users.id")
     }
 

data/lib/hubstats/github_api.rb

@@ -44,7 +44,7 @@ module Hubstats
       octo = client({:auto_paginate => true})
       octo.paginate(path, options) do |data, last_response|
         last_response.data.each{|v| route(v,kind,repo_name)}.clear
-        wait_limit(1,octo.rate_limit)
+        wait_limit(false, 1, octo.rate_limit)
       end.each{|v| route(v,kind,repo_name)}.clear
     end
 
@@ -82,7 +82,7 @@ module Hubstats
             pr = client.pull_request(repo.full_name, pull.number)
             Hubstats::PullRequest.create_or_update(HubHelper.pull_setup(pr))
           end
-          wait_limit(grab_size,client.rate_limit)
+          wait_limit(false, grab_size, client.rate_limit)
         end
         puts "All Pull Requests are up to date"
       rescue Faraday::ConnectionFailed
@@ -115,7 +115,7 @@ module Hubstats
             end
           end
         end
-        wait_limit(grab_size,client.rate_limit)
+        wait_limit(false, grab_size, client.rate_limit)
         puts "All teams are up to date"
       rescue Faraday::ConnectionFailed
         puts "Connection Timeout, restarting team updating"
@@ -270,9 +270,12 @@ module Hubstats
     # rate_limit - the amount of time to wait to grab data
     #
     # Returns - nothing
-    def self.wait_limit(grab_size, rate_limit)
-      if rate_limit.remaining < grab_size
-        puts "Hit Github rate limit, waiting #{Time.at(rate_limit.resets_in).utc.strftime("%H:%M:%S")} to get more"
+    def self.wait_limit(force, grab_size=nil, rate_limit=nil)
+      rate_limit = client.rate_limit unless rate_limit
+      grab_size = 250 unless grab_size
+
+      if force || rate_limit.remaining < grab_size
+        puts "We don't want to hit the GitHub wait limit; waiting #{Time.at(rate_limit.resets_in).utc.strftime("%H:%M:%S")} to get more"
         sleep(rate_limit.resets_in)
       end
     end

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.11.1"
+  VERSION = "0.11.4"
 end

data/lib/tasks/populate_task.rake

@@ -15,11 +15,16 @@ namespace :hubstats do
 
     desc "Updates which repos hubstats tracks" 
     task :update_repos => :environment do
-      Hubstats::GithubAPI.get_repos.each do |repo|
+      Hubstats::GithubAPI.get_repos.each_with_index do |repo, index|
         unless Hubstats::Repo.where(full_name: repo.full_name).first
           Rake::Task["hubstats:populate:setup_repo"].execute({repo: repo})
         end
+
+        if index % 10 == 0
+          Hubstats::GithubAPI.wait_limit(true)
+        end
       end
+
       puts "Finished with initial updating, grabbing extra info about pull requests"
       Rake::Task["hubstats:populate:update_pulls"].execute
       puts "Finished grabbing info about pull requests, populating teams"

data/spec/lib/hubstats/events_handler_spec.rb

@@ -70,6 +70,16 @@ module Hubstats
         allow(Hubstats::User).to receive_message_chain(:create_or_update).and_return(user)
         expect(ehandler.route(payload, payload[:type]).class).to eq(Hubstats::Comment)
       end
+
+      it 'should successfully creates_or_updates the event even if the user_id is missing' do
+        ehandler = Hubstats::EventsHandler.new()
+        payload = build(:comment_payload_hash, :user => {:login=>"hermina", :id=>0, :role=>"User"},
+                        :comment => {"id"=>194761, "body"=>"Quidem ea minus ut odio optio.",
+                                     "kind"=>"Issue", "repo_id"=>101010,
+                                     "created_at" => Date.today, "updated_at" => Date.today})
+        allow(Hubstats::User).to receive_message_chain(:create_or_update).and_return(user)
+        expect(ehandler.route(payload, payload[:type])).to be_nil
+      end
     end
 
     context "TeamEvent" do

data/test/dummy/config/database.yml

@@ -15,7 +15,7 @@ development:
 test:
   adapter: mysql2
   database: hubstats_test
-  username: <%= ENV['TRAVIS'] ? 'travis' : 'root' %>
+  username: 'root'
   pool: 5
   timeout: 5000
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.4
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -407,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Github Statistics