hubstats 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da861f041a2a1a129245de7a643e83650598f4e
-  data.tar.gz: 864924f4e7b9b86bed5edcdcd6e1ee91a125da53
+  metadata.gz: ee68bdb6be4fcfe7732bb77d4234574172a1081c
+  data.tar.gz: 7b1aa1ee88453e1a3bd7c93fcb104e2757261f91
 SHA512:
-  metadata.gz: 6111af1041627514787ccdfcb2a66d8f880e036cc29d895e97992eb004e6da3885a1e1a910d3617a62abf65f81ea371eb2d5b18a118dea828d5b0e0a8dfceb60
-  data.tar.gz: 22079d9f13c5e5fb6347b4fcebb9fb825001a40f9a4a2446c75e7cd3d306a6290b97da423422131dbc6dc4f81f68190b0aba3a54ec5a4ec7ed24fcf69494783a
+  metadata.gz: c4d71cd46f7288aa600de8b8262c6c671145dd0149134cb0d757d3deced803bc24caff337bb2f30660e6cd22ab9a31e4bf6cad3866b07bab08d54939b2dbbc7b
+  data.tar.gz: 31773307d4e3cdd228f76c955b7b15b230c93254681d3b69ea62423a8e28cbb5c980a9342d7e0b2b49e6230e2475619d148e49f6ccc65d0749af1bfa06251d15

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### 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
 

data/app/controllers/hubstats/repos_controller.rb

@@ -36,7 +36,9 @@ 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)
+      @users = Hubstats::User.with_pulls_or_comments_or_deploys(@start_date, @end_date, @repo.id).only_active.order("login ASC").limit(20)
       @active_user_count = Hubstats::User.with_pulls_or_comments_or_deploys(@start_date, @end_date, @repo.id).only_active.length
+      @qa_signoff_count = Hubstats::QaSignoff.belonging_to_repo(@repo.id).signed_within_date_range(@start_date, @end_date).count(:all)
       @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)
