hubstats 0.12.2 → 1.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c64060494a5b0519e55a8baaa92e0275adfec5f
-  data.tar.gz: 32d75bfb93d1eaa5b2923832fe5b177d17364ce8
+SHA256:
+  metadata.gz: ed7d93b16a3876de97581f4dc7c76be14e2cf40bee2ead1883231283cdd264e3
+  data.tar.gz: a59a5cde37267a9595f763d55916d7ef05412f6126c0578c5ba7a92de8b37e98
 SHA512:
-  metadata.gz: dedcad39ebd8266563d7ebe10ada5d9a1fbf78fb990abc21d9cfff5d3b7f7aa05af4b0e47544df274b497cf21332e5cf8c940163e5b1fb690a98461759825d99
-  data.tar.gz: a5ead0f76dd1b3679795dc1dc7fd250ac864e0245f6c46954eac361e38f5075b88e7a04add615b2e8859eb38d58764536924329997c4013c2cf41037437dfa5b
+  metadata.gz: e7666522d273e5ec4c581ab965631669685d952b478c374849593fc862a9a69fc26b4100ebe47c92b6a497076dcafc7429cdfc0e05ebb4ce972ba3aa0d767ba7
+  data.tar.gz: 2e1536857df35eb959f0011ba1c5dedea3fd93bfe001280ca72150db505051e76065619bc1c5d45e96dc65f68fa923c7e035fb9e6b385cd09017a669c4e5d697

data/.travis.yml

@@ -1,9 +1,11 @@
 sudo: false
+dist: trusty
+language: ruby
+cache: bundler
+
 branches:
   only:
     - master
-language: ruby
-cache: bundler
 rvm:
   - 2.1
   - 2.2

data/app/controllers/hubstats/application_controller.rb

@@ -4,10 +4,9 @@ module Hubstats
 
     # Private - Reads the cookie, and then either sets @start_date and @end_date to be the cookie's values
     # or sets them to be today + 1 and two weeks ago.
-    # 
-    # Returns -  nothing 
-    private
-    def set_time
+    #
+    # Returns -  nothing
+    private def set_time
       cookie = cookies[:hubstats_dates]
       if cookie == nil || cookie.include?("null")
         @start_date = Date.today - 14

data/app/controllers/hubstats/deploys_controller.rb

@@ -78,7 +78,7 @@ module Hubstats
     #
     # repo - the repository
     #
-    # Returns - true if the repo is valid 
+    # Returns - true if the repo is valid
     def valid_repo(repo)
       return !repo.empty?
     end
@@ -106,8 +106,7 @@ module Hubstats
     # Private - Allows only these parameters to be added when creating a deploy
     #
     # Returns - hash of parameters
-    private
-    def deploy_params
+    private def deploy_params
       params.permit(:git_revision, :repo_name, :deployed_at, :user_id, :pull_request_ids)
     end
   end

data/app/controllers/hubstats/events_controller.rb

@@ -11,7 +11,7 @@ module Hubstats
     # Returns - nothing, but makes a new event
     def handler
       verify_signature(request)
-      
+
       kind = request.headers['X-Github-Event']
       event = event_params.with_indifferent_access
 
@@ -25,12 +25,11 @@ module Hubstats
     end
 
     # Public - Will check that the request passed is a valid signature.
-    # 
+    #
     # request - the signature to be checked
     #
     # Returns - an error if the signatures don't match
-    private
-    def verify_signature(request)
+    private def verify_signature(request)
       request.body.rewind
       payload_body = request.body.read
       signature = 'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), Hubstats.config.webhook_endpoint, payload_body)
@@ -40,8 +39,7 @@ module Hubstats
     # Private - Allows only these parameters to be added when creating an event
     #
     # Returns - hash of parameters
-    private
-    def event_params
+    private def event_params
       params.permit!
     end
   end

data/app/models/hubstats/team.rb

