cuke_ci_workers 0.1 → 0.2

data/lib/cuke_ci_workers/runner.rb

@@ -15,7 +15,7 @@ module CukeCIWorkers
     def initialize(options)
       @configuration_file_name = options[:configuration_file_name]
       @configuration = YAML.load_file(@configuration_file_name)
-        
+      
       @poll_uri = URI.parse(@configuration['poll_url'])
       @push_url = @configuration['push_url']
 
@@ -26,16 +26,22 @@ module CukeCIWorkers
 
     def run
       $running = true
-      Signal.trap('INT') { $running = false }
-      
+
+      Signal.trap('INT') {
+        say('Exiting...')
+        $running = false
+      }
+
       while($running) do
         begin
           run_present = poll_for_run
-        #rescue Exception => e
-         # log_exception(e)
+        rescue Exception => e
+          log_exception(e)
         end
         
         if run_present
+          say('Found run.')
+          
           begin
             pull_repo
             checkout_commit
@@ -46,10 +52,11 @@ module CukeCIWorkers
             else
               push_error
             end
-          #rescue Exception => e
-           # log_exception(e)
+          rescue Exception => e
+            log_exception(e)
           end
         else
+          say('Nothing found. Going to sleep...')
           sleep 5
         end
       end
@@ -59,6 +66,7 @@ module CukeCIWorkers
     
     def poll_for_run
       message('Polling for run')
+      say("from #{@poll_uri}")
       result = Net::HTTP.get(@poll_uri)
 
       begin
@@ -85,7 +93,6 @@ module CukeCIWorkers
     
     def prepare
       message('Preparing working directory')
-      return
       run_command(:prepare)
     end
 
@@ -93,12 +100,12 @@ module CukeCIWorkers
       message('Running Cucumber')
       output = run_command(:cucumber, temp_file_name)
 
-      if $?.success?
-        File.read(temp_file_name)
-      else
-        logger.error("Cucumber failed: #{output}")
-        nil
-      end
+      #if $?.success?
+      File.read(temp_file_name)
+      #else
+      #  logger.error("Cucumber failed: #{output}")
+      #  nil
+      #end
     end
 
     def push_result(result)
@@ -122,7 +129,7 @@ module CukeCIWorkers
       url = @push_url % @run_id
       @push_uri = URI.parse(url)
 
-      message "Pushing json to #{url}"
+      say "Pushing json to #{url}"
       
       Net::HTTP.start(@push_uri.host, @push_uri.port) do |http|
         http.post("#{@push_uri.path}?#{@push_uri.query}", json, 'Content-Type' => 'application/json')
@@ -157,7 +164,13 @@ module CukeCIWorkers
         opts.parse!
 
         options[:configuration_file_name] ||= default_runner_config_file_name
-        self.new(options)
+
+        begin
+          self.new(options)
+        rescue 
+          puts "Could not open configuration file at '#{options[:configuration_file_name]}'."
+          exit
+        end
       rescue OptionParser::ParseError
         puts opts
         exit

data/lib/cuke_ci_workers/worker.rb

@@ -17,6 +17,7 @@ module CukeCIWorkers
     private
 
     def log_exception(e)
+      say("### Exception: #{e.message}")
       logger.error(e.message + "\n   " + e.backtrace * "\n   ")
     end
     
@@ -27,6 +28,12 @@ module CukeCIWorkers
       end
     end
 
+    def say(text)
+      if @verbose
+        puts(text)
+      end
+    end
+    
     def run_command(key, *args)
       command = interpolate_command(key, args)
       logger.info "  #{command}"

data/templates/post-commit.erb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-server_url = 'http://localhost:3000/projects/<%= project_id %>/receipt?api_key=<%= api_key %>'
+server_url = 'http://localhost:3000/projects/<%= project_id %>/receipt.json?api_key=<%= api_key %>'
 log_file_name = 'cuke_ci_notifier.log'
 
 require 'rubygems'

data/templates/runner_config.yml.erb

@@ -1,8 +1,8 @@
 temp_file_name: "cucumber.out"
 log_file_name: "cuke_ci_runner.log"
 log_level: "WARN"
-poll_url: "http://localhost:3000/projects/<%= project_id %>/runs/next?api_key=<%= api_key %>"
-push_url: "http://localhost:3000/projects/<%= project_id %>/runs/%s/results?api_key=<%= api_key %>"
+poll_url: "http://localhost:3000/projects/<%= project_id %>/runs/next.json?api_key=<%= api_key %>"
+push_url: "http://localhost:3000/projects/<%= project_id %>/runs/%s/results.json?api_key=<%= api_key %>"
 commands:
   pull: "git pull origin master"
   check_out: "git reset --hard %s"

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cuke_ci_workers
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Gregor Weckbecker
@@ -18,8 +18,21 @@ cert_chain: []
 
 date: 2010-10-17 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Cucumber based continuous integration.
 email: 
 - info@timfischbach.de