hubstats 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70362c13d5ef627afc7c23ac91372ce4b19a603b
-  data.tar.gz: 419eb2b3f4efc1d53f1970f7d06e89a4ee32a680
+  metadata.gz: fd6afdc60bb321ead7ca1d88abf2ef0c7dc0b0f3
+  data.tar.gz: c8cdaa2df2c12b307931b5ebadcbe29270208747
 SHA512:
-  metadata.gz: 924011691995ee7de31c6a0e096d649552a231c23dd61c1ebd70b50f5b9cbd052fbc774d339e863a0f0bc2aac9eec277f614da2b7b93c9951b62e7534fc29d10
-  data.tar.gz: 76f5422f93f235543281a6c07c8cf53272d0edcf513f6e7a4dc48504d32e0dc8b029c920f58c8f69559124e8c961e9bd5535ba32046b8312aedf456daef720fd
+  metadata.gz: 82f465b50ec0e8e2ecbd5672fb055e4c87efc3f29eb8a5bbf2c6ad25a77b0d3c6a010728f150fc457de93469cafc874ff94e965a6181dddbdc1de7cf295c033f
+  data.tar.gz: 7f5c3e6b305282393fd98d690c701d2f40c7f87ad8f1c7daed57e25d9779194e6f4f8ca4a5577778f29542745a0eb57c481abac1c0ceec6b6737e8979b270ff2

data/.soyuz.yml

@@ -2,7 +2,7 @@ defaults:
   deploy_cmd: gem push *.gem
   before_deploy_cmds:
     - /usr/local/bin/op tag-release
-    - sed -i "" -e "s/\".*/\"$(git tag| sort -n -t. -k1,1 -k2,2 -k3,3 | tail -1 | sed s/v//)\"/" lib/hubstats/version.rb
+    - sed -i "" -e "s/\".*/\"$(git tag| sed s/v// | sort -n -t. -k1,1 -k2,2 -k3,3 | tail -1)\"/" lib/hubstats/version.rb
     - git add  lib/hubstats/version.rb
     - git commit -m "Version Bump" && git push
     - gem build hubstats.gemspec

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v0.7.5
+* Improved handling of labeling/unlabeling a PR
+
+  > Arvind Menon: Andy Fleener: https://github.com/sportngin/hubstats/pull/106
+
 #### v0.7.4
 * Sort decorators for consistent behavior
 

data/app/models/hubstats/pull_request.rb

@@ -27,7 +27,7 @@ module Hubstats
     belongs_to :repo
     belongs_to :deploy
     belongs_to :team
-    has_and_belongs_to_many :labels, :join_table => "hubstats_labels_pull_requests"
+    has_and_belongs_to_many :labels, ->{ uniq }, :join_table => "hubstats_labels_pull_requests"
 
     # Public - Makes a new pull request from a GitHub webhook. Finds user_id and repo_id based on users and repos 
     # that are already in the Hubstats database. Updates the user_id of a deploy if the pull request has been merged in a deploy.
@@ -54,10 +54,10 @@ module Hubstats
       if github_pull[:merged_by] && github_pull[:merged_by][:id]
         pull_data[:merged_by] = github_pull[:merged_by][:id]
         deploy = Hubstats::Deploy.where(id: pull.deploy_id, user_id: nil).first
-          if deploy
-            deploy.user_id = pull_data[:merged_by]
-            deploy.save!
-          end
+        if deploy
+          deploy.user_id = pull_data[:merged_by]
+          deploy.save!
+        end
       end
 
       if user.team && user.team.id
@@ -155,8 +155,22 @@ module Hubstats
     #
     # Returns - the new labels
     def add_labels(labels)
-      labels.map!{|label| Hubstats::Label.first_or_create(label) }
+      labels.map! { |label| Hubstats::Label.first_or_create(label) }
       self.labels = labels
     end