@@ -6,11 +6,11 @@ module Hubstats
     scope :with_id, lambda {|team_id| where(id: team_id.split(',')) if team_id}
 
     # Public - Counts all of the comments a selected team's members have written that occurred between the start_date and end_date.
-    # 
+    #
     # start_date - the start of the date range
     # end_date - the end of the data range
     # user_id_array - an array of all of the user ids in selected team
-    # 
+    #
     # Returns - count of comments
     scope :comments_count, lambda {|start_date, end_date|
       select("IFNULL(COUNT(DISTINCT hubstats_comments.id),0) AS comment_count, hubstats_teams.id as team_id")
@@ -20,10 +20,10 @@ module Hubstats
     }
 
     # Public - Counts all of the merged pull requests for selected team's users that occurred between the start_date and end_date.
-    # 
+    #
     # start_date - the start of the date range
     # end_date - the end of the data range
-    # 
+    #
     # Returns - count of pull requests
     scope :pull_requests_count, lambda {|start_date, end_date|
       select("hubstats_teams.id as team_id")
@@ -33,10 +33,10 @@ module Hubstats
     }
 
     # Public - Joins all of the metrics together for selected team: net additions, comments, repos, and pull requests.
-    # 
+    #
     # start_date - the start of the date range
     # end_date - the end of the data range
-    # 
+    #
     # Returns - all of the stats about the team
     scope :with_all_metrics, lambda {|start_date, end_date|
       select("hubstats_teams.*, pull_request_count, comment_count")
@@ -46,14 +46,14 @@ module Hubstats
     }
 
     has_and_belongs_to_many :users, :join_table => 'hubstats_teams_users', :uniq => true
-    
-    # Public - Checks if the team is currently existing, and if it isn't, then makes a new team with 
+
+    # Public - Checks if the team is currently existing, and if it isn't, then makes a new team with
     # the specifications that are passed in. We are assuming that if it is not already existent,
     # then we probably don't really care about the team, so our hubstats boolean will be set to false.
     #
     # github_team - the info that's passed in about the new or updated team
     #
-    # Returns - the team 
+    # Returns - the team
     def self.create_or_update(github_team)
       github_team = github_team.to_h.with_indifferent_access if github_team.respond_to? :to_h
 
@@ -88,5 +88,12 @@ module Hubstats
     def self.order_by_name
       order("name ASC")
     end
+
+    def self.designed_for_hubstats?(description)
+      description.include?("hubstats") ||
+      description.include?("Hubstats") ||
+      description.include?("hub") ||
+      description.include?("Hub")
+    end
   end
 end

data/lib/generators/hubstats/octokit.example.yml

@@ -3,9 +3,8 @@ github_auth: # Must include access_token
 
 github_config: # Must include org_name. The repo_list, team_list, and ignore_users_list are optional.
   # org_name: <ORGANIZATION NAME>
-  # team_list: [<ARRAY OF TEAMS>]
-  # repo_list: [<ARRAY OF REPOS>]
-  # ignore_users_list: [<ARRAY OF USERS' LOGINS TO IGNORE>]
+  # repo_list: [<ARRAY OF OPTIONAL REPOS>]
+  # ignore_users_list: [<ARRAY OF OPTIONAL USERS' LOGINS TO IGNORE>]
 
 webhook_secret: #<40 CHARACTER ACCESS TOKEN >
 webhook_endpoint: #<url of webhook endpoint>

data/lib/hubstats/events_handler.rb

@@ -17,8 +17,10 @@ module Hubstats
         pull_processor(payload)
       when "pull_request_review_comment", "PullRequestReviewCommentEvent"
         comment_processor(payload, "PullRequest")
-      when "membership", "MembershipEvent"
+      when "membership", "MembershipEvent", "team", "TeamEvent"
         team_processor(payload)
+      when "repository", "RepositoryEvent"
+        repository_processor(payload)
       end
     end
 
