hubstats 0.3.4 → 0.3.5

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

@@ -1,14 +1,15 @@
 <div class="row single-repo">
-  <div class="repo-image-small col-lg-1 col-md-1 col-sm-1 col-xs-2" >
+  <div class="repo-image-small col-lg-1 col-md-1 col-sm-1 col-xs-1" >
     <span class="repo-octicon-small mega-octicon octicon-repo"></span>
-
   </div>
+
   <div class="repo-info col-lg-10 col-md-10 col-sm-10 col-xs-8">
     <h4> 
       <%= link_to repo.name, repo_path(repo)%>
     </h4>
     updated <%= distance_of_time_in_words(DateTime.now,repo.updated_at) %> ago
   </div>
+  
   <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
     <div class="pull-right">
       <a class="subtle" href=<%= repo.html_url %> > 
@@ -17,4 +18,4 @@
       </span>
     </div>
   </div>
-</div>
+</div>

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

@@ -14,6 +14,13 @@
       </a>
     </h4>
   </div>
+  <!-- Show the total number of deploys 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>
@@ -26,17 +33,23 @@
       <span class="mega-octicon octicon-comment"></span>
     </div>
   </div>
+  <!-- Show the net additions using the average_additions and the average_deletions -->
   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
-      <span class="text-large"><%= user.average_additions %></span>
-      <span class="mega-octicon octicon-plus"></span>
+      <span class="text-large"><%= user.average_additions - user.average_deletions %></span>
     </div>
   </div>
-  <div class="col-lg-2 col-md-2 col-sm-2">
+<!--   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
-      <span class="text-large"><%= user.average_deletions %></span>
-      <span class="mega-octicon octicon-dash"></span>
+      <span class="text-medium"><%= user.average_additions %></span>
+      <span class="octicon octicon-plus"></span>
     </div>
   </div>
+  <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="text-center">
+      <span class="text-medium"><%= user.average_deletions %></span>
+      <span class="octicon octicon-dash"></span>
+    </div>
+  </div> -->
 
 </div>

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

@@ -9,6 +9,16 @@
     <%= render 'hubstats/partials/quick_stats' %>
   </div>
 
+  <!-- If the pull request is closed, then show the deploy that merged this PR -->
+  <div class="col col-lg-8 col-lg-offset-2">
+    <div class="row">
+      <%if @pull_request.state == "closed"%>
+      <h4> Deployment </h4>
+      <%= render 'hubstats/tables/deploys-condensed' %>
+      <%end%>
+    </div>
+  </div>
+
   <div class="col col-lg-8 col-lg-offset-2">
     <div class="row">
       <h4> Comments </h4>

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

@@ -1,24 +1,19 @@
 <div class="container" id="splash">
   <div class="row text-center">
     <%= render 'hubstats/partials/quick_stats' %>
+    <br>
+    <br>
+    <br>
+    <br>
+    <br>
+    <%= render 'hubstats/partials/quick_addition_stats' %>
   </div>
   
   <div class="row">
     <div class="col col-lg-12">
       <h3> All Repositories </h3>       
       <%= render 'hubstats/tables/repos' %>
-<!--      <% if @repo_count > 20 %>
-        <p class="pull-right"><%= link_to "View All", repos_path %></p>
-      <% end %>-->
     </div>
-
-  <!--  <div class="col col-lg-6">
-      <h3> Active Users </h3>
-      <%= render 'hubstats/tables/users-condensed' %>
-      <% if @user_count > 20 %>
-        <p class="pull-right"><%= link_to "View All", users_path %></p>
-      <% end %>
-    </div> -->
     
   </div>
 </div>

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

@@ -2,11 +2,26 @@
 
   <div class="row">
     <h1 class="title text-center"><a href=<%=@repo.html_url%>> <%= @repo.name.titleize %> </a></h1>
-    <%= render 'hubstats/partials/quick_stats' %>
+    <%= render 'hubstats/partials/quick_stats' %>    
+    <br>
+    <br>
+    <br>
+    <br>
+    <br>
+    <%= render 'hubstats/partials/quick_addition_stats' %>
   </div>
 
   <div class="row">
 
+    <!-- Show all of the deploys for this repository -->
+    <div class="col col-lg-6">
+      <h3> Deploys </h3>
+      <%= render "hubstats/tables/deploys-condensed" %>
+      <% if @deploy_count > 20 %>
+        <p class="pull-right"><%= link_to "View All", deploys_path(:repos => @repo.id) %></p>
+      <% end %>
+    </div>
+
     <div class="col col-lg-6">
       <h3> Pull Requests</h3>       
       <%= render 'hubstats/tables/pulls-condensed'%>
@@ -15,10 +30,10 @@
       <% end %>
     </div>
 
-    <div class="col col-lg-6">
-      <h3> Active Users </h3>
-      <%= render 'hubstats/tables/users-condensed' %>
-    </div>
+    <!-- <div class="col col-lg-6"> -->
+      <!-- <h3> Active Users </h3> -->
+      <!-- <%= render 'hubstats/tables/users-condensed' %> -->
+    <!-- </div> -->
 
   </div>
 

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

@@ -1,7 +1,7 @@
 <% if @deploys.length > 0 %>
   <div class="deploys">
-    <%= render partial: 'hubstats/partials/deploys-condensed', collection: @deploys, as: :deploy %>
+    <%= render partial: 'hubstats/partials/deploy-condensed', collection: @deploys, as: :deploy %>
   </div>
 <% else %>
-  <p> No deploys to show </p>
+  <p> No deployment information available</p>
 <% end %>

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

@@ -4,4 +4,4 @@
   </div>
 <% else %>
   <p> No users to show </p>
-<% end %>
+<% end %>

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

@@ -3,21 +3,28 @@
     <div class="row single-user header">
       <div class="col-lg-4 col-md-4 col-sm-4">
       </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="deploys"> Deploys <span class="octicon"></span> </a>
+      </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
         <a class="header desc" id="pulls"> Pulls <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>
+      <!-- Show the net additions instead of the additions and deletions separately -->
       <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="additions"> Net Additions <span class="octicon"></span></a>
+      </div>
+<!--  <div class="col-lg-2 col-md-2 col-sm-2">
         <a class="header desc" id="additions"> Additions <span class="octicon"></span></a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
         <a class="header desc" id="deletions"> Deletions <span class="octicon"></span></a>
-      </div>
+      </div> -->
     </div>
     <%= render partial: 'hubstats/partials/user', collection: @users, as: :user %>
   </div>
 <% else %>
   <p> No users to show </p>
-<% end %>
+<% end %>

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

@@ -20,4 +20,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

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

@@ -13,9 +13,15 @@
       <% end %>
     </div>
 
+    <!-- <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> -->
+      <!-- <h3> Comments </h3> -->
+      <!-- <%= render 'hubstats/tables/comments-condensed' %> -->
+    <!-- </div> -->
+
+    <!-- Show all of the deploys this user did -->
     <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
-      <h3> Comments </h3>
-      <%= render 'hubstats/tables/comments-condensed' %>
+      <h3> Deploys </h3>
+      <%= render 'hubstats/tables/deploys-condensed' %>
     </div>
   </div>
-</div>
+</div>

data/config/routes.rb

@@ -6,7 +6,7 @@ Hubstats::Engine.routes.draw do
   get "/pulls" => "pull_requests#index", :as => :pulls #routes to list of pulls
   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 "/repos" => "repos#dashboard", :as => :repos #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
     get '/pull/:id' => "pull_requests#show", :as => :pull

data/db/migrate/20150526154850_create_hubstats_deploys.rb

@@ -5,7 +5,6 @@ class CreateHubstatsDeploys < ActiveRecord::Migration
       t.integer :repo_id
       t.timestamp :deployed_at
       t.string :deployed_by
-      t.integer :user_id
     end
   end
 end

data/db/migrate/20150605184015_add_user_id_delete_deployed_by_to_deploy.rb

@@ -0,0 +1,6 @@
+class AddUserIdDeleteDeployedByToDeploy < ActiveRecord::Migration
+  def change
+  	add_column :hubstats_deploys, :user_id, :integer
+  	remove_column :hubstats_deploys, :deployed_by
+  end
+end

data/db/migrate/20150605190549_add_merged_by_column_to_pull_request.rb

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

data/db/seeds.rb

@@ -13,7 +13,7 @@ deploy_list = [
 	["is93h1n", "sportngin/janky", "2014-12-31 09:00:00 -0500", "EvaMartinuzzi", 6384174, "3274757, 5708038"],
 	["kdiq13j", "sportngin/ngin", "2013-11-17 04:00:00 -0500", "Olson3R", 6902485, "10444039, 11917574"],
 	["ciap1kd", "sportngin/statcore_ice_hockey", "2010-08-29 01:00:00 -0500", "odelltuttle", 7231089, "25856007"],
-	["iek9s0d", "sportngin/freshbooks.rb", "2015-05-13 12:00:00 -0500", "tombadaczewski", 4095632, "4534280, 3557640"],
+	["iek9s0d", "sportngin/thinking-sphinx", "2015-05-13 12:00:00 -0500", "tombadaczewski", 4095632, "4534280, 3557640"],
 	["918240d", "sportngin/pocket_ngin", "2015-04-01 03:00:00 -0500", "plaincheesepizza", 5577837, "27117320, 1967369, 20911625"],
 	["dis8203", "sportngin/sport_ngin_live", "2015-02-27 08:00:00 -0500", "GeoffreyHinck", 5167099, "9657609, 4745225, 35976969, 5180938"],
 	["2kd9sac", "sportngin/jarvis", "2015-05-26 03:00:00 -0500", "Bleisz22", 7452482, "23303693, 2990349"],

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/controllers/hubstats/deploys_controller_spec.rb

@@ -6,89 +6,97 @@ module Hubstats
     describe "#create" do
 
       before :each do
-        create(:repo, :full_name => "sportngin/ngin")
+        create(:pull_request, :number => 33364992, :merged_by => 202020)
       end
 
       it 'should create a deploy' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "sportngin/ngin",
+                       "repo_name" => "hub/hubstats",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
-                       "deployed_by" => "emmasax1",
                        "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).deployed_by).to eq("emmasax1")
         expect(assigns(:deploy).repo_id).to eq(101010)
         expect(assigns(:pull_request_id_array)).to eq([33364992, 5870592, 33691392])
+        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" => "sportngin/ngin",
+                       "repo_name" => "hub/hubstats",
                        "deployed_at" => nil,
-                       "deployed_by" => "emmasax1",
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
         expect(assigns(:deploy).git_revision).to eq("c1a2b37")
-        expect(assigns(:deploy).deployed_by).to eq("emmasax1")
         expect(assigns(:deploy).repo_id).to eq(101010)
         expect(assigns(:pull_request_id_array)).to eq([33364992, 5870592, 33691392])
+        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" => "sportngin/ngin",
+                       "repo_name" => "hub/hubstats",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
-                       "deployed_by" => "emmasax1",
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
         expect(response).to have_http_status(400)
       end
 
-      it 'should NOT create a deploy without a deployed_by' do
+      it 'should create a deploy without a user_id' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "sportngin/ngin",
+                       "repo_name" => "hub/hubstats",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
-                       "deployed_by" => nil,
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
-        expect(response).to have_http_status(400)
+        expect(response).to have_http_status(200)
       end
 
       it 'should NOT create a deploy without a repo_name' do
         post(:create, {"git_revision" => "c1a2b37",
                        "repo_name" => nil,
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
-                       "deployed_by" => "emmasax1",
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
         expect(response).to have_http_status(400)
       end
 
       it 'should NOT create a deploy when given a non existing repo_name' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "sportngin/make_resourceful",
+                       "repo_name" => "sportngin/example",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
-                       "deployed_by" => "emmasax1",
                        "pull_request_ids" => "33364992, 5870592, 33691392"})
         expect(response).to have_http_status(400)
       end
 
       it 'should NOT create a deploy without pull request ids' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "sportngin/make_resourceful",
+                       "repo_name" => "hub/hubstats",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
-                       "deployed_by" => "emmasax1",
                        "pull_request_ids" => nil})
         expect(response).to have_http_status(400)
       end
 
       it 'should NOT create a deploy when given empty pull request ids' do
         post(:create, {"git_revision" => "c1a2b37",
-                       "repo_name" => "sportngin/make_resourceful",
+                       "repo_name" => "hub/hubstats",
                        "deployed_at" => "2009-02-03 03:00:00 -0500",
-                       "deployed_by" => "emmasax1",
                        "pull_request_ids" => ""})
         expect(response).to have_http_status(400)
       end
+
+      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",
+                       "deployed_at" => "2009-02-03 03:00:00 -0500",
+                       "pull_request_ids" => "blah bleh blooh"})
+        expect(response).to have_http_status(400)
+      end
+
+      it 'should NOT create a deploy when given invalid pull request ids' do
+        post(:create, {"git_revision" => "c1a2b37",
+                       "repo_name" => "hub/hubstats",
+                       "deployed_at" => "2009-02-03 03:00:00 -0500",
+                       "pull_request_ids" => "77, 81, 92"})
+        expect(response).to have_http_status(400)
+      end
     end
 
     describe "#index" do
@@ -101,15 +109,19 @@ module Hubstats
         deploy1 = create(:deploy, :git_revision => "c1a2b37",
                                   :repo_id => 101010,
                                   :deployed_at => "2009-02-03 03:00:00 -0500",
-                                  :deployed_by => "emmasax1")
+                                  :user_id => 404040)
         deploy2 = create(:deploy, :git_revision => "kd9c102",
                                   :repo_id => 101010,
                                   :deployed_at => "2015-02-03 03:00:00 -0500",
-                                  :deployed_by => "emmasax1")
+                                  :user_id => 303030)
         deploy3 = create(:deploy, :git_revision => "owk19sf",
                                   :repo_id => 101010,
                                   :deployed_at => "2011-02-03 03:00:00 -0500",
-                                  :deployed_by => "emmasax1")
+                                  :user_id => 202020)
+        deploy4 = create(:deploy, :git_revision => "owk19sf",
+                                  :repo_id => 101010,
+                                  :deployed_at => "2011-02-03 03:00:00 -0500",
+                                  :user_id => nil)
         deploys_ordered = [deploy2, deploy3, deploy1]
         expect(Hubstats::Deploy).to receive_message_chain("group_by.order_with_timespan.paginate").and_return(deploys_ordered)
         get :index
@@ -127,8 +139,7 @@ module Hubstats
       it "should show the pull requests of the specific deploy" do
         deploy = create(:deploy, :git_revision => "c1a2b37",
                         :repo_id => 101010,
-                        :deployed_at => "2009-02-03 03:00:00 -0500",
-                        :deployed_by => "emmasax1")
+                        :deployed_at => "2009-02-03 03:00:00 -0500")
         get :show, id: deploy.id
         expect(assigns(:deploy)).to eq(deploy)
         expect(assigns(:deploy).repo_id).to eq(101010)

data/spec/factories/deploys.rb

@@ -3,6 +3,13 @@ FactoryGirl.define do
     git_revision "3dis01"
     repo_id 101010
     deployed_at "2015-02-03 03:00:00 -0500"
-    deployed_by "emmasax1"
+    user_id 202020
+  end
+
+   factory :deploy_no_user, :class => Hubstats::Deploy do
+    git_revision "3dis01"
+    repo_id 101010
+    deployed_at "2015-02-03 03:00:00 -0500"
+    user_id nil
   end
 end