Run rubyocop -a.

Author: ashfurrow

Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-ruby "2.2.5"
+ruby '2.2.5'
 
 gem 'sinatra'
 gem 'json'
@@ -12,7 +12,7 @@ group :development do
   gem 'guard-rubocop'
 end
 
-group :test do 
+group :test do
   gem 'rack-test'
   gem 'rspec'
   gem 'rspec-sinatra'

Guardfile

@@ -1,4 +1,4 @@
-guard :rspec, cmd: "bundle exec rspec" do
+guard :rspec, cmd: 'bundle exec rspec' do
   require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 
@@ -14,6 +14,6 @@ guard :rspec, cmd: "bundle exec rspec" do
 end
 
 guard :rubocop do
-  watch(%r{.+\.rb$})
+  watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

lib/api.rb

@@ -2,10 +2,9 @@
 require 'octokit'
 
 class API
-
   attr_accessor :github_client
 
-  def initialize(github_client = Octokit::Client.new(:access_token => ENV['GITHUB_TOKEN']))
+  def initialize(github_client = Octokit::Client.new(access_token: ENV['GITHUB_TOKEN']))
     @github_client = github_client
   end
 
@@ -16,32 +15,29 @@ def handle_push(push)
       team_id = ENV['CONTRIBUTOR_TEAM_ID']
       pr_number = pull_request['number']
       repo_name = pull_request['base']['repo']['full_name']
-      
+
       if needs_invitation?(team_id, username)
         invite_and_comment(team_id, username, pr_number, repo_name)
-        return {'msg' => 'Invitation sent.'}
+        return { 'msg' => 'Invitation sent.' }
       else
-        return {'msg' => 'Already a member.'}
+        return { 'msg' => 'Already a member.' }
       end
     else
-      return {'msg' => 'Pull request not yet merged.'}
+      return { 'msg' => 'Pull request not yet merged.' }
     end
   end
 
-
   def is_merged?(push)
     push['action'] == 'closed' && push['pull_request'] && push['pull_request']['merged'] == true
   end
 
   def needs_invitation?(team_id, username)
-    begin
-      # This raises if the user has not been invited yet, as the happy
-      # path is 'user invitation is pending' or 'user has accepted'.
-      @github_client.team_membership(team_id, username)
-      return false
-    rescue Octokit::NotFound
-      return true
-    end
+    # This raises if the user has not been invited yet, as the happy
+    # path is 'user invitation is pending' or 'user has accepted'.
+    @github_client.team_membership(team_id, username)
+    return false
+  rescue Octokit::NotFound
+    return true
   end
 
   def invite_and_comment(team_id, username, pr_number, repo_name)

lib/ping_checker.rb

@@ -2,4 +2,4 @@ class PingChecker
   def is_ping?(push)
     push['zen'].nil? == false
   end
-end
+end

lib/server.rb

@@ -6,7 +6,6 @@
 require './lib/signature_verifier'
 
 class AerynApp < Sinatra::Base
-
   set :logging, true
 
   attr_accessor :signature_verifier
@@ -17,7 +16,7 @@ def initialize(
       signature_verifier = SignatureVerifier.new,
       ping_checker = PingChecker.new,
       api = API.new
-    )
+  )
     @signature_verifier = signature_verifier
     @ping_checker = ping_checker
     @api = api
@@ -36,12 +35,12 @@ def initialize(
 
     if is_ping
       logger.info 'Received ping.'
-      halt 200, {'Content-Type' => 'text/plain'}, 'Pong.'
+      halt 200, { 'Content-Type' => 'text/plain' }, 'Pong.'
     end
 
     unless is_valid_sig
       logger.info "Received Unauthorized request: #{request}"
-      halt 403, "Unauthorized."
+      halt 403, 'Unauthorized.'
     end
 
     logger.info 'Received PR action.'

lib/signature_verifier.rb

@@ -1,12 +1,10 @@
 require 'sinatra'
 
 class SignatureVerifier
-
   def verify_signature(payload_body, request)
     signature = 'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), ENV['WEBHOOK_SECRET_TOKEN'], payload_body)
     header = request.env['HTTP_X_HUB_SIGNATURE']
     return false unless header
     return false unless Rack::Utils.secure_compare(signature, header)
   end
-
 end

spec/api_spec.rb

@@ -6,39 +6,38 @@
   let(:api) { API.new(github_client) }
   let(:github_client) { double(Octokit::Client) }
 
-
   it 'does not invite for unmerged PRs' do
-    result = api.handle_push({'action' => 'closed', 'pull_request' => {'merged' => false}})
+    result = api.handle_push('action' => 'closed', 'pull_request' => { 'merged' => false })
 
     expect(result['msg']) == 'Pull request not yet merged.'
   end
 
   it 'does not re-invite members' do
     allow(github_client).to receive(:team_membership).with('1234567', 'splendid_username')
-    
-    result = api.handle_push({'action' => 'closed', 
-      'pull_request' => {
-        'merged' => true, 
-        'number' => 13,
-        'user' => {'login' => 'splendid_username'},
-        'base' => {'repo' => {'full_name' => 'my_repo'}}
-        }})
+
+    result = api.handle_push('action' => 'closed',
+                             'pull_request' => {
+                               'merged' => true,
+                               'number' => 13,
+                               'user' => { 'login' => 'splendid_username' },
+                               'base' => { 'repo' => { 'full_name' => 'my_repo' } }
+                             })
 
     expect(result['msg']).to eq('Already a member.')
   end
 
   it 'adds team membership and sends a friendly comment' do
-    allow(github_client).to receive(:team_membership).with('1234567', 'splendid_username').and_raise (Octokit::NotFound)
+    allow(github_client).to receive(:team_membership).with('1234567', 'splendid_username').and_raise Octokit::NotFound
     allow(github_client).to receive(:add_team_membership).with('1234567', 'splendid_username')
     allow(github_client).to receive(:add_comment).with('my_repo', 13, 'Thanks!')
 
-    result = api.handle_push({'action' => 'closed', 
-      'pull_request' => {
-        'merged' => true, 
-        'number' => 13,
-        'user' => {'login' => 'splendid_username'},
-        'base' => {'repo' => {'full_name' => 'my_repo'}}
-        }})
+    result = api.handle_push('action' => 'closed',
+                             'pull_request' => {
+                               'merged' => true,
+                               'number' => 13,
+                               'user' => { 'login' => 'splendid_username' },
+                               'base' => { 'repo' => { 'full_name' => 'my_repo' } }
+                             })
 
     expect(result['msg']) == 'Invitation sent.'
   end

spec/ping_checker_spec.rb

@@ -4,10 +4,10 @@
   let(:subject) { PingChecker.new }
 
   it 'handles a ping' do
-    expect(subject.is_ping? '{"zen": "Howdy there!"}' ).to be_truthy
+    expect(subject.is_ping?('{"zen": "Howdy there!"}')).to be_truthy
   end
 
   it 'handles non-pings' do
-    expect(subject.is_ping? '{"boring_pr_data": "so boring"}' ).to be_falsey
+    expect(subject.is_ping?('{"boring_pr_data": "so boring"}')).to be_falsey
   end
-end
+end

spec/server_spec.rb

@@ -30,8 +30,8 @@
   it 'passes on to the api' do
     allow(signature_verifier).to receive(:verify_signature).and_return(true)
     allow(ping_checker).to receive(:is_ping?).and_return(false)
-    allow(api).to receive(:handle_push).and_return ({'msg' => 'Everything is fine.'})
-    
+    allow(api).to receive(:handle_push).and_return ({ 'msg' => 'Everything is fine.' })
+
     post '/payload', '{}'
 
     expect(last_response).to be_ok
@@ -42,8 +42,8 @@
   it 'defers to the api for response code' do
     allow(signature_verifier).to receive(:verify_signature).and_return(true)
     allow(ping_checker).to receive(:is_ping?).and_return(false)
-    allow(api).to receive(:handle_push).and_return({'error' => 'Something went wrong.'})
-    
+    allow(api).to receive(:handle_push).and_return('error' => 'Something went wrong.')
+
     post '/payload', '{}'
 
     expect(last_response.status) == 400