crazy_ivan 1.1.1 → 1.2.0

data/lib/crazy_ivan/test_runner.rb

@@ -1,11 +1,12 @@
 class TestRunner
-  def initialize(project_path)
+  def initialize(project_path, report_assembler)
     @project_path = project_path
     @results = {:project_name => File.basename(@project_path),
                 :version => {:output => '', :error => '', :exit_status => ''},
                 :update  => {:output => '', :error => '', :exit_status => ''},
                 :test    => {:output => '', :error => '', :exit_status => ''},
                 :timestamp => {:start => nil, :finish => nil}}
+    @report_assembler = report_assembler
   end
   
   attr_reader :results
@@ -31,26 +32,74 @@ class TestRunner
     Dir.chdir(@project_path) do
       if File.exists?(script_path)
         if !File.stat(script_path).executable?
-          abort "#{@project_path}/.ci/#{name} script not executable"
+          msg = "#{@project_path}/.ci/#{name} script not executable"
+          Syslog.warning msg
+          abort msg
         elsif File.open(script_path).read.empty?
-          abort "#{@project_path}/.ci/#{name} script empty"
+          msg = "#{@project_path}/.ci/#{name} script empty"
+          Syslog.warning msg
+          abort msg
         end
       else
-        abort "#{@project_path}/.ci/#{name} script missing"
+        msg = "#{@project_path}/.ci/#{name} script missing"
+        Syslog.warning msg
+        abort msg
       end
     end
   end
   
-  def run_script(name)
+  def run_script(name, options = {})
     output = ''
     error = ''
     exit_status = ''
     
     Dir.chdir(@project_path) do
+      Syslog.debug "Opening up the pipe to #{script_path(name)}"
+      
       status = Open4::popen4(script_path(name)) do |pid, stdin, stdout, stderr|
         stdin.close  # Close to prevent hanging if the script wants input
-        output = stdout.read
-        error = stderr.read
+        
+        until stdout.eof? && stderr.eof? do
+          ready_io_streams = select( [stdout], nil, [stderr], 3600 )
+          
+          script_output = ready_io_streams[0].pop
+          script_error = ready_io_streams[2].pop
+          
+          if script_output && !script_output.eof?
+            o = script_output.readpartial(4096)
+            print o
+            output << o
+            
+            if options[:stream_test_results?]
+              @results[:test][:output] = output
+              @report_assembler.update_project(self)
+            end
+          end
+          
+          if script_error && !script_error.eof?
+            e = script_error.readpartial(4096)
+            print e
+            error << e
+            
+            if options[:stream_test_results?]
+              @results[:test][:error] = error
+              @report_assembler.update_project(self)
+            end
+          end
+          
+          # FIXME - this feels like I'm using IO.select wrong
+          if script_output.eof? && script_error.nil?
+            # there's no more output to SDOUT, and there aren't any errors
+            e = stderr.read
+            error << e
+            print e
+            
+            if options[:stream_test_results?]
+              @results[:test][:error] = error
+              @report_assembler.update_project(self)
+            end
+          end
+        end
       end
       
       exit_status = status.exitstatus
@@ -60,7 +109,6 @@ class TestRunner
   end
   
   def run_conclusion_script
-    
     # REFACTOR do this asynchronously so the next tests don't wait on running the conclusion
     
     Dir.chdir(@project_path) do
@@ -103,7 +151,7 @@ class TestRunner
   def test!
     if @results[:version][:exit_status] == '0'
       Syslog.debug "Testing #{@results[:project_name]} build #{@results[:version][:output]}"
-      @results[:test][:output], @results[:test][:error], @results[:test][:exit_status] = run_script('test')
+      @results[:test][:output], @results[:test][:error], @results[:test][:exit_status] = run_script('test', :stream_test_results? => true)
     else
       Syslog.debug "Failed to test #{project_name}; version exit status was #{@results[:version][:exit_status]}"
     end

data/lib/crazy_ivan/vendor/open4.rb

@@ -2,5 +2,5 @@ begin
   require 'open4'
 rescue LoadError
   $LOAD_PATH.unshift(File.dirname(__FILE__) + '/open4-1.0.1/lib')
-  require 'open4.rb'
+  require 'open4'
 end

data/lib/crazy_ivan/version.rb

@@ -1,3 +1,3 @@
 module CrazyIvan
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/crazy_ivan.rb