@@ -67,8 +69,17 @@ module Hubstats
     # Returns - nothing, but updates or makes the team
     def team_processor(payload)
       team = payload[:team]
-      team_list = Hubstats.config.github_config["team_list"] || []
-      if team_list.include? team[:name]
+
+      if payload[:scope] == "team" && payload[:action] == "added"
+        if Hubstats::Team.designed_for_hubstats?(team[:description])
+           Hubstats::Team.create_or_update(team.with_indifferent_access)
+           hubstats_team = Hubstats::Team.where(name: team[:name]).first
+           hubstats_user = Hubstats::User.create_or_update(payload[:member])
+           Hubstats::Team.update_users_in_team(hubstats_team, hubstats_user, payload[:github_action])
+        end
+      end
+
+      if payload[:action] == "edited" && Hubstats::Team.designed_for_hubstats?(team[:description])
         Hubstats::Team.create_or_update(team.with_indifferent_access)
         hubstats_team = Hubstats::Team.where(name: team[:name]).first
         hubstats_user = Hubstats::User.create_or_update(payload[:member])
@@ -76,6 +87,17 @@ module Hubstats
       end
     end
 
+    def repository_processor(payload)
+      repo = payload[:repository]
+
+      if payload[:action] == "created" # it's a new repository
+        Hubstats::Repo.create_or_update
+        Hubstats::GithubAPI.create_repo_hook(repo)
+        # The hook was probably already made when we made the repository,
+        # but we'll put this here just in case
+      end
+    end
+
     # Public - Grabs the PR number off of any of the various places it can be
     #
     # payload - the thing that we will use to try to attain the PR number

data/lib/hubstats/github_api.rb

@@ -100,10 +100,9 @@ module Hubstats
         Octokit.auto_paginate = true
         client = Hubstats::GithubAPI.client
         all_teams_in_org = client.organization_teams(Hubstats.config.github_config["org_name"])
-        team_list = Hubstats.config.github_config["team_list"] || []
 
         all_teams_in_org.each do |team|
-          if team_list.include? team[:name]
+          if Hubstats::Team.designed_for_hubstats?(team[:description])
             puts "Making a team"
             Hubstats::Team.create_or_update(team)
             users = client.team_members(team[:id])
@@ -126,12 +125,12 @@ module Hubstats
     # Public - Goes through entire team database and updates the hubstats boolean based on the octokit.yml file
     #
     # Returns - nothing
-    def self.deprecate_teams_from_file
-      team_list = Hubstats.config.github_config["team_list"] || []
+    def self.deprecate_teams
       teams = Hubstats::Team.all
 
       teams.each do |team|
-        if (!team_list.include? team[:name]) && (team[:hubstats] == true)
+        desc = client.team(team.id)[:description]
+        if Hubstats::Team.designed_for_hubstats?(desc) && (team[:hubstats] == true)
           team.update_column(:hubstats, false)
           team.save!
           puts "Changed #{team[:name]} from true to false"
@@ -147,7 +146,7 @@ module Hubstats
     # repo - the repository that is attempting to have a hook made with
     #
     # Returns - the hook and a message (or just a message and no hook)
-    def self.create_hook(repo)
+    def self.create_repo_hook(repo)
       begin
         client.create_hook(
           repo.full_name,
@@ -185,7 +184,7 @@ module Hubstats
             :secret => Hubstats.config.webhook_secret
           },
           {
-            :events => ['membership'],
+            :events => ['membership', 'repository', 'team'],
             :active => true
           }
         )
@@ -197,36 +196,6 @@ module Hubstats
       end
     end
 
-    # Public - Delete webhook from github repository
-    #
-    # repo - a repo github object
-    # old_endpoint - A string of the previous endpoint
-    #
-    # Return - nothing
-    def self.delete_hook(repo, old_endpoint)
-      begin
-        client.hooks(repo.full_name).each do |hook|
-          if hook[:config][:url] == old_endpoint
-            Hubstats::GithubAPI.client.remove_hook(repo.full_name, hook[:id])
-            puts "Successfully deleted hook with id #{hook[:id]} and url #{hook[:config][:url]} from #{repo.full_name}"
-          end
-        end
-      rescue Octokit::NotFound
-        puts "You don't have sufficient privileges to remove an event hook to #{repo.full_name}"
-      end
-    end
-
-    # Public - updates a hook if it exists, otherwise creates one
-    #
-    # repo - a repo github object
-    # old_endpoint - A string of the previous endpoint
-    #
-    # Returns - the new hook
-    def self.update_hook(repo, old_endpoint = nil)
-      delete_hook(repo, old_endpoint) unless old_endpoint == nil
-      create_hook(repo)
-    end
-
     # Public - gets labels for a particular label
     #
     # repo - a repo github object

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.12.2"
+  VERSION = "1.0.0.beta"
 end

data/lib/tasks/hubstats_tasks.rake

@@ -8,8 +8,7 @@ namespace :hubstats do
     puts "Running rake db:migrate"
     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
+    Rake::Task['hubstats:populate:setup'].invoke
   end
 
   desc "Drops the database, then runs rake hubstats:setup"
@@ -21,8 +20,8 @@ namespace :hubstats do
 
   desc "Updates changes to the config file"
   task :update => :environment do
-    puts "Updating repos"
-    Rake::Task['hubstats:populate:update_repos'].invoke
+    puts "Updating repos and teams"
+    Rake::Task['hubstats:populate:update'].invoke
   end
 
   desc "Updates the seed"
@@ -43,16 +42,15 @@ namespace :hubstats do
     Rake::Task['hubstats:populate:update_teams'].invoke
   end
 
-  desc "Deprecates teams based on the octokit.yml file"
-  task :deprecate_teams_from_file => :environment do
-    puts "Deprecating teams based on whitelist in octokit.yml"
-    Rake::Task['hubstats:populate:deprecate_teams_from_file'].invoke
+  desc "Deprecates teams"
+  task :deprecate_teams => :environment do
+    puts "Deprecating teams"
+    Rake::Task['hubstats:populate:deprecate_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
+    Rake::Task['hubstats:populate:create_organization_hook'].invoke
   end
-
 end

data/lib/tasks/populate_task.rake

@@ -1,23 +1,23 @@
 # A variety of commands that can be used to populate the database information
-namespace :hubstats do 
+namespace :hubstats do
   namespace :populate do
 
     desc "Pull repos from Github saves in database"
-    task :setup_repos => :environment do
+    task :setup => :environment do
       Hubstats::GithubAPI.get_repos.each do |repo|
-        Rake::Task["hubstats:populate:setup_repo"].execute({repo: repo})
+        setup_repo(repo)
       end
       puts "Finished with initial population, grabbing extra info about pull requests"
-      Rake::Task["hubstats:populate:update_pulls"].execute
+      update_pulls
       puts "Finished grabbing info about pull requests, populating teams"
-      Rake::Task["hubstats:populate:teams"].execute
+      update_teams
     end
 
-    desc "Updates which repos hubstats tracks" 
-    task :update_repos => :environment do
+    desc "Updates which repos hubstats tracks"
+    task :update => :environment do
       Hubstats::GithubAPI.get_repos.each_with_index do |repo, index|
         unless Hubstats::Repo.where(full_name: repo.full_name).first
-          Rake::Task["hubstats:populate:setup_repo"].execute({repo: repo})
+          setup_repo(repo)
         end
 
         if index % 10 == 0
@@ -26,49 +26,52 @@ namespace :hubstats do
       end
 
       puts "Finished with initial updating, grabbing extra info about pull requests"
-      Rake::Task["hubstats:populate:update_pulls"].execute
+      update_pulls
       puts "Finished grabbing info about pull requests, populating teams"
-      Rake::Task["hubstats:populate:teams"].execute
+      update_teams
     end
 
     desc "Updates teams for past pull requests"
     task :update_teams_in_pulls => :environment do
-      Rake::Task["hubstats:populate:update_teams_in_prs"].execute
+      update_teams_in_prs
     end
 
     desc "Updates the teams"
     task :update_teams => :environment do
-      Rake::Task['hubstats:populate:teams'].execute
+      update_teams
     end
 
-    desc "Deprecates teams based on the octokit.yml file"
-    task :deprecate_teams_from_file => :environment do
-      Hubstats::GithubAPI.deprecate_teams_from_file
+    desc "Deprecates teams"
+    task :deprecate_teams => :environment do
+      Hubstats::GithubAPI.deprecate_teams
     end
 
     desc "Creates the webhook for the current org"
-    task :setup_teams => :environment do
-      Rake::Task['hubstats:populate:create_org_hook'].execute
+    task :create_organization_hook => :environment do
+      create_org_hook
     end
 
     task :create_org_hook => :environment do
+      create_org_hook
+    end
+
+    private def create_org_hook
       Hubstats::GithubAPI.create_org_hook(Hubstats.config.github_config["org_name"])
     end
 
-    desc "Pulls in all information for an indivdual repo"
-    task :setup_repo, [:repo] => :environment do |t, args|
-      repo = args[:repo]
+    private def setup_repo(repo)
       Hubstats::Repo.create_or_update(repo)
-      Hubstats::GithubAPI.create_hook(repo)
-      Rake::Task["hubstats:populate:users"].execute({repo: repo})
-      Rake::Task["hubstats:populate:pulls"].execute({repo: repo})
-      Rake::Task["hubstats:populate:comments"].execute({repo: repo})
-      Rake::Task["hubstats:populate:labels"].execute({repo: repo})
+      Hubstats::GithubAPI.create_repo_hook(repo)
+      # These are the pieces that take forever when we run the command. Let's not do this, and just make
+      # hubstats accurate from this time on out.
+      # populate_users(repo)
+      # populate_pulls(repo)
+      # populate_comments(repo)
+      # populate_labels(repo)
     end
 
-    desc "Pull members from Github saves in database"
-    task :users, [:repo] => :environment do |t, args|
-      repo = repo_checker(args[:repo])
+    private def populate_users(repo)
+      repo = repo_checker(repo)
       puts "Adding contributors to " + repo.full_name
 
       users = Hubstats::GithubAPI.client({:auto_paginate => true}).contribs(repo.full_name)
@@ -77,9 +80,8 @@ namespace :hubstats do
       end unless users == "" # there are no contributors because there are no commits yet
     end
 
-    desc "Pull comments from Github saves in database"
-    task :comments, [:repo] => :environment do |t, args|
-      repo = repo_checker(args[:repo])
+    private def populate_comments(repo)
+      repo = repo_checker(repo)
       puts "Adding comments to " + repo.full_name
 
       pull_comments = Hubstats::GithubAPI.inline(repo.full_name,'pulls/comments')
@@ -87,58 +89,38 @@ namespace :hubstats do
       commit_comments = Hubstats::GithubAPI.inline(repo.full_name,'comments')
     end
 
-    desc "Pull pull requests from Github saves in database"
-    task :pulls, [:repo] => :environment do |t, args|
-      repo = repo_checker(args[:repo])
+    private def populate_pulls(repo)
+      repo = repo_checker(repo)
       puts "Adding pulls to " + repo.full_name
-      
+
       pull_requests = Hubstats::GithubAPI.inline(repo.full_name,'pulls', :state => "all")
     end
 
-    desc "Pull labels from Github saves in database"
-    task :labels, [:repo] => :environment do |t, args|
-      repo = repo_checker(args[:repo])
+    private def populate_labels(repo)
+      repo = repo_checker(repo)
       puts "Getting labels for " + repo.full_name
       Hubstats::GithubAPI.add_labels(repo)
     end
 
-    desc "indivdually gets and updates pull requests"
-    task :update_pulls => :environment do
+    private def update_pulls
       Hubstats::GithubAPI.update_pulls
     end
 
-    desc "Updates labels for all repos"
-    task :update_labels => :environment do
-      Hubstats::Repo.all.each do |repo|
-        Hubstats::GithubAPI.add_labels(repo)
-      end
-    end
-
-    desc "indivdually gets and updates all of the teams"
-    task :teams => :environment do
+    private def update_teams
       Hubstats::GithubAPI.update_teams
     end
 
-    desc "updates the teams for all pull requests from past 365 days"
-    task :update_teams_in_prs => :environment do
+    private def update_teams_in_prs
       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|
-        Hubstats::GithubAPI.update_hook(repo, args[:old_endpoint])
-      end
-    end
-
-    def repo_checker(args)
+    private def repo_checker(args)
       raise ArgumentError, "Must be called with repo argument. [:org/:repo]" if args.nil?
       if args.is_a? String
         return Hubstats::Repo.where(full_name: args).first
-      else 
+      else
         return args
       end
     end
-
   end
 end

data/spec/factories/teams.rb

@@ -16,14 +16,15 @@ FactoryGirl.define do
     name "Team One"
     hubstats true
     action "added"
-    initialize_with { attributes } 
+    description "description"
+    initialize_with { attributes }
   end
 
-  factory :team_payload_hash, class:Hash do 
+  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 
+    initialize_with { attributes }
+  end
 end

data/spec/lib/hubstats/events_handler_spec.rb

@@ -66,7 +66,7 @@ module Hubstats
         payload = build(:comment_payload_hash,
           :user => {:login=>"hermina", :id=>0, :role=>"User"},
           :comment => {
-            "id"=>194761, 
+            "id"=>194761,
             "body"=>"Quidem ea minus ut odio optio.",
             "kind"=>"Issue",
             "user"=>{},
@@ -83,11 +83,11 @@ module Hubstats
         payload = build(:comment_payload_hash,
           :user => {:login=>"hermina", :id=>0, :role=>"User"},
           :comment => {
-            "id"=>194761, 
+            "id"=>194761,
             "body"=>"Quidem ea minus ut odio optio.",
-            "kind"=>"Issue", 
+            "kind"=>"Issue",
             "user"=>nil,
-            "created_at" => Date.today, 
+            "created_at" => Date.today,
             "updated_at" => Date.today
           }
         )
@@ -108,11 +108,12 @@ module Hubstats
         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(payload).to receive(:[]).with(:event).and_return(payload)
-        allow(payload).to receive(:[]).with(:team).and_return({:name => "Team One"})
+        allow(payload).to receive(:[]).with(:team).and_return({:name => "Team One", :description => "Hubstats"})
         allow(payload).to receive(:[]).with(:member).and_return(user)
         allow(payload).to receive(:[]).with(:github_action).and_return("added")
+        allow(payload).to receive(:[]).with(:scope).and_return("team")
+        allow(payload).to receive(:[]).with(:action).and_return("added")
         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)
@@ -124,12 +125,13 @@ module Hubstats
         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)
         allow(payload).to receive(:[]).with(:event).and_return(payload)
-        allow(payload).to receive(:[]).with(:team).and_return({:name => "Team One"})
+        allow(payload).to receive(:[]).with(:team).and_return({:name => "Team One", :description => "Hubstats"})
         allow(payload).to receive(:[]).with(:member).and_return(user)
         allow(payload).to receive(:[]).with(:github_action).and_return("added")
+        allow(payload).to receive(:[]).with(:scope).and_return("team")
+        allow(payload).to receive(:[]).with(:action).and_return("added")
         expect(Hubstats::Team).to receive(:update_users_in_team)
         expect(Hubstats::Team).to receive(:create_or_update).and_return(team)
         ehandler.route(payload, "MembershipEvent")

data/spec/lib/hubstats/github_api_spec.rb

@@ -70,7 +70,7 @@ module Hubstats
     context '.update_teams' do
       subject {Hubstats::GithubAPI}
       let(:org) {'sportngin'}
-      let(:team1) {build(:team_hash, :name => "Team One")}
+      let(:team1) {build(:team_hash, :name => "Team One", description: "hubstats")}
       let(:team2) {build(:team_hash, :name => "Team Four")}
       let(:team3) {build(:team_hash, :name => "Team Five")}
       let(:team4) {build(:team_hash, :name => "Team Six")}
@@ -82,12 +82,14 @@ module Hubstats
       let(:hubstats_user) {build(:user)}
       let(:access_token) { "access_token" }
       let(:user) { double }
-      let(:client) { double(:user => user) }
+      let(:octokit_team) {double(:octokit_team)}
+      let(:client) {double(:octokit_client, team: octokit_team, 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(client).to receive(:team).and_return(octokit_team)
         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)
@@ -101,44 +103,30 @@ module Hubstats
       end
     end
 
-    context '.deprecate_teams_from_file' do
+    context '.deprecate_teams' do
       subject {Hubstats::GithubAPI}
       let(:team1) {create(:team, :name => "Team One")}
       let(:team2) {create(:team, :name => "Team Two")}
       let(:team3) {create(:team, :name => "Team Three")}
       let(:team4) {create(:team, :name => "Team Four")}
       let(:team5) {create(:team, :name => "Team Five")}
+      let(:octokit_team) {double(:octokit_team, description: "Description for Hubstats")}
+      let(:client) {double(:octokit_client, team: octokit_team)}
+
+      before do
+        allow(octokit_team).to receive(:[]).with(:description).and_return("Description for Hubstats")
+      end
 
       it 'should update the teams in the database based on a given whitelist' do
-        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("team_list") { ["Team One", "Team Two", "Team Three", "Team Four"] }
         allow(Hubstats::Team).to receive(:all).and_return( [team1, team2, team3, team4, team5] )
+        allow(client).to receive(:team).and_return(octokit_team)
+        allow(subject).to receive(:client).and_return(client)
         expect(team5).to receive(:update_column).with(:hubstats, false)
-        subject.deprecate_teams_from_file
-      end
-    end
-
-    context ".update_hook" do
-      subject {Hubstats::GithubAPI}
-      let(:repo) {'hubstats'}
-      context "with old_endpoint" do
-        let(:old_endpoint) {'www.hubstats.com'}
-        it 'should call delete_hook' do
-          allow(subject).to receive(:create_hook)
-          expect(subject).to receive(:delete_hook).with(repo,old_endpoint)
-          subject.update_hook('hubstats','www.hubstats.com')
-        end
-      end
-
-      context "without old_point" do
-        it 'should not call delete_hook' do
-          allow(subject).to receive(:create_hook)
-          expect(subject).to_not receive(:delete_hook).with(repo)
-          subject.update_hook('hubstats')
-        end
+        subject.deprecate_teams
       end
     end
 
-    context ".create_hook" do
+    context ".create_repo_hook" do
       subject {Hubstats::GithubAPI}
       let(:config) {double(:webhook_secret => 'a1b2c3d4', :webhook_endpoint => "hubstats.com")}
       let(:client) {double}
@@ -150,12 +138,12 @@ module Hubstats
 
       it "should call octokit create_hook for repositories" do
         expect(client).to receive(:create_hook)
-        subject.create_hook(repo)
+        subject.create_repo_hook(repo)
       end
 
       it "should rescue unprocessable entity from repo hook" do
         allow(client).to receive(:create_hook) { raise Octokit::UnprocessableEntity }
-        subject.create_hook(repo)
+        subject.create_repo_hook(repo)
       end
     end
 
@@ -169,14 +157,14 @@ module Hubstats
         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)
+      it "should call octokit create_org_hook for organizations" do
+        expect(client).to receive(:create_org_hook)
+        subject.create_org_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)
+        allow(client).to receive(:create_org_hook) { raise Octokit::UnprocessableEntity }
+        subject.create_org_hook(org)
       end
     end
 

data/test/dummy/db/schema.rb

@@ -11,19 +11,20 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161222173633) do
+ActiveRecord::Schema.define(version: 20161222173310) do
 
   create_table "hubstats_comments", force: :cascade do |t|
-    t.string   "html_url",         limit: 255
-    t.string   "url",              limit: 255
-    t.string   "pull_request_url", limit: 255
-    t.integer  "path",             limit: 4
     t.string   "kind",             limit: 255
     t.integer  "user_id",          limit: 4
     t.integer  "pull_request_id",  limit: 4
     t.integer  "repo_id",          limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "body_string",      limit: 255
+    t.integer  "path",             limit: 4
+    t.string   "html_url",         limit: 255
+    t.string   "url",              limit: 255
+    t.string   "pull_request_url", limit: 255
     t.text     "body",             limit: 65535
   end
 
@@ -55,21 +56,21 @@ ActiveRecord::Schema.define(version: 20161222173633) do
   add_index "hubstats_labels_pull_requests", ["pull_request_id"], name: "index_hubstats_labels_pull_requests_on_pull_request_id", using: :btree
 
   create_table "hubstats_pull_requests", force: :cascade do |t|
+    t.integer  "number",     limit: 4
+    t.integer  "user_id",    limit: 4
+    t.integer  "repo_id",    limit: 4
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "closed_at"
+    t.integer  "additions",  limit: 4
+    t.integer  "deletions",  limit: 4
+    t.integer  "comments",   limit: 4
     t.string   "url",        limit: 255
     t.string   "html_url",   limit: 255
     t.string   "issue_url",  limit: 255
-    t.integer  "number",     limit: 4
     t.string   "state",      limit: 255
     t.string   "title",      limit: 255
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
-    t.datetime "closed_at"
     t.string   "merged",     limit: 255
-    t.integer  "comments",   limit: 4
-    t.integer  "additions",  limit: 4
-    t.integer  "deletions",  limit: 4
-    t.integer  "user_id",    limit: 4
-    t.integer  "repo_id",    limit: 4
     t.integer  "deploy_id",  limit: 4
     t.integer  "merged_by",  limit: 4
     t.datetime "merged_at"
@@ -94,15 +95,15 @@ ActiveRecord::Schema.define(version: 20161222173633) do
   add_index "hubstats_qa_signoffs", ["user_id"], name: "index_hubstats_qa_signoffs_on_user_id", using: :btree
 
   create_table "hubstats_repos", force: :cascade do |t|
+    t.integer  "owner_id",   limit: 4
     t.string   "name",       limit: 255
     t.string   "full_name",  limit: 255
+    t.datetime "pushed_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "url",        limit: 255
     t.string   "html_url",   limit: 255
     t.string   "labels_url", limit: 255
-    t.datetime "pushed_at"
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
-    t.integer  "owner_id",   limit: 4
   end
 
   add_index "hubstats_repos", ["owner_id"], name: "index_hubstats_repos_on_owner_id", using: :btree
@@ -122,12 +123,12 @@ ActiveRecord::Schema.define(version: 20161222173633) do
 
   create_table "hubstats_users", force: :cascade do |t|
     t.string   "login",      limit: 255
+    t.string   "role",       limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "avatar_url", limit: 255
     t.string   "url",        limit: 255
     t.string   "html_url",   limit: 255
-    t.string   "role",       limit: 255
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 1.0.0.beta
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -402,12 +402,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Github Statistics