fourchette 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a81c926b6fccb25d10111bbd826e6f12ac1b4925
-  data.tar.gz: b99d9faac8fc580772d1c5e45517343b9ae07427
+  metadata.gz: 8c9f8cf3c1ab81a0d6e9dccfe8bcdc3c514e63cb
+  data.tar.gz: e45ab1fae384d7d27177547d22f5bcaf45a4df79
 SHA512:
-  metadata.gz: 486ac1c0d082e82aab0483acb3acfa34abbbc339c916962fa0bb38c1ef8a01299a9ece417bf3b526bf4f52d9abd06b780415f002e60fd83da721fb39f314f965
-  data.tar.gz: e833fb94778d18cf6621d9e96524be64779119bb554796d7a50c3531dac281ae889f9c6b7e3da5dbf4632c5203039758d91c9a8f7facfc89a49a1b907483ae3d
+  metadata.gz: 72e449f543a1a0236c55b3032ce8369ebfcc085c5b19bcaa3f29e1edf2963ac2c811c8afb567825a2d4f4052f9bc38a230f127e9ffe599b31bb514b6366b1930
+  data.tar.gz: a0408665d2915e8f03dd0db64b8abf4913086c522f0fd33f2499a9723ac562e8e45e8a55371527f682566ddf55c7dfc48d9a9e9916f777e2c9d339da34a743e5

data/Gemfile

@@ -1,3 +1,5 @@
 source 'http://rubygems.org'
 
-gemspec
+gemspec
+
+gem 'puma'

data/README.md

@@ -8,6 +8,7 @@
   <a href="https://codeclimate.com/github/jipiboily/fourchette"><img src="https://codeclimate.com/github/jipiboily/fourchette.png" /></a>
   <a href="https://github.com/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>
 </p>
 
 **IMPORTANT: this is a work in progress, use at your own risk.**
@@ -99,6 +100,14 @@ Fourchette uses [Sucker Punch](https://github.com/brandonhilkert/sucker_punch),
 
 Bonus: if you need a tunnel to your local dev machine to work with GitHub hooks, you might want to look at https://ngrok.com/.
 
+### Logging
+
+If you want the maximum output in your GitHub comments, set this environment variable:
+
+```
+export DEBUG='true'
+```
+
 ## It needs some love...
 
 What needs to be improved?

data/fourchette.gemspec

@@ -18,17 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bundler", "~> 1.5"
   spec.add_dependency "rake"
-  spec.add_dependency "sinatra", "~> 1.4.4"
-  spec.add_dependency "sinatra-contrib", "~> 1.4.2"
-  spec.add_dependency "octokit", "~> 3.0.0"
-  spec.add_dependency "git", "~> 1.2.6"
+  spec.add_dependency "sinatra"
+  spec.add_dependency "sinatra-contrib"
+  spec.add_dependency "octokit"
+  spec.add_dependency "git"
   spec.add_dependency "heroics", "0.0.2"
-  spec.add_dependency "heroku", "~> 3.3.0" # Deprecated, but best/easiest solution for the pgbackups...
-  spec.add_dependency "sucker_punch", "~> 1.0.2"
+  spec.add_dependency "heroku" # Deprecated, but best/easiest solution for the pgbackups...
+  spec.add_dependency "sucker_punch"
 
-  spec.add_development_dependency 'foreman', '~> 0.63.0'
+  spec.add_development_dependency 'foreman'
   spec.add_development_dependency 'pry-debugger'
   spec.add_development_dependency 'rspec', '~> 2.14.1'
   spec.add_development_dependency 'coveralls'

data/lib/fourchette.rb

@@ -29,6 +29,7 @@ end
 
 
 module Fourchette
+  DEBUG = ENV['DEBUG'] ? true : false
 end
 
 require_relative 'fourchette/logger'

data/lib/fourchette/fork.rb

@@ -4,6 +4,7 @@ class Fourchette::Fork
   def initialize params
     @params = params
     @heroku = Fourchette::Heroku.new
+    @github = Fourchette::GitHub.new
   end
 
   def update
@@ -65,7 +66,7 @@ class Fourchette::Fork
   end
 
   def create
-    github.comment_pr(pr_number, "Fourchette is initializing a new fork.")
+    @github.comment_pr(pr_number, "Fourchette is initializing a new fork.") if Fourchette::DEBUG
     create_unless_exists
     update
   end
@@ -74,22 +75,9 @@ class Fourchette::Fork
     @heroku.delete(fork_name)
 
     # Update PR with URL
-    github.comment_pr(pr_number, "Test app deleted!")
+    @github.comment_pr(pr_number, "Test app deleted!")
   end
-
-  private
-  def github
-    @github ||= Fourchette::GitHub.new
-  end
-
-  def create_unless_exists
-    unless @heroku.app_exists?(fork_name)
-      @heroku.fork(ENV['FOURCHETTE_HEROKU_APP_TO_FORK'] ,fork_name)
-      # Update PR with URL
-      github.comment_pr(pr_number, "Test URL: #{@heroku.client.app.info(fork_name)['web_url']}")
-    end
-  end
-
+  
   def fork_name
     "#{ENV['FOURCHETTE_HEROKU_APP_PREFIX']}-PR-#{pr_number}".downcase # It needs to be lowercase only.
   end
@@ -99,10 +87,19 @@ class Fourchette::Fork
   end
 
   def branch_name
-    @branch_name ||= "remotes/origin/#{@params['pull_request']['head']['ref']}"
+    "remotes/origin/#{@params['pull_request']['head']['ref']}"
   end
 
   def pr_number
-    @pr_number ||= @params['pull_request']['number']
+    @params['pull_request']['number']
+  end
+
+  private
+  def create_unless_exists
+    unless @heroku.app_exists?(fork_name)
+      @heroku.fork(ENV['FOURCHETTE_HEROKU_APP_TO_FORK'] ,fork_name)
+      # Update PR with URL
+      @github.comment_pr(pr_number, "Test URL: #{@heroku.client.app.info(fork_name)['web_url']}")
+    end
   end
 end

data/lib/fourchette/github.rb

@@ -30,7 +30,7 @@ class Fourchette::GitHub
   end
 
   def comment_pr pr_number, comment
-    comment = "****** FOURCHETTE COMMENT ******\n\n#{comment}\n\n****** END OF FOURCHETTE COMMENT ******"
+    comment = "****** FOURCHETTE COMMENT ******\n\n#{comment}\n\n****** END OF FOURCHETTE COMMENT ******" if Fourchette::DEBUG
     octokit.add_comment(ENV['FOURCHETTE_GITHUB_PROJECT'], pr_number, comment)
   end
 

data/lib/fourchette/pull_request.rb

@@ -3,12 +3,12 @@ class Fourchette::PullRequest
 
   def perform params
     callbacks = Fourchette::Callbacks.new(params)
-    @params = params
+    fork = Fourchette::Fork.new(params)
 
     callbacks.before
 
-    case action
-    when 'synchronize' # new push against the PR
+    case params['action']
+    when 'synchronize' # new push against the PR (updating code, basically)
       fork.update
     when 'closed'
       fork.delete
@@ -20,12 +20,4 @@ class Fourchette::PullRequest
 
     callbacks.after
   end
-
-  def action
-    @params['action']
-  end
-
-  def fork
-    @fork ||= Fourchette::Fork.new(@params)
-  end
 end

data/lib/fourchette/version.rb

@@ -1,3 +1,3 @@
 module Fourchette
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/fourchette/pull_request_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Fourchette::PullRequest do
+  describe '#perform' do
+    let!(:fork) { double('fork') }
+    subject { described_class.new }
+
+    after do
+      Fourchette::Fork.stub(:new).and_return(fork)
+      subject.perform(params)
+    end
+
+    context 'action == synchronize' do
+      let!(:params) { { 'action' => 'synchronize' } }
+
+      it { fork.should_receive(:update) }
+    end
+
+    context 'action == closed' do
+      let!(:params) { { 'action' => 'closed' } }
+
+      it { fork.should_receive(:delete) }
+    end
+
+    context 'action == reopened' do
+      let!(:params) { { 'action' => 'reopened' } }
+
+      it { fork.should_receive(:create) }
+    end
+
+    context 'action == opened' do
+      let!(:params) { { 'action' => 'opened' } }
+
+      it { fork.should_receive(:create) }
+    end
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fourchette
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jean-Philippe Boily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -42,58 +28,58 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: heroics
   requirement: !ruby/object:Gem::Requirement
@@ -112,44 +98,44 @@ dependencies:
   name: heroku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.63.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.63.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +192,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - Procfile
 - README.md
@@ -226,6 +211,7 @@ files:
 - lib/fourchette/web.rb
 - lib/fourchette/web/hooks.rb
 - spec/lib/fourchette/heroku_spec.rb
+- spec/lib/fourchette/pull_request_spec.rb
 - spec/spec_helper.rb
 - spec/support/silent-logger.rb
 homepage: https://github.com/jipiboily/fourchette
@@ -254,5 +240,6 @@ specification_version: 4
 summary: Your new best friend for isolated testing environments on Heroku.
 test_files:
 - spec/lib/fourchette/heroku_spec.rb
+- spec/lib/fourchette/pull_request_spec.rb
 - spec/spec_helper.rb
 - spec/support/silent-logger.rb