@@ -1,29 +1,28 @@
 require 'syslog'
 require 'fileutils'
+require 'yaml'
+require 'crazy_ivan/process_manager'
 require 'crazy_ivan/report_assembler'
 require 'crazy_ivan/test_runner'
-require 'crazy_ivan/html_asset_crush'
 require 'crazy_ivan/version'
 require 'crazy_ivan/vendor/json'
 require 'crazy_ivan/vendor/open4'
 require 'crazy_ivan/vendor/tmpdir'
 
 module CrazyIvan
-  # VERSION = '1.0.0'
-  
   def self.setup
     puts
     puts "Preparing per-project continuous integration configuration scripts"
     puts
     
-    Dir['*'].each do |dir|
+    Dir['*/'].each do |dir|
       Dir.chdir(dir) do
         FileUtils.mkdir_p('.ci')
 
         Dir.chdir('.ci') do
-          puts "        #{dir}/.ci"
+          puts "         #{dir}.ci"
           if File.exists?('version')
-            puts "      #{' ' * (dir + "/.ci").size}/version already exists - skipping"
+            puts "        #{' ' * (dir + "/.ci").size}/version already exists - skipping"
           else
             File.open('version', 'w+') do |f|
               f.puts "#!/usr/bin/env ruby"
@@ -34,11 +33,11 @@ module CrazyIvan
               f.puts
               f.puts "puts `git show`[/^commit (.+)$/, 1]"
             end
-            puts "      #{' ' * (dir + "/.ci").size}/version -- created"
+            puts "        #{' ' * (dir + ".ci").size}/version -- created"
           end
           
           if File.exists?('update')
-            puts "      #{' ' * (dir + "/.ci").size}/update already exists - skipping"
+            puts "        #{' ' * (dir + "/.ci").size}/update already exists - skipping"
           else
             File.open('update', 'w+') do |f|
               f.puts "#!/usr/bin/env bash"
@@ -50,11 +49,11 @@ module CrazyIvan
               f.puts
               f.puts "git pull"
             end
-            puts "      #{' ' * (dir + "/.ci").size}/update -- created"
+            puts "        #{' ' * (dir + ".ci").size}/update -- created"
           end
 
           if File.exists?('test')
-            puts "        #{' ' * (dir + "/.ci").size}/test already exists -- skipping"
+            puts "         #{' ' * (dir + ".ci").size}/test already exists -- skipping"
           else
             File.open('test', 'w+') do |f|
               f.puts "#!/usr/bin/env bash"
@@ -64,11 +63,11 @@ module CrazyIvan
               f.puts
               f.puts "rake"
             end
-            puts "      #{' ' * (dir + "/.ci").size}/test -- created"
+            puts "         #{' ' * (dir + ".ci").size}/test -- created"
           end
           
           if File.exists?('conclusion')
-            puts "      #{' ' * (dir + "/.ci").size}/conclusion already exists -- skipping"
+            puts "         #{' ' * (dir + ".ci").size}/conclusion already exists -- skipping"
           else
             File.open('conclusion', 'w+') do |f|
               f.puts "#!/usr/bin/env ruby"
@@ -78,14 +77,14 @@ module CrazyIvan
               f.puts "# If you're interested in bouncing the message to campfire, "
               f.puts "# emailing, or otherwise sending notifications, this is the place to do it."
               f.puts
-              f.puts "# To enable campfire notifications, uncomment the next lines:"
+              f.puts "# To enable campfire notifications, uncomment the next lines and make sure you have the httparty gem installed:"
               f.puts "# CAMPFIRE_ROOM_URL = 'http://your-company.campfirenow.com/room/265250'"
               f.puts "# CAMPFIRE_API_KEY = '23b8al234gkj80a3e372133l4k4j34275f80ef8971'"
               f.puts "# CRAZY_IVAN_REPORTS_URL = 'http://ci.your-projects.com'"
               f.puts "# IO.popen(\"test_report2campfire \#{CAMPFIRE_ROOM_URL} \#{CAMPFIRE_API_KEY} \#{CRAZY_IVAN_REPORTS_URL}\", 'w') {|f| f.puts STDIN.read }"
               f.puts
             end
-            puts "      #{' ' * (dir + "/.ci").size}/conclusion -- created"
+            puts "         #{' ' * (dir + ".ci").size}/conclusion -- created"
           end
           puts
 
@@ -100,7 +99,10 @@ module CrazyIvan
     puts
     puts "  crazy_ivan /path/to/directory/your/reports/go"
     puts
-    puts "then look at index.html in that path to confirm that everything is ok."
+    puts "then look at index.html in that path to confirm that everything is ok. "
+    puts
+    puts "To force a re-run of the same build version of a project, delete its test "
+    puts "results directory from the /path/to/directory/your/reports/go"
     puts
     puts "If things look good, then set up a cron job or other script to run"
     puts "crazy_ivan on a periodic basis."
@@ -119,6 +121,7 @@ module CrazyIvan
     report = ReportAssembler.new(Dir.pwd, output_directory)
     report.generate
     
+    # TODO this should really indicate how many projects were tested
     msg = "Generated test reports for #{report.runners.size} projects"
     Syslog.info(msg)
     puts msg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: crazy_ivan
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Edward Ocampo-Gooding
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -05:00
+date: 2010-02-01 00:00:00 -05:00
 default_executable: crazy_ivan
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,19 +52,10 @@ extra_rdoc_files: []
 files: 
 - bin/crazy_ivan
 - bin/test_report2campfire
-- lib/crazy_ivan/html_asset_crush.rb
+- lib/crazy_ivan/process_manager.rb
 - lib/crazy_ivan/report_assembler.rb
-- lib/crazy_ivan/templates/css/ci.css
 - lib/crazy_ivan/templates/index.html
-- lib/crazy_ivan/templates/javascript/builder.js
-- lib/crazy_ivan/templates/javascript/controls.js
 - lib/crazy_ivan/templates/javascript/date.js
-- lib/crazy_ivan/templates/javascript/dragdrop.js
-- lib/crazy_ivan/templates/javascript/effects.js
-- lib/crazy_ivan/templates/javascript/json-template.js
-- lib/crazy_ivan/templates/javascript/prototype.js
-- lib/crazy_ivan/templates/javascript/scriptaculous.js
-- lib/crazy_ivan/templates/javascript/slider.js
 - lib/crazy_ivan/test_runner.rb
 - lib/crazy_ivan/vendor/core_ext/tmpdir.rb
 - lib/crazy_ivan/vendor/json-1.1.7/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log

data/lib/crazy_ivan/html_asset_crush.rb

@@ -1,56 +0,0 @@
-# Parses an html file's <head> section,
-# looks for <script ... > and <link rel="stylesheet" ... >
-# and crunches them all together into one file
-# 
-# Warning: this script is super-ghetto and probably not robust.
-# If you're concerned, use a real lexer/parser.
-
-require 'strscan'
-
-module HtmlAssetCrush
-  def self.source_for(asset_path)
-    case asset_path
-    when /js$/
-      <<-JS
-      <script type="text/javascript" charset="utf-8">
-        #{File.open(asset_path).read}
-      </script>
-      JS
-    when /css$/
-      <<-CSS
-      <style type="text/css">
-        #{File.open(asset_path).read}
-      </style>
-      CSS
-    end
-  rescue Errno::ENOENT
-    raise "Could not find #{asset_path} to bring in"
-  end
-  
-  def self.crush(html_filepath)
-    Dir.chdir(File.dirname(html_filepath)) do
-      html = File.open(html_filepath).read
-      crushed_html = ""    
-
-      s = StringScanner.new(html)
-
-      js = /<script.+? src=['"](.+)['"].+?\/script>/
-      css = /<link .+? href=['"](.+?)['"].+?>/
-      asset = Regexp.union(js, css)
-
-      while result = s.scan_until(asset) do
-        asset_path = s[2] || s[1]
-
-        # Weird that pre_match doesn't do this
-        # crushed_html << s.pre_match
-        crushed_html << result[0...(-s.matched_size)]
-
-        crushed_html << source_for(asset_path) + "\n"
-      end
-
-      crushed_html << s.rest
-
-      return crushed_html
-    end
-  end
-end

data/lib/crazy_ivan/templates/css/ci.css

@@ -1,34 +0,0 @@
-body {
-  margin: 2.5em 3em;
-  padding: 0;
-  background: #fff;
-  color: #333;
-  font: 100%/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-h1 { margin: 0;}
-
-pre { margin: 0;}
-
-.error {
-  color: red;
-}
-
-.project h2 { margin: 12px 0 0 0;}
-
-.tests { margin: 0 0 0 18px;}
-.tests .test { font-size: 80%; margin-right: 8px;}
-.tests .latest { font-size: 100%;}
-
-.results .result .timestamp { margin-right: 12px;}
-.results .result .version { margin: 6px 0 6px 12px }
-.results .result .output { padding: 5px; color: silver; background:black; margin: 12px 18px 8px 18px;}
-.results .result .output .update { margin: 6px 0 6px 12px }
-.results .result .output .test { margin: 6px 0 6px 12px }
-
-.footer { 
-  margin: 24px 0 0 0;
-  font-size: 60%;
-  width: 100%;
-  text-align: center;
-}

data/lib/crazy_ivan/templates/javascript/builder.js

@@ -1,136 +0,0 @@
-// script.aculo.us builder.js v1.8.3, Thu Oct 08 11:23:33 +0200 2009
-
-// Copyright (c) 2005-2009 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Builder = {
-  NODEMAP: {
-    AREA: 'map',
-    CAPTION: 'table',
-    COL: 'table',
-    COLGROUP: 'table',
-    LEGEND: 'fieldset',
-    OPTGROUP: 'select',
-    OPTION: 'select',
-    PARAM: 'object',
-    TBODY: 'table',
-    TD: 'table',
-    TFOOT: 'table',
-    TH: 'table',
-    THEAD: 'table',
-    TR: 'table'
-  },
-  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
-  //       due to a Firefox bug
-  node: function(elementName) {
-    elementName = elementName.toUpperCase();
-
-    // try innerHTML approach
-    var parentTag = this.NODEMAP[elementName] || 'div';
-    var parentElement = document.createElement(parentTag);
-    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
-    } catch(e) {}
-    var element = parentElement.firstChild || null;
-
-    // see if browser added wrapping tags
-    if(element && (element.tagName.toUpperCase() != elementName))
-      element = element.getElementsByTagName(elementName)[0];
-
-    // fallback to createElement approach
-    if(!element) element = document.createElement(elementName);
-
-    // abort if nothing could be created
-    if(!element) return;
-
-    // attributes (or text)
-    if(arguments[1])
-      if(this._isStringOrNumber(arguments[1]) ||
-        (arguments[1] instanceof Array) ||
-        arguments[1].tagName) {
-          this._children(element, arguments[1]);
-        } else {
-          var attrs = this._attributes(arguments[1]);
-          if(attrs.length) {
-            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-              parentElement.innerHTML = "<" +elementName + " " +
-                attrs + "></" + elementName + ">";
-            } catch(e) {}
-            element = parentElement.firstChild || null;
-            // workaround firefox 1.0.X bug
-            if(!element) {
-              element = document.createElement(elementName);
-              for(attr in arguments[1])
-                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
-            }
-            if(element.tagName.toUpperCase() != elementName)
-              element = parentElement.getElementsByTagName(elementName)[0];
-          }
-        }
-
-    // text, or array of children
-    if(arguments[2])
-      this._children(element, arguments[2]);
-
-     return $(element);
-  },
-  _text: function(text) {
-     return document.createTextNode(text);
-  },
-
-  ATTR_MAP: {
-    'className': 'class',
-    'htmlFor': 'for'
-  },
-
-  _attributes: function(attributes) {
-    var attrs = [];
-    for(attribute in attributes)
-      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
-    return attrs.join(" ");
-  },
-  _children: function(element, children) {
-    if(children.tagName) {
-      element.appendChild(children);
-      return;
-    }
-    if(typeof children=='object') { // array can hold nodes and text
-      children.flatten().each( function(e) {
-        if(typeof e=='object')
-          element.appendChild(e);
-        else
-          if(Builder._isStringOrNumber(e))
-            element.appendChild(Builder._text(e));
-      });
-    } else
-      if(Builder._isStringOrNumber(children))
-        element.appendChild(Builder._text(children));
-  },
-  _isStringOrNumber: function(param) {
-    return(typeof param=='string' || typeof param=='number');
-  },
-  build: function(html) {
-    var element = this.node('div');
-    $(element).update(html.strip());
-    return element.down();
-  },
-  dump: function(scope) {
-    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
-
-    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
-      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
-      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
-      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
-      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
-      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
-
-    tags.each( function(tag){
-      scope[tag] = function() {
-        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
-      };
-    });
-  }
-};