hubstats 0.5.4 → 0.5.5

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

@@ -14,19 +14,19 @@
             {: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 (Teams, Deployments, Metrics, Pull Requests, Users) in tab form -->
+      <!-- Show all of the pages (Repositories, Teams, Users, Deployments, Pull Requests) 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/repos'%>">
+            <%= link_to "Repositories", repos_path%></li>
           <li class="<%='navbar-active' if params[:controller] == 'hubstats/teams'%>">
             <%= link_to "Teams", teams_path%></li>
+          <li class="<%='navbar-active' if params[:controller] == 'hubstats/users'%>">
+            <%= link_to "Users", users_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'%>">
-            <%= link_to "Metrics", metrics_path%></li>
           <li class="<%='navbar-active' if params[:controller] == 'hubstats/pull_requests'%>">
             <%= link_to "Pull Requests", root_path%></li>
-          <li class="<%='navbar-active' if params[:controller] == 'hubstats/users'%>">
-            <%= link_to "Users", users_path%></li>
           <li>
             <!-- Show the datepicker -->
             <div class="input-daterange input-group" id="datepicker">

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

@@ -0,0 +1,93 @@
+<!-- All of the options for showing any stats -->
+<div class="col-lg-<%= (12-(@stats_row_one.length)*2)/2 %>"></div>
+
+<% if @stats_row_one.has_key? :active_user_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_one[:active_user_count] %> </h1>
+    <h4> Active Users </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :developer_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_one[:developer_count] %> </h1>
+    <h4> Developers </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :reviewer_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_one[:reviewer_count] %> </h1>
+    <h4> Reviewers </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :pull_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_one[:pull_count] %> </h1>
+    <h4> Merged Pull Requests </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :pulls_per_dev %>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1> <%= @stats_row_one[:pulls_per_dev] %> </h1>
+    <h4> Pull Requests per Developer </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :deploy_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_one[:deploy_count] %> </h1>
+    <h4> Deployments </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :comment_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_row_one[:comment_count] %> </h1>
+    <h4> Comments </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :review_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+     <h1> <%= @stats_row_one[:review_count] %> </h1>
+    <h4> Code Reviews </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :comments_per_rev %>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1> <%= @stats_row_one[:comments_per_rev] %> </h1>
+    <h4> Comments per Reviewer </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :repo_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+     <h1> <%= @stats_row_one[:repo_count] %> </h1>
+    <h4> Repositories with Pull Requests or Comments </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :net_additions %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_one[:net_additions] %> </h1>
+    <h4> Net Additions </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :avg_additions %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_one[:avg_additions] %> </h1>
+    <h4> Average Additions per Pull Request </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :avg_deletions%>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_row_one[:avg_deletions] %> </h1>
+    <h4> Average Deletions per Pull Request </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :additions %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_one[:additions] %> </h1>
+    <h4> Additions </h4>
+  </div>
+<% end %>
+<% if @stats_row_one.has_key? :deletions%>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_row_one[:deletions] %> </h1>
+    <h4> Deletions </h4>
+  </div>
+<% end %>

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

@@ -0,0 +1,93 @@
+<!-- All of the options for showing any stats -->
+<div class="col-lg-<%= (12-(@stats_row_two.length)*2)/2 %>"></div>
+
+<% if @stats_row_two.has_key? :active_user_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_two[:active_user_count] %> </h1>
+    <h4> Active Users </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :developer_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_two[:developer_count] %> </h1>
+    <h4> Developers </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :reviewer_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_two[:reviewer_count] %> </h1>
+    <h4> Reviewers </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :pull_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_two[:pull_count] %> </h1>
+    <h4> Merged Pull Requests </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :pulls_per_dev %>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1> <%= @stats_row_two[:pulls_per_dev] %> </h1>
+    <h4> Pull Requests per Developer </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :deploy_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_two[:deploy_count] %> </h1>
+    <h4> Deployments </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :comment_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_row_two[:comment_count] %> </h1>
+    <h4> Comments </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :review_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+     <h1> <%= @stats_row_two[:review_count] %> </h1>
+    <h4> Code Reviews </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :comments_per_rev %>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1> <%= @stats_row_two[:comments_per_rev] %> </h1>
+    <h4> Comments per Reviewer </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :repo_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+     <h1> <%= @stats_row_two[:repo_count] %> </h1>
+    <h4> Repositories with Pull Requests or Comments </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :net_additions %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_two[:net_additions] %> </h1>
+    <h4> Net Additions </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :avg_additions %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_two[:avg_additions] %> </h1>
+    <h4> Average Additions per Pull Request </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :avg_deletions%>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_row_two[:avg_deletions] %> </h1>
+    <h4> Average Deletions per Pull Request </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :additions %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_row_two[:additions] %> </h1>
+    <h4> Additions </h4>
+  </div>
+<% end %>
+<% if @stats_row_two.has_key? :deletions%>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_row_two[:deletions] %> </h1>
+    <h4> Deletions </h4>
+  </div>
+<% end %>

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

@@ -10,7 +10,7 @@
     </h1>
 
     <!-- Show the date/time that the deploy was deployed -->
-    <%= render 'hubstats/partials/quick_stats' %>
+    <%= render 'hubstats/partials/quick_stats_one' %>
   </div>
 
   <!-- If the pull request is closed, then show the deploy that merged this PR -->

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

@@ -0,0 +1,14 @@
+<div class="container" id="repo">
+
+  <%= render 'hubstats/partials/dashboard', :collection => dashboard %>
+
+  <div class="row">
+    <div class="col col-lg-12">
+      <%= render 'hubstats/tables/repos' %>
+      <div class="text-center">
+        <%= will_paginate @repo, renderer: BootstrapPagination::Rails %>
+      </div>
+    </div>
+  </div>
+</div>
+

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

@@ -5,14 +5,14 @@
     <h1 class="title text-center"><a href=<%=@repo.html_url%>> <%= @repo.name.titleize %> </a></h1>
 
     <!-- Show all of the stats about the repository -->
-    <%= render 'hubstats/partials/quick_stats' %>    
+    <%= render 'hubstats/partials/quick_stats_one' %>    
     <br>
     <br>
     <br>
     <br>
     <br>
     <br>
-    <%= render 'hubstats/partials/quick_addition_stats' %>
+    <%= render 'hubstats/partials/quick_stats_two' %>
   </div>
 
   <div class="row">

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

@@ -1,4 +1,7 @@
 <div class="container" id="team"%>
+
+  <%= render 'hubstats/partials/dashboard', :collection => dashboard %>
+  
   <div class="row">
     <div class="col col-lg-12">
       <%= render 'hubstats/tables/teams' %>

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

@@ -5,14 +5,14 @@
     <h1 class="title text-center"><%= @team.name %></a> </h1>
 
     <!-- Show all of the stats about the team -->
-        <%= render 'hubstats/partials/quick_stats' %>
+    <%= render 'hubstats/partials/quick_stats_one' %>
     <br>
     <br>
     <br>
     <br>
     <br>
     <br>
-    <%= render 'hubstats/partials/quick_addition_stats' %>
+    <%= render 'hubstats/partials/quick_stats_two' %>
   </div>
 
   <div class="row">

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

@@ -1,20 +1,10 @@
 <div class="container" id="user"%>
-  <div class="row"%>
-    <div class="col-lg-3">
 
-      <!-- Allow for filtering by repository or user -->
-      <div class="form-group">
-        <input class="select2-control" id="repos">
-        </input>
-      </div>
-      <div class="form-group">
-        <input class="select2-control" id="users">
-        </input>
-      </div>
-    </div>
+  <%= render 'hubstats/partials/dashboard', :collection => dashboard %>
+  <br>
 
-    <!-- Show all of the users with their individual stats -->
-    <div class="col-lg-9">
+  <div class="row"%>
+    <div class="col col-lg-12">
       <%= render 'hubstats/tables/users' %>
       <div class="text-center">
         <%= will_paginate @users, renderer: BootstrapPagination::Rails %>

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

@@ -5,7 +5,7 @@
     <h1 class="title text-center"><a href=<%=@user.html_url%>> <%= @user.login %></a> </h1>
 
     <!-- Show all of the stats about the user -->
-    <%= render 'hubstats/partials/quick_stats' %>
+    <%= render 'hubstats/partials/quick_stats_one' %>
   </div>
 
   <div class="row">

data/config/routes.rb

@@ -7,8 +7,7 @@ Hubstats::Engine.routes.draw do
   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 "/repos" => "repos#index", :as => :repos # routes to the list of repos
   get "/:repo" => "repos#show", :as => :repo # routes to specific repo's stats
   scope "/:repo", :as => :repo do
     get '/pull/:id' => "pull_requests#show", :as => :pull # routes to the specific repo's pull id

data/lib/hubstats/engine.rb

@@ -10,6 +10,7 @@ module Hubstats
       Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
         require_dependency(c)
       end
+      ApplicationController.helper(MetricsHelper)
     end
 
     require 'octokit'

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/controllers/hubstats/deploys_controller_spec.rb

@@ -6,7 +6,7 @@ module Hubstats
     
     describe "#index" do
       it "should correctly order all of the deploys" do
-        repo = create(:repo, :full_name => "sportngin/ngin")
+        repo = create(:repo, :full_name => "sportngin/ngin", :updated_at => Date.today)
         deploy1 = create(:deploy, :git_revision => "c1a2b37",
                                   :repo_id => 101010,
                                   :deployed_at => "2009-02-03 03:00:00 -0500",
@@ -33,12 +33,13 @@ module Hubstats
 
     describe "#show" do
       it "should show the pull requests of the specific deploy" do
-        repo = create(:repo, :full_name => "sportngin/ngin")
+        repo = create(:repo, :full_name => "sportngin/ngin", :updated_at => Date.today)
+        user = build(:user, :updated_at => Date.today)
         deploy = create(:deploy, :git_revision => "c1a2b37",
                                  :repo_id => 101010,
                                  :deployed_at => "2009-02-03 03:00:00 -0500")
-        pull1 = create(:pull_request, :deploy_id => deploy.id, :repo => repo)
-        pull2 = create(:pull_request, :deploy_id => deploy.id, :repo => repo)
+        pull1 = create(:pull_request, :deploy_id => deploy.id, :repo => repo, :updated_at => Date.today, :user_id => user.id)
+        pull2 = create(:pull_request, :deploy_id => deploy.id, :repo => repo, :updated_at => Date.today, :user_id => user.id)
         get :show, id: deploy.id
         expect(assigns(:deploy)).to eq(deploy)
         expect(assigns(:pull_requests)).to contain_exactly(pull1, pull2)
@@ -48,35 +49,37 @@ module Hubstats
 
     describe "#create" do
       before :each do
-        create(:pull_request, :number => 33364992, :merged_by => 202020)
+        user = build(:user, :updated_at => Date.today)
+        repo = create(:repo, :id => 505050, :full_name => "example/name", :updated_at => Date.today)
+        create(:pull_request, :number => 33364992, :merged_by => 202020, :updated_at => Date.today, :user_id => user.id, :repo_id => repo.id)
       end
 
       it 'should create a deploy' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "hub/hubstats",
+                       "repo_name" => "example/name",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
         expect(assigns(:deploy).git_revision).to eq("c1a2b37")
         expect(assigns(:deploy).deployed_at).to eq("2009-02-03 03:00:00 -0500")
-        expect(assigns(:deploy).repo_id).to eq(101010)
+        expect(assigns(:deploy).repo_id).to eq(505050)
         expect(assigns(:deploy).user_id).to eq(202020)
         expect(response).to have_http_status(200)
       end
 
       it 'should create a deploy without a deployed_at because nil time turns into current time' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "hub/hubstats",
+                       "repo_name" => "example/name",
                        "deployed_at" => nil,
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
         expect(assigns(:deploy).git_revision).to eq("c1a2b37")
-        expect(assigns(:deploy).repo_id).to eq(101010)
+        expect(assigns(:deploy).repo_id).to eq(505050)
         expect(assigns(:deploy).user_id).to eq(202020)
         expect(response).to have_http_status(200)
       end
 
       it 'should NOT create a deploy without a git_revision' do
         post(:create, {"git_revision" => nil,
-                       "repo_name" => "hub/hubstats",
+                       "repo_name" => "example/name",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
         expect(response).to have_http_status(400)
@@ -84,7 +87,7 @@ module Hubstats
 
       it 'should create a deploy without a user_id' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "hub/hubstats",
+                       "repo_name" => "example/name",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
         expect(response).to have_http_status(200)
@@ -108,7 +111,7 @@ module Hubstats
 
       it 'should NOT create a deploy without pull request ids' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "hub/hubstats",
+                       "repo_name" => "example/name",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
                        "pull_request_ids" => nil})
         expect(response).to have_http_status(400)
@@ -116,7 +119,7 @@ module Hubstats
 
       it 'should NOT create a deploy when given empty pull request ids' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "hub/hubstats",
+                       "repo_name" => "example/name",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
                        "pull_request_ids" => ""})
         expect(response).to have_http_status(400)
@@ -124,7 +127,7 @@ module Hubstats
 
       it 'should NOT create a deploy when given something that are not pull request ids' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "hub/hubstats",
+                       "repo_name" => "example/name",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
                        "pull_request_ids" => "blah bleh blooh"})
         expect(response).to have_http_status(400)
@@ -132,7 +135,7 @@ module Hubstats
 
       it 'should NOT create a deploy when given invalid pull request ids' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "hub/hubstats",
+                       "repo_name" => "example/name",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
                        "pull_request_ids" => "77, 81, 92"})
         expect(response).to have_http_status(400)