omg_pull_request 0.2.3 → 0.3.0

data/.gitignore

@@ -31,6 +31,9 @@
 *.swn
 *.swm
 
+# No Gemfile.lock since this is a gem
+Gemfile.lock
+
 test/functional/coverage/**
 test/unit/coverage/**
 test/functional/advertisers/coverage/**
@@ -48,3 +51,4 @@ tags
 test/omg_pull_request/config.yml
 test/integrations/config.yml
 test/integrations/.stage
+.omgprrc

data/README.md

@@ -29,9 +29,10 @@ On running the test suite an animated gif can be generated of the lolcommits tha
 
 * In a rails project, add `omg_pull_request` to the Gemfile.
 * Make an `omg_pull_request` directory in the project's `test` directory.
-* Add a `database.yml` file in the `omg_pull_request` dir.  This will drop databases, so it is suggested this points to different databases than the main `config/database.yml` file
+* Make an `.omgprrc` directory in the project's `root` directory.
+* Add a `database.yml` file in the `.omgprrc` dir.  This will drop databases, so it is suggested this points to different databases than the main `config/database.yml` file
 * Create a github user to run the tests as.  This user will need to have access to the repo the test is run on.  It can be your developer account, or a new account specifically for this.
-* Add a `config.yml` file in the `omg_pull_request` dir.  It follows this template:
+* Add a `config.yml` file in the `.omgprrc` dir.  It follows this template:
 
 ```
 repo_owner: kenmazaika

data/lib/omg_pull_request/configuration.rb

@@ -38,7 +38,7 @@ module OmgPullRequest
     end
 
     def omg_dir
-      File.join(local_repo, 'test/omg_pull_request')
+      File.join(local_repo, '.omgprrc')
     end
 
     def runner_class

data/lib/omg_pull_request/github_wrapper.rb

@@ -1,6 +1,12 @@
 module OmgPullRequest
   class GithubWrapper
     attr_accessor :configuration
+    STATUSES = {
+      :pending  => "pending",
+      :success  => "success",
+      :conflict => "error",
+      :failure  => "failure"
+    }
 
     def initialize(attributes={})
       attributes.each do |attr, value|
@@ -30,10 +36,23 @@ module OmgPullRequest
       end
     end
 
-    def make_comment(issue_number, body)
+    def create_comment(issue_number, body)
       github_client.issues.comments.create(repo_owner, repo, issue_number, :body => body)
     end
 
+    def create_status(sha, status, params={})
+      if STATUSES.has_value? status
+        params.merge! :state => status
+        github_client.repos.statuses.create(repo_owner, repo, sha, params)
+      end
+    end
+
+    def get_statuses(sha, params={})
+      github_client.repos.statuses.list(repo_owner, repo, sha, params).collect do |h|
+        h.slice("state", "target_url", "description")
+      end
+    end
+
     def pull_requests
       github_client.pull_requests.list(repo_owner, repo)
     end

data/lib/omg_pull_request/notifications.rb

@@ -22,6 +22,37 @@ module OmgPullRequest
       github_comment(message)
     end
 
+    #GITHUB STATUS
+    def make_status_success!(output_file)
+      github_status(
+        GithubWrapper::STATUSES[:success],
+        :target_url => output_file,
+        :description => t("completed.github_status.success", runner_hash)
+      )
+    end
+
+    def make_status_failure!(output_file)
+      github_status(
+        GithubWrapper::STATUSES[:failure],
+        :target_url => output_file,
+        :description => t("completed.github_status.failure", runner_hash)
+      )
+    end
+
+    def make_status_conflict!
+      github_status(
+        GithubWrapper::STATUSES[:conflict],
+        :description => t("error.github_status.conflict", runner_hash)
+      )
+    end
+
+    def make_status_test_running!
+      github_status(
+        GithubWrapper::STATUSES[:pending],
+        :description => t("start.github_status.message", runner_hash)
+      )
+    end
+
     # PROWL
     def prowl_alert_success!
       message = t("completed.prowl.success", runner_hash)
@@ -38,15 +69,21 @@ module OmgPullRequest
       output_file = store_logger_data!
       if self.success?
         make_comment_success!(output_file)
+        make_status_success!(output_file)
         prowl_alert_success!
       else
         make_comment_failure!(output_file)
+        make_status_failure!(output_file)
         prowl_alert_failure!
       end
     end
 
     def github_comment(message)
-      self.github_wrapper.make_comment(self.issue_number, message)
+      self.github_wrapper.create_comment(self.issue_number, message)
+    end
+
+    def github_status(status, params={})
+      self.github_wrapper.create_status(self.to_sha, status, params)
     end
 
     def runner_hash(also=Hash.new)

data/lib/omg_pull_request/test_runner/base.rb

@@ -18,12 +18,14 @@ module OmgPullRequest
       def run
         log_test_details!
         make_comment_test_running!
+        make_status_test_running!
 
         git_client.checkout!(from_sha)
         merge_response = git_client.merge!(to_sha)
 
         if merge_response == :conflict
           make_comment_conflict!
+          make_status_conflict!
           return
         end
 

data/lib/omg_pull_request/test_runner/rails.rb

@@ -3,7 +3,7 @@ module OmgPullRequest
     class Rails < TestRunner::Base
       def setup
         execute!("cd #{local_repo} && cp #{database_yml} config/database.yml && bundle")
-        execute!("cd #{local_repo} && bundle exec rake db:drop:all && rake db:create:all && bundle exec rake db:schema:load")
+        execute!("cd #{local_repo} && bundle exec rake db:drop:all && bundle exec rake db:create:all && bundle exec rake db:schema:load")
       end
 
       def execute_tests

data/lib/omg_pull_request/version.rb

@@ -1,3 +1,3 @@
 module OmgPullRequest
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/locales/en.yml

@@ -2,12 +2,16 @@ en:
   error:
     github:
       conflict: "### Unable To Run  \nA conflict prevented the test suite from being run.  Please manually resolve the conflict and the tests will be rerun.\nFrom `%{abbr_from_sha}` to `%{abbr_to_sha}`"
+    github_status:
+      conflict: "A conflict prevented the test suite from being run."
 
   start:
     banner: "OmgPullRequest %{version}\n
 From:         %{abbr_from_sha}\n
 To:           %{abbr_to_sha}\n
 Issue Number: %{issue_number}"
+    github_status:
+      message: "Running tests %{abbr_from_sha} to %{abbr_to_sha}"
     github:
       message: ":trollface: Running tests: `%{abbr_from_sha}` to `%{abbr_to_sha}`"
       lolcommits:
@@ -17,6 +21,9 @@ Issue Number: %{issue_number}"
     github:
       success: ":thumbsup: :shipit: \n### Tests Passed  \nFrom `%{abbr_from_sha}` to `%{abbr_to_sha}`\nTests took %{minutes} minutes, %{seconds} seconds.\n[results](%{output_file})"
       failure: ":thumbsdown: :fire: :broken_heart: \n### Tests Failed \n `%{abbr_from_sha}` to `%{abbr_to_sha}`\nTests too %{minutes} minutes, %{seconds} seconds.\n[results](%{output_file})"
+    github_status:
+      success: "Tests Passed (%{abbr_from_sha} to %{abbr_to_sha}) in %{minutes} minutes, %{seconds} seconds."
+      failure: "Tests Failed (%{abbr_from_sha} to %{abbr_to_sha}) in %{minutes} minutes, %{seconds} seconds."
     prowl:
       success: "Thumbs up, bro.\nPull request #%{issue_number}\n%{title}\nTests took %{minutes} minutes, %{seconds} seconds."
       failure: "Sad face to the max, homie.\nPull request #%{issue_number}\n%{title}\nTests took %{minutes} minutes, %{seconds} seconds."

data/omg_pull_request.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency(%q<aws-s3>, ">= 0.6.3")
   gem.add_runtime_dependency(%q<faraday>, ">= 0.8.4")
-  gem.add_runtime_dependency(%q<github_api>, ">= 0.6.5")
+  gem.add_runtime_dependency(%q<github_api>, ">= 0.7.0")
   gem.add_runtime_dependency(%q<uuid>, ">= 2.3.5")
   gem.add_runtime_dependency(%q<rake>, ">= 0.9.2.2")
   gem.add_runtime_dependency(%q<activesupport>, ">= 3.1.0")

data/test/fixtures/create_status

@@ -0,0 +1,24 @@
+HTTP/1.1 201 Created
+Server: nginx/0.8.52
+Date: Fri, 17 Dec 2010 02:02:58 GMT
+Content-Type: application/json; charset=utf-8
+Connection: keep-alive
+Expires: Fri, 17 Dec 2010 02:02:58 UTC
+Cache-Control: no-cache; private; no-store
+Pragma: no-cache
+
+{
+  "created_at": "2012-08-27T06:12:24Z",
+  "updated_at": "2012-08-27T06:12:24Z",
+  "state": "success",
+  "id": 8047694,
+  "url": "https://api.github.com/repos/kenmazaika/pictures/issues/comments/8047694",
+  "user": {
+    "gravatar_id": "2a9b8f5273d934fe57daa8cf54c3a017",
+    "avatar_url": "https://secure.gravatar.com/avatar/2a9b8f5273d934fe57daa8cf54c3a017?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png",
+    "login": "kenmazaika",
+    "url": "https://api.github.com/users/kenmazaika",
+    "id": 233615
+  }
+}
+

data/test/fixtures/get_statuses

@@ -0,0 +1,25 @@
+HTTP/1.1 201 Created
+Server: nginx/0.8.52
+Date: Fri, 17 Dec 2010 02:02:58 GMT
+Content-Type: application/json; charset=utf-8
+Connection: keep-alive
+Expires: Fri, 17 Dec 2010 02:02:58 UTC
+Cache-Control: no-cache; private; no-store
+Pragma: no-cache
+
+[
+  {
+    "created_at": "2012-08-27T06:12:24Z",
+    "updated_at": "2012-08-27T06:12:24Z",
+    "state": "success",
+    "id": 8047694,
+    "url": "https://api.github.com/repos/kenmazaika/pictures/issues/comments/8047694",
+    "creator": {
+      "gravatar_id": "2a9b8f5273d934fe57daa8cf54c3a017",
+      "avatar_url": "https://secure.gravatar.com/avatar/2a9b8f5273d934fe57daa8cf54c3a017?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png",
+      "login": "kenmazaika",
+      "url": "https://api.github.com/users/kenmazaika",
+      "id": 233615
+    }
+  }
+]

data/test/integrations/runner_test.rb

@@ -55,7 +55,34 @@ class RunnerTest < MiniTest::Unit::TestCase
     runner.run
 
     posts = github.issues.comments.list(config[:login], 'omg', pr.number)
+    statuses = github.repos.statuses.list(config[:login], 'omg', pr.head.sha)
     assert_equal 2, posts.count
+    assert_equal "success", statuses.first.state
+    running = posts.first
+    pass = posts.last
+
+    assert running['body'].match(/Running tests/)
+    assert pass['body'].match(/Tests Passed/)
+  end
+
+  def test_pending
+    github.pull_requests.create config[:login], 'omg',
+        "head" => "#{config[:login]}:success",
+        "base" => "master",
+        "title" => 'Success'
+    
+    prs = github.pull_requests.list(config[:login], "omg")
+    assert_equal 1, prs.count
+    pr = prs.first
+
+    runner = build_runner(pr)
+    
+    runner.run
+
+    posts = github.issues.comments.list(config[:login], 'omg', pr.number)
+    statuses = github.repos.statuses.list(config[:login], 'omg', pr.head.sha)
+    assert_equal 2, posts.count
+    assert_equal "pending", statuses.at(1).state
     running = posts.first
     pass = posts.last
 
@@ -78,7 +105,9 @@ class RunnerTest < MiniTest::Unit::TestCase
     runner.run
 
     posts = github.issues.comments.list(config[:login], 'omg', pr.number)
+    statuses = github.repos.statuses.list(config[:login], 'omg', pr.head.sha)
     assert_equal 2, posts.count
+    assert_equal "failure", statuses.first.state
     running = posts.first
     pass = posts.last
 
@@ -101,7 +130,9 @@ class RunnerTest < MiniTest::Unit::TestCase
     runner.run
 
     posts = github.issues.comments.list(config[:login], 'omg', pr.number)
+    statuses = github.repos.statuses.list(config[:login], 'omg', pr.head.sha)
     assert_equal 2, posts.count
+    assert_equal "error", statuses.first.state
     running = posts.first
     conflict = posts.last
 

data/test/test_helper.rb

@@ -56,6 +56,18 @@ def fakeweb_create_comment
     :response => File.expand_path('test/fixtures/create_comment'))
 end
 
+def fakeweb_create_status
+  FakeWeb.register_uri(:post,
+    "https://omg:pull_request@api.github.com/repos/kenmazaika/pictures/statuses/HEAD_SHA",
+    :response => File.expand_path('test/fixtures/create_status'))
+end
+
+def fakeweb_get_statuses
+  FakeWeb.register_uri(:get,
+    "https://omg:pull_request@api.github.com/repos/kenmazaika/pictures/statuses/HEAD_SHA",
+    :response => File.expand_path('test/fixtures/get_statuses'))
+end
+
 def fakeweb_pull_requests
   FakeWeb.register_uri(:get,
     "https://omg:pull_request@api.github.com/repos/kenmazaika/pictures/pulls",

data/test/units/omg_pull_request/github_wrapper_test.rb

@@ -19,9 +19,20 @@ module OmgPullRequest
       assert_equal expected, github_wrapper.commit_shas(MockPullRequest.new)
     end
 
-    def test_make_comment
+    def test_create_comment
       fakeweb_create_comment
-      github_wrapper.make_comment(MockPullRequest.new.number, "omg")
+      github_wrapper.create_comment(MockPullRequest.new.number, "omg")
+    end
+
+    def test_create_status
+      fakeweb_create_status
+      github_wrapper.create_status(MockPullRequest.new.head.sha, "success")
+    end
+
+    def test_get_statuses
+      fakeweb_get_statuses
+      expected = [ "state" => "success" ]
+      assert_equal expected, github_wrapper.get_statuses(MockPullRequest.new.head.sha)
     end
 
     def test_pull_requests

data/test/units/omg_pull_request/notifications_test.rb

@@ -66,6 +66,41 @@ module OmgPullRequest
       mock_runner.send(:make_comment_success!, "url")
     end
 
+    def test_make_status_success
+      mock_runner.expects(:github_status).with(
+        GithubWrapper::STATUSES[:success],
+        :target_url => "url",
+        :description => "Tests Passed (abbr_from_sha to abbr_to_sha) in 1 minutes, 3.45 seconds."
+      )
+      mock_runner.send(:make_status_success!, "url")
+    end
+
+    def test_make_status_failure
+      mock_runner.expects(:github_status).with(
+        GithubWrapper::STATUSES[:failure],
+        :target_url => "url",
+        :description => "Tests Failed (abbr_from_sha to abbr_to_sha) in 1 minutes, 3.45 seconds."
+
+      )
+      mock_runner.send(:make_status_failure!, "url")
+    end
+
+    def test_make_status_conflict
+      mock_runner.expects(:github_status).with(
+        GithubWrapper::STATUSES[:conflict],
+        :description => "A conflict prevented the test suite from being run."
+      )
+      mock_runner.send(:make_status_conflict!)
+    end
+
+    def test_make_status_test_running
+      mock_runner.expects(:github_status).with(
+        GithubWrapper::STATUSES[:pending],
+        :description => "Running tests abbr_from_sha to abbr_to_sha"
+      )
+      mock_runner.send(:make_status_test_running!)
+    end
+
     protected
 
     def mock_runner

data/test/units/omg_pull_request/test_runner/base_test.rb

@@ -28,9 +28,11 @@ module OmgPullRequest
       def test_run_success
         runner.expects(:log_test_details!).once
         runner.expects(:make_comment_test_running!).once
+        runner.expects(:make_status_test_running!).once
         runner.git_client.expects(:checkout!).once
         runner.git_client.expects(:merge!).once.returns(:success)
         runner.expects(:make_comment_conflict!).never
+        runner.expects(:make_status_conflict!).never
         runner.expects(:process_output!).once
 
         runner.run
@@ -39,9 +41,11 @@ module OmgPullRequest
       def test_run_conflict
         runner.expects(:log_test_details!).once
         runner.expects(:make_comment_test_running!).once
+        runner.expects(:make_status_test_running!).once
         runner.git_client.expects(:checkout!).once
         runner.git_client.expects(:merge!).once.returns(:conflict)
         runner.expects(:make_comment_conflict!).once
+        runner.expects(:make_status_conflict!).once
         runner.expects(:process_output!).never
 
         runner.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omg_pull_request
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70319646326680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70319646326680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70319646326180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,21 +40,31 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70319646326180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: github_api
-  requirement: &70319646325720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70319646325720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70319646325260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +72,15 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70319646325260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70319646324800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +88,15 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70319646324800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70319646324340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +104,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70319646324340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70319646323880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +120,12 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70319646323880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: Have tests run automatically for your Github Pull Request
 email:
 - kenmazaika@gmail.com
@@ -101,7 +136,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/omg_pull_request
@@ -129,6 +163,8 @@ files:
 - test/fixtures/comments
 - test/fixtures/config.yml
 - test/fixtures/create_comment
+- test/fixtures/create_status
+- test/fixtures/get_statuses
 - test/fixtures/github_commits
 - test/fixtures/kenmazaika
 - test/fixtures/make_gist
@@ -166,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Have tests run automatically for your Github Pull Request
@@ -174,6 +210,8 @@ test_files:
 - test/fixtures/comments
 - test/fixtures/config.yml
 - test/fixtures/create_comment
+- test/fixtures/create_status
+- test/fixtures/get_statuses
 - test/fixtures/github_commits
 - test/fixtures/kenmazaika
 - test/fixtures/make_gist

data/Gemfile.lock

@@ -1,68 +0,0 @@
-PATH
-  remote: .
-  specs:
-    omg_pull_request (0.2.3)
-      activesupport (>= 3.1.0)
-      aws-s3 (>= 0.6.3)
-      faraday (>= 0.8.4)
-      github_api (>= 0.6.5)
-      i18n (>= 0.6.0)
-      rake (>= 0.9.2.2)
-      uuid (>= 2.3.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    aws-s3 (0.6.3)
-      builder
-      mime-types
-      xml-simple
-    builder (3.0.0)
-    fakeweb (1.3.0)
-    faraday (0.8.4)
-      multipart-post (~> 1.1)
-    github_api (0.6.5)
-      faraday (~> 0.8.1)
-      hashie (~> 1.2.0)
-      multi_json (~> 1.3)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (1.2.0)
-    httpauth (0.1)
-    i18n (0.6.1)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
-    metaclass (0.0.1)
-    mime-types (1.19)
-    minitest (3.3.0)
-    mocha (0.12.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    multipart-post (1.1.5)
-    nokogiri (1.5.5)
-    oauth2 (0.8.0)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      rack (~> 1.2)
-    rack (1.4.1)
-    rake (0.9.2.2)
-    systemu (2.5.2)
-    uuid (2.3.5)
-      macaddr (~> 1.0)
-    xml-simple (1.1.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fakeweb
-  minitest
-  mocha
-  omg_pull_request!