tutter-sppuppet 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c82c8f1b531c0e1577d3d18c117f8ebda785b4c
-  data.tar.gz: c8995bccc8a4f0d9a4a27477ca13bfb7243ddd66
+  metadata.gz: 3c4746d2776652a1a3312a5c400938c2ada7e747
+  data.tar.gz: 9bb20eb13de1803246a25ab8cf19d122cf96ee9b
 SHA512:
-  metadata.gz: 3a416fb995a3bebf146e3dc6b174e644d38830d664be2f41aa75eb740829dfd62583cd2cf386bd0c2788773f3e2e7cfe8efa7c6508ff0fd47c16a680c7544fbd
-  data.tar.gz: 2575109d71bbc07c5f82a85f44a60e3a9a04c8c4617fcfe4416fb4aaa68c90b717119c50283b1ab4aaa6cf771d467c2f861fc5823afd9cf22c6ff55c12eef177
+  metadata.gz: 1bf0a7d8d0b52e04a8df8b8b6930d7980747975b2765a0d93e7bcb3d37d863675f278424a98dfea6e5f91522caba2fcf8838d66afb83accfeaf4db1699788622
+  data.tar.gz: 71e4e8f8a8007b208c7354a5e0e27940a28190f0bb9f7eb630d8a9e36ff28cc83f9168ab1c4661513ca40eefa05a84d2a7bb7d6085e87d12e1119b9c55094f23

data/.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-sppuppet'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.author      = 'Johan Haals'
   s.email       = ['johan.haals@gmail.com']
   s.homepage    = 'https://github.com/jhaals/tutter-sppuppet'
@@ -13,4 +13,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.required_ruby_version = '>= 1.8.7'
+
+  s.add_runtime_dependency 'tutter'
 end

data/lib/tutter/action/sppuppet.rb

@@ -1,11 +1,11 @@
 class Sppuppet
 
-  def initialize(settings, client, project, data)
+  def initialize(settings, client, project, data, event)
     @settings = settings
     @client = client
     @project = project
     @data = data
-    @debug = settings['debug'] unless settings['debug'].nil?
+    @event = event
   end
 
   def debug(message)
@@ -14,24 +14,21 @@ class Sppuppet
 
   def run
     pull_request_id = @data['issue']['number']
-    debug "pull request id: #{pull_request_id}"
     pr = @client.pull_request @project, pull_request_id
     plus_one = {}
     merge = false
 
     if pr.mergeable_state != 'clean'
-      debug "merge state for #{@project} #{pull_request_id} is not clean. Current state: #{pr.mergeable_state}"
-      return false
+      return 200, "merge state for #{@project} #{pull_request_id} is not clean. Current state: #{pr.mergeable_state}"
     end
 
     # No comments, no need to go further.
     if pr.comments == 0
-      debug 'no comments, skipping'
-      return false
+      return 200, 'no comments, skipping'
     end
 
     # Don't care about code we can't merge
-    return false unless pr.mergeable
+    return 200, 'merge state not clean' unless pr.mergeable
 
     # We fetch the latest commit and it's date.
     last_commit = @client.pull_request_commits(@project, pull_request_id).last
@@ -55,16 +52,19 @@ class Sppuppet
       # TODO it should calculate the +1's - the -1's
       # Never merge if someone says -1
       if /^(\-1|:\-1:)/.match i.body
-        debug "#{@project} #{pull_request_id} has a -1. I will not take the blame"
-        return false
+        return 200, "#{@project} #{pull_request_id} has a -1. I will not take the blame"
       end
     end
 
     merge = true if comments.last.body == '!merge'
 
     if plus_one.count >= @settings['plus_ones_required'] and merge
-      debug "merging #{pull_request_id} #{@project}"
       @client.merge_pull_request(@project, pull_request_id, 'SHIPPING!!')
+      return 200, "merging #{pull_request_id} #{@project}"
+    elsif plus_one.count >= @settings['plus_ones_required']
+      return 200, "have enough +1, but no merge command"
+    else
+      return 200, "not enough +1, have #{plus_one.count} but need #{@settings['plus_ones_required']}"
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tutter-sppuppet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Johan Haals
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
-dependencies: []
+date: 2015-01-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tutter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This tutter action let non collaborators review and merge code without
   having more then read access to the project
 email:
@@ -18,7 +32,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemspec
+- ".gemspec"
 - README.md
 - lib/tutter/action/sppuppet.rb
 homepage: https://github.com/jhaals/tutter-sppuppet
@@ -31,19 +45,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Github code review without collaborator access
 test_files: []
-has_rdoc: