hubstats 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f14e805fad77874457b3172ce6280c193e1ae6
-  data.tar.gz: 3ccc6d0f669631b8cd7cf75a8509d77bddd57c2e
+  metadata.gz: 72959e4215249bd0772a2aada53c4ea5a6da6f54
+  data.tar.gz: aec75c78a72b43dfffdf886f4e3343c6cc43b95e
 SHA512:
-  metadata.gz: 510e5f4169c4520a49945be5f8146c61adbae0b1ef2eeee3e07b352be35fd21488bb05093b793bccb87b26a76f52c3680c79c6c354d31cace08b5eb685eee7e0
-  data.tar.gz: 83dd4e89f4d1471d968373ef60d4f2cd2b327f2bcd2d8c012ec0d6ea455883912e60b73d1ae44f021f48d35e7aeee8e9fad9b12da1e566c4438ed75270558323
+  metadata.gz: 15477112cb8070620567400365515b466c13e275144221a2fd3f283388a122d181651cd12a4211f864ac47fa9b9b4656bba714dd0605b3f69955d48cc6806636
+  data.tar.gz: 535d7b0bc4c4dbe1bb9782f5e2cc4046be1dd8fb9ac6b575dfb12be139a555d850b20dd461e7fb3e36f5c848e91a3e34ec01302c7571ba6fededa836eefc5a1f

data/.octopolo.yml

@@ -0,0 +1,4 @@
+github_repo: sportngin/hubstats
+semantic_versioning: true
+branches_to_keep:
+  - master

data/.soyuz.yml

@@ -0,0 +1,14 @@
+defaults:
+  deploy_cmds:
+    - gem build hubstats.gemspec
+    - gem push *.gem
+  before_deploy_cmds:
+    - /usr/local/bin/op tag-release
+    - sed -i '' -e "s/\".*/\"$(git tag | tail -1 | sed s/v//)\"/" lib/hubstats/version.rb
+    - git add  lib/hubstats/version.rb
+    - git commit -m "Version Bump" && git push
+  after_deploy_cmds:
+    - rm *.gem
+environments:
+  -
+    rubygems: {}

data/CHANGELOG.markdown

@@ -0,0 +1,2 @@
+#### v0.2.0
+#### 2015.02.26.13.51

data/app/assets/javascripts/hubstats/users.js

@@ -5,15 +5,46 @@ $(document).ready(function() {
   queryParameters = getUrlVars();
   setUserDefaults(queryParameters);
 
-  $("#user-sort-group > .btn").on("click", function(){
-    updateQueryStringParameter(queryParameters,"order",$(this).attr('id'));
+  $("#pulls").on("click", function(){
+    toggleOrder(queryParameters,$(this).attr('id'));
   });
 
+  $("#comments").on("click", function(){
+    toggleOrder(queryParameters,$(this).attr('id'));
+  });
+
+  $("#additions").on("click", function(){
+    toggleOrder(queryParameters,$(this).attr('id'));
+  });
+
+  $("#deletions").on("click", function(){
+    toggleOrder(queryParameters,$(this).attr('id'));
+  });
 });
 
+function toggleOrder(queryParams, sort_by) {
+  if (queryParameters["order"] !== undefined) {
+    if (queryParameters["order"] === sort_by+"-desc" ) {
+      updateQueryStringParameter(queryParameters,"order",sort_by+"-asc");
+    } else {
+      updateQueryStringParameter(queryParameters,"order",sort_by+"-desc");
+    }
+  } else {
+    updateQueryStringParameter(queryParameters,"order",sort_by+"-asc");
+  }
+}
+
 function setUserDefaults(queryParameters) {
-  if (queryParameters["order"])
-    $('#' + queryParameters["order"]).addClass('active');
-  else 
-    $('#smallest-pulls').addClass('active');
+  if (queryParameters["order"]) {
+    sort_by = queryParameters["order"].split("-")[0];
+    order = queryParameters["order"].split("-")[1];
+    if (order === 'asc') {
+      $('#'+sort_by+' .octicon').addClass('octicon-arrow-up');
+    } else {
+      $('#'+sort_by+' .octicon').addClass('octicon-arrow-down');
+    }
+  }
+  else {
+    $("#pulls .octicon").addClass('octicon-arrow-down');
+  }
 }

data/app/assets/stylesheets/hubstats/application.css

@@ -76,6 +76,10 @@
   border-radius: 5px;
 }
 
+.users {
+  margin: 0px 0px 15px 0px;
+}
+
 .pulls > .col, .comments > .col, .users > .col, .repos > .col{
   padding: 0px 5px 0px 5px;
 }
@@ -124,4 +128,14 @@
 
 .subtle:hover {
   text-decoration: none;
+}
+
+.header {
+  text-align: center;
+  margin: 0px;
+}
+
+a.header:hover {
+  cursor: pointer;
+  text-decoration: none;
 }

data/app/controllers/hubstats/repos_controller.rb

@@ -28,9 +28,10 @@ module Hubstats
         user_count: @user_count,
         pull_count: @pull_count,
         comment_count: Hubstats::Comment.belonging_to_repo(@repo.id).created_since(@timespan).count(:all),
-        avg_additions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_repo(@repo.id).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_repo(@repo.id).average(:deletions).to_i,
-        net_additions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_repo(@repo.id).sum(:additions).to_i - Hubstats::PullRequest.updated_since(@timespan).belonging_to_repo(@repo.id).sum(:deletions).to_i
+        avg_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).average(:additions).to_i,
+        avg_deletions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).average(:deletions).to_i,
+        net_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).sum(:additions).to_i -
+          Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).sum(:deletions).to_i
       }
     end
 
@@ -41,10 +42,10 @@ module Hubstats
       @user_count = Hubstats::User.with_pulls_or_comments(@timespan).only_active.length
       @stats = {
         user_count: @user_count,
-        pull_count: Hubstats::PullRequest.updated_since(@timespan).count(:all),
+        pull_count: Hubstats::PullRequest.merged_since(@timespan).count(:all),
         comment_count: Hubstats::Comment.created_since(@timespan).count(:all),
-        avg_additions: Hubstats::PullRequest.updated_since(@timespan).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.updated_since(@timespan).average(:deletions).to_i
+        avg_additions: Hubstats::PullRequest.merged_since(@timespan).average(:additions).to_i,
+        avg_deletions: Hubstats::PullRequest.merged_since(@timespan).average(:deletions).to_i
       }
     end
   end

data/app/controllers/hubstats/users_controller.rb

@@ -26,12 +26,13 @@ module Hubstats
       @pull_count = Hubstats::PullRequest.belonging_to_user(@user.id).updated_since(@timespan).count(:all)
       @comment_count = Hubstats::Comment.belonging_to_user(@user.id).created_since(@timespan).count(:all)
       @stats = {
-        pull_count: @pull_count,
+        pull_count: Hubstats::PullRequest.belonging_to_user(@user.id).merged_since(@timespan).count(:all),
         comment_count: @comment_count,
         review_count: @review ? @review.reviews_count : 0,
-        avg_additions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_user(@user.id).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_user(@user.id).average(:deletions).to_i,
-        net_additions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_user(@user.id).sum(:additions).to_i - Hubstats::PullRequest.updated_since(@timespan).belonging_to_user(@user.id).sum(:deletions).to_i
+        avg_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).average(:additions).to_i,
+        avg_deletions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).average(:deletions).to_i,
+        net_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).sum(:additions).to_i -
+          Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).sum(:deletions).to_i
       }
     end
 

data/app/models/hubstats/pull_request.rb

@@ -3,6 +3,7 @@ module Hubstats
     scope :closed_since, lambda {|time| where("hubstats_pull_requests.closed_at > ?", time) }
     scope :updated_since, lambda {|time| where("hubstats_pull_requests.updated_at > ?", time) }
     scope :opened_since, lambda {|time| where("hubstats_pull_requests.created_at > ?", time) }
+    scope :merged_since, lambda {|time| where("hubstats_pull_requests.merged").where("hubstats_pull_requests.created_at > ?", time) }
     scope :belonging_to_repo, lambda {|repo_id| where(repo_id: repo_id)}
     scope :belonging_to_user, lambda {|user_id| where(user_id: user_id)}
     scope :belonging_to_repos, lambda {|repo_id| where(repo_id: repo_id.split(',')) if repo_id}
@@ -64,6 +65,5 @@ module Hubstats
         scoped
       end
     end
