foca-integrity 0.1.9.2 → 0.1.9.3

data/test/unit/build_test.rb

@@ -36,18 +36,6 @@ class BuildTest < Test::Unit::TestCase
       @build.successful = false
       @build.status.should be(:failed)
     end
-
-    test "deprecated properties" do
-      silence_warnings {
-        @build.short_commit_identifier.should == @build.commit.short_identifier
-        @build.commit_identifier.should == @build.commit.identifier
-        @build.commit_author.should     == @build.commit.author
-        @build.commit_message.should    == @build.commit.message
-        @build.commited_at.should       == @build.commit.committed_at
-        @build.project_id.should        == @build.commit.project_id
-        @build.should respond_to(:commit_metadata)
-      }
-    end
   end
 
   describe "Pending builds" do

data/test/unit/commit_test.rb

@@ -32,6 +32,8 @@ class CommitTest < Test::Unit::TestCase
       commit.author.name.should == "Nicolás Sanguinetti"
       commit.author.email.should == "contacto@nicolassanguinetti.info"
       commit.author.full.should == "Nicolás Sanguinetti <contacto@nicolassanguinetti.info>"
+
+      Commit.gen(:author => nil).author.to_s.should =~ /not loaded/
     end
 
     it "raises ArgumentError with invalid author" do
@@ -41,6 +43,8 @@ class CommitTest < Test::Unit::TestCase
     it "has a commit message" do
       commit = Commit.gen(:message => "This commit rocks")
       commit.message.should == "This commit rocks"
+
+      Commit.gen(:message => nil).message.should =~ /not loaded/
     end
 
     it "has a commit date" do

data/test/unit/migrations_test.rb

@@ -24,13 +24,14 @@ class MigrationsTest < Test::Unit::TestCase
 
   before(:each) do
     [Project, Build, Commit, Notifier].each(&:auto_migrate_down!)
+    database_adapter.execute("DROP TABLE migration_info")
     assert !table_exists?("migration_info") # just to be sure
   end
 
   test "upgrading a pre migration database" do
     capture_stdout { Integrity.migrate_db }
 
-    current_migrations.should == ["initial", "add_commits"]
+    current_migrations.should == ["initial", "add_commits", "add_enabled_column"]
     assert table_exists?("integrity_projects")
     assert table_exists?("integrity_builds")
     assert table_exists?("integrity_notifiers")
@@ -41,7 +42,7 @@ class MigrationsTest < Test::Unit::TestCase
     load_initial_migration_fixture
 
     capture_stdout { Integrity.migrate_db }
-    current_migrations.should == ["initial", "add_commits"]
+    current_migrations.should == ["initial", "add_commits", "add_enabled_column"]
 
     sinatra = Project.first(:name => "Sinatra")
     sinatra.should have(1).commits

data/test/unit/notifier/base_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + "/../../helpers"
+
+class BaseNotifierTest < Test::Unit::TestCase
+  before(:each) do
+    @commit = Commit.gen(:successful)
+    @base = Notifier::Base.new(@commit, {})
+  end
+
+  it "requires to implement .to_haml" do
+    assert_raise(NotImplementedError) { Notifier::Base.to_haml }
+  end
+
+  it "requires to implement #deliver!" do
+    assert_raise(NotImplementedError) { @base.deliver! }
+  end
+
+  it "provides a short message" do
+    assert_equal "Built #{@commit.short_identifier} successfully", @base.short_message
+  end
+
+  it "provides a full message" do
+    assert @base.full_message.include?("Commit Message: #{@commit.message}")
+    assert @base.full_message.include?("Commit Date: #{@commit.committed_at}")
+    assert @base.full_message.include?("Commit Author: #{@commit.author.name}")
+    assert @base.full_message.include?("Link: #{@base.commit_url}")
+    assert @base.full_message.include?("Build Output")
+    assert @base.full_message.include?(@commit.build.output)
+  end
+
+  it "provides a commit url" do
+    assert_equal "http://localhost:8910/#{@commit.project.name}" +
+      "/commits/#{@commit.identifier}", @base.commit_url
+  end
+
+  test "deprecated methods" do
+    silence_warnings {
+      assert_equal @base.commit, @base.build
+      assert_equal @base.commit_url, @base.build_url
+      assert_equal @base.send(:stripped_commit_output),
+        @base.send(:stripped_build_output)
+    }
+  end
+end

data/test/unit/notifier_test.rb

@@ -1,11 +1,6 @@
 require File.dirname(__FILE__) + "/../helpers"
 
 class NotifierTest < Test::Unit::TestCase
-  test "deprecated methods" do
-    Notifier::Base.new(Build.gen, {}).should respond_to(:build)
-    Notifier::Base.new(Build.gen, {}).should respond_to(:build_url)
-  end
-
   specify "IRC fixture is valid and can be saved" do
     lambda do
       Notifier.generate(:irc).tap do |project|
@@ -71,58 +66,32 @@ class NotifierTest < Test::Unit::TestCase
     end
   end
 
-  it "knows which notifiers are available" do
-    Notifier.gen(:irc)
-    Notifier.gen(:twitter)
-    Notifier.should have(2).available
-    Notifier.available.should include(Integrity::Notifier::IRC)
-    Notifier.available.should include(Integrity::Notifier::Twitter)
-  end
+  describe "Registering a notifier" do
+    it "registers given notifier class" do
+      load "helpers/acceptance/textfile_notifier.rb"
 
-  it "knows how to notify the world of a build" do
-    irc   = Notifier.generate(:irc)
-    build = Integrity::Build.generate
-    Notifier::IRC.expects(:notify_of_build).with(build, irc.config)
-    irc.notify_of_build(build)
-  end
+      Notifier.register(Integrity::Notifier::Textfile)
 
-  describe "Enabling a list of notifiers for a project" do
-    it "creates new notifiers for the project" do
-      project = Project.generate
-      lambda do
-        project.enable_notifiers(["IRC", "Twitter"],
-          {"IRC" => {"uri" => "irc://irc.freenode.net/integrity"},
-           "Twitter" => {"username" => "john"}})
-      end.should change(project.notifiers, :count).from(0).to(2)
+      assert_equal Integrity::Notifier::Textfile,
+        Notifier.available["Textfile"]
     end
 
-    it "deletes all of previous notifiers" do
-      project = Project.generate(:notifiers => [Notifier.gen(:irc), Notifier.gen(:twitter)])
-      lambda do
-        project.enable_notifiers("IRC", {"IRC" => {:foo => "bar"}})
-        project.reload
-      end.should change(project.notifiers, :count).from(2).to(1)
-    end
+    it "raises ArgumentError if given class is not a valid notifier" do
+      assert_raise(ArgumentError) {
+        Notifier.register(Class.new)
+      }
 
-    it "does nothing if given nil as the list of notifiers to enable" do
-      lambda { Project.gen.enable_notifiers(nil, {}) }.should_not change(Notifier, :count)
+      assert Notifier.available.empty?
     end
+  end
 
-    it "doesn't destroy any of the other notifiers that exist for other projects" do
-      irc = Notifier.generate(:irc)
-
-      project = Project.gen
-      project.enable_notifiers("IRC", {"IRC" => irc.config})
+  it "knows how to notify the world of a build" do
+    irc   = Notifier.gen(:irc)
+    Notifier.register(Integrity::Notifier::IRC)
+    build = Build.gen
 
-      lambda do
-        Project.gen.enable_notifiers("IRC", {"IRC" => irc.config})
-      end.should_not change(project.notifiers, :count)
-    end
-  end
+    mock(Notifier::IRC).notify_of_build(build, irc.config) { nil }
 
-  it "requires notifier classes to implement Notifier.to_haml and Notifier#deliver!" do
-    class Blah < Notifier::Base; end
-    lambda { Blah.to_haml }.should raise_error(NoMethodError)
-    lambda { Blah.new(Build.gen, {}).deliver! }.should raise_error(NoMethodError)
+    irc.notify_of_build(build)
   end
 end

data/test/unit/project_test.rb

@@ -110,13 +110,6 @@ class ProjectTest < Test::Unit::TestCase
       project = Project.gen(:commits => commits)
       project.last_commit.should == commits.sort_by {|c| c.committed_at }.last
     end
-
-    test "deprecated properties" do
-      silence_warnings {
-        @project.last_build.should      == @project.last_commit
-        @project.previous_builds.should == @project.previous_commits
-      }
-    end
   end
 
   describe "Validation" do
@@ -220,31 +213,113 @@ class ProjectTest < Test::Unit::TestCase
     end
   end
 
+  describe "When updating its notifiers" do
+    setup do
+      twitter = Notifier.gen(:twitter, :enabled => true)
+      irc     = Notifier.gen(:irc,     :enabled => false)
+
+      @project = Project.gen(:notifiers => [twitter, irc])
+    end
+
+    it "creates and enable the given notifiers" do
+      Notifier.all.destroy!
+
+      project = Project.gen
+      project.update_notifiers(["IRC", "Twitter"],
+          {"IRC"     => {"uri" => "irc://irc.freenode.net/integrity"},
+           "Twitter" => {"username" => "john"}})
+
+      assert_equal 2,         Notifier.count
+      assert_equal 2,         project.enabled_notifiers.count
+      assert_equal "IRC",     project.notifiers.first.name
+      assert_equal "Twitter", project.notifiers.last.name
+
+      project.update_notifiers(["Twitter"],
+          {"IRC"     => {"uri" => "irc://irc.freenode.net/integrity"},
+           "Twitter" => {"username" => "john"}})
+
+      assert_equal 2, Notifier.count
+      assert ! project.notifies?("IRC")
+      assert   project.notifies?("Twitter")
+    end
+
+    it "creates notifiers present in config even when they're disabled" do
+      @project.update_notifiers(["IRC"],
+        {"IRC"     => {"uri" => "irc://irc.freenode.net/integrity"},
+         "Twitter" => {"username" => "john"}})
+
+      assert_equal 2, @project.notifiers.count
+    end
+
+    it "disables notifiers that are not included in the list" do
+      @project.update_notifiers(["IRC"],
+          {"IRC"     => {"uri" => "irc://irc.freenode.net/integrity"},
+           "Twitter" => {"username" => "john"}})
+
+      @project.update_notifiers(["IRC"],
+        {"IRC"     => {"uri" => "irc://irc.freenode.net/integrity"}})
+
+      assert ! @project.notifiers.first(:name => "Twitter").enabled?
+      assert   @project.notifiers.first(:name => "IRC").enabled?
+    end
+
+    it "preserves config of notifiers that are being disabled" do
+      @project.update_notifiers(["IRC"],
+        {"IRC"     => {"uri" => "irc://irc.freenode.net/integrity"},
+          "Twitter" => {"username" => "john"}})
+
+      assert_equal "john",
+        @project.notifiers.first(:name => "Twitter").config["username"]
+    end
+
+    it "does nothing if given nil as the list of notifiers to enable" do
+      lambda { Project.gen.update_notifiers(nil, {}) }.should_not change(Notifier, :count)
+    end
+
+    it "doesn't destroy any of the other notifiers that exist for other projects" do
+      irc = Notifier.generate(:irc)
+
+      project = Project.gen
+      project.update_notifiers("IRC", {"IRC" => irc.config})
+
+      lambda {
+        Project.gen.update_notifiers("IRC", {"IRC" => irc.config})
+      }.should_not change(project.notifiers, :count)
+    end
+  end
+
   describe "When retrieving state about its notifier" do
     before(:each) do
-      @project = Project.generate
+      @project = Project.gen
       @irc     = Notifier.generate(:irc)
     end
 
+    it "knows which notifiers are enabled" do
+      notifiers = [Notifier.gen(:irc, :enabled => false),
+        Notifier.gen(:twitter, :enabled => true)]
+      project = Project.gen(:notifiers => notifiers)
+
+      assert_equal 1, project.enabled_notifiers.size
+    end
+
     specify "#config_for returns given notifier's configuration" do
       @project.update_attributes(:notifiers => [@irc])
       @project.config_for("IRC").should == {:uri => "irc://irc.freenode.net/integrity"}
     end
 
-    specify "#config_for returns an empty hash if no such notifier" do
+    specify "#config_for returns an empty hash for unknown notifier" do
       @project.config_for("IRC").should == {}
     end
 
-    specify "#notifies? is true if it uses the given notifier" do
-      @project.update_attributes(:notifiers => [@irc])
-      @project.notifies?("IRC").should == true
-    end
+    specify "#notifies? is true if the notifier exists and is enabled" do
+      assert ! @project.notifies?("UndefinedNotifier")
 
-    specify "#notifies? is false if it doesnt use the given notifier" do
-      @project.update_attributes(:notifiers => [])
+      @project.update_attributes(:notifiers =>
+        [ Notifier.gen(:irc, :enabled     => true),
+          Notifier.gen(:twitter, :enabled => false) ])
 
-      @project.notifies?("IRC").should == false
-      @project.notifies?("UndefinedNotifier").should == false
+      assert @project.notifies?("IRC")
+      assert ! @project.notifies?("Twitter")
     end
   end
 
@@ -277,13 +352,12 @@ class ProjectTest < Test::Unit::TestCase
       }.should change(Commit, :count).by(1)
 
       build = Build.all.last
-      build.commit.should be(@project.last_commit)
+      build.commit.should == @project.last_commit
 
       @project.last_commit.should be_pending
-      @project.last_commit.identifier.should be("FOOBAR")
-
+      @project.last_commit.identifier.should  == "FOOBAR"
       @project.last_commit.author.name.should == "<Commit author not loaded>"
-      @project.last_commit.message.should == "<Commit message not loaded>"
+      @project.last_commit.message.should     == "<Commit message not loaded>"
     end
   end
 end

data/views/_commit_info.haml

@@ -12,7 +12,7 @@
     %span.who<
       &== by: #{commit.author.name}
     |
-    %span.when{ :title => commit.commited_at }<
+    %span.when{ :title => commit.committed_at }<
       &= pretty_date commit.committed_at
     |
     %span.what<

data/views/new.haml

@@ -29,8 +29,7 @@
     %input.hidden{ :name => "project_data[public]", :value => "0", :type => "hidden" }
     %input.checkbox#project_public{ checkbox("project_data[public]", @project.public?) }
 
-  - Integrity::Notifier.available.each do |notifier|
-    = notifier_form(notifier)
+  - notifier_form
 
   %p.submit
     %button.positive{ :type => "submit" }= @project.new_record? ? "Create Project" : "Update Project"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: foca-integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.9.2
+  version: 0.1.9.3
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,9 +49,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        version: 0.9.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: uuidtools
@@ -163,6 +163,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: jeremymcanally-matchy
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: jeremymcanally-pending
   type: :development
@@ -194,7 +204,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - CHANGES
-- README.markdown
+- README.md
 - Rakefile
 - bin/integrity
 - config/config.sample.ru
@@ -227,6 +237,8 @@ files:
 - lib/integrity/notifier/test/fixtures.rb
 - lib/integrity/notifier/test/hpricot_matcher.rb
 - lib/integrity/project.rb
+- lib/integrity/project/notifiers.rb
+- lib/integrity/project/push.rb
 - lib/integrity/project_builder.rb
 - lib/integrity/scm.rb
 - lib/integrity/scm/git.rb
@@ -245,7 +257,6 @@ files:
 - test/acceptance/installer_test.rb
 - test/acceptance/manual_build_project_test.rb
 - test/acceptance/not_found_page_test.rb
-- test/acceptance/notifier_test.rb
 - test/acceptance/project_syndication_test.rb
 - test/acceptance/stylesheet_test.rb
 - test/acceptance/unauthorized_page_test.rb
@@ -253,19 +264,20 @@ files:
 - test/helpers/acceptance.rb
 - test/helpers/acceptance/email_notifier.rb
 - test/helpers/acceptance/git_helper.rb
+- test/helpers/acceptance/notifier_helper.rb
 - test/helpers/acceptance/textfile_notifier.rb
 - test/helpers/expectations.rb
 - test/helpers/expectations/be_a.rb
 - test/helpers/expectations/change.rb
 - test/helpers/expectations/have.rb
 - test/helpers/expectations/predicates.rb
-- test/helpers/fixtures.rb
 - test/helpers/initial_migration_fixture.sql
 - test/unit/build_test.rb
 - test/unit/commit_test.rb
 - test/unit/helpers_test.rb
 - test/unit/integrity_test.rb
 - test/unit/migrations_test.rb
+- test/unit/notifier/base_test.rb
 - test/unit/notifier/test_test.rb
 - test/unit/notifier_test.rb
 - test/unit/project_builder_test.rb