hubstats 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77496c48a3720e8d978086bd5cfa738de57b03df
-  data.tar.gz: 0d0b00ea075ecee963a6186a501709e60cd12207
+  metadata.gz: e925f69924867d0a38870e2a7727abb5a6184df1
+  data.tar.gz: 1de514e9df778d9103bae816e568d6d85998a1bd
 SHA512:
-  metadata.gz: 8a371b8a04f7da2adbc23c5f31847230c4d024d4b3708103826a5aee59bd0164f4c242e7cb3ed2f367248c3b16984a1271e2c8c4a0f7d56ff053477a5c8775f4
-  data.tar.gz: 3e37c386fef9ccb576145df17ced3f136059b5281fcb2bb5580c95e142b7f89adfd4e3bf22c1ec927d10823123f5e898e124e21db08578bb1a3b301780100519
+  metadata.gz: 91b2586e9b58d013738fbc730536be8ff384a24427f7c28fe9f17ebffdce6c9aa6a11ca8b9064f2063804befe6dcdd3ed4e3399c712e9c6019515af065043b52
+  data.tar.gz: b58ce472383f6690d647be15d05bfc51088db260bb7af39626cddf0bfa7f632ba895d781bd99fcc11707ac0a6d002c780be0ac6ba45a169e75da4bae9b3b2775

data/CHANGELOG.markdown

@@ -1,3 +1,12 @@
+#### v0.5.5
+* Another attempt at fixing bug to correct updated_at timestamp
+
+  > Emma Sax: Andy Fleener: https://github.com/sportngin/hubstats/pull/83
+
+* Adding metrics to all metric pages on Hubstats
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/hubstats/pull/82
+
 #### v0.5.4
 * updated_at shouldn't change when updating teams for pull requests
 

data/app/controllers/hubstats/deploys_controller.rb

@@ -9,7 +9,7 @@ module Hubstats
     # Returns - the deploy data
     def index
       @deploys = Hubstats::Deploy.includes(:repo, :pull_requests, :user)
-        .belonging_to_users(params[:users]).belonging_to_repos(params[:repos])
+        .belonging_to_users(params[:users]).belonging_to_repos(params[:repos]).belonging_to_teams(params[:teams])
         .group_by(params[:group])
         .order_with_date_range(@start_date, @end_date, params[:order])
         .paginate(:page => params[:page], :per_page => 15)
@@ -26,7 +26,7 @@ module Hubstats
       repo = @deploy.repo
       @pull_requests = @deploy.pull_requests.limit(20)
       @pull_request_count = @pull_requests.length
-      @stats_basics = {
+      @stats_row_one = {
         pull_count: @pull_request_count,
         net_additions: @deploy.find_net_additions,
         comment_count: @deploy.find_comment_count,

data/app/controllers/hubstats/pull_requests_controller.rb

@@ -33,7 +33,7 @@ module Hubstats
       @comments = Hubstats::Comment.belonging_to_pull_request(params[:id]).created_in_date_range(@start_date, @end_date).limit(20)
       comment_count = Hubstats::Comment.belonging_to_pull_request(params[:id]).created_in_date_range(@start_date, @end_date).count(:all)
       @deploys = Hubstats::Deploy.where(id: @pull_request.deploy_id).order("deployed_at DESC")
-      @stats_basics = {
+      @stats_row_one = {
         comment_count: comment_count,
         net_additions: @pull_request.additions.to_i - @pull_request.deletions.to_i,
         additions: @pull_request.additions.to_i,

data/app/controllers/hubstats/repos_controller.rb

@@ -3,8 +3,8 @@ require_dependency "hubstats/application_controller"
 module Hubstats
   class ReposController < Hubstats::BaseController
 
-    # Public - Lists all of the repos, either in alphabetical order, by query params, or with activity in between
-    # @start_date and @end_date.
+    # Public - Shows all of the repos, in either alphabetical order, by filter params, or that have done things in
+    # github between the selected @start_date and @end_date.
     #
     # Returns - the repository data
     def index
@@ -13,10 +13,14 @@ module Hubstats
       elsif params[:id]
         @repos = Hubstats::Repo.where(id: params[:id].split(",")).order("name ASC")
       else
-        @repos = Hubstats::Repo.with_recent_activity(@start_date, @end_date)
+        @repos = Hubstats::Repo.with_all_metrics(@start_date, @end_date)
+          .with_id(params[:repos])
+          .custom_order(params[:order])
+          .paginate(:page => params[:page], :per_page => 15)
       end
 
       respond_to do |format|
+        format.html
         format.json { render :json => @repos}
       end
     end
@@ -32,7 +36,7 @@ module Hubstats
       @deploys = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_in_date_range(@start_date, @end_date).order("deployed_at DESC").limit(20)
       @deploy_count = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_in_date_range(@start_date, @end_date).count(:all)
       @comment_count = Hubstats::Comment.belonging_to_repo(@repo.id).created_in_date_range(@start_date, @end_date).count(:all)
-      @user_count = Hubstats::User.with_pulls_or_comments_or_deploys(@start_date, @end_date, @repo.id).only_active.length
+      @active_user_count = Hubstats::User.with_pulls_or_comments_or_deploys(@start_date, @end_date, @repo.id).only_active.length
       @net_additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_repo(@repo.id).sum(:additions).to_i -
                        Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_repo(@repo.id).sum(:deletions).to_i
       @additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_repo(@repo.id).average(:additions)
@@ -41,46 +45,19 @@ module Hubstats
       stats
     end
 
-    # Public - Shows all of the repositories with individual stats for each repo. Also shows the stats for all of
-    # the repositories within @start_date and @end_date.
-    #
-    # Returns - the stats for the entirety of Hubstats and all repos
-    def dashboard
-      @repos = Hubstats::Repo.with_all_metrics(@start_date, @end_date)
-        .with_id(params[:repos])
-        .custom_order(params[:order])
-        .paginate(:page => params[:page], :per_page => 15)
-
-      @user_count = Hubstats::User.with_pulls_or_comments_or_deploys(@start_date, @end_date).only_active.length
-      @deploy_count = Hubstats::Deploy.deployed_in_date_range(@start_date, @end_date).count(:all)
-      @pull_count = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).count(:all)
-      @comment_count = Hubstats::Comment.created_in_date_range(@start_date, @end_date).count(:all)
-      @net_additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).sum(:additions).to_i - 
-                       Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).sum(:deletions).to_i
-      @additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).average(:additions)
-      @deletions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).average(:deletions)
-
-      stats
-
-      respond_to do |format|
-        format.html
-        format.json { render :json => @repos}
-      end
-    end
-
     # Public - Will assign all of the stats for both the show page and the dashboard page.
     #
     # Returns - the data in two hashes
     def stats
       @additions ||= 0
       @deletions ||= 0
-      @stats_basics = {
-        user_count: @user_count,
+      @stats_row_one = {
+        active_user_count: @active_user_count,
         deploy_count: @deploy_count,
         pull_count: @pull_count,
         comment_count: @comment_count
       }
-      @stats_additions = {
+      @stats_row_two = {
         avg_additions: @additions.round.to_i,
         avg_deletions: @deletions.round.to_i,
         net_additions: @net_additions

data/app/controllers/hubstats/teams_controller.rb

@@ -3,7 +3,8 @@ require_dependency "hubstats/application_controller"
 module Hubstats
   class TeamsController < Hubstats::BaseController
 
-    # Public - Shows all of the teams by filter params lists them with metrics between the start date and end date.
+    # Public - Shows all of the teams in either alphabetical order, by filter params, or that have done things in
+    # github between the selected @start_date and @end_date.
     #
     # Returns - the team data
     def index
@@ -33,10 +34,10 @@ module Hubstats
       @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")
-      @user_count = @users.length
+      @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)
-      repos_comment = Hubstats::Comment.where("user_id IN (?)", @users).created_in_date_range(@start_date, @end_date).pluck(:repo_id)
+      repos_comment = Hubstats::Comment.belonging_to_team(@users.pluck(:id)).created_in_date_range(@start_date, @end_date).pluck(:repo_id)
       @repo_count = repos_pr.concat(repos_comment).uniq.count
       @net_additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).sum(:additions).to_i -
                        Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).sum(:deletions).to_i
@@ -52,13 +53,13 @@ module Hubstats
     def stats
       @additions ||= 0
       @deletions ||= 0
-      @stats_basics = {
+      @stats_row_one = {
         pull_count: @pull_count,
-        user_count: @user_count,
+        active_user_count: @active_user_count,
         comment_count: @comment_count,
         repo_count: @repo_count
       }
-      @stats_additions = {
+      @stats_row_two = {
         avg_additions: @additions.round.to_i,
         avg_deletions: @deletions.round.to_i,
         net_additions: @net_additions

data/app/controllers/hubstats/users_controller.rb

@@ -12,11 +12,6 @@ module Hubstats
         @users = Hubstats::User.where("login LIKE ?", "%#{params[:query]}%").order("login ASC")
       elsif params[:id]
         @users = Hubstats::User.where(id: params[:id].split(",")).order("login ASC")
-      elsif params[:repos]
-        @users = Hubstats::User.only_active.with_contributions(@start_date, @end_date, params[:repos])
-          .with_id(params[:users])
-          .custom_order(params[:order])
-          .paginate(:page => params[:page], :per_page => 15)
       else
         @users = Hubstats::User.only_active.with_all_metrics(@start_date, @end_date)
           .with_id(params[:users])
@@ -55,7 +50,7 @@ module Hubstats
     def stats
       @additions ||= 0
       @deletions ||= 0
-      @stats_basics = {
+      @stats_row_one = {
         pull_count: @pull_count,
         deploy_count: @deploy_count,
         comment_count: @comment_count,
@@ -64,6 +59,5 @@ module Hubstats
         net_additions: @net_additions
       }
     end
-
   end
 end

data/app/helpers/hubstats/metrics_helper.rb

@@ -0,0 +1,105 @@
+module Hubstats
+  module MetricsHelper
+
+    # Public - Gets the number of active developers within the start date and end date
+    #
+    # Returns - the number of developers
+    def get_developer_count
+      Hubstats::User.count_active_developers(@start_date, @end_date)
+    end
+
+    # Public - Gets the number of active reviewers within the start date and end date
+    #
+    # Returns - the number of reviewers
+    def get_reviewer_count
+      Hubstats::User.count_active_reviewers(@start_date, @end_date)
+    end
+
+    # Public - Gets the number of deployments within the start date and end date
+    #
+    # Returns - the number of deployments
+    def get_deploy_count
+      Hubstats::Deploy.deployed_in_date_range(@start_date, @end_date).count(:all)
+    end
+
+    # Public - Gets the number of pull requests within the start date and end date
+    #
+    # Returns - the number of pull requests
+    def get_pull_count
+      Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).count(:all)
+    end
+
+    # Public - Gets the number of comments within the start date and end date
+    #
+    # Returns - the number of comments
+    def get_comment_count
+      Hubstats::Comment.created_in_date_range(@start_date, @end_date).count(:all)
+    end
+
+    # Public - Gets the number of comments per reviewer within the start date and end date
+    #
+    # Returns - the number of comments per reviewer
+    def get_comments_per_rev
+      if get_reviewer_count != 0
+        comments_per_rev = (get_comment_count.to_f / get_reviewer_count.to_f).round(2)
+      else
+        comments_per_rev = 0
+      end
+    end
+
+    # Public - Gets the number of pull requests per developer within the start date and end date
+    #
+    # Returns - the number of pull requests per developer
+    def get_pulls_per_dev
+      if get_developer_count != 0
+        pulls_per_dev = (get_pull_count.to_f / get_developer_count.to_f).round(2)
+      else
+        pulls_per_dev = 0
+      end
+    end
+
+    # Public - Gets the total net additions from all pull requests within the start date and end date
+    #
+    # Returns - the net additions
+    def get_net_additions
+      Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).sum(:additions).to_i - 
+        Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).sum(:deletions).to_i
+    end
+
+    # Public - Gets the average number of additions from all pull requests within the start date and end date
+    #
+    # Returns - the average additions
+    def get_avg_additions
+      num = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).average(:additions) || 0
+      return num.round.to_i
+    end
+
+    # Public - Gets the average number of deletions from all pull requests within the start date and end date
+    #
+    # Returns - the average deletions
+    def get_avg_deletions
+      num = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).average(:deletions) || 0
+      return num.round.to_i
+    end
+
+    # Public - Formats statistics for all repos/users/teams of Hubstats
+    #
+    # Returns - all of the stats in a corresponding hash
+    def dashboard
+      @stats_row_one = {
+        developer_count: get_developer_count,
+        pull_count: get_pull_count,
+        pulls_per_dev: get_pulls_per_dev,
+        deploy_count: get_deploy_count,
+        net_additions: get_net_additions
+      }
+      @stats_row_two = {
+        reviewer_count: get_reviewer_count,
+        comment_count: get_comment_count,
+        comments_per_rev: get_comments_per_rev,
+        avg_additions: get_avg_additions,
+        avg_deletions: get_avg_deletions
+      }
+    end
+  end
+end

data/app/models/hubstats/comment.rb

@@ -1,6 +1,8 @@
 module Hubstats
   class Comment < ActiveRecord::Base
 
+    def self.record_timestamps; false; end
+
     # 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 :belonging_to_pull_request, lambda {|pull_request_id| where(pull_request_id: pull_request_id)}

data/app/models/hubstats/deploy.rb

@@ -20,7 +20,15 @@ module Hubstats
     scope :belonging_to_users, lambda {|user_id| where(user_id: user_id.split(',')) if user_id}
     scope :with_repo_name, select('DISTINCT hubstats_repos.name as repo_name, hubstats_deploys.*').joins("LEFT JOIN hubstats_repos ON hubstats_repos.id = hubstats_deploys.repo_id")
     scope :with_user_name, select('DISTINCT hubstats_users.login as user_name, hubstats_deploys.*').joins("LEFT JOIN hubstats_users ON hubstats_users.id = hubstats_deploys.user_id")
-
+    
+    scope :belonging_to_teams, lambda {|teams|
+      if teams
+        team_list = Hubstats::Team.where(id: teams.split(','))
+        user_list = team_list.map {|team| team.users.pluck(:id)}.flatten.uniq
+        where(user_id: user_list.split(','))
+      end
+    }
+    
     attr_accessible :git_revision, :repo_id, :deployed_at, :user_id, :pull_request_ids
 
     belongs_to :user
@@ -99,5 +107,11 @@ module Hubstats
       end
       return total_comments
     end
+
+    # def belonging_to_teams(teams)
+    #   team_list = Hubstats::Team.where(id: teams.split(','))
+    #   user_list = team_list.map {|team| team.users.pluck(:id)}.flatten.uniq
+    #   return in_teams(user_list)
+    # end
   end
 end

data/app/models/hubstats/label.rb

@@ -1,6 +1,8 @@
 module Hubstats
   class Label < ActiveRecord::Base
 
+    def self.record_timestamps; false; end
+
     # Various checks that can be used to filter and find info about labels.
     scope :with_ids, lambda {|pull_ids| (where("hubstats_labels_pull_requests.pull_request_id" => pull_ids))}
     scope :with_state, lambda {|state| (where(state: state) unless state == 'all') if state}

data/app/models/hubstats/pull_request.rb

@@ -1,5 +1,7 @@
 module Hubstats
   class PullRequest < ActiveRecord::Base
+
+    def self.record_timestamps; false; end
     
     # Various checks that can be used to filter, sort, and find info about pull requests.
     scope :closed_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.closed_at BETWEEN ? AND ?", start_date, end_date)}
@@ -149,7 +151,7 @@ module Hubstats
     def assign_team_from_user
       user = Hubstats::User.find(self.user_id)
       if user.team && user.team.id
-        self.update_columns(team_id: user.team.id)
+        self.update_column(:team_id, user.team.id)
       end
     end
 

data/app/models/hubstats/repo.rb

@@ -1,6 +1,8 @@
 module Hubstats
   class Repo < ActiveRecord::Base
 
+    def self.record_timestamps; false; end
+
     # Various checks that can be used to filter and find info about repos.
     scope :with_recent_activity, lambda {|start_date, end_date| where("hubstats_repos.updated_at BETWEEN ? AND ?", start_date, end_date).order("updated_at DESC")}
     scope :with_id, lambda {|repo_id| where(id: repo_id.split(',')) if repo_id}

data/app/models/hubstats/team.rb

@@ -1,6 +1,8 @@
 module Hubstats
   class Team < ActiveRecord::Base
 
+    def self.record_timestamps; false; end
+
     scope :with_id, lambda {|team_id| where(id: team_id.split(',')) if team_id}
 
     # Public - Counts all of the comments a selected team's members have written that occurred between the start_date and end_date.

data/app/models/hubstats/user.rb

@@ -1,6 +1,8 @@
 module Hubstats
   class User < ActiveRecord::Base
 
+    def self.record_timestamps; false; end
+
     # 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, having("comment_count > 0 OR pull_request_count > 0 OR deploy_count > 0")
@@ -163,7 +165,7 @@ module Hubstats
 
     attr_accessible :login, :id, :avatar_url, :gravatar_id, :url, :html_url, :followers_url,
       :following_url, :gists_url, :starred_url, :subscriptions_url, :organizations_url,
-      :repos_url, :events_url, :received_events_url, :role, :site_admin
+      :repos_url, :events_url, :received_events_url, :role, :site_admin, :created_at, :updated_at
     
     validates :id, presence: true, uniqueness: true
 

data/app/views/hubstats/deploys/index.html.erb

@@ -11,6 +11,10 @@
         <input class="select2-control" id="users">
         </input>
       </div>
+      <div class="form-group">
+        <input class="select2-control" id="teams">
+        </input>
+      </div>
     </div>
 
     <div class="col col-lg-9 col-md-9 col-sm-9">

data/app/views/hubstats/deploys/show.html.erb

@@ -13,7 +13,7 @@
     </h4>
 
     <!--Show the number of pull requests, comments, and net additions-->
-    <%= render "hubstats/partials/quick_stats" %>
+    <%= render "hubstats/partials/quick_stats_one" %>
   </div>
 
   <!--Show all of the pull requests in a "condensed" view -->

data/app/views/hubstats/partials/_dashboard.html.erb

@@ -0,0 +1,14 @@
+<div class="container" id="splash">
+  <div class="row text-center">
+
+    <!-- Show all of the statistics about all of the repositories and users within time frame -->
+     <%= render 'hubstats/partials/quick_stats_one' %>
+    <br>
+    <br>
+    <br>
+    <br>
+    <br>
+    <br>
+    <%= render 'hubstats/partials/quick_stats_two' %>
+   </div>
+</div>