divergence 0.0.1 → 0.2.0

data/.gitignore

@@ -17,3 +17,5 @@ test/version_tmp
 tmp
 log/*.log
 .DS_Store
+test/app_root
+test/cache_root

data/README.md

@@ -24,14 +24,48 @@ All configuration happens in `config/config.rb`. You must set the git repository
 
 You will probably want divergence to take over port 80 on your testing server, so you may have to update the forwarding host/port. Note, this is the address where your actual web application can be reached.
 
+A sample config could look like this:
+
+``` ruby
+Divergence::Application.configure do |config|
+  config.git_path = "/path/to/git_root"
+  config.app_path = "/path/to/app_root"
+  config.cache_path = "/path/to/cache_root"
+
+  config.forward_host = 'localhost'
+  config.forward_port = 80
+
+  config.callbacks :after_swap do
+    restart_passenger
+  end
+
+  config.callbacks :after_cache, :after_webhook do
+    bundle_install :path => "vendor/bundle"
+  end
+
+  config.callbacks :on_branch_discover do |subdomain|
+    case subdomain
+    when "release-1"
+      "test_branch"
+    when "release-2"
+      "other_branch"
+    end
+  end
+end
+```
+
 ### Callbacks
 
 Divergence lets you hook into various callbacks throughout the entire process. These are defined in `config/callbacks.rb`. Most callbacks automatically change the current working directory for you in order to make modifications as simple as possible.
 
 The available callbacks are:
 
-* before_swap
+* before_cache
   * Active dir: git repository
+* after_cache
+  * Active dir: cached folder path
+* before_swap
+  * Active dir: cached folder path
 * after_swap
   * Active dir: application
 * before_pull
@@ -47,11 +81,22 @@ The available callbacks are:
   * Active dir: git repository
   * Executes if the subdomain has a dash in the name. The subdomain name is passed to the callback in the options hash.
   * If the callback returns nil, Divergence will try to auto-detect the branch name, otherwise it will use whatever you return.
+* before_webook
+  * Active dir: git repository
+  * Runs before a branch is updated via webhooks.
+* after_webhook
+  * Active dir: cached folder path
+  * Runs after a webhook update completes
 
 There are also some built-in helper methods that are available inside callbacks. They are:
 
 * bundle_install
+  * Recommended - after_cache, after_webhook
+  * Options:
+    * :deployment => boolean
+    * :path => string
 * restart_passenger
+  * Recommended - after_swap
 
 ### Github Service Hook
 
@@ -91,8 +136,9 @@ Divergence currently does not support HTTPS on its own; however, you can still u
 
 ## TODO
 
-* Handle multiple users at the same time
-* Build-in HTTPS support
+* Handle simultaneous users better
+* Built-in HTTPS support
+* Helpers for more frameworks
 
 ## Contributing
 

data/bin/divergence

@@ -16,6 +16,7 @@ module CLI
     def create_directories
       empty_directory "config"
       empty_directory "log"
+      empty_directory "tmp"
     end
 
     def copy_templates
@@ -36,8 +37,19 @@ module CLI
       cmd = 'rackup'
       cmd << " -p #{options[:port]}" if options[:port]
       cmd << " -D" unless options[:dev]
+      cmd << " -P tmp/rack.pid"
       
       exec cmd
+
+      unless options[:dev]
+        puts "Divergence is now running"
+      end
+    end
+
+    desc "stop", "Stop divergence"
+    def stop
+      `kill -9 $(cat tmp/rack.pid) && rm tmp/rack.pid`
+      puts "Divergence halted"
     end
   end
 end

data/divergence.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rack"
   gem.add_dependency "rack-proxy"
   gem.add_dependency "thor"
-  gem.add_dependency "git"
   gem.add_dependency "json"
   gem.add_development_dependency "rack-test"
 end

data/generators/files/config.rb

@@ -1,8 +1,15 @@
 require File.expand_path('../callbacks', __FILE__)
 
 Divergence::Application.configure do |config|
-  config.git_path = nil # Change this to the git repository path
-  config.app_path = nil # and this to your application's path.
+  config.git_path = nil   # Change this to the git repository path
+  config.app_path = nil   # and this to your application's path.
+  config.cache_path = nil # This should be an empty directory
+
+  # The number of branches to cache for quick switching. If you're
+  # switching around between many branches frequently, you might
+  # want to raise this. Keep in mind that each cached branch will
+  # have it's own Passenger instance, so don't get too carried away.
+  # config.cache_num = 5
 
   # Where should we proxy this request to? Normally you can leave
   # the host as 'localhost', but if you are using virtual hosts in

data/lib/divergence.rb

@@ -1,12 +1,14 @@
 require "rack/proxy"
-require "git"
 require "json"
 require "logger"
+require "fileutils"
 
 require "rack_ssl_hack"
 require "divergence/version"
 require "divergence/config"
+require "divergence/application"
 require "divergence/git_manager"
+require "divergence/cache_manager"
 require "divergence/helpers"
 require "divergence/request_parser"
 require "divergence/respond"
@@ -30,25 +32,15 @@ module Divergence
     end
 
     def initialize
-      file_checks
+      config.ok?
 
-      @g = GitManager.new(config)
+      @git = GitManager.new(config.git_path)
+      @cache = CacheManager.new(config.cache_path, config.cache_num)
+      @active_branch = ""
     end
 
     def config
       @@config
     end
-
-    private
-
-    def file_checks
-      unless File.exists?(config.app_path)
-        raise "Configured path not found: #{config.app_path}"
-      end
-
-      unless File.exists?(config.git_path)
-        raise "Configured git path not found: #{config.git_path}"
-      end
-    end
   end
 end

data/lib/divergence/application.rb

@@ -0,0 +1,27 @@
+module Divergence
+  # Responsible for managing the cache folders and swapping
+  # the codebases around.
+  class Application < Rack::Proxy
+    # Prepares the filesystem for loading up a branch
+    def prepare(branch, opts = {})
+      return nil if branch == @active_branch
+
+      unless @cache.is_cached?(branch)
+        @cache.add branch, @git.switch(branch)
+      end
+
+      @cache.path(branch)
+    end
+
+    # Links the application directory to the given path,
+    # which is always a cache directory in our case.
+    def link!(path)
+      Application.log.info "Link: #{path} -> #{config.app_path}"
+
+      config.callback :before_swap, path
+      FileUtils.rm config.app_path if File.exists?(config.app_path)
+      FileUtils.ln_s path, config.app_path, :force => true
+      config.callback :after_swap, config.app_path
+    end
+  end
+end

data/lib/divergence/cache_manager.rb

@@ -0,0 +1,55 @@
+module Divergence
+  class CacheManager
+    def initialize(cache_path, cache_num)
+      @cache_path = cache_path
+      @cache_num = cache_num
+
+      Dir.chdir @cache_path do
+        @cached_branches = Dir['*/'].map {|dir| dir.gsub('/', '')}
+      end
+    end
+
+    def is_cached?(branch)
+      @cached_branches.include?(branch)
+    end
+
+    def add(branch, src_path)
+      Application.log.info "Caching: #{branch} from #{src_path}"
+
+      prune_cache!
+
+      Application.config.callback :before_cache, src_path, :branch => branch
+
+      FileUtils.mkdir_p path(branch)
+      sync branch, src_path
+      @cached_branches.push branch
+
+      Application.config.callback :after_cache, path(branch), :branch => branch
+    end
+
+    def sync(branch, src_path)
+      `rsync -a --delete #{src_path}/* #{path(branch)}`
+    end
+
+    def path(branch)
+      "#{@cache_path}/#{branch}"
+    end
+
+    private
+
+    # Delete the oldest cached branches to make room for new
+    def prune_cache!
+      Dir.chdir @cache_path do
+        branches = Dir.glob('*/')
+        return if branches.nil? or branches.length <= @cache_num
+
+        branches
+          .sort_by {|f| File.mtime(f)}[@cache_num..-1]
+          .each do|dir|
+            FileUtils.rm_rf(dir)
+            @cached_branches.delete(dir.gsub('/', ''))
+          end
+      end
+    end
+  end
+end

data/lib/divergence/config.rb

@@ -2,12 +2,17 @@ module Divergence
   class Configuration
     include Enumerable
 
-    attr_accessor :app_path, :git_path
+    attr_accessor :app_path, :git_path, :cache_path
+    attr_accessor :cache_num
     attr_accessor :forward_host, :forward_port
 
     def initialize
       @git_path = nil
       @app_path = nil
+      @cache_path = nil
+
+      @cache_num = 5
+
       @forward_host = 'localhost'
       @forward_port = 80
 
@@ -15,33 +20,46 @@ module Divergence
       @helpers = Divergence::Helpers.new(self)
     end
 
-    # Might get rid of realpath in the future because it
-    # resolves symlinks and that could be problematic
-    # with capistrano in case someone accidentally deploys.
-    def app_path=(p)
-      @app_path = File.realpath(p)
-    end
+    def ok?
+      [:git_path, :app_path, :cache_path].each do |path|
+        if instance_variable_get("@#{path}").nil?
+          raise "Configure #{path} before running"
+        end
+      end
+
+      unless File.exists?(@git_path)
+        raise "Configured git path not found: #{@git_path}"
+      end
 
-    def git_path=(p)
-      @git_path = File.realpath(p)
+      unless File.exists?(@cache_path)
+        FileUtils.mkdir_p @cache_path
+      end
     end
 
     # Lets a user define a callback for a specific event
-    def callbacks(name, &block)
-      unless @callback_store.has_key?(name)
-        @callback_store[name] = []
-      end
+    def callbacks(*names, &block)
+      names.each do |name|
+        unless @callback_store.has_key?(name)
+          @callback_store[name] = []
+        end
 
-      @callback_store[name].push block
+        @callback_store[name].push block
+      end
     end
 
-    def callback(name, args = {})
+    def callback(name, run_path=nil, args = {})
       return unless @callback_store.has_key?(name)
 
-      Application.log.debug "Execute callback: #{name.to_s}"
+      if run_path.nil? or !File.exists?(run_path)
+        run_path = Dir.pwd
+      end
+
+      Application.log.debug "Execute callback: #{name.to_s} in #{run_path}"
 
-      @callback_store[name].each do |cb|
-        @helpers.execute cb, args
+      Dir.chdir run_path do
+        @callback_store[name].each do |cb|
+          @helpers.execute cb, args
+        end
       end
     end
 

data/lib/divergence/git_manager.rb

@@ -1,81 +1,47 @@
 module Divergence
+  # Manages the configured Git repository
   class GitManager
     attr_reader :current_branch
 
-    def initialize(config)
-      @config = config
-      @app_path = config.app_path
-      @git_path = config.git_path
-
+    def initialize(git_path)
+      @git_path = git_path
       @log = Logger.new('./log/git.log')
-      @git = Git.open(@git_path, :log => @log)
-
-      @current_branch = @git.branch
-      @new_branch = false
+      @current_branch = current_branch
     end
 
-    def prepare_directory(branch, force=false)
-      return if is_current?(branch) and !force
+    def switch(branch, force=false)
+      return @git_path if is_current?(branch) and !force
+      
       pull branch
-    end
-
-    # Performs the swap between the git directory and the working
-    # app directory. We want to copy the files without copying
-    # the .git directory, but this is a temporary dumb solution.
-    #
-    # Future idea: try the capistrano route and simply symlink
-    # to the git directory instead of copying files.
-    #
-    # TODO: make this more ruby-like.
-    def swap!
-      return unless @new_branch
-
-      Dir.chdir @config.git_path do
-        @config.callback :before_swap
-      end
-
-      Application.log.info "Swap: #{@git_path} -> #{@app_path}"
-      `rsync -a --delete --exclude=.git #{@git_path}/* #{@app_path}`
-      @new_branch = false
-
-      Dir.chdir @config.app_path do
-        @config.callback :after_swap
-      end
+      return @git_path
     end
 
     # Since underscores are technically not allowed in URLs,
     # but they are allowed in Git branch names, we have to do
     # some magic to possibly convert dashes to underscores
     # so we can load the right branch.
-    #
-    # Another possible thing to explore is converting all
-    # dashes in the URL to a regex search against all branches
-    # in this repository to avoid the current brute-force
-    # solution we're using.
     def discover(branch)
       return branch if is_branch?(branch)
 
-      Dir.chdir @git_path do
-        resp = @config.callback :on_branch_discover, branch
+      resp = Application.config.callback :on_branch_discover, @git_path, branch
 
-        unless resp.nil?
-          return resp
-        end
-      
-        local_search = "^" + branch.gsub(/-/, ".") + "$"
-        remote_search = "^remotes/origin/(" + branch.gsub(/-/, ".") + ")$"
-        local_r = Regexp.new(local_search, Regexp::IGNORECASE)
-        remote_r = Regexp.new(remote_search, Regexp::IGNORECASE)
-
-        `git branch -a`.split("\n").each do |b|
-          b = b.gsub('*', '').strip
-          
-          return b if local_r.match(b)
-          if remote_r.match(b)
-            return remote_r.match(b)[1]
-          end
-        end
+      unless resp.nil?
+        return resp
       end
+    
+      local_search = "^" + branch.gsub(/-/, ".") + "$"
+      remote_search = "^remotes/origin/(" + branch.gsub(/-/, ".") + ")$"
+      local_r = Regexp.new(local_search, Regexp::IGNORECASE)
+      remote_r = Regexp.new(remote_search, Regexp::IGNORECASE)
+
+      git('branch -a').split("\n").each do |b|
+        b = b.gsub('*', '').strip
+        
+        return b if local_r.match(b)
+        if remote_r.match(b)
+          return remote_r.match(b)[1]
+        end
+      end 
 
       raise "Unable to automatically detect branch. Given = #{branch}"
     end
@@ -86,6 +52,14 @@ module Divergence
 
     private
 
+    def current_branch
+      git('branch -a').split("\n").each do |b|
+        if b[0, 2] == '* '
+          return b.gsub('* ', '').strip
+        end
+      end
+    end
+
     def is_branch?(branch)
       Dir.chdir @git_path do
         # This is fast, but only works on locally checked out branches
@@ -100,26 +74,11 @@ module Divergence
 
     def pull(branch)
       if checkout(branch)
-        Dir.chdir @config.git_path do
-          @config.callback :before_pull
-        end
-
-        #@git.pull 'origin', branch
-        @git.chdir do
-          # For some reason, I'm having issues with the pull
-          # that's built into the library. Doing this manually
-          # for now.
-          @log.info "git pull origin #{branch} 2>&1"
-          `git pull origin #{branch} 2>&1`
-        end
-
-        Dir.chdir @config.git_path do
-          @config.callback :after_pull
-        end
+        Application.config.callback :before_pull, @git_path
+        git "pull origin #{branch}"
+        Application.config.callback :after_pull, @git_path
       else
-        Dir.chdir @config.git_path do
-          @config.callback :on_pull_error
-        end
+        Application.config.callback :on_pull_error, @git_path
 
         return false
       end
@@ -130,21 +89,34 @@ module Divergence
       reset
       
       begin
-        @git.checkout branch, :force => true
+        git "checkout -f #{branch}"
         @current_branch = branch
-        @new_branch = true
       rescue
         return false
       end
     end
 
     def reset
-      @git.reset_hard('HEAD')
+      git 'reset --hard'
     end
 
     # Fetch all remote branch information
     def fetch
-      @git.fetch
+      git :fetch
+    end
+
+    def git(cmd)
+      Dir.chdir @git_path do
+        @log.info "git #{cmd.to_s}"
+        out = `git #{cmd.to_s} 2>&1`
+
+        if $?.exitstatus != 0
+          Application.log.error "git #{cmd.to_s} failed"
+          Application.log.error out
+        end
+
+        return out
+      end
     end
   end
 end

data/lib/divergence/helpers.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Divergence
   class Helpers
     def initialize(config)
@@ -12,22 +10,32 @@ module Divergence
 
     private
 
-    def bundle_install
+    def bundle_install(opts={})
       Application.log.debug "bundle install"
-      
-      Dir.chdir @config.app_path do
-        `bundle install`
+
+      begin
+        cmd = 'bundle install'
+        cmd << ' --deployment' if opts[:deployment]
+        cmd << " --path #{opts[:path]}" if opts[:path]
+        cmd << ' --without development test'
+        result = `#{cmd}`
+        Application.log.debug result
+      rescue
+        Application.log.error "bundle install failed!"
+        Application.log.error e.message
       end
     end
 
     def restart_passenger
       Application.log.debug "Restarting passenger..."
 
-      Dir.chdir @config.app_path do
-        begin
-          FileUtils.touch 'tmp/restart.txt'
-        rescue
+      begin
+        unless File.exists? 'tmp'
+          FileUtils.mkdir_p 'tmp'
         end
+
+        FileUtils.touch 'tmp/restart.txt'
+      rescue
       end
     end
   end

data/lib/divergence/request_parser.rb

@@ -1,8 +1,7 @@
 module Divergence
   class RequestParser
-    def initialize(env, git)
+    def initialize(env)
       @req = Rack::Request.new(env)
-      @git = git
     end
 
     def raw

data/lib/divergence/respond.rb

@@ -1,9 +1,9 @@
 module Divergence
   class Application < Rack::Proxy
-    # The main entry point for the application. This is caled
+    # The main entry point for the application. This is called
     # by Rack.
     def call(env)
-      @req = RequestParser.new(env, @g)
+      @req = RequestParser.new(env)
 
       # First, lets find out what subdomain/git branch
       # we're dealing with (if any).
@@ -15,18 +15,27 @@ module Divergence
       # Handle webhooks from Github for updating the current
       # branch if necessary.
       if @req.is_webhook?
-        return Webhook.handle @g, @req
+        return handle_webhook
       end
 
-      # Ask our GitManager to prepare the directory
-      # for the given branch.
-      result = @g.prepare_directory @req.branch
-      if result === false
-        return error!
-      end
+      # Lets get down to business.
+      begin
+        # Get the proper branch name using a touch of magic
+        branch = @git.discover(@req.subdomain)
 
-      # And then perform the codebase swap
-      @g.swap!
+        # Prepare the branch and cache if needed
+        path = prepare(branch)
+        
+        # If we're requesting a different branch than the
+        # one currently loaded, we'll need to link it to
+        # the application directory.
+        link!(path) unless path.nil?
+        
+        @active_branch = branch
+      rescue Exception => e
+        Application.log.error e.message
+        return error!(branch)
+      end
 
       # We're finished, pass the request through.
       proxy(env)
@@ -56,8 +65,8 @@ module Divergence
       env["HTTP_HOST"] = "#{config.forward_host}:#{config.forward_port}"
     end
 
-    def error!
-      Application.log.error "Branch #{@req.branch} does not exist"
+    def error!(branch)
+      Application.log.error "Branch #{branch} does not exist"
       Application.log.error @req.raw
 
       public_path = File.expand_path('../../../public', __FILE__)

data/lib/divergence/version.rb

@@ -1,3 +1,3 @@
 module Divergence
-  VERSION = "0.0.1"
+  VERSION = "0.2.0"
 end

data/lib/divergence/webhook.rb

@@ -1,30 +1,34 @@
 module Divergence
-  class Webhook
-    def self.handle(git, req)
-      hook = JSON.parse(req['payload'])
+  class Application
+    def handle_webhook
+      hook = JSON.parse(@req['payload'])
       branch = hook["ref"].split("/").last.strip
 
       Application.log.info "Webhook: received for #{branch} branch"
 
       # If the webhook is for the currently active branch,
       # then we perform a pull and a swap.
-      if git.is_current?(branch)
+      if @cache.is_cached?(branch)
         Application.log.info "Webhook: updating #{branch}"
 
-        git.prepare_directory(branch, true)
-        git.swap!
-        
+        git_path = @git.switch branch, :force => true
+
+        config.callback :before_webhook, git_path, :branch => branch
+        @cache.sync branch, git_path
+        config.callback :after_webhook, @cache.path(branch), :branch => branch
+
         ok
       else
+        Application.log.info "Webhook: ignoring #{branch}"
         ignore
       end
     end
 
-    def self.ok
+    def ok
       [200, {"Content-Type" => "text/html"}, ["OK"]]
     end
 
-    def self.ignore
+    def ignore
       [200, {"Content-Type" => "text/html"}, ["IGNORE"]]
     end
   end

data/test/config.rb

@@ -1,10 +1,12 @@
 Divergence::Application.configure do |config|
-  config.git_path = "test/git_root"
-  config.app_path = "test/app_root"
+  config.git_path = "./test/git_root"
+  config.app_path = "./test/app_root"
+  config.cache_path = "./test/cache_root"
+
   config.forward_host = 'localhost'
   config.forward_port = 80
 
-  config.callbacks :after_swap do
+  config.callbacks :after_swap, :after_webhook do
     # Run anything after the swap finishes
   end
 end

data/test/config_test.rb

@@ -4,15 +4,19 @@ class ConfigureTest < Test::Unit::TestCase
   def test_config
     git_path = File.expand_path('../git_root', __FILE__)
     app_path = File.expand_path('../app_root', __FILE__)
+    cache_path = File.expand_path('../cache_root', __FILE__)
 
     Divergence::Application.configure do |config|
       config.git_path = git_path
       config.app_path = app_path
+      config.cache_path = cache_path
+
       config.forward_host = 'localhost'
       config.forward_port = 80
     end
 
     assert app.config.app_path, app_path
     assert app.config.git_path, git_path
+    assert app.config.cache_path, cache_path
   end
 end

data/test/git_test.rb

@@ -2,38 +2,30 @@ require 'test_helper'
 
 class GitTest < Test::Unit::TestCase
   def test_ignore
-    force_branch :master
     mock_get 'master.example.com'
 
-    git = Git.open('test/git_root')
-    assert_equal "master", git.current_branch
+    assert_equal "master", active_branch
 
     # and again...
     mock_get 'master.example.com'
-    assert_equal 'master', git.current_branch
+    assert_equal 'master', active_branch
   end
 
   def test_switch_branch
-    force_branch :master
     mock_get 'branch1.example.com'
-
-    git = Git.open('test/git_root')
-    assert_equal 'branch1', git.current_branch
+    assert_equal 'branch1', active_branch
   end
 
   def test_branch_discover
-    force_branch :master
     mock_get 'branch-1.example.com'
-
-    git = Git.open('test/git_root')
-    assert_equal 'branch_1', git.current_branch
+    assert_equal 'branch_1', active_branch
 
     mock_get 'branch-with-complex-name-1.example.com'
-    assert_equal 'branch_with_complex_name-1', git.current_branch
+    assert_equal 'branch_with_complex_name-1', active_branch
   end
 
   def test_dirty_switch
-    force_branch :master
+    mock_get "master.example.com"
 
     File.open 'test/git_root/test.txt', 'a' do |f|
       f.write 'modifying this'
@@ -41,19 +33,14 @@ class GitTest < Test::Unit::TestCase
 
     mock_get 'branch1.example.com'
 
-    git = Git.open('test/git_root')
-    assert_equal 'branch1', git.current_branch
+    assert_equal 'branch1', active_branch
   end
 
   def test_swap
-    force_branch :master
     mock_get "branch1.example.com"
 
     assert File.exists? 'test/app_root/test.txt'
-    file = File.open 'test/app_root/test.txt'
-    contents = file.read.strip
-    file.close
 
-    assert_equal "branch1", contents
+    assert_equal "branch1", active_branch
   end
 end

data/test/test_helper.rb

@@ -3,6 +3,9 @@ require "rack"
 require "rack/test"
 
 require "./lib/divergence"
+require "./test/config"
+
+#require 'debugger'; debugger
 
 Test::Unit::TestCase.class_eval do
   include Rack::Test::Methods
@@ -17,10 +20,11 @@ class Test::Unit::TestCase
     @d
   end
 
-  def force_branch(branch)
-    git = Git.open('test/git_root')
-    git.reset_hard('HEAD')
-    git.checkout branch.to_s, :force => true
+  def active_branch
+    file = File.open 'test/app_root/test.txt'
+    contents = file.read.strip
+    file.close
+    contents
   end
 
   # We have to rewrite the host constant in rack-test
@@ -34,8 +38,7 @@ class Test::Unit::TestCase
 
   def set_mock_request(addr, opts={})
     req = Rack::MockRequest.env_for "http://#{addr}", opts
-    git = Divergence::GitManager.new(Divergence::Application.config)
-    app.req = Divergence::RequestParser.new(req, git)
+    app.req = Divergence::RequestParser.new(req)
   end
 
   def mock_get(addr, params={})
@@ -63,7 +66,7 @@ end
 
 module Divergence
   class Application < Rack::Proxy
-    attr_accessor :req
+    attr_accessor :req, :active_branch
 
     def perform_request(env)
       [200, {"Content-Type" => "text/html"}, ["Ohai"]]

data/test/webhook_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class WebhookTest < Test::Unit::TestCase
   def test_detect
-    force_branch :master
+    mock_get "master.example.com"
     status, _, body = mock_webhook :master
 
     assert_equal 200, status
@@ -10,8 +10,7 @@ class WebhookTest < Test::Unit::TestCase
   end
 
   def test_ignore
-    force_branch :master
-    status, _, body = mock_webhook :branch1
+    status, _, body = mock_webhook 'webhook-ignore'
 
     assert_equal 200, status
     assert_equal ["IGNORE"], body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: divergence
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +104,6 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - bin/divergence
@@ -129,6 +112,8 @@ files:
 - generators/files/config.rb
 - generators/files/config.ru
 - lib/divergence.rb
+- lib/divergence/application.rb
+- lib/divergence/cache_manager.rb
 - lib/divergence/config.rb
 - lib/divergence/git_manager.rb
 - lib/divergence/helpers.rb
@@ -139,7 +124,6 @@ files:
 - lib/rack_ssl_hack.rb
 - log/.gitkeep
 - public/404.html
-- test/app_root/test.txt
 - test/config.rb
 - test/config_test.rb
 - test/git_test.rb
@@ -171,7 +155,6 @@ signing_key:
 specification_version: 3
 summary: Map virtual host subdomains to git branches for testing
 test_files:
-- test/app_root/test.txt
 - test/config.rb
 - test/config_test.rb
 - test/git_test.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Ryan LeFevre
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/test/app_root/test.txt

@@ -1 +0,0 @@
-master