-
   end
 end

data/app/models/hubstats/user.rb

@@ -3,16 +3,19 @@ module Hubstats
 
     scope :with_id, lambda {|user_id| where(id: user_id.split(',')) if user_id}
 
+    scope :merged_pulls, lambda { 
+      where("hubstats_pull_requests.merged = '1'")
+    }
     scope :pull_requests_count, lambda { |time|
       select("hubstats_users.id as user_id")
       .select("COUNT(DISTINCT hubstats_pull_requests.id) AS pull_request_count")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.closed_at > '#{time}'")
+      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.created_at > '#{time}'")
       .group("hubstats_users.id")
     }
     scope :pull_requests_count_by_repo, lambda { |time,repo_id|
       select("hubstats_users.id as user_id")
       .select("COUNT(DISTINCT hubstats_pull_requests.id) AS pull_request_count")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.closed_at > '#{time}' AND hubstats_pull_requests.repo_id = '#{repo_id}'")
+      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.created_at > '#{time}' AND hubstats_pull_requests.repo_id = '#{repo_id}'")
       .group("hubstats_users.id")
     }
     scope :comments_count, lambda { |time|
@@ -31,7 +34,7 @@ module Hubstats
       select("hubstats_users.id as user_id")
       .select("COUNT(DISTINCT hubstats_pull_requests.id) as reviews_count")
       .joins("LEFT JOIN hubstats_comments ON hubstats_comments.user_id = hubstats_users.id AND hubstats_comments.created_at > '#{time}'")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.id = hubstats_comments.pull_request_id AND hubstats_pull_requests.closed_at > '#{time}'")
+      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.id = hubstats_comments.pull_request_id AND hubstats_pull_requests.created_at > '#{time}'")
       .where("hubstats_pull_requests.user_id != hubstats_users.id")
       .group("hubstats_users.id")
     }
@@ -40,28 +43,28 @@ module Hubstats
       select("hubstats_users.id as user_id")
       .select("ROUND(IFNULL(AVG(hubstats_pull_requests.additions),0)) AS average_additions")
       .select("ROUND(IFNULL(AVG(hubstats_pull_requests.deletions),0)) AS average_deletions")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.closed_at > '#{time}'")
+      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.created_at > '#{time}'")
       .group("hubstats_users.id")
     }
 
     scope :pull_and_comment_count, lambda { |time|
       select("hubstats_users.*, pull_request_count, comment_count")
-      .joins("LEFT JOIN (#{pull_requests_count(time).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{pull_requests_count(time).merged_pulls.to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
       .joins("LEFT JOIN (#{comments_count(time).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
       .group("hubstats_users.id")
     }
 
     scope :pull_and_comment_count_by_repo, lambda { |time,repo_id|
       select("hubstats_users.*, pull_request_count, comment_count")
-      .joins("LEFT JOIN (#{pull_requests_count_by_repo(time,repo_id).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{pull_requests_count_by_repo(time,repo_id).merged_pulls.to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
       .joins("LEFT JOIN (#{comments_count_by_repo(time,repo_id).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
       .group("hubstats_users.id")
     }
 
     scope :with_all_metrics, lambda { |time|
       select("hubstats_users.*, pull_request_count, comment_count, average_additions, average_deletions")
-      .joins("LEFT JOIN (#{averages(time).to_sql}) AS averages ON averages.user_id = hubstats_users.id")
-      .joins("LEFT JOIN (#{pull_requests_count(time).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{averages(time).merged_pulls.to_sql}) AS averages ON averages.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{pull_requests_count(time).merged_pulls.to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
       .joins("LEFT JOIN (#{comments_count(time).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
       .group("hubstats_users.id")
     }
@@ -98,17 +101,23 @@ module Hubstats
       end
     end
 
-    def self.custom_order(order)
-
-      case order
-      when 'largest-pulls'
-        order("average_additions = 0, average_additions DESC")
-      when 'most-active'
-        order("(pull_request_count)*2 + (comment_count) DESC")
-      when 'least-active'
-        order("(pull_request_count)*2 + (comment_count) ASC")
-      else
-        order("average_additions = 0, average_additions ASC")
+    def self.custom_order(order_params)
+      if order_params
+        order = order_params.include?('asc') ? "ASC" : "DESC"
+        case order_params.split('-').first
+        when 'pulls'
+          order("pull_request_count #{order}")
+        when 'comments'
+          order("pull_request_count #{order}")
+        when 'additions'
+          order("average_additions #{order}")
+        when 'deletions'
+          order("average_deletions #{order}")
+        else
+          order("pull_request_count #{order}")
+        end
+      else 
+        order("pull_request_count DESC")
       end
     end
 

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

@@ -8,11 +8,13 @@
       <%= link_to pull.title, repo_pull_path({:repo => pull.repo.name, :id => pull.id}) %> 
     </h4>
     by <%= link_to pull.user.login, user_path(pull.user) %>
-    <% if pull.state == 'closed' %>
+    <% if pull.merged == '1'%>
+      <%= "merged #{time_ago_in_words(pull.created_at)} ago "%>
+    <% elsif pull.state == 'closed' %>
       <%= "closed #{time_ago_in_words(pull.closed_at)} ago "%>
-    <% else %>
+    <% else %> 
       <%= "opened #{time_ago_in_words(pull.created_at)} ago "%>
-    <% end %> 
+    <% end %>
   </div>
 
   <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2" >

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

@@ -13,11 +13,13 @@
     <% end %>
     <br>
     by <%= link_to pull.user.login, user_path(pull.user) %>
-    <% if pull.state == 'closed' %>
+    <% if pull.merged == '1'%>
+      <%= "merged #{time_ago_in_words(pull.created_at)} ago "%>
+    <% elsif pull.state == 'closed' %>
       <%= "closed #{time_ago_in_words(pull.closed_at)} ago "%>
-    <% else %>
+    <% else %> 
       <%= "opened #{time_ago_in_words(pull.created_at)} ago "%>
-    <% end %> 
+    <% end %>
   </div>
 
   <div class="col-lg-2 col-md-2 col-sm-2" >

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

@@ -15,31 +15,27 @@
     </h4>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="pull-right">
+    <div class="text-center">
       <span class="text-large"><%= user.pull_request_count %></span>
       <span class="mega-octicon octicon-git-pull-request"></span>
-      <p class="text-small text-center"> pulls </p>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="pull-right">
+    <div class="text-center">
       <span class="text-large"><%= user.comment_count %></span>
       <span class="mega-octicon octicon-comment"></span>
-      <p class="text-small text-center"> comments </p>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="pull-right">
+    <div class="text-center">
       <span class="text-large"><%= user.average_additions %></span>
       <span class="mega-octicon octicon-plus"></span>
-      <p class="text-small text-center"> additions </p>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="pull-right">
+    <div class="text-center">
       <span class="text-large"><%= user.average_deletions %></span>
       <span class="mega-octicon octicon-dash"></span>
-      <p class="text-small text-center"> deletions </p>
     </div>
   </div>
 

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

@@ -1,5 +1,21 @@
 <% if @users.length > 0 %>
   <div class="users">
+    <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="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>
+      <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>
     <%= render partial: 'hubstats/partials/user', collection: @users, as: :user %>
   </div>
 <% else %>

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

@@ -13,22 +13,6 @@
 
     <div class="col-lg-9">
 
-      <div id="user-sort-group" class="btn-group" data-toggle="buttons">
-        <label class="btn btn-default" id='smallest-pulls'>
-          <input type="radio" name="sort"> Smallest Pulls
-        </label>
-        <label class="btn btn-default" id='largest-pulls'>
-          <input type="radio" name="sort"> Largest Pulls
-        </label>
-        <label class="btn btn-default" id='most-active'>
-          <input type="radio" name="sort"> Most Active
-        </label>
-        <label class="btn btn-default" id='least-active'>
-          <input type="radio" name="sort"> Least Active
-        </label>
-      </div>
-
-  
       <%= render 'hubstats/tables/users' %>
 
       <div class="text-center">

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Elliot Hursh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,10 +129,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".automation.yml"
 - ".gitignore"
+- ".octopolo.yml"
 - ".rspec"
+- ".soyuz.yml"
 - ".travis.yml"
+- CHANGELOG.markdown
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -292,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Github Statistics

data/.automation.yml

@@ -1 +0,0 @@
-github_repo: sportngin/hubstats