hercules 0.1.2 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.2

data/hercules.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hercules}
-  s.version = "0.1.2"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Diogo Biazus"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2011-01-11}
   s.default_executable = %q{hercules}
   s.description = %q{Very simple deployment tool. It was made to deploy rails applications using github, bundler.}
   s.email = %q{diogob@gmail.com}

data/lib/deployer.rb

@@ -39,6 +39,7 @@ module Hercules
       @log.warn "Branch #{@branch} deployed"
       dir = "#{git.branches_path}/#{@branch}"
       Bundler.with_clean_env do
+        @log.debug "We do have an after trigger? #{has_before_trigger} Trigger Class: #{@trigger_class.inspect}"
         after_trigger(dir) if has_after_trigger?
       end
     ensure

data/lib/git_handler.rb

@@ -67,7 +67,7 @@ module Hercules
       dir = "#{@options['target_directory']}/checkouts/#{branch}"
       if (Dir.glob("#{dir}/*").size) > max
         # Here we must delete the oldest checkout
-        checkout_to_delete = Dir.glob("#{dir}/*").sort{|a,b| File.new(a).mtime.strftime("%Y%m%d%H%M%S") <=> File.new(b).mtime.strftime("%Y%m%d%H%M%S") }.shift
+        checkout_to_delete = Dir.glob("#{dir}/*").sort{|a,b| File.new(a).mtime <=> File.new(b).mtime }.shift
         FileUtils.rm_r "#{checkout_to_delete}"
         # Remove log file if it exists
         # To achieve consistency we must remove the log when and only when we remove the checkout

data/lib/http_handler.rb

@@ -19,8 +19,19 @@ module Hercules
       begin
         @config.reload
         resp = EventMachine::DelegatedHttpResponse.new( self )
-        req = RequestHandler.new({:config => @config, :log => @log, :method => @http_request_method, :path => @http_path_info, :query => @http_query_string, :body => @http_post_content})
-        return send(resp, req.status, req.message)
+        # Block which fulfills the request
+        if @http_request_method == "GET"
+          req = RequestHandler.new({:config => @config, :log => @log, :method => @http_request_method, :path => @http_path_info, :query => @http_query_string, :body => @http_post_content})
+          req.run
+          resp.status = req.status
+          resp.content = req.message
+          resp.send_response
+        else
+          req = RequestHandler.new({:config => @config, :log => @log, :method => @http_request_method, :path => @http_path_info, :query => @http_query_string, :body => @http_post_content})
+          req.run
+          resp.content = "Deploy queued"
+          resp.send_response
+        end
       rescue Exception => e
         send(resp, 500, "Error while processing HTTP request: #{e.inspect} \nREQUEST: #{@http_request_method} #{@http_path_info}?#{@http_query_string}\n#{@http_post_content}")
         @log.error "Backtrace: #{e.backtrace}"
@@ -30,8 +41,6 @@ module Hercules
     def send resp, status, message
       if status == 500
         @log.error "#{status}: #{message}"
-      else
-        @log.info "#{status}: #{message}"
       end
       resp.status = status
       resp.content = message

data/lib/request_handler.rb

@@ -3,11 +3,14 @@ require 'json'
 require 'uri'
 require File.dirname(__FILE__) + '/deployer'
 
+require 'eventmachine'
+
 module Hercules
   # Class that knows how to handle deploy requests.
   # This implementation will just parse a JSON as defined by github http hooks.
   # In order to use other hook formats this class should be reimplemented.
   class RequestHandler
+    include EM::Deferrable
     # We must pass the request data (method, path, query and body).
     # * options is a hash containing all the request data described above plus the logger and the config hash.
     def initialize(options)
@@ -18,6 +21,11 @@ module Hercules
       @config = options[:config]
     end
 
+    def run
+      status
+      message
+      set_deferred_status :succeeded
+    end
     # Returns the message generated as response for the request passed in the initializer.
     # We also store the message for further queries.
     def message

data/tests/git_handler_test.rb

@@ -86,6 +86,7 @@ class GitHandlerTest < Test::Unit::TestCase
     g = Hercules::GitHandler.new(@config['test_project'])
     g.deploy_branch('master')
     generate_commit 'new_commit'
+    sleep 1 # Just to avoid creating two folders with same mtime
     g.deploy_branch('master')
     assert File.exists?(@config['test_project']['target_directory'] + '/branches/master/new_commit')
     assert_equal 3, Dir.entries(@config['test_project']['target_directory'] + '/checkouts/master').size

data/tests/http_handler_test.rb

@@ -57,20 +57,21 @@ class HttpHandlerTest < Test::Unit::TestCase
 
   def post token
     start_hercules do |pid,log|
-      res = Net::HTTP.post_form(URI.parse("http://127.0.0.1:8080/test_project/#{token}"), {'payload' => @json_request})
+      res = Net::HTTP.post_form(URI.parse("http://127.0.0.1:49456/test_project/#{token}"), {'payload' => @json_request})
       yield res, log
     end
   end
 
   def get token
     start_hercules do |pid,log|
-      res = Net::HTTP.get(URI.parse("http://127.0.0.1:8080/test_project/#{token}"))
+      res = Net::HTTP.get(URI.parse("http://127.0.0.1:49456/test_project/#{token}"))
       yield res, log
     end
   end
 
   def test_simple_post
     post "abc" do |res, log|
+      sleep 1
       log_content = log.read()
       assert_match /Received POST/, log_content
       assert_no_match /Repository .* not found/, log_content

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hercules
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Diogo Biazus
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -03:00
+date: 2011-01-11 00:00:00 -02:00
 default_executable: hercules
 dependencies: 
 - !ruby/object:Gem::Dependency