fourchette 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd6591b8703b74bde51dd854677cb614f5f3aa1
-  data.tar.gz: 345b066b668937adb7a2c5efbf81eab03e80f3a1
+  metadata.gz: 52bb772d746a51596c9b3a1d9289b5e7cdb06a35
+  data.tar.gz: e46108905c240695480644c8570f12e8157d92b8
 SHA512:
-  metadata.gz: 7221c0baa009a6b26853b653c194b2ee51b90414dd2e28ed06d9c113f82323adef5f330f215594b9abc6174efcb64409f8c73fa1526dcd4865a1d6fe09570ba8
-  data.tar.gz: 06b66d34ba4241156741e090ee34c3c89c2446b7ba674958b5844803151aef4cdd41db987c9f89a042872be5cbcb25652a659aab9cac54b4e1f068414ca16052
+  metadata.gz: efe7daf22b8f7a9c380bf5ab217d3e1a0919e62e7afd5e34f12b5554699c06fa59329961ef1fd5f2338653b6d0841a7959f8a5d97a05121e6e8de6ecfdf55e01
+  data.tar.gz: 9795df2566dacb92402c13b410e399d6038337215c9eea4d98c6f472005d9b2bb0046ac0117f72451446fc3bbfbbb6794ebfd039dc3dfde6a1bfa40553b8c6e3

data/Guardfile

@@ -1,5 +1,5 @@
-guard :rspec do
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
-end
+end

data/README.md

@@ -1,17 +1,20 @@
 <p align="center">
-  <a href="https://github.com/jipiboily/fourchette">
+  <a href="https://github.com/rainforestapp/fourchette">
     <img src="http://i.imgur.com/967yX36.png" alt="Fourchette" />
   </a>
   <br />
   <b>Your new best friend for isolated testing environments on Heroku</b>
   <br />
-  <a href="https://codeclimate.com/github/jipiboily/fourchette"><img src="https://codeclimate.com/github/jipiboily/fourchette.png" /></a>
-  <a href="https://travis-ci.org/jipiboily/fourchette"><img src="https://travis-ci.org/jipiboily/fourchette.png?branch=master" /></a>
-  <a href='https://coveralls.io/r/jipiboily/fourchette'><img src='https://coveralls.io/repos/jipiboily/fourchette/badge.png' alt='Coverage Status' /></a>
-  <a href="http://badge.fury.io/rb/fourchette"><img src="https://badge.fury.io/rb/fourchette.svg" alt="Gem Version" height="18"></a>
+  <a href="https://codeclimate.com/github/rainforestapp/fourchette"><img src="http://img.shields.io/codeclimate/github/rainforestapp/fourchette.svg?style=flat" /></a>
+  <a href="https://travis-ci.org/rainforestapp/fourchette"><img src="http://img.shields.io/travis/rainforestapp/fourchette/master.svg?style=flat" /></a>
+  <a href='https://coveralls.io/r/rainforestapp/fourchette'><img src='http://img.shields.io/coveralls/rainforestapp/fourchette.svg?style=flat' alt='Coverage Status' /></a>
+  <a href="http://badge.fury.io/rb/fourchette"><img src="http://img.shields.io/gem/v/fourchette.svg?style=flat" alt="Gem Version" height="18"></a>
+  <a href="http://tip4commit.com/github/rainforestapp/fourchette"><img src="http://tip4commit.com/projects/874.svg"><a>
 </p>
 
