tutter-sppuppet 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjMzYTk0ZTRlYjM1YjRiOTkwNDA3NzBlZDUwYmVhNDliOWVlOGZhYQ==
+    ZTYzMjJkNzU3NzBlOTgwYzhlZTgyMTcxODc4NmRiMTAyZjc3MjliYg==
   data.tar.gz: !binary |-
-    MmY1YmQ4OTcxZmQ3ZWJmYWMyZDAwZjllNTE5ODA3MDkzODU1Y2FhYw==
+    MGU2YjJkMzkyYWYyNTRmZjAyYjViYmI1Y2Y4ZTE0YzE0NjFhYjdkNQ==
 SHA512:
   metadata.gz: !binary |-
-    YmY5NjBlZWNkYzVhNmExYWEyM2I0NzZhMGNkZGU4ZmVlZjBiZGVlN2I5ZGU2
-    OTAwN2ExYTZjNDc3N2VhMTk0ZGMzZjk4YjQ1ZGM3MTFkNWQ5YjlmODQyNGM3
-    YmI4ZGNkMzc4MzM2MDAyMmQxNmZlZDRjMzI1Njk4YWMyMTNkYzg=
+    ODkwNmU2OTRiMzc5YTEwMzI4ZmNkZmJiNjRiYWM1MTc1Y2QxZDBjOTZkZDQy
+    MjEyMTllMWMxZjIzOTlmOWYyYWE4NWYxNDlkOGE2ZWUyZWY4Y2FlOTNhNjdl
+    YzhkNjg1OGVmY2Y5MDAxMzg0OTdjNjcwY2YxZWZkZTFlMzAyMWQ=
   data.tar.gz: !binary |-
-    ODI4MzdiMjYwNzEyNWVjMDkzOWZhZmJlZDdmMjJjM2YyZTRlNzNhYWViNDkx
-    ZjFiYmU3ZjAwNWE3NDY4YmQ2MmY0MzlmOTQ5MmVlZWMwNDhiYTAxZGYwNmFh
-    NzI2NDllNDQwYjcxMmNmZWI0NDQ1NjlmYzRiZjI0YWM0ZjMzZjM=
+    NWNhOTFmNzEzNDZkZDhhZDRjZWFjZDE5ZDEyZmJlNzUxMzA2OTE5OGZjZDMz
+    ODRjZDdkYzdmZjc2Nzg1NjQzM2Q4NjAxNTNmNTg3NDQ3Y2RjMjVhYTBlM2Fh
+    NGQxZTAyMGUyYjI0YjE2M2VmZjhkYjEyYjA0NmM0MzA0NGYxYjE=

data/README.md

@@ -1,11 +1,12 @@
 # tutter-sppuppet
 
-This action let non collaborators review
-and merge code without having more then read access to the project.
+This action lets non-collaborators review and merge code without having push access to the project.
+
+Here's how it works:
 
 1. A pull request get submitted
-2. Someone thinks it looks good and adds a _+1_ comment
-3. Another person comment _+1_
+2. Someone reviews it and adds a _+1_ comment
+3. Another person comments _+1_
 4. The pull request can be merged by commenting _!merge_ when it has the
 desired amount of +1's(configurable, defaults to 1)
 
@@ -22,6 +23,8 @@ sppuppet specific settings (goes into tutter.yaml)
       plus_ones_required: 3
       post_instructions: true
       instructions: 'To merge, post 3 +1s and then !merge'
+      generate_reports = true
+      reports_dir = '/var/lib/tutter/reports'
 
 ### TODO
 * whitelist

data/lib/tutter/action/sppuppet.rb

@@ -1,8 +1,12 @@
+require 'fileutils'
+require 'json'
+
 class Sppuppet
 
   def initialize(settings, client, project, data, event)
     @settings = settings
     @settings['plus_ones_required'] ||= 1
+    @settings['reports_dir'] ||= '/var/lib/tutter/reports'
     @client = client
     @project = project
     @data = data
@@ -80,8 +84,22 @@ class Sppuppet
 
     merge = comments.last.body == '!merge' || comments.last.body == ':shipit:'
 
-    if plus_one.count >= @settings['plus_ones_required'] and merge
-      @client.merge_pull_request(@project, pull_request_id, 'SHIPPING!!')
+    if plus_one.count >= @settings['plus_ones_required'] && merge
+      merge_commit = @client.merge_pull_request(@project, pull_request_id, 'SHIPPING!!')
+      json = { url: pr.html_url,
+               title: pr.title,
+               author: pr.user.login,
+               merge_sha: merge_commit.sha,
+               head_sha: pr.head.sha,
+               tests: @client.combined_status(@project, pr.head.sha).statuses.map { |s| {state: s.state, url: s.target_url, description: s.description } },
+               reviewers: plus_one.keys,
+               deployer: comments.last.user.login }
+      report_directory = "#{@settings['reports_dir']}/#{merge_commit.sha[0..1]}/#{merge_commit.sha[2..3]}"
+      report_path = "#{report_directory}/#{merge_commit.sha}.json"
+      if @settings['generate_reports']
+        FileUtils.mkdir_p report_directory
+        File.open(report_path, 'w') { |f| f.write(JSON.pretty_generate(json)) }
+      end
       return 200, "merging #{pull_request_id} #{@project}"
     elsif plus_one.count >= @settings['plus_ones_required']
       return 200, "have enough +1, but no merge command"

data/tutter-sppuppet.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-sppuppet'
-  s.version     = '0.0.8'
-  s.author      = 'Johan Haals'
-  s.email       = ['johan.haals@gmail.com']
+  s.version     = '0.0.9'
+  s.author      = ['Johan Haals', 'Erik Dalén', 'Alexey Lapitsky']
+  s.email       = ['johan.haals@gmail.com', 'dalen@spotify.com', 'alexey@spotify.com']
   s.homepage    = 'https://github.com/jhaals/tutter-sppuppet'
   s.summary     = 'Github code review without collaborator access'
   s.description = 'This tutter action let non collaborators review and merge code without having more then read access to the project'

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: tutter-sppuppet
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Johan Haals
+- Erik Dalén
+- Alexey Lapitsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tutter
@@ -28,6 +30,8 @@ description: This tutter action let non collaborators review and merge code with
   having more then read access to the project
 email:
 - johan.haals@gmail.com
+- dalen@spotify.com
+- alexey@spotify.com
 executables: []
 extensions: []
 extra_rdoc_files: []