hubstats 0.4.4 → 0.5.0

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/lib/tasks/hubstats_tasks.rake

@@ -9,6 +9,7 @@ namespace :hubstats do
     Rake::Task['db:migrate'].invoke
     puts "Pulling data from Github. This may take a while..."
     Rake::Task['hubstats:populate:setup_repos'].invoke
+    Rake::Task['hubstats:populate:setup_teams'].invoke
   end
 
   desc "Drops the database, then runs rake hubstats:setup"
@@ -30,4 +31,22 @@ namespace :hubstats do
     Rake::Task['db:seed'].invoke
   end
 
+  desc "Updates the teams for past pull requests"
+  task :update_teams_in_pulls => :environment do
+    puts "Updating teams for past pull requests"
+    Rake::Task['hubstats:populate:update_teams_in_pulls'].invoke
+  end
+
+  desc "Updates the teams"
+  task :update_teams => :environment do
+    puts "Updating teams"
+    Rake::Task['hubstats:populate:update_teams'].invoke
+  end
+
+  desc "Creates webhook from github for organization"
+  task :make_org_webhook => :environment do
+    puts "Making a webhook for an organization in octokit.yml"
+    Rake::Task['hubstats:populate:setup_teams'].invoke
+  end
+
 end

data/lib/tasks/populate_task.rake

@@ -7,8 +7,10 @@ namespace :hubstats do
       Hubstats::GithubAPI.get_repos.each do |repo|
         Rake::Task["hubstats:populate:setup_repo"].execute({repo: repo})
       end
-      puts "Finished with initial population, grabing extra info about pull requests"
+      puts "Finished with initial population, grabbing extra info about pull requests"
       Rake::Task["hubstats:populate:update_pulls"].execute
+      puts "Finished grabbing info about pull requests, populating teams"
+      Rake::Task["hubstats:populate:teams"].execute
     end
 
     desc "Updates which repos hubstats tracks" 
@@ -20,6 +22,27 @@ namespace :hubstats do
       end
       puts "Finished with initial updating, grabbing extra info about pull requests"
       Rake::Task["hubstats:populate:update_pulls"].execute
+      puts "Finished grabbing info about pull requests, populating teams"
+      Rake::Task["hubstats:populate:teams"].execute
+    end
+
+    desc "Updates teams for past pull requests"
+    task :update_teams_in_pulls => :environment do
+      Rake::Task["hubstats:populate:update_teams_in_prs"].execute
+    end
+
+    desc "Updates the teams"
+    task :update_teams => :environment do
+      Rake::Task['hubstats:populate:teams'].execute
+    end
+
+    desc "Creates the webhook for the current org"
+    task :setup_teams => :environment do
+      Rake::Task['hubstats:populate:create_org_hook'].execute
+    end
+
+    task :create_org_hook => :environment do
+      Hubstats::GithubAPI.create_org_hook(config.github_config["org_name"])
     end
 
     desc "Pulls in all information for an indivdual repo"
@@ -31,7 +54,7 @@ namespace :hubstats do
       Rake::Task["hubstats:populate:pulls"].execute({repo: repo})
       Rake::Task["hubstats:populate:comments"].execute({repo: repo})
       Rake::Task["hubstats:populate:labels"].execute({repo: repo})
-    end 
+    end
 
     desc "Pull members from Github saves in database"
     task :users, [:repo] => :environment do |t, args|
@@ -80,6 +103,16 @@ namespace :hubstats do
       end
     end
 
+    desc "indivdually gets and updates all of the teams"
+    task :teams => :environment do
+      Hubstats::GithubAPI.update_teams
+    end
+
+    desc "updates the teams for all pull requests from past 365 days"
+    task :update_teams_in_prs => :environment do
+      Hubstats::PullRequest.update_teams_in_pulls(365)
+    end
+
     desc "Updates WebHooks for all repos"
     task :update_hooks, [:old_endpoint] => :environment do |t, args|
       Hubstats::Repo.all.each do |repo|

data/spec/controllers/hubstats/repos_controller_spec.rb

@@ -45,6 +45,7 @@ module Hubstats
         expect(assigns(:repo).pull_requests).to contain_exactly(pull1, pull2)
         expect(assigns(:repo).deploys).to contain_exactly(deploy1, deploy2)
         expect(assigns(:repo).owner_id).to eq(user.id)
+        expect(response).to have_http_status(200)
       end
     end
 

data/spec/controllers/hubstats/teams_controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+module Hubstats
+  describe TeamsController, :type => :controller do
+    routes { Hubstats::Engine.routes }
+
+    describe "#index" do
+      it "should return all of the teams" do
+        team1 = create(:team, :name => "Team One", :hubstats => true)
+        team2 = create(:team, :name => "Team Two", :hubstats => false)
+        team3 = create(:team, :name => "Team Three", :hubstats => true)
+        team4 = create(:team, :name => "Team Four", :hubstats => true)
+        expect(Hubstats::Team).to receive_message_chain("with_id.custom_order.paginate").and_return([team1, team2, team3, team4])
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("ignore_users_list") { ["user"] }
+        get :index
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    describe "#show" do
+      it "should return the team and all of its users and pull requests" do
+        team = create(:team, :name => "Team Tests Passing", :hubstats => true, :id => 1)
+        user1 = create(:user, :id => 101010, :login => "examplePerson1")
+        user2 = create(:user, :id => 202020, :login => "examplePerson2")
+        team.users << user1
+        team.users << user2
+        pull1 = create(:pull_request, :user => user1, :id => 303030, :team => team)
+        pull2 = create(:pull_request, :user => user2, :id => 404040, :team => team, :repo => pull1.repo)
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("ignore_users_list") { ["user"] }
+        get :show, id: 1
+        expect(assigns(:team)).to eq(team)
+        expect(pull1.team_id).to eq(team.id)
+        expect(pull2.team_id).to eq(team.id)
+        expect(assigns(:team).users).to contain_exactly(user1, user2)
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+end

data/spec/controllers/hubstats/users_controller_spec.rb

@@ -12,6 +12,7 @@ module Hubstats
         user4 = create(:user, :id => 404040, :login => "examplePerson4")
         expect(Hubstats::User).to receive_message_chain("with_id.custom_order.paginate").and_return([user2, user3, user1, user4])
         get :index
+        expect(response).to have_http_status(200)
       end
     end
 
@@ -29,6 +30,7 @@ module Hubstats
         expect(assigns(:user).pull_requests).to contain_exactly(pull1, pull2)
         expect(assigns(:user).deploys).to contain_exactly(deploy1, deploy2)
         expect(assigns(:user).comments).to contain_exactly(comment2, comment1)
+        expect(response).to have_http_status(200)
       end
     end
   end

data/spec/factories/pull_requests.rb

@@ -35,5 +35,5 @@ FactoryGirl.define do
     merged_by(:id => 202020)
 
     initialize_with { attributes } 
-  end 
+  end
 end

data/spec/factories/teams.rb

@@ -0,0 +1,24 @@
+# Generates fake team data we can use to test with
+FactoryGirl.define do
+  factory :team, :class => Hubstats::Team do
+    name "Team One"
+    hubstats true
+  end
+
+  factory :team_hash, class:Hash do
+    association :user, factory: :user_hash, strategy: :build
+    id {Faker::Number.number(6).to_i}
+    name "Team One"
+    hubstats true
+    action "added"
+    initialize_with { attributes } 
+  end
+
+  factory :team_payload_hash, class:Hash do 
+    id {Faker::Number.number(6).to_i}
+    type "MembershipEvent"
+    association :user, factory: :user_hash, strategy: :build
+    association :team, factory: :team_hash, strategy: :build
+    initialize_with { attributes } 
+  end 
+end

data/spec/factories/users.rb

@@ -13,5 +13,4 @@ FactoryGirl.define do
 
     initialize_with { attributes } 
   end
-
 end

data/spec/lib/hubstats/events_handler_spec.rb

@@ -10,7 +10,7 @@ module Hubstats
       subject {Hubstats::EventsHandler.new()}
       it 'should successfully route the event' do
         expect(subject).to receive(:pull_processor)
-        subject.route(payload,payload[:type])
+        subject.route(payload, payload[:type])
       end
 
       it 'should add labels to pull request' do
@@ -18,7 +18,7 @@ module Hubstats
         allow(Repo).to receive(:where) {[repo,repo]}
         allow(GithubAPI).to receive(:get_labels_for_pull) {['low','high']}
         expect(pull).to receive(:add_labels).with(['low','high'])
-        subject.route(payload,payload[:type])
+        subject.route(payload, payload[:type])
       end
     end
 
@@ -27,22 +27,52 @@ module Hubstats
         ehandler = EventsHandler.new()
         payload = build(:comment_payload_hash)
         expect(ehandler).to receive(:comment_processor)
-
-        ehandler.route(payload,payload[:type])
+        ehandler.route(payload, payload[:type])
       end
 
       it 'should successfully process the event' do
         ehandler = Hubstats::EventsHandler.new()
         payload = build(:comment_payload_hash)
         expect(Hubstats::Comment).to receive(:create_or_update)
-
-        ehandler.route(payload,payload[:type])
+        ehandler.route(payload, payload[:type])
       end
 
       it 'should successfully creates_or_updates the event' do
         ehandler = Hubstats::EventsHandler.new()
         payload = build(:comment_payload_hash)
-        expect(ehandler.route(payload,payload[:type]).class).to eq(Hubstats::Comment)
+        expect(ehandler.route(payload, payload[:type]).class).to eq(Hubstats::Comment)
+      end
+    end
+
+    context "TeamEvent" do
+      it 'should successfully route the team' do
+        ehandler = EventsHandler.new()
+        payload = build(:team_payload_hash)
+        expect(ehandler).to receive(:team_processor)
+        ehandler.route(payload, payload[:type])
+      end
+
+      it 'should successfully process the team' do
+        ehandler = Hubstats::EventsHandler.new()
+        payload = build(:team_payload_hash)
+        user = build(:user)
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("team_list") { ["Team One", "Team Two", "Team Three"] }
+        allow(Hubstats::User).to receive(:create_or_update).and_return(user)
+        expect(Hubstats::Team).to receive(:create_or_update)
+        expect(Hubstats::Team).to receive(:update_users_in_team)
+        ehandler.route(payload, payload[:type])
+      end
+
+      it 'should successfully create_or_update the team' do
+        ehandler = Hubstats::EventsHandler.new()
+        payload = build(:team_payload_hash)
+        team = build(:team)
+        user = build(:user)
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("team_list") { ["Team One", "Team Two", "Team Three"] }
+        allow(Hubstats::User).to receive(:create_or_update).and_return(user)
+        expect(Hubstats::Team).to receive(:update_users_in_team)
+        expect(Hubstats::Team).to receive(:create_or_update).and_return(team)
+        ehandler.route(payload, payload[:type])
       end
     end
 

data/spec/lib/hubstats/github_api_spec.rb

@@ -67,6 +67,38 @@ module Hubstats
       end
     end
 
+    context '.update_teams' do
+      subject {Hubstats::GithubAPI}
+      let(:org) {'sportngin'}
+      let(:team1) {build(:team_hash, :name => "Team One")}
+      let(:team2) {build(:team_hash, :name => "Team Four")}
+      let(:team3) {build(:team_hash, :name => "Team Five")}
+      let(:team4) {build(:team_hash, :name => "Team Six")}
+      let(:team) {build(:team)}
+      let(:user1) {build(:user_hash)}
+      let(:user2) {build(:user_hash)}
+      let(:user3) {build(:user_hash)}
+      let(:hubstats_user) {build(:user)}
+      let(:access_token) { "access_token" }
+      let(:user) { double }
+      let(:client) { double(:user => user) }
+
+      it 'should successfully update all teams' do
+        allow_message_expectations_on_nil
+        allow(client).to receive(:organization_teams).with("sportngin").and_return([team1, team2, team3, team4])
+        allow(client).to receive(:team_members).with(team1[:id]).and_return([user1, user2, user3])
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("team_list") { ["Team One", "Team Two", "Team Three"] }
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("org_name") {"sportngin"}
+        allow(Hubstats::GithubAPI).to receive(:client).and_return(client)
+        allow(client).to receive(:rate_limit)
+        allow(Hubstats::Team).to receive_message_chain(:where, :name).with("Team One")
+        allow(Hubstats::Team.where(name: "Team One")).to receive(:first).and_return(team)
+        allow(client).to receive_message_chain(:rate_limit, :remaining).and_return(500)
+        expect(Hubstats::Team).to receive(:create_or_update).at_least(:once)
+        subject.update_teams
+      end
+    end
+
     context ".update_hook" do
       subject {Hubstats::GithubAPI}
       let(:repo) {'hubstats'}
@@ -98,16 +130,37 @@ module Hubstats
         allow(subject).to receive(:client) {client}
       end
 
-      it "should call octokit create_hook" do
+      it "should call octokit create_hook for repositories" do
         expect(client).to receive(:create_hook)
         subject.create_hook(repo)
       end
 
-      it "should rescue unprocessable entity" do
+      it "should rescue unprocessable entity from repo hook" do
         allow(client).to receive(:create_hook) { raise Octokit::UnprocessableEntity }
         subject.create_hook(repo)
       end
     end
 
+    context ".create_org_hook" do
+      subject {Hubstats::GithubAPI}
+      let(:config) {double(:webhook_secret => 'a1b2c3d4', :webhook_endpoint => "hubstats.com")}
+      let(:client) {double}
+      let(:org) {double(:full_name => 'sportngin') }
+      before do
+        allow(Hubstats).to receive(:config) {config}
+        allow(subject).to receive(:client) {client}
+      end
+
+      it "should call octokit create_hook for organizations" do
+        expect(client).to receive(:create_hook)
+        subject.create_hook(org)
+      end
+
+      it "should rescue unprocessable entity from organization hook" do
+        allow(client).to receive(:create_hook) { raise Octokit::UnprocessableEntity }
+        subject.create_hook(org)
+      end
+    end
+
   end
 end

data/spec/lib/hubstats_spec.rb

@@ -3,9 +3,15 @@ require 'spec_helper'
 describe Hubstats
   context ".config" do
     subject { Hubstats }
-    after do
+    
+    before do
       Hubstats.class_variable_set(:@@config, nil)
     end
+
+    after do
+      Hubstats.remove_class_variable(:@@config)
+    end
+    
     it "creates a new config object" do
       expect(Hubstats::Config).to receive(:parse).once { double(:config) }
       subject.config

data/spec/models/hubstats/pull_request_spec.rb

@@ -41,5 +41,39 @@ module Hubstats
       expect(deploy.user_id).to eq(nil)
       expect(pull_request.deploy.user_id).to eq(202020)
     end
+
+    it "should track the team_id when making a pull request" do
+      user_hash = {login: 'name', id: '12345'}
+      user = User.create(user_hash)
+      team = create(:team, id: 1010)
+      team.users << user
+      pull = build(:pull_request_hash, :user => user_hash)
+      pull_request = PullRequest.create_or_update(pull)
+      expect(pull_request.user_id).to eq(user[:id])
+      expect(pull_request.team_id).to eq(team[:id])
+    end
+
+    it "should leave the team_id of a pull request blank if user is not part of a team" do
+      user_hash = {login: 'name', id: '12345'}
+      user = User.create(user_hash)
+      pull = build(:pull_request_hash, :user => user_hash)
+      pull_request = PullRequest.create_or_update(pull)
+      expect(pull_request.user_id).to eq(user[:id])
+      expect(pull_request.team_id).to eq(nil)
+    end
+
+    it 'should update the team_ids in pull requests' do
+      team = build(:team)
+      repo = build(:repo)
+      user1 = build(:user)
+      user2 = build(:user, :id => 7)
+      team.users << user1
+      team.users << user2
+      pull1 = build(:pull_request, :created_at => Date.today - 250, :user => user1)
+      pull2 = build(:pull_request, :created_at => Date.today - 3, :repo => repo, :user => user2)
+      Hubstats::PullRequest.update_teams_in_pulls(365)
+      expect(pull1.team_id).to eq(team.id)
+      expect(pull2.team_id).to eq(team.id)
+    end
   end
 end

data/spec/models/hubstats/team_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Hubstats
+  describe Team, :type => :model do
+    it 'should create a team' do
+      team_hash = {name: "Team Tippy-Tappy-Toes",
+                   hubstats: true}
+      team = Team.create(team_hash)
+      expect(Team.count).to eq(1)
+      expect(team.name).to eq("Team Tippy-Tappy-Toes")
+      expect(team.hubstats).to eq(true)
+    end
+
+    it 'should add a member to a team' do
+      user = build(:user)
+      action = "added"
+      team = build(:team)
+      Hubstats::Team.update_users_in_team(team, user, action)
+      expect(team.users).to eq([user])
+      expect(team.users.length).to eq(1)
+    end
+  end
+end