hubstats 0.4.4 → 0.5.0

data/app/models/hubstats/comment.rb

@@ -5,6 +5,7 @@ module Hubstats
     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)}
     scope :belonging_to_user, lambda {|user_id| where(user_id: user_id)}
+    scope :belonging_to_team, lambda {|user_id| where(user_id: user_id.split(',')) if user_id}
     scope :belonging_to_repo, lambda {|repo_id| where(repo_id: repo_id)}
 
     # Public - Gets the number of PRs that a user commented on that were not their own PR.

data/app/models/hubstats/pull_request.rb

@@ -6,10 +6,13 @@ module Hubstats
     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 :created_since, lambda {|days| where("hubstats_pull_requests.created_at > ?", Date.today - days)}
     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)}
     scope :belonging_to_deploy, lambda {|deploy_id| where(deploy_id: deploy_id)}
     scope :belonging_to_repos, lambda {|repo_id| where(repo_id: repo_id.split(',')) if repo_id}
+    scope :belonging_to_teams, lambda {|team_id| where(team_id: team_id.split(',')) if team_id}
     scope :belonging_to_users, lambda {|user_id| where(user_id: user_id.split(',')) if user_id}
     scope :group, lambda {|group| group_by(:repo_id) if group }
     scope :with_state, lambda {|state| (where(state: state) unless state == 'all') if state}
@@ -22,15 +25,18 @@ module Hubstats
       :review_comments_url, :review_comment_url, :comments_url, :statuses_url, :number,
       :state, :title, :body, :created_at, :updated_at, :closed_at, :merged_at, 
       :merge_commit_sha, :merged, :mergeable, :comments, :commits, :additions,
-      :deletions, :changed_files, :user_id, :repo_id, :merged_by
+      :deletions, :changed_files, :user_id, :repo_id, :merged_by, :team_id
 
     belongs_to :user
     belongs_to :repo
     belongs_to :deploy
+    belongs_to :team
     has_and_belongs_to_many :labels, :join_table => "hubstats_labels_pull_requests"
 
     # Public - Makes a new pull request from a GitHub webhook. Finds user_id and repo_id based on users and repos 
-    # that are already in the Hubstats database. Also updates the user_id of a deploy if the pull request has been merged in a deploy.
+    # that are already in the Hubstats database. Updates the user_id of a deploy if the pull request has been merged in a deploy.
+    # If the user who makes the PR has a team, then it will update the team_id of the PR to match the team the user
+    # belongs to.
     #
     # github_pull - the info that is from Github about the new or updated pull request
     #
@@ -58,18 +64,22 @@ module Hubstats
           end
       end
 
+      if user.team && user.team.id
+        pull_data[:team_id] = user.team.id
+      end
+
       return pull if pull.update_attributes(pull_data)
       Rails.logger.warn pull.errors.inspect
     end
 
-    # Public - Adds any labels to the labels database if the labels passed in aren't already there.
+    # Public - Takes days, a number, and updates all pull requests' team_ids that were created since that many days ago
     #
-    # labels - the labels to be added to the db
+    # days - the amount of days ago that we wish to grab the number of pull requests since
     #
-    # Returns - the new labels
-    def add_labels(labels)
-      labels.map!{|label| Hubstats::Label.first_or_create(label) }
-      self.labels = labels
+    # Returns - nothing
+    def self.update_teams_in_pulls(days)
+      pulls = created_since(days)
+      pulls.each {|pull| pull.assign_team_from_user}
     end
 
     # Public - Filters all of the pull requests between start_date and end_date that are the given state
@@ -84,6 +94,7 @@ module Hubstats
       filter_based_on_date_range(start_date, end_date, params[:state])
        .belonging_to_users(params[:users])
        .belonging_to_repos(params[:repos])
+       .belonging_to_teams(params[:teams])
     end
 
     # Public - Finds all of the PRs with the current state, and then filters to ones that have been updated in
@@ -130,5 +141,26 @@ module Hubstats
         scoped
       end
     end
+
+    # Public - Assigns a team to a pull request based on the user's team
+    #
+    # Returns - nothing
+    def assign_team_from_user
+      user = Hubstats::User.find(self.user_id)
+      if user.team && user.team.id
+        self.team_id = user.team.id
+        self.save!
+      end
+    end
+
+    # Public - Adds any labels to the labels database if the labels passed in aren't already there.
+    #
+    # labels - the labels to be added to the db
+    #
+    # Returns - the new labels
+    def add_labels(labels)
+      labels.map!{|label| Hubstats::Label.first_or_create(label) }
+      self.labels = labels
+    end
   end
 end

data/app/models/hubstats/repo.rb

@@ -134,7 +134,7 @@ module Hubstats
         order("pull_request_count DESC")
       end
     end
-    
+
     # Public - Designed to make a path for the show page when a repository is selected.
     #
     # Returns - the show page of self.name

data/app/models/hubstats/team.rb

@@ -0,0 +1,159 @@
+module Hubstats
+  class Team < ActiveRecord::Base
+
+    scope :with_id, lambda {|team_id| where(id: team_id.split(',')) if team_id}
+
+    # Public - Counts all of the users that are a part of the selected team.
+    #
+    # start_date - the start of the date range
+    # end_date - the end of the date range
+    #
+    # Returns - the count of users
+    scope :users_count, lambda {|start_date, end_date|
+      select("hubstats_teams.id as team_id")
+       .select("COUNT(DISTINCT hubstats_teams_users.user_id) AS user_count")
+       .where("hubstats_users.login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"])
+       .joins(:users)
+       .group("hubstats_teams.id")
+    }
+
+    # Public - Counts all of the comments a selected team's members have written that occurred between the start_date and end_date.
+    # 
+    # start_date - the start of the date range
+    # end_date - the end of the data range
+    # user_id_array - an array of all of the user ids in selected team
+    # 
+    # Returns - count of comments
+    scope :comments_count, lambda {|start_date, end_date|
+      select("IFNULL(COUNT(DISTINCT hubstats_comments.id),0) AS comment_count, hubstats_teams.id as team_id")
+       .joins("LEFT OUTER JOIN hubstats_teams_users ON hubstats_teams.id = hubstats_teams_users.team_id")
+       .joins(sanitize_sql_array(["LEFT JOIN hubstats_comments ON (hubstats_comments.user_id = hubstats_teams_users.user_id) AND (hubstats_comments.created_at BETWEEN ? AND ?)", start_date, end_date]))
+       .group("hubstats_teams.id")
+    }
+
+    # Public - Counts all of the repos a selected team's members have made PRs or comments on.
+    # 
+    # start_date - the start of the date range
+    # end_date - the end of the data range
+    # 
+    # Returns - count of repos
+    scope :repos_count, lambda {|start_date, end_date|
+      select("hubstats_teams.id as team_id")
+       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.repo_id),0) AS repo_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]))
+       .group("hubstats_teams.id")
+    }
+
+    # Public - Counts all of the merged pull requests for selected team's users that occurred between the start_date and end_date.
+    # 
+    # start_date - the start of the date range
+    # end_date - the end of the data range
+    # 
+    # Returns - count of pull requests
+    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]))
+      .group("hubstats_teams.id")
+    }
+
+    # Public - Counts all of the addtiions and deletions made from PRs by a member of the selected team that have been merged between the start_date
+    # and the end_date.
+    #
+    # start_date - the start of the date range
+    # end_date - the end of the data range
+    #
+    # Returns - the additions and deletions
+    scope :net_additions_count, lambda {|start_date, end_date|
+      select("hubstats_teams.id as team_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.team_id = hubstats_teams.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date]))
+      .group("hubstats_teams.id")
+    }
+
+    # Public - Joins all of the metrics together for selected team: net additions, comments, repos, pull requests, and users.
+    # 
+    # start_date - the start of the date range
+    # end_date - the end of the data range
+    # 
+    # Returns - all of the stats about the team
+    scope :with_all_metrics, lambda {|start_date, end_date|
+      select("hubstats_teams.*, user_count, pull_request_count, comment_count, repo_count,additions, deletions")
+       .joins("LEFT JOIN (#{net_additions_count(start_date, end_date).to_sql}) AS net_additions ON net_additions.team_id = hubstats_teams.id")
+       .joins("LEFT JOIN (#{pull_requests_count(start_date, end_date).to_sql}) AS pull_requests ON pull_requests.team_id = hubstats_teams.id")
+       .joins("LEFT JOIN (#{comments_count(start_date, end_date).to_sql}) AS comments ON comments.team_id = hubstats_teams.id")
+       .joins("LEFT JOIN (#{repos_count(start_date, end_date).to_sql}) AS repos ON repos.team_id = hubstats_teams.id")
+       .joins("LEFT JOIN (#{users_count(start_date, end_date).to_sql}) AS users ON users.team_id = hubstats_teams.id")
+       .group("hubstats_teams.id")
+    }
+
+    attr_accessible :name, :hubstats
+    has_and_belongs_to_many :users, :join_table => 'hubstats_teams_users', :uniq => true
+    
+    # Public - Checks if the team is currently existing, and if it isn't, then makes a new team with 
+    # the specifications that are passed in. We are assuming that if it is not already existent,
+    # then we probably don't really care about the team, so our hubstats boolean will be set to false.
+    #
+    # github_team - the info that's passed in about the new or updated team
+    #
+    # Returns - the team 
+    def self.create_or_update(github_team)
+      github_team = github_team.to_h.with_indifferent_access if github_team.respond_to? :to_h
+
+      team_data = github_team.slice(*Hubstats::Team.column_names.map(&:to_sym))
+      team = where(:id => team_data[:id]).first_or_create(team_data)
+
+      team_data[:hubstats] = true
+
+      return team if team.update_attributes(team_data)
+      Rails.logger.warn team.errors.inspect
+    end
+
+    # Public - Adds or removes a user from a team
+    #
+    # team - a hubstats team that we wish to edit the users of
+    # user - a hubstats user that we wish to remove or add to the team
+    # action - whether the user is to be removed or added (string)
+    #
+    # Returns - nothing
+    def self.update_users_in_team(team, user, action)
+      if action == "added"
+        team.users << user
+      elsif action == "removed"
+        team.users.delete(user)
+      end
+      team.save!
+    end
+
+    # Public - Designed so that the list of teams can be ordered based on users, pulls, comments, net additions, or name.
+    # if none of these are selected, then the default is to order by pull request count in descending order.
+    #
+    # order_params - the param of what the teams should be sorted by
+    #
+    # Returns - the team data ordered
+    def self.custom_order(order_params)
+      if order_params
+        order = order_params.include?('asc') ? "ASC" : "DESC"
+        case order_params.split('-').first
+        when 'usercount'
+          order("user_count #{order}")
+        when 'pulls'
+          order("pull_request_count #{order}")
+        when 'comments'
+          order("comment_count #{order}")
+        when 'netadditions'
+          order("additions - deletions #{order}")
+        when 'repocount'
+          order("repo_count #{order}")
+        when 'name'
+          order("name #{order}")
+        else
+          order("pull_request_count #{order}")
+        end
+      else 
+        order("pull_request_count DESC")
+      end
+    end
+  end
+end

data/app/models/hubstats/user.rb

@@ -144,7 +144,7 @@ module Hubstats
       .group("hubstats_users.id")
     }
 
-    # Public - Joins all of the metrics together for selected repository: average additions and deletions, comments, pull requests, and deploys.
+    # Public - Joins all of the metrics together for selected user: average additions and deletions, comments, pull requests, and deploys.
     # 
     # start_date - the start of the date range
     # end_date - the end of the data range
@@ -169,6 +169,7 @@ module Hubstats
     has_many :repos, :class_name => "Repo"
     has_many :pull_requests
     has_many :deploys
+    has_and_belongs_to_many :teams, :join_table => 'hubstats_teams_users', :uniq => true
 
     # Public - Creates a new user form a GitHub webhook.
     #
@@ -231,6 +232,14 @@ module Hubstats
       end
     end
 
+    # Public - Gets the first team where the user is belongs to and where hubstats bool is true.
+    #
+    # Returns - the first team that the user belongs to where hubstats bool is true, if nothing
+    # meets these qualifications, nil is returned
+    def team
+      teams.where(hubstats: true).first
+    end
+
     # Public - Designed to make a path for the show page when a repository is selected.
     #
     # Returns - the show page of self.name

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

@@ -7,8 +7,6 @@
       <%= @deploy.git_revision.titleize %>
     </h1>
 
-    <br>
-
     <!-- Show the date/time that the deploy was deployed -->
     <h4 class="text-center">
       Deployed at: <%= @deploy.deployed_at %>
@@ -21,12 +19,11 @@
   <!--Show all of the pull requests in a "condensed" view -->
   <div class="col col-lg-8 col-lg-offset-2">
     <div class="row">
-      <h4> Pull Requests </h4>
+      <h4> Merged Pull Requests </h4>
       <%= render 'hubstats/tables/pulls-condensed' %>
       <% if @pull_request_count > 20 %>
         <p class="pull-right"><%= link_to "View All", pulls_path(:deploys => @deploy.id) %></p>
       <% end %>
     </div>
   </div>
-
 </div>

data/app/views/hubstats/partials/_comment-condensed.html.erb

@@ -14,6 +14,7 @@
     </div>
   </div>
 
+  <!-- Show the github octcat sign with a link to the comment on github -->
  <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
     <div class="pull-right">
       <a class="subtle" href=<%= comment.html_url %> > 

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

@@ -14,6 +14,7 @@
     </div>
   </div>
 
+ <!-- Show the github octcat sign with a link to the comment on github -->
  <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
     <div class="pull-right">
       <a class="subtle" href=<%= comment.html_url %> > 

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

@@ -2,11 +2,13 @@
   <hr>
   <div class="row">
     <div class="col-lg-3 col-md-3 col-sm-3">
+      <!-- Show the Sport Ngin copyright information, change if using a different copyright -->
       <div class="footer-text">
         © 2015 Sport Ngin
       </div>
     </div>
     <div class="col-lg-6 col-md-6 col-sm-6">
+      <!-- Show the Hubstats name in the footer -->
       <div class="footer-main-text">
         Hubstats
         <br>
@@ -14,6 +16,7 @@
       </div>
     </div>
     <div class="col-lg-3 col-md-3 col-sm-3">
+      <!-- Have a link to the Hubstats source code on github, change if wishing to connect to a different repository -->
       <div class="footer-text" align="right">
         <%= link_to("Source Code", "https://github.com/sportngin/hubstats") %>
       </div>

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

@@ -2,7 +2,7 @@
   <nav class="navbar navbar-default" role="navigation">
     <div class="container-fluid">
 
-      <!-- Show the Hubstats name in navbar along with a link to the PR page -->
+      <!-- Show the Hubstats name in navbar along with a link to the PR page that shows current open and deployable PRs sorted by repo -->
       <div class="navbar-header">
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
           <span class="sr-only">Toggle navigation</span>
@@ -11,12 +11,14 @@
           <span class="icon-bar"></span>
         </button>
         <%= link_to "Hubstats", root_path(:state => "open", :label => "deployable", :group => "repo"),
-            {:data => {:repo_path => repos_path(), :user_path => users_path()}, :class => "navbar-brand title", :id =>"brand"}%>
+            {:data => {:repo_path => repos_path(), :user_path => users_path(), :team_path => teams_path()}, :class => "navbar-brand title", :id =>"brand"}%>
       </div>
 
-      <!-- Show all of the pages in tab form -->
+      <!-- Show all of the pages (Teams, Deployments, Metrics, Pull Requests, Users) in tab form -->
       <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav navbar-right">
+          <li class="<%='navbar-active' if params[:controller] == 'hubstats/teams'%>">
+            <%= link_to "Teams", teams_path%></li>
           <li class="<%='navbar-active' if params[:controller] == 'hubstats/deploys'%>">
             <%= link_to "Deployments", deploys_path%></li>
           <li class="<%='navbar-active' if params[:controller] == 'hubstats/repos'%>">

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

@@ -0,0 +1,40 @@
+<div class="row single-team">
+
+  <!-- Show the team name and the date that it was last updated, with a link to the github team -->
+  <div class="team-info col-lg-2 col-md-2 col-sm-2 col-xs-8">
+    <h4> 
+      <%= link_to team.name, team_path(team)%>
+    </h4>
+    <br>
+  </div>
+
+  <!-- Show all of the stats for the individual team -->
+  <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="text-center">
+      <span class="text-large"><%= team.user_count || 0 %></span> <!-- minus one for the user we're using as the access_token -->
+    </div>
+  </div>
+  <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="text-center">
+      <span class="text-large"><%= team.pull_request_count %></span>
+      <span class="mega-octicon octicon-git-pull-request"></span>
+    </div>
+  </div>
+  <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="text-center">
+      <span class="text-large"><%= team.comment_count %></span>
+      <span class="mega-octicon octicon-comment"></span>
+    </div>
+  </div>
+  <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="text-center">
+      <span class="text-large"><%= team.repo_count %></span>
+      <span class="mega-octicon octicon-repo"></span>
+    </div>
+  </div>
+  <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="text-center">
+      <span class="text-large"><%= team.additions - team.deletions %></span>
+    </div>
+  </div>
+</div>

data/app/views/hubstats/partials/_user-condensed.html.erb

@@ -4,23 +4,24 @@
   <div class="user-image-small col-lg-1 col-md-1 col-sm-1 col-xs-2" >
     <img src= <%= user.avatar_url%> alt= <%= user.login %> >
   </div>
-  <div class="user-info col-lg-3 col-md-3 col-sm-3 col-xs-3">
+  <div class="user-info col-lg-4 col-md-4 col-sm-4 col-xs-4">
     <h4> 
       <%= link_to user.login, user_path(user) %>
     </h4>
+    updated <%= distance_of_time_in_words(DateTime.now,user.updated_at) %> ago
   </div>
 
   <!-- Show the number of pull requests and comments -->
-  <div class="col-lg-3 col-lg-offset-1 col-md-3 col-sm-3 col-xs-3">
+  <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
     <div class="pull-right">
-      <span class="text-large"><%= user.pull_request_count %></span>
+      <span class="text-large"><%= Hubstats::PullRequest.belonging_to_user(user.id).merged_in_date_range(@start_date, @end_date).count(:all) %></span>
       <span class="mega-octicon octicon-git-pull-request"></span>
     </div>
   </div>
   <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
     <div class="pull-right">
-      <span class="text-large"><%= user.comment_count %></span>
-      <span class="mega-octicon octicon-comment"></span>
+      <span class="text-large"><%= Hubstats::Deploy.belonging_to_user(user.id).deployed_in_date_range(@start_date, @end_date).count(:all) %></span>
+      <span class="mega-octicon octicon-rocket"></span>
     </div>
   </div>
   <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">