@@ -53,9 +55,9 @@ module Hubstats
       @deletions ||= 0
       @stats_row_one = {
         active_user_count: @active_user_count,
-        deploy_count: @deploy_count,
         pull_count: @pull_count,
-        comment_count: @comment_count
+        comment_count: @comment_count,
+        qa_signoff_count: @qa_signoff_count
       }
       @stats_row_two = {
         avg_additions: @additions.round.to_i,

data/app/controllers/hubstats/users_controller.rb

@@ -55,7 +55,6 @@ module Hubstats
       @deletions ||= 0
       @stats_row_one = {
         pull_count: @pull_count,
-        deploy_count: @deploy_count,
         comment_count: @comment_count,
         qa_signoff_count: @qa_signoff_count
       }

data/app/helpers/hubstats/metrics_helper.rb

@@ -36,6 +36,13 @@ module Hubstats
       Hubstats::Comment.created_in_date_range(@start_date, @end_date).ignore_comments_by(Hubstats::User.ignore_users_ids).count(:all)
     end
 
+    # Public - Gets the number of QA signoffs within the start date and end date
+    #
+    # Returns - the number of QA signoffs
+    def get_qa_signoff_count
+      Hubstats::QaSignoff.signed_within_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
@@ -90,7 +97,7 @@ module Hubstats
         developer_count: get_developer_count,
         pull_count: get_pull_count,
         pulls_per_dev: get_pulls_per_dev,
-        deploy_count: get_deploy_count,
+        qa_signoff_count: get_qa_signoff_count,
         net_additions: get_net_additions
       }
       @stats_row_two = {

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

@@ -23,8 +23,6 @@
             <%= 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/pull_requests'%>">
             <%= link_to "Pull Requests", root_path%></li>
           <li>

data/app/views/hubstats/partials/{_qa-signoffs-condensed.html.erb → _qa-signoff-condensed.html.erb}

@@ -1,15 +1,15 @@
-<div class="row single-qasignoff">
+<div class="row single-pull">
   <div class="user-image-small col-lg-1 col-md-1 col-sm-1 col-xs-2" >
-    <img src= <%= qa_signoff.user.avatar_url%> alt= <%= qa_signoff.user.login %> >
+    <img src= <%= qa_signoff.pull_request.user.avatar_url%> alt= <%= qa_signoff.pull_request.user.login %> >
   </div>
 
   <!-- Show the repo name and the specific qa_signoff request name and who made it when -->
-   <div class="qasignoff-info col-lg-9 col-md-9 col-sm-9 col-xs-8">
+  <div class="pull-info col-lg-9 col-md-9 col-sm-9 col-xs-8">
     <h4> 
       <%= link_to qa_signoff.repo.name, repo_path(qa_signoff.repo.name) %> /
       <%= link_to qa_signoff.pull_request.title, qa_signoff.pull_request.html_url, :target => '_blank' %>
     </h4>
-    by <%= link_to qa_signoff.user.login, user_path(qa_signoff.user) %>
+    by <%= link_to qa_signoff.pull_request.user.login, user_path(qa_signoff.pull_request.user) %>
     <% if qa_signoff.pull_request.merged == '1'%>
       <%= "merged #{time_ago_in_words(qa_signoff.pull_request.merged_at)} ago "%>
     <% elsif qa_signoff.pull_request.state == 'closed' %>
@@ -21,7 +21,7 @@
 
   <!-- Show the pull request number and a link to the github PR -->
   <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2" >
-    <div class="qasignoff-right">
+    <div class="pull-right">
       <%= qa_signoff.pull_request.number %>
       <span class="octicon octicon-mark-github"></span>
       </span>

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

@@ -31,12 +31,6 @@
     <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>

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

@@ -31,12 +31,6 @@
     <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>
@@ -45,7 +39,7 @@
 <% end %>
 <% if @stats_row_two.has_key? :qa_signoff_count %>
   <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-    <h1><%= @stats_row_one[:qa_signoff_count] %> </h1>
+    <h1><%= @stats_row_two[:qa_signoff_count] %> </h1>
     <h4> QA Signoffs </h4>
   </div>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div class="row single-repo">
 
   <!-- Show the repo name and the date that it was last updated, with a link to the github repo -->
-  <div class="repo-info col-lg-2 col-md-2 col-sm-2 col-xs-8">
+  <div class="repo-info col-lg-4 col-md-4 col-sm-4 col-xs-8">
     <h4> 
       <%= link_to repo.name, repo_path(repo)%>
     </h4>
@@ -16,12 +16,6 @@
   </div>
 
   <!-- Show all of the stats for the individual repo -->
-  <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="text-center">
-      <span class="text-large"><%= repo.deploy_count %></span>
-      <span class="mega-octicon octicon-rocket"></span>
-    </div>
-  </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
       <span class="text-large"><%= repo.pull_request_count %></span>

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

@@ -18,13 +18,9 @@
     </h4>
   </div>
 
+  <div class="col-lg-1 col-md-1 col-sm-1" ></div> <!-- Empty column just to make space -->
+
   <!-- Show the basic stats for this user for this user -->
-  <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="text-center">
-      <span class="text-large"><%= user.deploy_count %></span>
-      <span class="mega-octicon octicon-rocket"></span>
-    </div>
-  </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
       <span class="text-large"><%= user.pull_request_count %></span>
@@ -44,7 +40,7 @@
     </div>
   </div>
 
-  <div class="col-lg-1 col-md-1 col-sm-1">
+  <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
       <span class="text-large"><%= user.additions - user.deletions %></span>
     </div>

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

@@ -26,12 +26,12 @@
       <% end %>
     </div>
 
-    <!-- Show all of the deploys in a "condensed" view -->
-    <div class="col col-lg-6">
-      <h3> Deployments </h3>
-      <%= render "hubstats/tables/deploys_condensed" %>
-      <% if @deploy_count > 20 %>
-        <p class="pull-right"><%= link_to "View All", deploys_path(:repos => @repo.id) %></p>
+    <!-- Show all of the active users that contribute to this repo 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' %>
+      <% if @active_user_count > 20 %>
+        <p class="pull-right">Hubstats is currently not set up to view all active users for this repository</p>
       <% end %>
     </div>
   </div>

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

@@ -1,7 +1,7 @@
 <!-- Show the QA Signoffs or say there are no signoffs available -->
 <% if @qa_signoffs.length > 0 %>
-  <div class="qa_signoffs">
-    <%= render partial: 'hubstats/partials/qa-signoffs-condensed', collection: @qa_signoffs, as: :qa_signoff %>
+  <div class="pulls">
+    <%= render partial: 'hubstats/partials/qa-signoff-condensed', collection: @qa_signoffs, as: :qa_signoff %>
   </div>
 <% else %>
   <p> No QA signoff information available</p>

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

@@ -2,12 +2,10 @@
 <% if @repos.length > 0 %>
   <div class="repos">
     <div class="row single-repo header">
-      <div class="col-lg-2 col-md-2 col-sm-2">
+      <div class="col-lg-3 col-md-3 col-sm-3">
         <a class="header desc" id="name"> Repository Name <span class="octicon"></span> </a>
       </div>
-      <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="deploys"> Deployments <span class="octicon"></span> </a>
-      </div>
+      <div class="col-lg-1 col-md-1 col-sm-1" ></div> <!-- Empty column just to make space -->
       <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>

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

@@ -2,12 +2,9 @@
 <% if @users.length > 0 %>
   <div class="users">
     <div class="row single-user header">
-      <div class="col-lg-3 col-md-3 col-sm-3">
+      <div class="col-lg-4 col-md-4 col-sm-4">
         <a class="header desc" id="name"> GitHub Username <span class="octicon"></span> </a>
       </div>
-      <div class="col-lg-2 col-md-2 col-sm-2">
-        <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"> Merged Pull Requests <span class="octicon"></span> </a>
       </div>
@@ -17,7 +14,7 @@
       <div class="col-lg-2 col-md-2 col-sm-2">
         <a class="header desc" id="signoffs"> QA Signoffs <span class="octicon"></span></a>
       </div>
-      <div class="col-lg-1 col-md-1 col-sm-1">
+      <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>

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

@@ -30,6 +30,9 @@
     <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
       <h3> Active Users </h3>
       <%= render 'hubstats/tables/users_condensed' %>
+      <% if @active_user_count > 20 %>
+        <p class="pull-right">Hubstats is currently not set up to view all active users for this team</p>
+      <% end %>
     </div>
   </div>
 </div>

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

@@ -36,21 +36,12 @@
       <% end %>
     </div>
 
-    <!-- Show all of this user's deploys in a "condensed" view -->
-    <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
-      <h3> Deployments </h3>
-      <%= render 'hubstats/tables/deploys_condensed' %>
-      <% if @deploy_count > 20 %>
-        <p class="pull-right"><%= link_to "View All", deploys_path(:users => @user.id) %></p>
-      <% end %>
-    </div>
-
     <!-- Show all of this user's QA Signoffs in a "condensed" view -->
     <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
       <h3> QA Signoffs </h3>
       <%= render 'hubstats/tables/qa_signoffs_condensed' %>
       <% if @qa_signoff_count > 20 %>
-        <p class="pull-right">Hubstats is currently not set up to View All QA signoffs</p>
+        <p class="pull-right">Hubstats is currently not set up to view all QA signoffs for this user</p>
       <% end %>
     </div>
   </div>

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -255,7 +255,7 @@ files:
 - app/views/hubstats/partials/_header.html.erb
 - app/views/hubstats/partials/_pull-condensed.html.erb
 - app/views/hubstats/partials/_pull.html.erb
-- app/views/hubstats/partials/_qa-signoffs-condensed.html.erb
+- app/views/hubstats/partials/_qa-signoff-condensed.html.erb
 - app/views/hubstats/partials/_quick_stats_one.html.erb
 - app/views/hubstats/partials/_quick_stats_two.html.erb
 - app/views/hubstats/partials/_repo.html.erb