-Fourchette is your new best friend for having isolated testing environements. It will help you test your GitHub PRs against a fork of one your Heroku apps. You will have one Heroku app per PR now. Isn't that amazing? It will make testing way easier and you won't have the (maybe) broken code from other PRs on staging but only the code that requires testing.
+Fourchette is your new best friend for having isolated testing environments. It will help you test your [@GitHub](https://github.com/github) PRs against a fork of one your [@Heroku](https://github.com/heroku) apps. You will have one Heroku app per PR now. Isn't that amazing? It will make testing way easier and you won't have the (maybe) broken code from other PRs on staging but only the code that requires testing.
+
+Fourchette is maintained by [@jipiboily](https://github.com/jipiboily/)! You can see the other [contributors here](https://github.com/rainforestapp/fourchette/graphs/contributors).
 
 **IMPORTANT: Please note that forking your Heroku app means it will copy the same addon plans and that you will pay for multiple apps and their addons. Watch out!**
 
@@ -21,7 +24,7 @@ Fourchette is your new best friend for having isolated testing environements. It
   * [Configuration](#configuration)
   * [Enable your Fourchette instance](#enable-your-fourchette-instance)
   * [Enable, disable, update or delete the hook](#enable-disable-update-or-delete-the-hook)
-  * [Before & after steps, aka, callbacks](#before--after-steps-aka-callbacks)
+  * [Before & after steps; aka callbacks](#before--after-steps-aka-callbacks)
 - [Rake tasks](#rake-tasks)
 - [Async processing note](#async-processing-note)
 - [Contribute](#contribute)
@@ -30,14 +33,14 @@ Fourchette is your new best friend for having isolated testing environements. It
 
 ## How does that work exactly?
 
-- a PR is created against your GitHub project
-- Fourchette receives an event via GitHub Hooks
-  - it [forks](https://devcenter.heroku.com/articles/fork-app) an environement making it available to you
-  - any new commit against that PR will update the code
-- closing the PR will delete the forked app
-- re-opening the PR will re-create a fork
- 
-We use it a lot at [Rainforest QA](https://www.rainforestqa.com/). If you want to see a sample Fourchette app, here is one for you to look at: https://github.com/rainforestapp/fourchette.
+1. A PR is created against your GitHub project
+- Fourchette then receives an event via GitHub Hooks:
+  - It [forks](https://devcenter.heroku.com/articles/fork-app) an environment making it available to you
+  - Any new commit against that PR will update the code
+- Closing the PR will delete the forked app
+- Re-opening the PR will re-create a fork
+
+We use it a lot at [Rainforest QA](https://www.rainforestqa.com/). If you want to see a sample Fourchette app, here is one for you to look at: https://github.com/rainforestapp/rf-ourchette.
 
 ## Installation
 
@@ -46,15 +49,15 @@ We use it a lot at [Rainforest QA](https://www.rainforestqa.com/). If you want t
 3. run `cd my-app-name` (replace app name, again)
 4. run `git init && git add . && git commit -m "Initial commit :tada:"`
 5. push to Heroku
-6. configure the right environement variables (see [#configuration](#configuration))
+6. configure the right environment variables (see [#configuration](#configuration))
 7. Enable your Fourchette instance
 
 ### Configuration
 
-- `export FOURCHETTE_GITHUB_PROJECT="jipiboily/fourchette"`
-- `export FOURCHETTE_GITHUB_USERNAME="jipiboily"`
+- `export FOURCHETTE_GITHUB_PROJECT="rainforestapp/fourchette"`
+- `export FOURCHETTE_GITHUB_USERNAME="rainforestapp"`
 - `export FOURCHETTE_GITHUB_PERSONAL_TOKEN='a token here...'` # You can create one here: https://github.com/settings/applications
-- `export FOURCHETTE_HEROKU_API_KEY='API key here'`
+- `export FOURCHETTE_HEROKU_API_KEY="API key here"`
 - `export FOURCHETTE_HEROKU_APP_TO_FORK='the name of the app to fork from'`
 - `export FOURCHETTE_APP_URL="http://fourchette-app.herokuapp.com"`
 - `export FOURCHETTE_HEROKU_APP_PREFIX="fourchette"` # This is basically to namespace your forks. In that example, they would be named "fourchette-pr-1234" where "1234" is the PR number. Beware, the name can't be more than 30 characters total! It will be changed to be lowercase only, so you should probably just use lowercase characters anyways.
@@ -67,11 +70,11 @@ run `bundle exec rake fourchette:enable`
 
 ### Enable, disable, update or delete the hook
 
-`bundle exec rake -T` will tell you the rake tasks available. There are tasks to enable, disable or delete the GitHub hook to your Fourchette instance. There is also one to update the hook. That last one is mostly for development, if your local tunnel URl changed and you want to update the hook's URL.
+`bundle exec rake -T` will tell you the rake tasks available. There are tasks to enable, disable or delete the GitHub hook to your Fourchette instance. There is also one to update the hook. That last one is mostly for development, if your local tunnel URL changed and you want to update the hook's URL.
 
 ### Before & after steps, aka, callbacks
 
-You need to run steps before and/or after the creation of your new Heroku app? Let's say you want to run mirgations after deploying new code. There is a simple (and primitive) way of doing it. It might not be perfect but can work until there is a cleaner and more flexible way of doing so, if required.
+You need to run steps before and/or after the creation of your new Heroku app? Let's say you want to run mirgations after deploying new code. There is a simple (and primitive) way of doing it. It might not be perfect but will work until there is a cleaner and more flexible way of doing so, if required.
 
 Create a file in your project to override the `Fourchette::Callbacks` class and include it after Fourchette.
 
@@ -79,7 +82,7 @@ You just want to override the `before` or `after` methods of `Fourchette::Callba
 
 ## Rake tasks
 
-```
+```bash
 rake fourchette:console  # Brings up a REPL with the code loaded
 rake fourchette:delete   # This deletes the Fourchette hook
 rake fourchette:disable  # This disables Fourchette hook
@@ -87,9 +90,13 @@ rake fourchette:enable   # This enables Fourchette hook
 rake fourchette:update   # This updates the Fourchette hook with the current URL of the app
 ```
 
+## QA Skip
+
+Adding `[qa skip]` to the title of your pull request will cause Fourchette to ignore the pull request. This is inspired by the `[ci skip]` directive that [various](http://docs.travis-ci.com/user/how-to-skip-a-build/) [ci tools](https://circleci.com/docs/skip-a-build) support.
+
 ## Async processing note
 
-Fourchette uses [Sucker Punch](https://github.com/brandonhilkert/sucker_punch), "a single-process Ruby asynchronous processing library". No need for redis or extra processes. It also mean it can run for free on Heroku, if this is what you want.
+Fourchette uses [Sucker Punch](https://github.com/brandonhilkert/sucker_punch), "a single-process Ruby asynchronous processing library". No need for redis or extra processes. It also mean you can run it for free on Heroku, if this is what you want.
 
 ## Contribute
 
@@ -108,6 +115,6 @@ If you want the maximum output in your GitHub comments, set this environment var
 export DEBUG='true'
 ```
 
-# Contributors
+# Thanks to...
 
-Thanks to [@jpsirois](https://github.com/jpsirois/) for the logo!
+- [@jpsirois](https://github.com/jpsirois/) for the logo!

data/fourchette.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jean-Philippe Boily"]
   spec.email         = ["j@jipi.ca"]
   spec.summary       = %q{Your new best friend for isolated testing environments on Heroku.}
-  spec.description   = %q{Fourchette is your new best friend for having isolated testing environements. It will help you test your GitHub PRs against a fork of one your Heroku apps. You will have one Heroku app per PR now. Isn't that amazing? It will make testing way easier and you won't have the (maybe) broken code from other PRs on staging but only the code that requires testing.}
+  spec.description   = %q{Fourchette is your new best friend for having isolated testing environment. It will help you test your GitHub PRs against a fork of one your Heroku apps. You will have one Heroku app per PR now. Isn't that amazing? It will make testing way easier and you won't have the (maybe) broken code from other PRs on staging but only the code that requires testing.}
   spec.homepage      = "https://github.com/jipiboily/fourchette"
   spec.license       = "MIT"
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra-contrib"
   spec.add_dependency "octokit"
   spec.add_dependency "git"
-  spec.add_dependency "heroku", "~> 3.9" # Deprecated, but best/easiest solution for the pgbackups...
+  spec.add_dependency "heroku", "~> 3.9" # Deprecated, but best/easiest solution for pgbackups...
   spec.add_dependency 'platform-api', '~> 0.2.0'
   spec.add_dependency "sucker_punch"
   spec.add_dependency "thor"

data/lib/fourchette/github.rb

@@ -98,4 +98,4 @@ class Fourchette::GitHub
       }
     )
   end
-end
+end

data/lib/fourchette/heroku.rb

@@ -63,9 +63,13 @@ class Fourchette::Heroku
   end
 
   def copy_pg from, to
-    logger.info "Copying Postgres's data from #{from} to #{to}"
-    backup = Fourchette::Pgbackups.new
-    backup.copy(from, to)
+    if pg_enabled?(from)
+      logger.info "Copying Postgres's data from #{from} to #{to}"
+      backup = Fourchette::Pgbackups.new
+      backup.copy(from, to)
+    else
+      logger.info "Postgres not enabled on #{from}. Skipping data copy."
+    end
   end
 
   def copy_RACK_AND_RAILS_ENV_again(from, to)
@@ -84,4 +88,10 @@ class Fourchette::Heroku
     end
     environments
   end
+
+  def pg_enabled?(app)
+    client.addon.list(app).any? do |addon|
+      addon['addon_service']['name'] == 'heroku-postgresql'
+    end
+  end
 end

data/lib/fourchette/pull_request.rb

@@ -2,6 +2,8 @@ class Fourchette::PullRequest
   include SuckerPunch::Job
 
   def perform params
+    return if qa_skip?(params)
+
     callbacks = Fourchette::Callbacks.new(params)
     fork = Fourchette::Fork.new(params)
 
@@ -20,4 +22,11 @@ class Fourchette::PullRequest
 
     callbacks.after_all
   end
-end
+
+  private
+
+  def qa_skip? params
+    params['pull_request']['title'].downcase.include?('[qa skip]')
+  end
+
+end

data/lib/fourchette/version.rb

@@ -1,3 +1,3 @@
 module Fourchette
-  VERSION = "0.0.8"
-end
+  VERSION = "0.1.0"
+end

data/spec/lib/fourchette/fork_spec.rb

@@ -22,34 +22,6 @@ describe Fourchette::Fork do
         })
   end
 
-  describe '#update' do
-    before do
-      subject.stub(:create_unless_exists)
-      subject.stub(:monitor_build)
-      Fourchette::Heroku.any_instance.stub_chain(:client, :build, :create)
-    end
-
-    after do
-      # subject.update
-    end
-
-    it 'calls #create_unless_exists' do
-      subject.should_receive(:create_unless_exists)
-
-    end
-
-    it 'starts the build process with the generated tarball URL' do
-      heroku_client_stub = double
-      heroku_client_stub.stub(:build)
-      heroku_client_stub.build.should_receive(:create)
-      Fourchette::Heroku.any_instance.stub(:client).and_return(heroku_client_stub)
-      subject.update
-    end
-
-    it 'starts monitoring the build' do
-    end
-  end
-
   describe '#create' do
     it 'calls #update and #create_unless_exists' do
       subject.should_receive(:create_unless_exists)

data/spec/lib/fourchette/github_spec.rb

@@ -0,0 +1,127 @@
+require "spec_helper"
+
+describe Fourchette::GitHub do
+  subject { described_class.new }
+
+  let(:fake_hooks) { [] }
+
+  let(:fake_hook) do
+    hook = double("hook")
+    hook.stub(:config).and_return(nil)
+    hook.stub(:id).and_return(123)
+    hook
+  end
+
+  let(:fake_fourchette_hook) do
+    fake_hook.config.stub(:fourchette_env).and_return("something")
+    fake_hook
+  end
+
+  let(:fake_enabled_fourchette_hook) do
+    fake_fourchette_hook.stub(:active).and_return(true)
+    fake_fourchette_hook
+  end
+
+  let(:fake_disabled_fourchette_hook) do
+    fake_fourchette_hook.stub(:active).and_return(false)
+    fake_fourchette_hook
+  end
+
+  before do
+    allow_message_expectations_on_nil
+    subject.stub(:hooks).and_return(fake_hooks)
+    Octokit::Client.any_instance.stub(:edit_hook)
+  end
+
+  describe "#enable_hook" do
+    context "when there is alerady a Fourchette hook" do
+
+      context "when the hook was enabled" do
+        let(:fake_hooks) { [fake_enabled_fourchette_hook] }
+
+        it "does NOT enable the hook" do
+          Octokit::Client.any_instance.should_not_receive(:edit_hook)
+
+          subject.enable_hook
+        end
+      end
+
+      context "when the hook was disabled" do
+        let(:fake_hooks) { [fake_disabled_fourchette_hook] }
+
+        it "enables the hook" do
+          Octokit::Client.any_instance.should_receive(:edit_hook)
+
+          subject.enable_hook
+        end
+      end
+    end
+
+    context "when there is no Fourchette hook yet" do
+      it "adds a hook" do
+        Octokit::Client.any_instance.should_receive(:create_hook)
+
+        subject.enable_hook
+      end
+    end
+  end
+
+  describe "#disable_hook" do
+    context "where there is an active Fourchette hook" do
+      let(:fake_hooks) { [fake_enabled_fourchette_hook] }
+
+      it "disables the hook" do
+        Octokit::Client.any_instance.should_receive(:edit_hook)
+
+        subject.disable_hook
+      end
+    end
+
+    context "when there is a disabled Fourchette hook" do
+      let(:fake_hooks) { [fake_disabled_fourchette_hook] }
+      it "does not try to disable a hook" do
+        subject.should_not_receive(:disable)
+        subject.disable_hook
+      end
+    end
+
+    context "when there is no Fourchette hook" do
+      it "does not try to disable a hook" do
+        subject.should_not_receive(:disable)
+        subject.disable_hook
+      end
+    end
+  end
+
+  describe "#update_hook" do
+    let(:fake_hooks) { [fake_enabled_fourchette_hook] }
+
+    it "calls toggle_active_state_to" do
+      subject
+        .should_receive(:toggle_active_state_to)
+      subject.update_hook
+    end
+  end
+
+  describe "#delete_hook" do
+    it "deletes the hook on GitHub" do
+      subject.stub(:fourchette_hook).and_return(fake_hook)
+      Octokit::Client.any_instance.should_receive(:remove_hook)
+
+      subject.delete_hook
+    end
+  end
+
+  describe "#comment_pr" do
+    before do
+      stub_const("ENV", "FOURCHETTE_GITHUB_PROJECT" => "my-project")
+    end
+
+    it "adds a comment" do
+      Octokit::Client.any_instance
+        .should_receive(:add_comment).with("my-project", 1, "yo!")
+
+      subject.comment_pr(1, "yo!")
+    end
+  end
+end

data/spec/lib/fourchette/heroku_spec.rb

@@ -93,7 +93,7 @@ describe Fourchette::Heroku do
     let(:addon_list) { [ { 'plan' => { 'name' => 'redistogo' } } ] }
 
     before do
-      heroku.client.stub(:addon).and_return( double('addon') )
+      heroku.client.stub(:addon).and_return(double('addon'))
       heroku.client.addon.stub(:create)
       heroku.client.addon.stub(:list).and_return(addon_list)
     end
@@ -110,9 +110,34 @@ describe Fourchette::Heroku do
   end
 
   describe '#copy_pg' do
-    it 'calls Fourchette::Pgbackups#copy' do
-      Fourchette::Pgbackups.any_instance.should_receive(:copy).with(from_app_name, to_app_name)
-      heroku.copy_pg(from_app_name, to_app_name)
+
+    before do
+      heroku.client.stub(:addon).and_return(double('addon'))
+      heroku.client.addon.stub(:list).and_return(addon_list)
+    end
+
+    context 'when a heroku-postgresql addon is enabled' do
+      let(:addon_list) { [{ 'addon_service' => { 'name' => 'heroku-postgresql' } }] }
+
+      it 'calls Fourchette::Pgbackups#copy' do
+        Fourchette::Pgbackups.any_instance.should_receive(:copy).with(from_app_name, to_app_name)
+        heroku.copy_pg(from_app_name, to_app_name)
+      end
+    end
+
+    context 'when a heroku-postgresql addon is not enabled' do
+      let(:addon_list) { [{ 'addon_service' => { 'name' => 'redistogo' } }] }
+
+      it 'does not call Fourchette::Pgbackups#copy' do
+        # Had to work around lack of support for any_instance and should_not_receive
+        # see https://github.com/rspec/rspec-mocks/issues/164 for more details
+        count = 0
+        Fourchette::Pgbackups.any_instance.stub(:copy) do |from_app_name, to_app_name|
+          count += 1
+        end
+        heroku.copy_pg(from_app_name, to_app_name)
+        count.should eq(0)
+      end
     end
   end
 

data/spec/lib/fourchette/pull_request_spec.rb

@@ -11,27 +11,33 @@ describe Fourchette::PullRequest do
     end
 
     context 'action == synchronize' do
-      let!(:params) { { 'action' => 'synchronize' } }
+      let!(:params) { { 'action' => 'synchronize', 'pull_request' => { 'title' => 'Test Me' } } }
 
       it { fork.should_receive(:update) }
     end
 
     context 'action == closed' do
-      let!(:params) { { 'action' => 'closed' } }
+      let!(:params) { { 'action' => 'closed', 'pull_request' => { 'title' => 'Test Me' } } }
 
       it { fork.should_receive(:delete) }
     end
 
     context 'action == reopened' do
-      let!(:params) { { 'action' => 'reopened' } }
+      let!(:params) { { 'action' => 'reopened', 'pull_request' => { 'title' => 'Test Me' } } }
 
       it { fork.should_receive(:create) }
     end
 
     context 'action == opened' do
-      let!(:params) { { 'action' => 'opened' } }
+      let!(:params) { { 'action' => 'opened', 'pull_request' => { 'title' => 'Test Me' } } }
 
       it { fork.should_receive(:create) }
     end
+
+    context 'title includes [qa skip]' do
+      let!(:params) { { 'action' => 'opened', 'pull_request' => { 'title' => 'Skip Me [QA Skip]' } } }
+
+      it { fork.should_not_receive(:create) }
+    end
   end
-end
+end

data/spec/lib/web/hooks_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+require "support/sinatra_helper"
+require "sucker_punch/testing/inline"
+
+describe "GitHub web hooks receiver" do
+  it "kicks an async job doing all the work" do
+    expected_param = { "something" => "ok" }
+    Fourchette::PullRequest.any_instance
+      .should_receive(:perform)
+      .with(expected_param)
+
+    post "/hooks",
+         expected_param.to_json,
+         "CONTENT_TYPE" => "application/json"
+  end
+end

data/spec/lib/web/tarball_spec.rb

@@ -1,35 +1,29 @@
-require 'spec_helper'
-require 'rack/test'
+require "spec_helper"
+require "support/sinatra_helper"
 
-describe 'web tarball serving' do
-  include Rack::Test::Methods
-
-  def app
-    Sinatra::Application
-  end
-
-  context 'valid and not expired URL' do
+describe "web tarball serving" do
+  context "valid and not expired URL" do
     it "returns the file" do
       expire_in_2_secs = Time.now.to_i + 2
       Fourchette::Tarball.any_instance
         .should_receive(:filepath)
-        .with('1234567', expire_in_2_secs.to_s)
+        .with("1234567", expire_in_2_secs.to_s)
         .and_return { "#{Dir.pwd}/spec/factories/fake_file" }
-      
+
       get "/jipiboily/fourchette/1234567/#{expire_in_2_secs}"
-      expect(last_response.headers['Content-Type']).to eq "application/x-tgz"
-      expect(last_response.body).to eq 'some content...'
+      expect(last_response.headers["Content-Type"]).to eq "application/x-tgz"
+      expect(last_response.body).to eq "some content..."
     end
   end
 
-  context 'expired URL' do
+  context "expired URL" do
     it "does NOT returns the file if it is expired" do
       expired_one_sec_ago = Time.now.to_i - 1
       get "/jipiboily/fourchette/1234567/#{expired_one_sec_ago}"
       expect(last_response).not_to be_ok
-      expect(last_response.body).not_to eq('Hello World')
+      expect(last_response.body).not_to eq("Hello World")
       expect(last_response.status).to eq(404)
       subject.should_not_receive(:send_file)
     end
   end
-end
+end

data/spec/support/sinatra_helper.rb

@@ -0,0 +1,6 @@
+require "rack/test"
+include Rack::Test::Methods
+
+def app
+  Sinatra::Application
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fourchette
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Jean-Philippe Boily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -220,7 +220,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Fourchette is your new best friend for having isolated testing environements.
+description: Fourchette is your new best friend for having isolated testing environment.
   It will help you test your GitHub PRs against a fork of one your Heroku apps. You
   will have one Heroku app per PR now. Isn't that amazing? It will make testing way
   easier and you won't have the (maybe) broken code from other PRs on staging but
@@ -235,7 +235,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock.orig
 - Guardfile
 - LICENSE.txt
 - Procfile
@@ -265,9 +264,11 @@ files:
 - spec/lib/fourchette/logger_spec.rb
 - spec/lib/fourchette/pull_request_spec.rb
 - spec/lib/fourchette/tarball_spec.rb
+- spec/lib/web/hooks_spec.rb
 - spec/lib/web/tarball_spec.rb
 - spec/spec_helper.rb
 - spec/support/silent-logger.rb
+- spec/support/sinatra_helper.rb
 - templates/Gemfile
 - templates/Procfile
 - templates/Rakefile
@@ -306,6 +307,8 @@ test_files:
 - spec/lib/fourchette/logger_spec.rb
 - spec/lib/fourchette/pull_request_spec.rb
 - spec/lib/fourchette/tarball_spec.rb
+- spec/lib/web/hooks_spec.rb
 - spec/lib/web/tarball_spec.rb
 - spec/spec_helper.rb
 - spec/support/silent-logger.rb
+- spec/support/sinatra_helper.rb

data/Gemfile.lock.orig

@@ -1,163 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fourchette (0.0.8)
-      git
-      heroku
-      octokit
-      platform-api (~> 0.2.0)
-      rake
-      sinatra
-      sinatra-contrib
-      sucker_punch
-      thor
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    backports (3.6.0)
-    byebug (2.7.0)
-      columnize (~> 0.3)
-      debugger-linecache (~> 1.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    coderay (1.1.0)
-    columnize (0.8.9)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    docile (1.1.3)
-    dotenv (0.7.0)
-    erubis (2.7.0)
-    excon (0.34.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
-    foreman (0.64.0)
-      dotenv (~> 0.7.0)
-      thor (>= 0.13.6)
-    formatador (0.2.4)
-    git (1.2.6)
-    guard (2.5.1)
-      formatador (>= 0.2.4)
-      listen (~> 2.6)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-rspec (4.2.7)
-      guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    heroics (0.0.10)
-      erubis (~> 2.7.0)
-      excon
-      moneta
-      multi_json (>= 1.9.2)
-      netrc
-    heroku (3.8.2)
-      heroku-api (~> 0.3.17)
-      launchy (>= 0.3.2)
-      netrc (~> 0.7.7)
-      rest-client (~> 1.6.1)
-      rubyzip
-    heroku-api (0.3.18)
-      excon (~> 0.27)
-      multi_json (~> 1.8)
-    launchy (2.4.2)
-      addressable (~> 2.3)
-    listen (2.6.2)
-      celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
-    method_source (0.8.2)
-    mime-types (2.2)
-    moneta (0.7.20)
-    multi_json (1.9.2)
-    multipart-post (2.0.0)
-    netrc (0.7.7)
-    nio4r (1.0.0)
-    octokit (3.1.0)
-      sawyer (~> 0.5.3)
-    platform-api (0.2.0)
-      heroics (~> 0.0.10)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-byebug (1.3.2)
-      byebug (~> 2.7)
-      pry (~> 0.9.12)
-    puma (2.8.2)
-      rack (>= 1.1, < 2.0)
-    rack (1.5.2)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.3.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
-      ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rubyzip (1.1.4)
-    sawyer (0.5.4)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.2)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-    slop (3.5.0)
-    sucker_punch (1.0.5)
-      celluloid (~> 0.15.2)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    terminal-notifier-guard (1.5.3)
-    thor (0.19.1)
-    tilt (1.4.1)
-    timers (1.1.0)
-    tins (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coveralls
-  foreman
-  fourchette!
-  guard-rspec
-  pry-byebug
-  puma
-  rspec (~> 2.14.1)
-  terminal-notifier-guard