kid80-cijoe 0.1.3 → 0.2.0

data/Rakefile

@@ -16,10 +16,43 @@ begin
     gemspec.authors = ["Chris Wanstrath"]
     gemspec.add_dependency 'choice'
     gemspec.add_dependency 'sinatra'
-    gemspec.add_dependency 'open4'
     gemspec.version = CIJoe::Version.to_s
   end
 rescue LoadError
   puts "Jeweler not available." 
   puts "Install it with: gem install jeweler"
 end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "someproject #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/deps.rip

@@ -2,4 +2,3 @@ git://github.com/Manfred/broach.git HEAD
 git://github.com/sinatra/sinatra.git 0.9.4
 git://github.com/rack/rack.git 1.0
 git://github.com/defunkt/choice.git 8b125564
-git://github.com/ahoward/open4.git 25c3ed8

data/lib/cijoe.rb

@@ -13,12 +13,6 @@
 #
 # Seriously, I'm gonna be nuts about keeping this simple.
 
-begin
-  require 'open4'
-rescue LoadError
-  abort "** Please install open4"
-end
-
 require 'cijoe/version'
 require 'cijoe/config'
 require 'cijoe/commit'
@@ -74,6 +68,7 @@ class CIJoe
     @current_build.status = status
     @current_build.output = output
     @last_build = @current_build
+
     @current_build = nil
     write_build 'current', @current_build
     write_build 'last', @last_build
@@ -89,22 +84,42 @@ class CIJoe
     Thread.new { build! }
   end
 
+  def open_pipe(cmd)
+    read, write = IO.pipe
+
+    pid = fork do
+      read.close
+      STDOUT.reopen write
+      exec cmd
+    end
+
+    write.close
+
+    yield read, pid
+  end
+
   # update git then run the build
   def build!
     build = @current_build
-    out, err, status = '', '', nil
+    output = ''
     git_update
     build.sha = git_sha
     write_build 'current', build
 
-    status = Open4.popen4(runner_command) do |pid, stdin, stdout, stderr|
+    open_pipe("#{runner_command} 2>&1") do |pipe, pid|
+      puts "#{Time.now.to_i}: Building #{build.short_sha}: pid=#{pid}"
+
       build.pid = pid
       write_build 'current', build
-      err, out = stderr.read.strip, stdout.read.strip
+      output = pipe.read
     end
 
-    status.exitstatus.to_i == 0 ? build_worked(out) : build_failed(out, err)
+    status = $?.exitstatus.to_i
+    puts "#{Time.now.to_i}: Built #{build.short_sha}: status=#{status}"
+
+    status == 0 ? build_worked(output) : build_failed('', output)
   rescue Object => e
+    puts "Exception building: #{e.message} (#{e.class})"
     build_failed('', e.to_s)
   end
 
@@ -153,8 +168,14 @@ class CIJoe
 
   # restore current / last build state from disk.
   def restore
-    @last_build = read_build('last')
-    @current_build = read_build('current')
+    unless @last_build
+      @last_build = read_build('last')
+    end
+
+    unless @current_build
+      @current_build = read_build('current')
+    end
+
     Process.kill(0, @current_build.pid) if @current_build && @current_build.pid
   rescue Errno::ESRCH
     # build pid isn't running anymore. assume previous

data/lib/cijoe/build.rb

@@ -21,7 +21,11 @@ class CIJoe
     end
 
     def short_sha
-      sha[0,7] if sha
+      if sha
+        sha[0,7]
+      else
+        "<unknown>"
+      end
     end
 
     def clean_output

data/lib/cijoe/campfire.rb

@@ -2,7 +2,7 @@ class CIJoe
   module Campfire
     def self.activate
       if valid_config?
-        require 'broach'
+        require 'tinder'
 
         CIJoe::Build.class_eval do
           include CIJoe::Campfire
@@ -13,8 +13,9 @@ class CIJoe
         puts "Can't load Campfire notifier."
         puts "Please add the following to your project's .git/config:"
         puts "[campfire]"
-        puts "\ttoken = your_api_token"
-        puts "\taccount = whatever"
+        puts "\tuser = your@campfire.email"
+        puts "\tpass = passw0rd"
+        puts "\tsubdomain = whatever"
         puts "\troom = Awesomeness"
         puts "\tssl = false"
       end
@@ -22,22 +23,23 @@ class CIJoe
 
     def self.config
       @config ||= {
-        :account   => Config.campfire.account.to_s,
-        :token     => Config.campfire.token.to_s,
+        :subdomain => Config.campfire.subdomain.to_s,
+        :user      => Config.campfire.user.to_s,
+        :pass      => Config.campfire.pass.to_s,
         :room      => Config.campfire.room.to_s,
-        :use_ssl   => Config.campfire.ssl.to_s.strip == 'true'
+        :ssl       => Config.campfire.ssl.to_s.strip == 'true'
       }
     end
 
     def self.valid_config?