+
+    # Public - Adds/remove a label based on the the webhook action
+    # @param payload Webhook payload#
+    # @return The list of labels after the update
+    def update_label(payload)
+      return unless payload[:label]
+      label = Hubstats::Label.first_or_create(payload[:label])
+      if payload[:action] == 'labeled'
+        labels << label
+      elsif payload[:action] == 'unlabeled'
+        labels.delete(label)
+      end
+      labels
+    end
   end
 end

data/lib/hubstats/events_handler.rb

@@ -22,18 +22,23 @@ module Hubstats
       end
     end
 
-    # Public - Gets the information for the new PR, makes the new PR, grabs the labels, and makes new labels
+    # Public - Gets the information for the PR, creates/updates the new PR, grabs the labels, and makes new labels
     #
     # payload - the information that we will use to get data off of
     #
-    # Returns - nothing, but makes the new PR and adds appropriate labels
+    # Returns - nothing, but creates/updates the PR and adds appropriate labels
     def pull_processor(payload)
       pull_request = payload[:pull_request]
       pull_request[:repository] = payload[:repository]
       new_pull = Hubstats::PullRequest.create_or_update(pull_request.with_indifferent_access)
-      repo_name = Hubstats::Repo.where(id: new_pull.repo_id).first.full_name
-      labels = Hubstats::GithubAPI.get_labels_for_pull(repo_name, new_pull.number )
-      new_pull.add_labels(labels)
+      if payload[:action].include?('labeled')
+        new_pull.update_label(payload)
+      else
+        repo_name = Hubstats::Repo.where(id: new_pull.repo_id).first.full_name
+        labels = Hubstats::GithubAPI.get_labels_for_pull(repo_name, new_pull.number)
+        new_pull.add_labels(labels)
+      end
+      new_pull.save!
     end
 
     # Public - Gets the information for the new comment and updates it

data/lib/hubstats/github_api.rb

@@ -276,7 +276,7 @@ module Hubstats
       end
     end
 
-    # Public - Routes to the correst setup methods to be used to update or create comments or PRs
+    # Public - Routes to the correct setup methods to be used to update or create comments or PRs
     #
     # object - the new thing to be updated or created
     # kind - the type of thing (pull comment, issue comment, normal comment, pull, or issue)

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/factories/pull_requests.rb

@@ -33,6 +33,7 @@ FactoryGirl.define do
   factory :pull_request_payload_hash, class:Hash do 
     id {Faker::Number.number(6).to_i}
     type "PullRequestEvent"
+    action 'opened'
     association :repository, factory: :repo_hash, strategy: :build
     association :pull_request, factory: :pull_request_hash, strategy: :build
     merged_by(:id => 202020)

data/spec/lib/hubstats/events_handler_spec.rb

@@ -17,8 +17,28 @@ module Hubstats
       it 'should add labels to pull request' do
         allow(PullRequest).to receive(:create_or_update) {pull}
         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'])
+        allow(GithubAPI).to receive(:get_labels_for_pull) {[{name: 'low'}, {name: 'high'}]}
+        expect(pull).to receive(:add_labels).with([{name: 'low'}, {name: 'high'}])
+        subject.route(payload, payload[:type])
+      end
+
+      it 'should add new labels to pull requests' do
+        payload[:action] = 'labeled'
+        payload[:label] = {name: 'new_label'}
+        allow(PullRequest).to receive(:create_or_update) {pull}
+        allow(Repo).to receive(:where) {[repo,repo]}
+        allow(GithubAPI).to receive(:get_labels_for_pull) {[{name: 'low'}, {name: 'high'}]}
+        expect(pull).to receive(:update_label).with(payload)
+        subject.route(payload, payload[:type])
+      end
+
+      it 'should remove old labels from pull requests' do
+        payload[:action] = 'unlabeled'
+        payload[:label] = {name: 'old_label'}
+        allow(PullRequest).to receive(:create_or_update) {pull}
+        allow(Repo).to receive(:where) {[repo,repo]}
+        allow(GithubAPI).to receive(:get_labels_for_pull) {[{name: 'low'}, {name: 'high'}, {name: 'old_label'}]}
+        expect(pull).to receive(:update_label).with(payload)
         subject.route(payload, payload[:type])
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails