hubstats 0.4.4 → 0.5.0

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

@@ -1,6 +1,6 @@
 <div class="row single-user">
 
-  <!-- Show the avatar of the githuber user and the user's username -->
+  <!-- Show the avatar of the githuber user and the user's username with a link to their github page -->
   <div class="user-image col-lg-1 col-md-1 col-sm-1" >
     <img src= <%= user.avatar_url%> alt= <%= user.login %> >
   </div>
@@ -8,6 +8,7 @@
     <h4> 
       <%= link_to user.login, user_path(user) %>
     </h4>
+    updated <%= distance_of_time_in_words(DateTime.now,user.updated_at) %> ago
     <br>
     <h4>
       <a class="subtle" href=<%= user.html_url %> > 

data/app/views/hubstats/pull_requests/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>
       
       <hr>
       

data/app/views/hubstats/repos/dashboard.html.erb

@@ -15,7 +15,6 @@
   <!-- Show all of the repositories with their individual stats -->
   <div class="row">
     <div class="col col-lg-12">
-      <h3> Repositories </h3>       
       <%= render 'hubstats/tables/repos' %>
       <div class="text-center">
         <%= will_paginate @repo, renderer: BootstrapPagination::Rails %>

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

@@ -19,7 +19,7 @@
 
     <!-- Show all of the merged pull requests in a "condensed" view -->
     <div class="col col-lg-6">
-      <h3> Pull Requests</h3>
+      <h3> Merged Pull Requests</h3>
       <%= render 'hubstats/tables/pulls-condensed'%>
       <% if @pull_count > 20 %>
         <p class="pull-right"><%= link_to "View All", pulls_path(:repos => @repo.id) %></p>

data/app/views/hubstats/tables/_comments-condensed.html.erb

@@ -4,5 +4,5 @@
     <%= render partial: 'hubstats/partials/comment-condensed', collection: @comments, as: :comment %>
   </div>
 <% else %>
-  <p> No comments to show </p>
+  <p> No comment information available </p>
 <% end %>

data/app/views/hubstats/tables/_comments.html.erb

@@ -4,5 +4,5 @@
     <%= render partial: 'hubstats/partials/comment', collection: @comments, as: :comment %>
   </div>
 <% else %>
-  <p> No comments to show </p>
+  <p> No comment information available </p>
 <% end %>

data/app/views/hubstats/tables/_deploys.html.erb

@@ -4,5 +4,5 @@
     <%= render partial: 'hubstats/partials/deploy', collection: @deploys, as: :deploy %>
   </div>
 <% else %>
-  <p> No deployments to show </p>
+  <p> No deployment information available </p>
 <% end %>

data/app/views/hubstats/tables/_grouped_deploys.html.erb

@@ -13,5 +13,5 @@
     <%= render 'hubstats/tables/deploys' %>
   <% end %>
 <% else %>
-  <p> No deployments to show </p>
+  <p> No deployment information available </p>
 <% end %>

data/app/views/hubstats/tables/_grouped_pulls.html.erb

@@ -13,6 +13,6 @@
     <%= render 'hubstats/tables/pulls' %>
   <% end %>
 <% else %>
-  <p> No pull requests to show </p>
+  <p> No pull request information available </p>
 <% end %>
 

data/app/views/hubstats/tables/_pulls-condensed.html.erb

@@ -4,6 +4,6 @@
     <%= render partial: 'hubstats/partials/pull-condensed', collection: @pull_requests, as: :pull %>
   </div>
 <% else %>
-  <p> No pull requests to show </p>
+  <p> No pull request information available </p>
 <% end %>
 

data/app/views/hubstats/tables/_pulls.html.erb

@@ -4,6 +4,6 @@
     <%= render partial: 'hubstats/partials/pull', collection: @pull_requests, as: :pull %>
   </div>
 <% else %>
-  <p> No pull requests to show </p>
+  <p> No pull request information available </p>
 <% end %>
 

data/app/views/hubstats/tables/_repos-condensed.html.erb

@@ -4,6 +4,6 @@
     <%= render partial: 'hubstats/partials/repo-condensed', collection: @repos, as: :repo %>
   </div>
 <% else %>
-  <p> No repositories to show </p>
+  <p> No repository information available </p>
 <% end %>
 

data/app/views/hubstats/tables/_repos.html.erb

@@ -9,7 +9,7 @@
         <a class="header desc" id="deploys"> Deployments <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="pulls"> Pull Requests <span class="octicon"></span> </a>
+        <a class="header desc" id="pulls"> Merged Pull Requests <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
         <a class="header desc" id="comments"> Comments <span class="octicon"></span></a>
@@ -24,6 +24,6 @@
     <%= render partial: 'hubstats/partials/repo', collection: @repos, as: :repo %>
   </div>
 <% else %>
-  <p> No repositories to show </p>
+  <p> No repository information available </p>
 <% end %>
 

data/app/views/hubstats/tables/_teams.html.erb

@@ -0,0 +1,28 @@
+<!-- Either say there are no teams to show, or show all of the stat titles along with the stats/teams -->
+<% if @teams.length > 0 %>
+  <div class="teams">
+    <div class="row single-user header">
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="name"> Team Name <span class="octicon"></span> </a>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="usercount"> Users <span class="octicon"></span> </a>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="pulls"> Merged Pull Requests <span class="octicon"></span> </a>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="comments"> Comments <span class="octicon"></span></a>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="repocount"> Repositories <span class="octicon"></span></a>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="netadditions"> Net Additions <span class="octicon"></span></a>
+      </div>
+    </div>
+    <%= render partial: 'hubstats/partials/team', collection: @teams, as: :team %>
+  </div>
+<% else %>
+  <p> No team information available </p>
+<% end %>

data/app/views/hubstats/tables/_users-condensed.html.erb

@@ -4,5 +4,5 @@
     <%= render partial: 'hubstats/partials/user-condensed', collection: @users, as: :user %>
   </div>
 <% else %>
-  <p> No users to show </p>
+  <p> No user information available </p>
 <% end %>

data/app/views/hubstats/tables/_users.html.erb

@@ -9,7 +9,7 @@
         <a class="header desc" id="deploys"> Deployments <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="pulls"> Pull Requests <span class="octicon"></span> </a>
+        <a class="header desc" id="pulls"> Merged Pull Requests <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
         <a class="header desc" id="comments"> Comments <span class="octicon"></span></a>
@@ -21,5 +21,5 @@
     <%= render partial: 'hubstats/partials/user', collection: @users, as: :user %>
   </div>
 <% else %>
-  <p> No users to show </p>
+  <p> No user information available</p>
 <% end %>

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

@@ -0,0 +1,10 @@
+<div class="container" id="team"%>
+  <div class="row">
+    <div class="col col-lg-12">
+      <%= render 'hubstats/tables/teams' %>
+      <div class="text-center">
+        <%= will_paginate @team, renderer: BootstrapPagination::Rails %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,28 @@
+<div class="container" id="team">
+  <div class="row">
+
+    <!-- Title with the team's name -->
+    <h1 class="title text-center"><%= @team.name %></a> </h1>
+
+    <!-- Show all of the stats about the team -->
+    <%= render 'hubstats/partials/quick_stats' %>
+  </div>
+
+  <div class="row">
+
+    <!-- Show all of this team's merged pull requests in a "condensed" view -->
+    <div class="col-lg-6 col-md-5 col-sm-5 col-xs-5">
+      <h3> Merged Pull Requests</h3> 
+      <%= render 'hubstats/tables/pulls-condensed' %>
+      <% if @pull_count > 20 %>
+        <p class="pull-right"><%= link_to "View All", pulls_path(:teams => @team.id) %></p>
+      <% end %>
+    </div>
+
+    <!-- Show all of this team's users in a "condensed" view -->
+    <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+      <h3> Active Users </h3>
+      <%= render 'hubstats/tables/users-condensed' %>
+    </div>
+  </div>
+</div>

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

@@ -1,4 +1,4 @@
-<div class="container" id="repo">
+<div class="container" id="user">
   <div class="row">
 
     <!-- Title with the user's GitHub username -->
@@ -12,7 +12,7 @@
 
     <!-- Show all of this user's merged pull requests in a "condensed" view -->
     <div class="col-lg-6 col-md-5 col-sm-5 col-xs-5">
-      <h3> Pull Requests</h3> 
+      <h3> Merged Pull Requests</h3> 
       <%= render 'hubstats/tables/pulls-condensed' %>
       <% if @pull_count > 20 %>
         <p class="pull-right"><%= link_to "View All", pulls_path(:users => @user.id) %></p>

data/config/routes.rb

@@ -1,12 +1,13 @@
 # Draw all of the routes that will be used in Hubstats
 Hubstats::Engine.routes.draw do
-  root to: "pull_requests#index" # sets default root to be the pulls page
   post "/handler" => "events#handler", :as => :handler
-  resources :deploys, :only => [:create, :index, :show] # routes to index, show, and to create method
-  get "/metrics" => "repos#dashboard", :as => :metrics # routes to list of repos and stats
+  root to: "pull_requests#index" # sets default root to be the pulls page
   get "/pulls" => "pull_requests#index", :as => :pulls # routes to list of pulls
+  resources :deploys, :only => [:create, :index, :show] # routes to index, show, and to create method
+  resources :teams, :only => [:index, :show]
   get "/users" => "users#index", :as => :users # routes to list of users
   get "/user/:id" => "users#show", :as => :user # routes to specific user's contributions
+  get "/metrics" => "repos#dashboard", :as => :metrics # routes to list of repos and stats
   get "/repos" => "repos#index", :as => :repos # route is for the repo filter on the pull request and deploys page
   get "/:repo" => "repos#show", :as => :repo # routes to specific repo's stats
   scope "/:repo", :as => :repo do

data/db/migrate/20150706204910_create_hubstats_teams.rb

@@ -0,0 +1,8 @@
+class CreateHubstatsTeams < ActiveRecord::Migration
+  def change
+    create_table :hubstats_teams do |t|
+      t.string :name
+      t.boolean :hubstats
+    end
+  end
+end

data/db/migrate/20150706205049_create_hubstats_teams_users.rb

@@ -0,0 +1,8 @@
+class CreateHubstatsTeamsUsers < ActiveRecord::Migration
+  def change
+    create_table :hubstats_teams_users do |t|
+      t.integer :user_id
+      t.integer :team_id
+    end
+  end
+end

data/db/migrate/20150713185013_add_team_id_to_prs.rb

@@ -0,0 +1,5 @@
+class AddTeamIdToPrs < ActiveRecord::Migration
+  def change
+    add_column :hubstats_pull_requests, :team_id, :integer
+  end
+end

data/hubstats.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
 
   s.add_dependency "rails", "~> 3.2.18"
-  s.add_dependency "octokit", "~> 3.2"
+  s.add_dependency "octokit", "~> 4.0"
   s.add_dependency "will_paginate-bootstrap"
   s.add_dependency "select2-rails", "3.5.9"
   s.add_dependency "bootstrap-datepicker-rails", "~> 1.4.0"
@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "shoulda-matchers", "~> 2.6"
   s.add_development_dependency "factory_girl_rails", "~> 4.4"
   s.add_development_dependency "faker", "~> 1.3"
+  s.add_development_dependency "test-unit", "~> 3.0"
 end

data/lib/generators/hubstats/octokit.example.yml

@@ -3,9 +3,11 @@ github_auth: # Must include either access_token || (client_id && client_secret)
   # client_id: <CLIENT ID>
   # client_secret: <CLIENT SECRET>
 
-github_config: # Must include either org_name || repo_list
+github_config: # Must include org_name. The repo_list, team_list, and ignore_users_list are optional.
   # org_name: <ORGANIZATION NAME>
+  # team_list: [<ARRAY OF TEAMS>]
   # repo_list: [<ARRAY OF REPOS>]
+  # ignore_users_list: [<ARRAY OF USERS' LOGINS TO IGNORE>]
 
 webhook_secret: #<40 CHARACTER ACCESS TOKEN >
 webhook_endpoint: #<url of webhook endpoint>

data/lib/hubstats/events_handler.rb

@@ -17,6 +17,8 @@ module Hubstats
         pull_processor(payload)
       when "pull_request_review_comment", "PullRequestReviewCommentEvent"
         comment_processor(payload, "PullRequest")
+      when "membership", "MembershipEvent"
+        team_processor(payload)
       end
     end
 
@@ -47,6 +49,24 @@ module Hubstats
       Hubstats::Comment.create_or_update(comment.with_indifferent_access)
     end
 
+    # Public - Gets the information for the new team and updates it
+    #
+    # payload - the information that we will use to get the data off of
+    #
+    # Returns - nothing, but updates or makes the team
+    def team_processor(payload)
+      team = payload[:team]
+      team[:action] = payload[:action]
+      team[:current_user] = payload[:member]
+      team_list = Hubstats.config.github_config["team_list"] || []
+      if team_list.include? team[:name]
+        Hubstats::Team.create_or_update(team.with_indifferent_access)
+        hubstats_team = Hubstats::Team.where(name: team[:name]).first
+        hubstats_user = Hubstats::User.create_or_update(team[:current_user])
+        Hubstats::Team.update_users_in_team(hubstats_team, hubstats_user, team[:action])
+      end
+    end
+
     # Public - Grabs the PR number off of any of the various places it can be
     #
     # payload - the thing that we will use to try to attain the PR number

data/lib/hubstats/github_api.rb

@@ -52,18 +52,22 @@ module Hubstats
     #
     # Returns - an array of github repo objects
     def self.get_repos
-      if Hubstats.config.github_config.has_key?("org_name")
-        repos = client.organization_repositories(Hubstats.config.github_config["org_name"])
-      else
+      if Hubstats.config.github_config.has_key?("org_name") == false
+        raise RuntimeError, "COULD NOT COMPLETE RAKE TASK! Organization name in .octokit.yml is required, but was not found."
+      end
+
+      if Hubstats.config.github_config.has_key?("repo_list")
         repos = []
         Hubstats.config.github_config["repo_list"].each do |repo|
           repos << client.repository(repo)
         end
+      elsif Hubstats.config.github_config.has_key?("org_name")
+        repos = client.organization_repositories(Hubstats.config.github_config["org_name"])
       end
       repos
     end
 
-    # Public - Gets extra information on pull requests, e.g size, additions ...
+    # Public - Gets extra information on pull requests, e.g. size, additions ...
     #
     # Returns - nothing
     def self.update_pulls
@@ -71,9 +75,9 @@ module Hubstats
       begin
         while Hubstats::PullRequest.where(deletions: nil).where(additions: nil).count > 0
           client = Hubstats::GithubAPI.client
-          incomplete = Hubstats::PullRequest.where(deletions: nil).where(additions: nil).limit(grab_size)
+          pull_requests = Hubstats::PullRequest.where(deletions: nil).where(additions: nil).limit(grab_size)
 
-          incomplete.each do |pull|
+          pull_requests.each do |pull|
             repo = Hubstats::Repo.where(id: pull.repo_id).first
             pr = client.pull_request(repo.full_name, pull.number)
             Hubstats::PullRequest.create_or_update(HubHelper.pull_setup(pr))
@@ -87,6 +91,37 @@ module Hubstats
       end
     end
 
+    # Public - Gets information on teams, e.g. name
+    #
+    # Returns - nothing
+    def self.update_teams
+      grab_size = 250
+      begin
+        client = Hubstats::GithubAPI.client
+        all_teams_in_org = client.organization_teams(Hubstats.config.github_config["org_name"])
+        team_list = Hubstats.config.github_config["team_list"] || []
+
+        all_teams_in_org.each do |team|
+          if team_list.include? team[:name]
+            puts "Making a team"
+            Hubstats::Team.create_or_update(team)
+            users = client.team_members(team[:id])
+            users.each do |user|
+              hubstats_team = Hubstats::Team.where(name: team[:name]).first
+              hubstats_user = Hubstats::User.create_or_update(user)
+              puts "Adding a user to a team"
+              Hubstats::Team.update_users_in_team(hubstats_team, hubstats_user, "added")
+            end
+          end
+        end
+        wait_limit(grab_size,client.rate_limit)
+        puts "All teams are up to date"
+      rescue Faraday::ConnectionFailed
+        puts "Connection Timeout, restarting team updating"
+        update_teams
+      end
+    end
+
     # Public - Makes a new webhook from a repository
     #
     # repo - the repository that is attempting to have a hook made with
@@ -103,14 +138,7 @@ module Hubstats
             :secret => Hubstats.config.webhook_secret
           },
           {
-            :events => [
-              'pull_request',
-              'pull_request_review_comment',
-              'commit_comment',
-              'issues',
-              'issue_comment',
-              'member'
-              ],
+            :events => ['pull_request', 'pull_request_review_comment', 'commit_comment', 'issues', 'issue_comment'],
             :active => true
           }
         )
@@ -122,6 +150,34 @@ module Hubstats
       end
     end
 
+    # Public - Makes a new webhook from an organization
+    #
+    # org_name - the name of the organization that is attempting to have a hook made with
+    #
+    # Returns - the hook and a message (or just a message and no hook)
+    def self.create_org_hook(org_name)
+      begin
+        client.create_hook(
+          org_name,
+          'web',
+          {
+            :url => Hubstats.config.webhook_endpoint,
+            :content_type => 'json',
+            :secret => Hubstats.config.webhook_secret
+          },
+          {
+            :events => ['membership'],
+            :active => true
+          }
+        )
+        puts "Hook on #{org_name} successfully created"
+      rescue Octokit::UnprocessableEntity
+        puts "Hook on #{org_name} already existed"
+      rescue Octokit::NotFound
+        puts "You don't have sufficient privileges to add an event hook to #{org_name}"
+      end
+    end
+
     # Public - Delete webhook from github repository
     #
     # repo - a repo github object
@@ -133,7 +189,7 @@ module Hubstats
         client.hooks(repo.full_name).each do |hook|
           if hook[:config][:url] == old_endpoint
             Hubstats::GithubAPI.client.remove_hook(repo.full_name, hook[:id])
-            puts "successfully deleted hook with id #{hook[:id]} and url #{hook[:config][:url]} from #{repo.full_name}"
+            puts "Successfully deleted hook with id #{hook[:id]} and url #{hook[:config][:url]} from #{repo.full_name}"
           end
         end
       rescue Octokit::NotFound