ssp-cijoe 0.4.4.2 → 0.4.4.3

data/lib/cijoe.rb

@@ -22,7 +22,7 @@ require 'cijoe/server'
 require 'fileutils'
 
 class CIJoe
-  
+
   attr_reader :user, :project, :url, :current_build, :last_build
 
   def initialize(project_path)
@@ -78,7 +78,7 @@ class CIJoe
     @last_build = @current_build
 
     @current_build = nil
-    
+
     actual_build_id = "#{@last_build.commit.sha[0..7]}.#{Time.now.to_i}.build"
     write_build actual_build_id, @last_build
     write_build 'current', @current_build
@@ -150,8 +150,10 @@ class CIJoe
   rescue Object => e
     puts "Exception building: #{e.message} (#{e.class})"
     build_failed('', e.to_s)
+    publish_screenshots(build)
   else
     publish_metrics_and_coverage(build)
+    publish_screenshots(build)
   end
 
   def publish_metrics_and_coverage(build)
@@ -165,6 +167,13 @@ class CIJoe
     `cp -r tmp/metric_fu/output/* #{build.metrics_dir}`
   end
 
+  def publish_screenshots(build)
+    puts "Creating screenshots dir ..."
+    `mkdir #{build.screenshots_dir}`
+    puts "Publishing screenshots ..."
+    `cp screenshots/* #{build.screenshots_dir}`
+  end
+
   # shellin' out
   def runner_command
     runner = Config.cijoe.runner.to_s
@@ -240,7 +249,7 @@ class CIJoe
   def read_build(name)
     Build.load(".git/builds/#{name}")
   end
-  
+
   def build_history
     build_entries = Dir.open(".git/builds").entries.select { |dir| dir.match /^([a-z0-9]{8})\.([\d]{10})\.build$/ }
     history = build_entries.inject([]) do |builds, entry|

data/lib/cijoe/build.rb

@@ -49,6 +49,10 @@ class CIJoe
       "#{Config.cijoe.coveragedir}/#{project}/#{full_id}"
     end
 
+    def screenshots_dir
+      "#{Config.cijoe.screenshotsdir}/#{project}/#{full_id}"
+    end
+
     def metrics_url
       "/metrics/#{project}/#{full_id}/index.html"
     end
@@ -57,6 +61,10 @@ class CIJoe
       "/coverage/#{project}/#{full_id}/index.html"
     end
 
+    def screenshots_url
+      "/screenshots/#{project}/#{full_id}/"
+    end
+
     def clean_output
       output.gsub(/\e\[.+?m/, '').strip
     end

data/lib/cijoe/public/screen.css

@@ -131,27 +131,27 @@ ul.posts {
     line-height: 1.75em;
     margin-bottom: 18px;
   }
-  
+
   ul.posts .date,
   ul.posts .duration {
     color: #aaa;
     font-family: Monaco, "Courier New", monospace;
     font-size: 80%;
   }
-  
-  ul.posts span.metrics {
+
+  ul.posts span.links {
     margin-left: 20px;
     line-height: 18px;
     font-size: 11px;
   }
 
-  ul.posts span.metrics a {
+  ul.posts span.links a {
     color: #e61e4e;
     background: #fff;
     padding: 2px 5px;
   }
-  
-  ul.posts span.metrics a:hover {
+
+  ul.posts span.links a:hover {
     background: #e61e4e;
     color: #fff;
   }

data/lib/cijoe/views/_build.erb

@@ -1,9 +1,12 @@
 <li>
-  <span class="date"><%= pretty_time(build.finished_at) %></span> &raquo; <span class="<%= build.status %>"><%= build.status %></span> &raquo; Built <a href="<%= build.commit.url %>"><%= build.short_sha %></a> 
+  <span class="date"><%= pretty_time(build.finished_at) %></span> &raquo; <span class="<%= build.status %>"><%= build.status %></span> &raquo; Built <a href="<%= build.commit.url %>"><%= build.short_sha %></a>
   <% if build.duration %>
     in <span class="duration"><%= build.duration %></span> seconds.
   <% end %>
-  <span class="metrics">
+  <span class="links">
     <a class="metrics" href="<%= build.metrics_url %>">Metrics</a> <a class="coverage" href="<%= build.coverage_url %>">Coverage</a>
   </span>
+  <span class="links">
+    <a class="screenshots" href="<%= build.screenshots_url %>">Screenshots</a>
+  </span>
 </li>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ssp-cijoe
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 121
   prerelease: false
   segments: 
   - 0
   - 4
   - 4
-  - 2
-  version: 0.4.4.2
+  - 3
+  version: 0.4.4.3
 platform: ruby
 authors: 
 - Chris Wanstrath