crazy_ivan 1.2.2 → 1.2.3

data/bin/crazy_ivan

@@ -16,7 +16,6 @@ require "logger"
 Syslog.open('crazy_ivan', Syslog::LOG_PID | Syslog::LOG_CONS)
 
 Signal.trap("INT") do
-  # Syslog.debug("Interrupted - Now dropping a note in the test output and exiting.")
   Syslog.debug("Interrupted - exiting.")
   CrazyIvan.interrupt_test
   ProcessManager.unlock

data/bin/test_report2campfire

@@ -94,9 +94,12 @@ Campfire.basic_auth ARGV[1], 'x'
 campfire_room_id = campfire_url.path[/\d+/]
 campfire_room = Campfire.room(campfire_room_id)
 
-exit_status = report['test']['exit_status']     
+exit_status = report['test']['exit_status']
+version = report['version']['output'][0...5]
+version << '...' if report['version']['output'].size > 5
+
 if exit_status == "0" || exit_status.nil?
-  campfire_room.message "#{report['project_name']} #{report['version']['output']} built happily: #{ARGV[2]}"
+  campfire_room.message "PASS: #{report['project_name']} #{version} built happily: #{ARGV[2]}"
 else
-  campfire_room.message "#{report['project_name']} #{report['version']['output']} broke. Please take a look at #{ARGV[2]}"
+  campfire_room.message "FAIL: #{report['project_name']} #{version} broke. Please take a look at #{ARGV[2]}"
 end

data/lib/crazy_ivan/process_manager.rb

@@ -34,7 +34,7 @@ class ProcessManager
       end
     else
       if ci_already_running?
-        msg = "Detected another running CI process #{pid} - terminating myself"
+        msg = "Detected another running CI process #{pid} - interrupting and terminating myself"
         Syslog.warning msg
         puts msg
         Process.kill("INT", 0)

data/lib/crazy_ivan/report_assembler.rb

@@ -6,19 +6,11 @@ class ReportAssembler
   
   def initialize(projects_directory, output_directory)
     @runners = []
+    @projects = {}
     @projects_directory = projects_directory
     @output_directory = File.expand_path(output_directory, projects_directory)
   end
   
-  def different_than_last_version?(runner)
-    project_path = File.join(@output_directory, runner.project_name)
-    
-    Dir.chdir(project_path) do
-      version = runner.results[:version][:output]
-      Dir["#{version}.json"].size == 0
-    end
-  end
-  
   def generate
     Dir.chdir(@projects_directory) do
       Dir['*'].each do |dir|
@@ -29,109 +21,126 @@ class ReportAssembler
     end
     
     Dir.chdir(@output_directory) do
+      # Write out the index.html file
       update_index
+      
+      # Write out the projects.json file and the reports.json in each
       update_projects
+      init_project_reports
+      
+      get_project_reports
       
       runners.each do |runner|
         # REFACTOR to run this block in multiple threads to have multi-project testing
-      
+        
         # Write the first version of the report with just the start time to currently_building.json
         runner.start!
-        update_project(runner)
-
+        update_currently_building(runner)
+        
         # Update the report in currently_building.json with the update output and error
         runner.update!
-        update_project(runner)
-
+        update_currently_building(runner)
+        
         # Update the report in currently_building.json with the version output and error
         runner.version!
-        update_project(runner)
+        update_currently_building(runner)
         
-        if different_than_last_version?(runner)
-          # Empty the currently_building.json and add to recents.json this new report with the test output and error
-          runner.test!  # update_project will be called from within the runner to stream the test output
-          update_project(runner)
-        else
-          flush_build_progress(runner)
+        if already_tested?(runner)
           Syslog.debug("Already tested #{runner.project_name} version #{runner.results[:version][:output]} - skipping test")
+        else
+          # update_project will be called from within the runner to stream the test output
+          runner.test!
+          update_project(runner)
         end
+        flush_build_progress(runner)
       end
     end
   end
   
-  def filename_from_version(string)
-    s = string[0..240]
+  def update_index
+    FileUtils.cp(File.expand_path("index.html", TEMPLATES_PATH), 'index.html')
+    FileUtils.mkdir_p('javascript')
+    FileUtils.cp(File.expand_path("date.js", File.join(TEMPLATES_PATH, 'javascript')), 'javascript/date.js')
+  end
+    
+  def update_projects
+    projects = @runners.map {|r| r.project_name }
     
-    return s
+    File.open('projects.json', 'w+') do |f|
+      f.print({"projects" => projects}.to_json)
+    end
   end
   
-  def flush_build_progress(runner)
-    project_results_path = File.join(@output_directory, runner.project_name)
+  def init_project_reports
+    projects = @runners.map {|r| r.project_name }
     
-    Dir.chdir(project_results_path) do
-      File.open("currently_building.json", 'w+') do |f|
-        f.puts({}.to_json)
+    projects.each do |project_name|
+      FileUtils.mkdir_p(project_name)
+      Dir.chdir(project_name) do
+        if !File.exists?('reports.json')
+          File.open('reports.json', 'w+') do |f|
+            f.puts [].to_json
+          end
+        end
       end
     end
   end
   
-  def update_project(runner)
+  def get_project_reports
+    projects = @runners.map {|r| r.project_name }
+    
+    Dir.chdir(@output_directory) do
+      projects.each do |project_name|
+        reports = JSON.parse(File.read(File.expand_path('reports.json', project_name)))
+        @projects[project_name] = reports
+      end
+    end
+  end
+  
+  def update_currently_building(runner)
     project_path = File.expand_path(runner.project_name, @output_directory)
-    FileUtils.mkdir_p(project_path)
     
     Dir.chdir(project_path) do
-      filename = ''
-      
-      if runner.still_building?
-        filename = 'currently_building'
-      else
-        if runner.results[:version][:exit_status] == '0'
-          filename = filename_from_version(runner.results[:version][:output])
-        else
-          filename = filename_from_version(runner.results[:version][:error])
-        end
-      end
-      
-      File.open("#{filename}.json", 'w+') do |f|
+      File.open('currently_building.json', 'w+') do |f|
         f.puts runner.results.to_json
       end
-      
-      if runner.finished?
-        Syslog.debug "Runner is FINISHED"
-        flush_build_progress(runner)
-        update_recent(runner.results, filename)
-      end
     end
   end
   
-  def update_recent(result, filename)
-    recent_versions_json = File.open('recent.json', File::RDWR | File::CREAT).read
-    
-    recent_versions = []
+  def already_tested?(runner)
+    project_path = File.join(@output_directory, runner.project_name)
     
-    if !recent_versions_json.empty?
-      recent_versions = JSON.parse(recent_versions_json)["recent_versions"]
+    Dir.chdir(project_path) do
+      version = runner.results[:version][:output]
+      tested_versions = @projects[runner.project_name].map {|r| r['version']['output'] }
+      tested_versions.include?(version)
     end
+  end
+  
+  def update_project(runner)
+    project_path = File.expand_path(runner.project_name, @output_directory)
     
-    recent_versions << filename
-    recent_versions.shift if recent_versions.size > MAXIMUM_RECENTS
+    @projects[runner.project_name] << runner.results
+    cull_old_reports(runner.project_name)
     
-    File.open('recent.json', 'w+') do |f|
-      f.print({"recent_versions" => recent_versions}.to_json)
+    Dir.chdir(project_path) do
+      File.open("reports.json", 'w+') do |f|
+        f.puts @projects[runner.project_name].to_json
+      end
     end
   end
   
-  def update_projects
-    projects = @runners.map {|r| r.project_name }
-    
-    File.open('projects.json', 'w+') do |f|
-      f.print({"projects" => projects}.to_json)
-    end
+  def cull_old_reports(project_name)
+    @projects[project_name].shift if @projects[project_name].size > MAXIMUM_RECENTS
   end
   
-  def update_index
-    FileUtils.cp(File.expand_path("index.html", TEMPLATES_PATH), 'index.html')
-    FileUtils.mkdir_p('javascript')
-    FileUtils.cp(File.expand_path("date.js", File.join(TEMPLATES_PATH, 'javascript')), 'javascript/date.js')
+  def flush_build_progress(runner)
+    project_results_path = File.join(@output_directory, runner.project_name)
+    
+    Dir.chdir(project_results_path) do
+      File.open("currently_building.json", 'w+') do |f|
+        f.puts({}.to_json)
+      end
+    end
   end
 end

data/lib/crazy_ivan/templates/index.html

@@ -63,9 +63,9 @@
       .project h2 { margin: 12px 0 0 0;}
 
       .tests { margin: 0 0 0 18px;}
-      .tests .test { font-size: 80%; margin-right: 8px}
+      .tests .test { margin-right: 8px}
       .tests a.test:hover { text-decoration: underline;}
-      .tests .test:first-child { font-size: 100%;}
+      .tests .test.first { font-size: 100%;}
       .tests .test.active { font-weight: bold;}
 
       .result .timestamp { margin-right: 12px;}
@@ -98,16 +98,22 @@
         <h2><%= projectName %></h2>
         
         <div class="tests"></div>
+        <div style="clear: left"></div>
         <div class="results"></div>
       <div>
     </script>
     
     <!-- test link template -->
     <script type="text/html" id="resultLinkTemplate">
-      <a id="<%= projectDomId %>-<%= version.output %>" class="test"><%= shortTimeStamp %></a>
+      <div style="float: left; margin-right: 8px">
+        <div style="float:left; height: 1.2em; font-size: 84%"><%= longTimeStamp %></div>
+        <div style="clear: left">
+          <a id="<%= projectDomId %>-<%= version.output %>" class="test"><%= shortTimeStamp %></a>
+        </div>
+      </div>
     </script>
     
-    <!-- build result holder -->
+    <!-- build rult holder -->
     <script type="text/html" id="resultTemplate">
       <div class="result <%= projectDomId %>-<%= version.output %>" style="display: none">
         <div>
@@ -133,9 +139,11 @@
 
     <script type="text/javascript" charset="utf-8">
       var json = {projects: []};
+      var projectNames;
       
       jQuery(document).ready(function($) {
         $.getJSON("projects.json", function(data) {
+          projectNames = data.projects;
           jQuery.each(data.projects, function(i, projectName) {
             addProjectToJson(projectName);
           });
@@ -143,66 +151,71 @@
       });
       
       function addProjectToJson(name) {
-        var project = {'name': name, reports: []};
-        var recentVersionsJsonPath = name + "/recent.json";
-        
-        jQuery.getJSON(recentVersionsJsonPath, function(data) {
-          jQuery.each(data.recent_versions, function(i, version) {
-            addReportToProject(project, version);
-          });
-        });
+        var projectJsonPath = name + "/reports.json";
         
-        json.projects.push(project);
-      }
-      
-      function addReportToProject(project, version) {
-        var name = project.name;
-        var resultJsonPath = name + "/" + version + ".json";
-        jQuery.getJSON(resultJsonPath, function(data) { 
-          project.reports.push(data);
+        jQuery.getJSON(projectJsonPath, function(data) {
+          json.projects.push({'name': name, reports: data});
           trigger_render();
         });
       }
       
-      function sortReports(reports) {
-        return reports.sort(function(report_a, report_b) { 
-          // Not sure why providing a 3-letter day trips up Date.js sometimes
-          a = Date.parse(report_a.timestamp.finish.substring(4));
-          b = Date.parse(report_b.timestamp.finish.substring(4));
-          
-          return Date.compare(a, b);
-        });
-      }
-      
       var timeout = null;
       function trigger_render() {       
         if (timeout)  { clearTimeout(timeout) }
         timeout = setTimeout(render, 50);
       }
       
+      function orderedProjects(projects) {
+        var orderedProjects = [];
+        
+        // order the projects by what the projects.json returns
+        for(var name in projectNames) {
+          for(var project in projects) {
+            if(projects[project].name == projectNames[name]) {
+              orderedProjects.push(projects[project]);
+              break;
+            }
+          }
+        }
+        return orderedProjects;
+      }
+      
       var render = function() {
         $('#projects').empty();
         
-        jQuery.each(json.projects, function(i, project) {
+        var sortedProjects = orderedProjects(json.projects);
+        
+        jQuery.each(sortedProjects, function(i, project) {
           var name = project.name;
           var domId = name.replace(/\./g, "");      // remove . from id name
           
           // create project holder div
           $('#projects').append(tmpl("projectTemplate", {projectName: name, projectId: domId}));
           
-          project.reports = sortReports(project.reports);
-          
-          jQuery.each(project.reports, function(i, report) {
+          jQuery.each(project.reports.reverse(), function(i, report) {
             var version = report.version.output;
             var resultJsonPath = name + "/" + version + ".json";
             var domId = name.replace(/\./g, "");      // remove . from id name
             
+            var timestamp = report.timestamp.finish;
+            report["longTimeStamp"] = Date.parse(timestamp.substring(4)).toString("MMM d");
+            
+            // To group the long time stamps (e.g. Feb 8)
+            if(project.reports[i - 1] != undefined) {
+              next_timestamp = project.reports[i - 1].timestamp.finish;
+              next_longTimeStamp = Date.parse(next_timestamp.substring(4)).toString("MMM d");
+              
+              if(report["longTimeStamp"] == next_longTimeStamp) {
+                report["longTimeStamp"] = "";
+              }
+            }
+            
             // Not sure why providing a 3-letter day trips up Date.js sometimes
-            report["shortTimeStamp"] = Date.parse(report.timestamp.finish.substring(4)).toString("HH:mm");
+            report["shortTimeStamp"] = Date.parse(timestamp.substring(4)).toString("HH:mm");
             report["projectDomId"] = domId;
             
             $("#" + domId + " .results").append(tmpl("resultTemplate", report));
-            $("#" + domId + " .tests").prepend(tmpl("resultLinkTemplate", report));
+            $("#" + domId + " .tests").append(tmpl("resultLinkTemplate", report));
             
             // add failed/success indication to link - inlining in the template screws up
             if (report.test.exit_status && report.test.exit_status != '0') {

data/lib/crazy_ivan/test_runner.rb

@@ -72,7 +72,7 @@ class TestRunner
             
             if options[:stream_test_results?]
               @results[:test][:output] = output
-              @report_assembler.update_project(self)
+              @report_assembler.update_currently_building(self)
             end
           end
           
@@ -83,7 +83,7 @@ class TestRunner
             
             if options[:stream_test_results?]
               @results[:test][:error] = error
-              @report_assembler.update_project(self)
+              @report_assembler.update_currently_building(self)
             end
           end
           
@@ -96,7 +96,7 @@ class TestRunner
             
             if options[:stream_test_results?]
               @results[:test][:error] = error
-              @report_assembler.update_project(self)
+              @report_assembler.update_currently_building(self)
             end
           end
         end

data/lib/crazy_ivan/version.rb

@@ -1,3 +1,3 @@
 module CrazyIvan
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: crazy_ivan
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Edward Ocampo-Gooding