cijoe 0.8.1 → 0.9.0

data/bin/cijoe

@@ -2,6 +2,7 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'choice'
+require 'cijoe'
 
 Choice.options do
   banner "Usage: #{File.basename(__FILE__)} [-hpv] path_to_git_repo"
@@ -46,6 +47,4 @@ end
 
 options = Choice.choices
 
-require 'cijoe'
-
-CIJoe::Server.start(options[:host], options[:port], File.expand_path(Choice.rest[0]))
+CIJoe::Server.start(options[:host], options[:port], File.expand_path(Choice.rest[0].to_s))

data/lib/cijoe.rb

@@ -127,10 +127,11 @@ class CIJoe
     output = ''
     git_update
     build.sha = git_sha
+    build.branch = git_branch
     write_build 'current', build
 
     open_pipe("cd #{@project_path} && #{runner_command} 2>&1") do |pipe, pid|
-      puts "#{Time.now.to_i}: Building #{build.short_sha}: pid=#{pid}"
+      puts "#{Time.now.to_i}: Building #{build.branch} at #{build.short_sha}: pid=#{pid}"
 
       build.pid = pid
       write_build 'current', build
@@ -139,6 +140,7 @@ class CIJoe
 
     Process.waitpid(build.pid, 1)
     status = $?.exitstatus.to_i
+    @current_build = build
     puts "#{Time.now.to_i}: Built #{build.short_sha}: status=#{status}"
 
     status == 0 ? build_worked(output) : build_failed('', output)
@@ -187,10 +189,9 @@ class CIJoe
           {}
         end
 
+      ENV.clear
       data.each{ |k, v| ENV[k] = v }
-      ret = `cd #{@project_path} && sh #{file}`
-      data.each{ |k, v| ENV[k] = nil }
-      ret
+      `cd #{@project_path} && sh #{file}`
     end
   end
 

data/lib/cijoe/build.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 class CIJoe
-  class Build < Struct.new(:project_path, :user, :project, :started_at, :finished_at, :sha, :status, :output, :pid)
+  class Build < Struct.new(:project_path, :user, :project, :started_at, :finished_at, :sha, :status, :output, :pid, :branch)
     def initialize(*args)
       super
       self.started_at ||= Time.now
@@ -52,7 +52,7 @@ class CIJoe
     end
 
     def dump(file)
-      config = [user, project, started_at, finished_at, sha, status, output, pid]
+      config = [user, project, started_at, finished_at, sha, status, output, pid, branch]
       data = YAML.dump(config)
       File.open(file, 'wb') { |io| io.write(data) }
     end

data/lib/cijoe/server.rb

@@ -27,8 +27,10 @@ class CIJoe
     end
 
     post '/?' do
-      payload = YAML.load(params[:payload].to_s) || {}
-      pushed_branch = payload['ref'].to_s.split('/').last
+      payload = params[:payload].to_s
+      if payload =~ /"ref":"(.+?)"/
+        pushed_branch = $1.split('/').last
+      end
 
       # Only build if we were given an explicit branch via `?branch=blah`,
       # no payload exists (we're probably testing), or the payload exists and
@@ -86,6 +88,11 @@ class CIJoe
       CIJoe::Server.run! :host => host, :port => port
     end
 
+    def self.rack_start(project_path)
+      set :project_path, project_path
+      self.new
+    end
+
     def self.project_path=(project_path)
       user, pass = Config.cijoe(project_path).user.to_s, Config.cijoe(project_path).pass.to_s
       if user != '' && pass != ''

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = VERSION = "0.8.1"
+  Version = VERSION = "0.9.0"
 end

data/lib/cijoe/views/template.erb

@@ -19,7 +19,7 @@
             <li>
               <span class="date"><%= pretty_time(joe.current_build.started_at) if joe.current_build %></span> &raquo;
               <% if joe.current_build.sha %>
-                Building <a href="<%= joe.current_build.commit.url %>"><%= joe.current_build.short_sha %></a> <small>(pid: <%= joe.pid %>)</small>
+                Building <%= joe.current_build.branch %> at <a href="<%= joe.current_build.commit.url %>"><%= joe.current_build.short_sha %></a> <small>(pid: <%= joe.pid %>)</small>
               <% else %>
                 Build starting...
               <% end %>
@@ -32,7 +32,7 @@
             <li>
               <span class="date"><%= pretty_time(joe.last_build.finished_at) %></span> &raquo;
               <% if joe.last_build.sha %>
-                Built <a href="<%= joe.last_build.commit.url %>"><%= joe.last_build.short_sha %></a>
+                Built <%= joe.last_build.branch %> at <a href="<%= joe.last_build.commit.url %>"><%= joe.last_build.short_sha %></a>
               <% end %>
               <span class="<%= joe.last_build.status %>">(<%= joe.last_build.status %>)</span>
               <% if joe.last_build.duration %>
@@ -49,10 +49,10 @@
       <div class="footer">
         <div class="contact">
           <p>
-            <a href="http://github.com/defunkt/cijoe/tree/master#readme">Documentation</a><br/>
-            <a href="http://github.com/defunkt/cijoe">Source</a><br/>
-            <a href="http://github.com/defunkt/cijoe/issues">Issues</a><br/>
-            <a href="http://twitter.com/defunkt">Twitter</a>
+            <a href="https://github.com/defunkt/cijoe#readme">Documentation</a><br/>
+            <a href="https://github.com/defunkt/cijoe">Source</a><br/>
+            <a href="https://github.com/defunkt/cijoe/issues">Issues</a><br/>
+            <a href="https://github.com/defunkt/cijoe/tree/v<%= CIJoe::VERSION %>">v<%= CIJoe::VERSION %></a>
           </p>
         </div>
         <div class="contact">

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cijoe
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -08:00
+date: 2011-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency