cijoe 0.5.0 → 0.6.0

data/lib/cijoe/campfire.rb

@@ -1,6 +1,8 @@
 class CIJoe
   module Campfire
-    def self.activate
+    def self.activate(project_path)
+      @project_path = project_path
+
       if valid_config?
         require 'tinder'
 
@@ -22,12 +24,13 @@ class CIJoe
     end
 
     def self.config
+      campfire_config = Config.new('campfire', @project_path)
       @config ||= {
-        :subdomain => Config.campfire.subdomain.to_s,
-        :user      => Config.campfire.user.to_s,
-        :pass      => Config.campfire.pass.to_s,
-        :room      => Config.campfire.room.to_s,
-        :ssl       => Config.campfire.ssl.to_s.strip == 'true'
+        :subdomain => campfire_config.subdomain.to_s,
+        :user      => campfire_config.user.to_s,
+        :pass      => campfire_config.pass.to_s,
+        :room      => campfire_config.room.to_s,
+        :ssl       => campfire_config.ssl.to_s.strip == 'true'
       }
     end
 
@@ -47,9 +50,9 @@ class CIJoe
     def room
       @room ||= begin
         config = Campfire.config
-        campfire = Tinder::Campfire.new(config[:subdomain], 
-            :username => config[:user], 
-            :password => config[:pass], 
+        campfire = Tinder::Campfire.new(config[:subdomain],
+            :username => config[:user],
+            :password => config[:pass],
             :ssl => config[:ssl] || false)
         campfire.find_room_by_name(config[:room])
       end

data/lib/cijoe/server.rb

@@ -16,7 +16,7 @@ class CIJoe
 
     get '/ping' do
       if joe.building? || !joe.last_build || !joe.last_build.worked?
-        halt 412, joe.last_build ? joe.last_build.sha : "building"
+        halt 412, (joe.building? || joe.last_build.nil?) ? "building" : joe.last_build.sha
       end
 
       joe.last_build.sha
@@ -61,7 +61,7 @@ class CIJoe
       check_project
       @joe = CIJoe.new(options.project_path)
 
-      CIJoe::Campfire.activate
+      CIJoe::Campfire.activate(options.project_path)
     end
 
     def self.start(host, port, project_path)

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = VERSION = "0.5.0"
+  Version = VERSION = "0.6.0"
 end

data/test/test_cijoe_server.rb

@@ -33,6 +33,16 @@ class TestCIJoeServer < Test::Unit::TestCase
     assert_equal "building", last_response.body
   end
 
+  def test_ping_building_with_a_previous_build
+    app.joe.last_build = build :worked
+    app.joe.current_build = build :building
+    assert app.joe.building?, "buildin' a awsum project"
+
+    get "/ping"
+    assert_equal 412, last_response.status
+    assert_equal "building", last_response.body
+  end
+
   def test_ping_failed
     app.joe.last_build = build :failed
 
@@ -41,10 +51,18 @@ class TestCIJoeServer < Test::Unit::TestCase
     assert_equal app.joe.last_build.sha, last_response.body
   end
 
+  def test_ping_should_not_reset_current_build_in_tests
+    current_build = build :building
+    app.joe.current_build = current_build
+    assert app.joe.building?
+    get "/ping"
+    assert_equal current_build, app.joe.current_build
+  end
+
   # Create a new, fake build. All we care about is status.
 
   def build status
-    CIJoe::Build.new "user", "project", Time.now, Time.now,
-      "deadbeef", status, "output", 1337
+    CIJoe::Build.new "path", "user", "project", Time.now, Time.now,
+      "deadbeef", status, "output", nil
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 -07:00
+date: 2010-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency