fourchette 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb220257050dab90239666b5b564eb4fc8654709
-  data.tar.gz: 72f3e73d160475e282b84f8e1fa28b5521f9d8c6
+  metadata.gz: e3d2dcc715d8a2c65fe34a0248a6089bcfb5762a
+  data.tar.gz: 74456ce01a2cff7e4939f04efc7b0c49891597a1
 SHA512:
-  metadata.gz: c5df94511416b3f0357b151fadb2f18063a0f0eb6eabc9c493d1eda6db62f34cbb4aa3fa7a6ac6cc6f24827828798b40d04f96d4cfb39a149bc0256f53d0673a
-  data.tar.gz: f152cd6b5390905874ef495bb3bc776f1d6dc681eefcc171a4e19daf0e75f44dc0022e6d1cefc6415616aa565066c11f1b2ec20b82a09490bb294f526c9f7a9f
+  metadata.gz: b8055c8a81b2dc7253139b50b42e5fbd7188c137246ff73a44a4e0ce9a15ea9539a12dacab07f7893f56d389a7bac072aa18688f7f51357617aac2971118e4e4
+  data.tar.gz: 69ba6c5cc5d1e26972a865ef438168e154f879cc9e419405d760c0c881a0e58897f98adf5a8d026cf1281776c9c4b78a54162b3f87c01330f545cac63234acb9

data/Guardfile

@@ -0,0 +1,5 @@
+guard :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

data/fourchette.gemspec

@@ -31,5 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'foreman'
   spec.add_development_dependency 'pry-debugger'
   spec.add_development_dependency 'rspec', '~> 2.14.1'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'terminal-notifier-guard'
   spec.add_development_dependency 'coveralls'
 end

data/lib/fourchette.rb

@@ -40,4 +40,5 @@ require_relative 'fourchette/pull_request'
 require_relative 'fourchette/fork'
 require_relative 'fourchette/heroku'
 require_relative 'fourchette/pgbackups'
-require_relative 'fourchette/callbacks'
+require_relative 'fourchette/callbacks'
+require_relative 'fourchette/tarball'

data/lib/fourchette/fork.rb

@@ -9,10 +9,11 @@ class Fourchette::Fork
 
   def update
     create_unless_exists
-
+    tarball = Fourchette::Tarball.new
+    tarball_url = tarball.url(github_git_url, git_branch_name, ENV['FOURCHETTE_GITHUB_PROJECT'])
     options = {
       source_blob: {
-          url: "https://github.com/#{ENV['FOURCHETTE_GITHUB_PROJECT']}/archive/#{branch_name}.tar.gz?token=#{ENV['FOURCHETTE_GITHUB_PERSONAL_TOKEN']}"
+          url: tarball_url
         }
     }
 
@@ -21,12 +22,15 @@ class Fourchette::Fork
   end
 
   def monitor_build build
+    logger.info "Start of the build process on Heroku..."
     build_info = @heroku.client.build.info(fork_name, build['id'])
-    while build_info['status'] == 'pending'
-      build_info = @heroku.client.build.info(fork_name, build['id'])
-      sleep 5
+    # Let's just leave some time to Heroku to download the tarball and start 
+    # the process. This is some random timing that seems to make sense at first.
+    sleep 30
+    if build_info['status'] == 'failed'
+      @github.comment_pr(pr_number, "The build failed on Herok. See the activity tab on Heroku.")
+      fail Fourchette::DeployException
     end
-    fail Fourchette::DeployException if build_info['status'] == 'failed'
   end
 
   def create
@@ -62,4 +66,12 @@ class Fourchette::Fork
       @github.comment_pr(pr_number, "Test URL: #{@heroku.client.app.info(fork_name)['web_url']}")
     end
   end
+
+  def git_branch_name
+    "remotes/origin/#{branch_name}"
+  end
+
+  def github_git_url
+    @params['pull_request']['head']['repo']['clone_url'].gsub("//github.com", "//#{ENV['FOURCHETTE_GITHUB_USERNAME']}:#{ENV['FOURCHETTE_GITHUB_PERSONAL_TOKEN']}@github.com")
+  end
 end

data/lib/fourchette/tarball.rb

@@ -0,0 +1,43 @@
+require 'securerandom'
+class Fourchette::Tarball
+  include Fourchette::Logger
+
+  def url(github_git_url, branch_name, github_repo)
+    filepath = prepare_tarball(github_git_url, branch_name)
+    tarball_to_url(filepath, github_repo)
+  end
+
+  def filepath(uuid, expiration)
+    "tmp/#{uuid}/#{expiration}.tar.gz"
+  end
+
+  private
+  def prepare_tarball(github_git_url, branch_name)
+    clone_path = "tmp/#{SecureRandom.uuid}"
+    clone(github_git_url, branch_name, clone_path)
+    tar(clone_path)
+  end
+
+  def clone(github_git_url,branch_name, clone_path)
+    logger.info "Cloning repository..."
+    repo = Git.clone(github_git_url, clone_path, recursive: true)
+    repo.checkout(branch_name)
+  end
+
+  def tar(path)
+    logger.info "Preparing tarball..."
+    filepath = "#{path}/#{expiration_timestamp}.tar.gz"
+    system("tar -zcvf #{filepath} -C #{path} .")
+    filepath
+  end
+
+  def expiration_timestamp
+    Time.now.to_i + 300
+  end
+
+  def tarball_to_url(filepath, github_repo)
+    logger.info "Tarball to URL as a service in progress..."
+    cleaned_path = filepath.gsub('tmp/', '').gsub('.tar.gz', '')
+    "#{ENV['FOURCHETTE_APP_URL']}/#{github_repo}/#{cleaned_path}"
+  end
+end

data/lib/fourchette/version.rb

@@ -1,3 +1,3 @@
 module Fourchette
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/fourchette/web.rb

@@ -1 +1,2 @@
-require_relative 'web/hooks'
+require_relative 'web/hooks'
+require_relative 'web/tarball'

data/lib/fourchette/web/tarball.rb

@@ -0,0 +1,10 @@
+get '/:github_user/:github_repo/:uuid/:expiration_timestamp' do
+  if params['expiration_timestamp'].to_i < Time.now.to_i
+    status 404
+    'Oops...'
+  else
+    logger.info('Serving a tarball!')
+    filepath = Fourchette::Tarball.new.filepath(params['uuid'], params['expiration_timestamp'])
+    send_file filepath, :type => 'application/x-tgz'
+  end
+end

data/spec/factories/fake_file

@@ -0,0 +1 @@
+some content...

data/spec/lib/fourchette/tarball_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Fourchette::Tarball do
+  subject { described_class.new }
+
+  describe '#url' do
+    let(:git_repo_url) { 'git://github.com/jipiboily/fourchette.git' }
+    let(:github_repo) { 'jipiboily/fourchette' }
+    let(:branch_name) { 'feature/something-new' }
+
+    before do
+      subject.stub(:expiration_timestamp).and_return('123')
+      subject.stub(:clone)
+      subject.stub(:tar).and_return('tmp/1234567/123.tar.gz')
+      subject.stub(:system)
+      stub_const('ENV', {'FOURCHETTE_APP_URL' => 'http://example.com'})
+      SecureRandom.stub(:uuid).and_return('1234567')
+    end
+
+    it {
+        expect(
+            subject.url(git_repo_url, branch_name, github_repo)
+          ).to eq "http://example.com/jipiboily/fourchette/1234567/123"
+        }
+
+    it 'clones the repo and checkout the branch' do
+      subject.unstub(:clone)
+      git_instance = double
+      Git.should_receive(:clone).with(git_repo_url, "tmp/1234567", recursive: true).and_return(git_instance)
+      git_instance.should_receive(:checkout).with(branch_name)
+      subject.url(git_repo_url, branch_name, github_repo)
+    end
+
+    it 'creates the tarball' do
+      subject.unstub(:tar)
+      subject.should_receive(:system).with 'tar -zcvf tmp/1234567/123.tar.gz -C tmp/1234567 .'
+      subject.url(git_repo_url, branch_name, github_repo)
+    end
+  end
+
+  describe '#filepath' do
+    it { expect(subject.filepath('1234567', '123')).to eq 'tmp/1234567/123.tar.gz' }
+  end
+end

data/spec/lib/web/tarball_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'rack/test'
+
+describe 'web tarball serving' do
+  include Rack::Test::Methods
+
+  def app
+    Sinatra::Application
+  end
+
+  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)
+        .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...'
+    end
+  end
+
+  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.status).to eq(404)
+      subject.should_not_receive(:send_file)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'coveralls'
+require 'rack/test'
 Coveralls.wear!
 
 require_relative '../lib/fourchette'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fourchette
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jean-Philippe Boily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -178,6 +178,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +235,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - Procfile
 - README.md
@@ -223,11 +252,16 @@ files:
 - lib/fourchette/pgbackups.rb
 - lib/fourchette/pull_request.rb
 - lib/fourchette/rake_tasks.rb
+- lib/fourchette/tarball.rb
 - lib/fourchette/version.rb
 - lib/fourchette/web.rb
 - lib/fourchette/web/hooks.rb
+- lib/fourchette/web/tarball.rb
+- spec/factories/fake_file
 - spec/lib/fourchette/heroku_spec.rb
 - spec/lib/fourchette/pull_request_spec.rb
+- spec/lib/fourchette/tarball_spec.rb
+- spec/lib/web/tarball_spec.rb
 - spec/spec_helper.rb
 - spec/support/silent-logger.rb
 - templates/Gemfile
@@ -261,7 +295,10 @@ signing_key:
 specification_version: 4
 summary: Your new best friend for isolated testing environments on Heroku.
 test_files:
+- spec/factories/fake_file
 - spec/lib/fourchette/heroku_spec.rb
 - spec/lib/fourchette/pull_request_spec.rb
+- spec/lib/fourchette/tarball_spec.rb
+- spec/lib/web/tarball_spec.rb
 - spec/spec_helper.rb
 - spec/support/silent-logger.rb