sr-integrity-irc 0.0.2 → 0.0.4

data/lib/notifier/irc.rb

@@ -8,7 +8,11 @@ module Integrity
       attr_reader :uri
       
       def self.to_haml
-        File.read File.dirname(__FILE__) / "config.haml"
+        <<-HAML
+%p.normal
+  %label{ :for => 'irc_notifier_uri' } Send to
+  %input.text#irc_notifier_uri{ :name => 'notifiers[IRC][uri]', :type => 'text', :value => config['uri'] || 'irc://IntegrityBot@irc.freenode.net:6667/#test' }
+        HAML
       end
 
       def initialize(build, config={})
@@ -17,9 +21,9 @@ module Integrity
       end
 
       def deliver!
-        ShoutBot.shout(uri, :as => "IntegrityBot") do |channel|
+        ShoutBot.shout(uri) do |channel|
           channel.say "#{build.project.name}: #{short_message}"
-          channel.say build_url
+          channel.say commit_url
         end
       end
     end

data/test/irc_test.rb

@@ -0,0 +1,33 @@
+require "test/unit"
+require "rr"
+require "integrity/notifier/test_helpers"
+
+begin
+  require "redgreen"
+rescue LoadError
+end
+
+require File.dirname(__FILE__) + "/../lib/notifier/irc"
+
+class IRCTest < Test::Unit::TestCase
+  include RR::Adapters::TestUnit
+  include Integrity::Notifier::TestHelpers
+
+  def setup
+    setup_database
+  end
+
+  def notifier
+    "IRC"
+  end
+
+  def test_configuration_form
+    assert_form_have_option "uri", "irc://irc.freenode.net/test"
+  end
+
+  def test_send_notification
+    config = { "uri" => "irc://foo:bar@irc.freenode.net/test" }
+    stub(ShoutBot).shout("irc://foo:bar@irc.freenode.net/test") { nil }
+    Integrity::Notifier::IRC.new(commit, config).deliver!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sr-integrity-irc
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Simon Rozet
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-20 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: foca-integrity
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -22,7 +23,8 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: sr-shout-bot
+  name: ichverstehe-shout-bot
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,7 +42,6 @@ extra_rdoc_files: []
 
 files: 
 - README.markdown
-- lib/notifier/config.haml
 - lib/notifier/irc.rb
 has_rdoc: false
 homepage: http://integrityapp.com
@@ -69,4 +70,4 @@ signing_key:
 specification_version: 2
 summary: IRC notifier for the Integrity continuous integration server
 test_files: 
-- spec/irc_spec.rb
+- test/irc_test.rb

data/lib/notifier/config.haml

@@ -1,3 +0,0 @@
-%p.normal
-  %label{ :for => 'irc_notifier_uri' } Send to
-  %input.text#irc_notifier_uri{ :name => 'notifiers[IRC][uri]', :type => 'text', :value => config['uri'] || 'irc://irc.freenode.net:6667/test' }

data/spec/irc_spec.rb

@@ -1,72 +0,0 @@
-require File.dirname(__FILE__) +  "/../lib/notifier/irc"
-require Integrity.root / "spec" / "spec_helper"
-
-describe Integrity::Notifier::IRC do
-  include AppSpecHelper
-  include NotifierSpecHelper
-  
-  it_should_behave_like "A notifier"
-
-  def klass
-    Integrity::Notifier::IRC
-  end
-
-  def notifier_config(opts={})
-    {"uri" =>"irc://irc.freenode.net:6667/integrity"}
-  end
-
-  def notifier
-    @notifier ||= Integrity::Notifier::IRC.new(mock_build, notifier_config)
-  end
-
-  it "should have an uri" do
-    notifier.uri.should == "irc://irc.freenode.net:6667/integrity"
-  end
-
-  describe "Generating a form for configuration" do
-    describe "with a field for the IRC URI" do
-      it "should have the proper name, id and label and a default value" do
-        the_form.should have_textfield("irc_notifier_uri").
-          named("notifiers[IRC][uri]").
-          with_label("Send to").
-          with_value("irc://irc.freenode.net:6667/test")
-      end
-      
-      it "should use the config's 'uri' value if available" do
-        the_form(:config => { "uri" => "irc://irc.freenode.net/integrity" }).
-          should have_textfield("irc_notifier_uri").
-          with_value("irc://irc.freenode.net/integrity")
-      end
-    end
-  end
-
-  describe "Delevering the build" do
-    def do_notify
-      notifier.deliver!
-    end
-
-    before do
-      @channel = mock("channel", :say => "")
-      ShoutBot.stub!(:shout).and_yield(@channel)
-    end
-
-    it "should connect to the given URI as IntegrityBot" do
-      ShoutBot.should_receive(:shout).
-        with(notifier_config["uri"], {:as => "IntegrityBot"})
-      do_notify
-    end
-
-    it "should give the build status and project name" do
-      notifier.build.project.should_receive(:name).and_return("Integrity")
-      notifier.should_receive(:short_message).and_return("short message")
-      @channel.should_receive(:say).with("Integrity: short message")
-      do_notify
-    end
-
-    it "should give the build url" do
-      notifier.should_receive(:build_url).and_return("http://example.org")
-      @channel.should_receive(:say).with("http://example.org")
-      do_notify
-    end
-  end
-end