-      %w( account token room ).all? do |key|
-        puts config.inspect if config[key.intern].nil?
+      %w( subdomain user pass room ).all? do |key|
         !config[key.intern].empty?
       end
     end
-
+    
     def notify
-      room.speak "#{short_message}. #{commit.url} #{play_sound}"
+      room.speak "#{short_message}. #{commit.url}"
+      room.play "#{play_sound}"
       room.paste full_message if failed?
       room.leave
     end
@@ -45,8 +47,12 @@ class CIJoe
   private
     def room
       @room ||= begin
-        Broach.settings = Campfire.config
-        Broach::Room.find_by_name(Campfire.config['room'])
+        config = Campfire.config
+        options = {}
+        options[:ssl] = config[:ssl] ? true : false
+        campfire = Tinder::Campfire.new(config[:subdomain], options)
+        campfire.login(config[:user], config[:pass])
+        campfire.find_room_by_name(config[:room])
       end
     end
 
@@ -55,7 +61,7 @@ class CIJoe
     end
     
     def play_sound
-      "/play #{worked? ? "rimshot" : "trombone"}"
+      "#{worked? ? "rimshot" : "trombone"}"
     end
 
     def full_message
@@ -68,4 +74,4 @@ Commit Author: #{commit.author}
 EOM
     end
   end
-end
+end

data/lib/cijoe/config.rb

@@ -14,11 +14,29 @@ class CIJoe
     end
 
     def to_s
-      `git config #{config_string}`.chomp
+      git_command = "git config #{config_string}"
+      result = `#{git_command} 2>&1`.chomp
+      process_status = $?
+      
+      if successful_command?(process_status) || config_command_with_empty_value?(result,process_status)
+        return result
+      else
+        raise "Error calling git config, is a recent version of git installed? Command: #{git_command}, Error: #{result}"
+      end
     end
 
     def config_string
       @parent ? "#{@parent.config_string}.#{@command}" : @command
     end
+    
+    private
+    
+    def successful_command?(process_status)
+      process_status.exitstatus.to_i == 0
+    end
+    
+    def config_command_with_empty_value?(result, process_status)
+      process_status.exitstatus.to_i == 1 && result.empty?
+    end    
   end
 end

data/lib/cijoe/public/screen.css

@@ -11,10 +11,6 @@
   padding: 0;
 }
 
-html, body {
-  height: 100%;
-}
-
 body {
   background-color: white;
   font: 13.34px helvetica, arial, clean, sans-serif;
@@ -198,8 +194,8 @@ ul.posts {
 
 pre.terminal {
   border: 1px solid black;
-  background-color: #333;
-  color: white;
+  background-color: #fff;
+  color: #333;
   padding: 5px;
   overflow: auto;
   word-wrap: break-word;
@@ -207,6 +203,6 @@ pre.terminal {
 
 pre.terminal code {
   font-family: 'Bitstream Vera Sans Mono', 'Courier', monospace;
-  background-color: #333;
+  background-color: #fff;
 }
 

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = "0.1.2"
+  Version = "0.2.0"
 end

data/lib/cijoe/views/template.erb

@@ -2,17 +2,12 @@
 <html>
   <head>
     <link href="<%= cijoe_root %>/screen.css" media="screen" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" href="<%= cijoe_root %>/favicon.ico" type="image/x-icon" />
     <title><%= h(joe.project) %>: CI Joe</title>
   </head>
   <body>
     <div class="site">
-      <div class="title">
-        <a href="<%= cijoe_root %>/">CI Joe</a>
-        <span class="extra">because knowing is half the battle</span>
-      </div>
-
       <div id="home">
-        <h1><a href="<%= joe.url %>"><%= joe.project %></a></h1>
         <ul class="posts">
           <% if joe.current_build %>
             <li>
@@ -35,30 +30,7 @@
           <% end %>
         </ul>
       </div>
-
-      <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>
-          </p>
-        </div>
-        <div class="contact">
-          <p>
-            Designed by <a href="http://tom.preston-werner.com/">Tom Preston-Werner</a><br/>
-            Influenced by <a href="http://integrityapp.com/">Integrity</a><br/>
-            Built with <a href="http://sinatrarb.com/">Sinatra</a><br/>
-            Keep it simple, Sam.
-          </p>
-        </div>        
-        <div class="rss">
-          <a href="http://github.com/defunkt/cijoe">
-            <img src="<%= cijoe_root %>/octocat.png" alt="Octocat!" />
-          </a>
-        </div>
-      </div>
+      
     </div>
   </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kid80-cijoe
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chris Wanstrath