integrity-integrity 0.1.9.3 → 0.1.10

data/AUTHORS

@@ -0,0 +1,35 @@
+Integrity is maintained by Nicolás Sanguinetti and Simon Rozet.
+
+Thanks to the following people for their feedbacks, ideas and patches :
+
+* Bodaniel Jeanes
+* James Golick
+* Wilson Bilkovich
+* Mislav Marohnić
+* Miles Z. Sterrett
+* Kyle Hargraves
+* Josh Nichols
+* Jeremy Hinegardner
+* Chris Wanstrath
+* Will Leinweber
+* Pier-Hugues Pellerin
+* Justin Knowlden
+* Elliott Cable
+* dbr
+* Scott Taylor
+* Jeff Whitmire
+* Diego Algorta
+* Eric Mill
+* Pat Nakajima
+* Nick Quaranto
+* Levent Ali
+* Jeff Schoolcraft
+* James Adam
+* Harry Vangberg
+* Guilherme Chapiewski
+* David Dollar
+* Corey Donohoe
+* Christopher Redinger
+* Alexander Lang
+
+NOTE: Please let us know if your name is missing

data/CHANGES

@@ -1,8 +1,26 @@
-0.1.9.4 / unreleased
+0.1.10 / 2009-05-14
 ====================
 
-* Fix that notifications are sent to every notifiers,
-  including disabled ones
+* Bundle the NULL commit author/message fix as a migration
+
+* Fix issue with stale notifier. See 693c95e for details
+
+* Rename the "Build the last commit" button to "Fetch and build"
+
+* Fix the rebuild button (Eric Mill)
+
+* Various improvements to the Heroku install (Miles Z. Sterrett)
+
+* Documentation to the default config.yml for the
+  :build_all_commits option. (Jeff Whitmire)
+
+* `integrity launch` now saves the database into $HOME/.integrity.sqlite3
+
+* Changed the Notifier::Test API. Notifiers tests are expected
+  to break. That API is still not defined and might change at
+  any time. See [#130] to discuss this.
+
+* Send notifications to enabled notifiers only
 
 0.1.9.3 / 2009-04-06
 ====================

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008, 2009 Nicolás Sanguinetti <http://nicolassanguinetti.info>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -11,9 +11,9 @@ Integrity
 Try it!
 -------
 
-    $ git clone git://github.com/foca/integrity.git
+    $ git clone git://github.com/integrity/integrity.git
     $ rake launch
-    # Navigate to <http://0.0.0.0:4567>
+    $ open http://0.0.0.0:4567/
 
 Run the test suite
 ------------------
@@ -24,59 +24,17 @@ Run the test suite
    `gem build integrity.gemspec && gem install *.gem --development`.
 3. Run the test suite: `rake test`
 
-Thanks
-------
+Why we don't `require "rubygems"`
+---------------------------------
 
-Thanks to the following people for their feedbacks, ideas and patches :
-
-* [James Adam][james]
-* [Elliott Cable][ec]
-* [Corey Donohoe][atmos]
-* [Kyle Hargraves][kyle]
-* [Pier-Hugues Pellerin][ph]
-* [Simon Rozet][sr]
-* [Scott Taylor][scott]
-
-License
--------
-
-(The MIT License)
-
-Copyright (c) 2008 [Nicolás Sanguinetti][foca], [entp][]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+We decided to leave that choice up to the user. For more information, please
+see [Why "require 'rubygems'" In Your Library/App/Tests Is Wrong][rubygems]
+by [Ryan Tomayko][rtomayko].
 
 [website]: http://integrityapp.com
 [demo]: http://builder.integrityapp.com
-[repo]: http://github.com/foca/integrity
+[repo]: http://github.com/integrity/integrity
 [lighthouse]: http://integrity.lighthouseapp.com/projects/14308-integrity
 [irc-channel]: irc://irc.freenode.net/integrity
-
-[foca]: http://nicolassanguinetti.info/
-[entp]: http://entp.com
-
-[james]: http://github.com/lazyatom
-[ec]: http://github.com/elliotcabble
-[atmos]: http://github.com/atmos
-[kyle]: http://github.com/pd
-[ph]: http://github.com/ph
-[sr]: http://purl.org/net/sr/
-[scott]: http://github.com/smtlaissezfaire
-
+[rubygems]: http://gist.github.com/54177
+[rtomayko]: http://tomayko.com/about

data/integrity.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "integrity"
-  s.version = "0.1.9.3"
-  s.date    = "2009-04-06"
+  s.version = "0.1.10"
+  s.date    = "2009-05-14"
 
   s.description = "Your Friendly Continuous Integration server. Easy, fun and painless!"
   s.summary     = "The easy and fun Continuous Integration server"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.has_rdoc          = false
   s.rubygems_version  = "1.3.1"
 
-  s.add_dependency "sinatra", [">= 0.9.1.1"]
+  s.add_dependency "sinatra", ["= 0.9.1.1"]
   s.add_dependency "sinatra-authorization"
   s.add_dependency "haml",    [">= 2.0.0"]
   s.add_dependency "data_mapper", ["= 0.9.11"]
@@ -42,7 +42,9 @@ Gem::Specification.new do |s|
 
   s.files = %w[
 .gitignore
+AUTHORS
 CHANGES
+LICENSE
 README.md
 Rakefile
 bin/integrity
@@ -95,6 +97,7 @@ test/acceptance/error_page_test.rb
 test/acceptance/installer_test.rb
 test/acceptance/manual_build_project_test.rb
 test/acceptance/not_found_page_test.rb
+test/acceptance/notifier_test_test.rb
 test/acceptance/project_syndication_test.rb
 test/acceptance/stylesheet_test.rb
 test/acceptance/unauthorized_page_test.rb

data/lib/integrity.rb

@@ -2,6 +2,8 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 
 require "json"
 require "haml"
+require "sass"
+require "builder"
 require "dm-core"
 require "dm-validations"
 require "dm-types"

data/lib/integrity/helpers/urls.rb

@@ -17,12 +17,12 @@ module Integrity
         project_url(project, path).path
       end
 
-      def commit_url(commit)
-        project_url(commit.project, "commits", commit.identifier)
+      def commit_url(commit, *path)
+        project_url(commit.project, ["commits", commit.identifier, *path].flatten)
       end
 
       def commit_path(commit, *path)
-        commit_url(commit).path
+        commit_url(commit, *path).path
       end
 
       def build_path(build, *path)

data/lib/integrity/installer.rb

@@ -47,7 +47,8 @@ module Integrity
       require "thin"
       require "do_sqlite3"
 
-      options[:port] ||= 4567
+      port = options[:port] || 4567
+
       config = { :database_uri => "sqlite3://#{ENV["HOME"]}/.integrity.db",
                  :base_uri     => "http://0.0.0.0:#{options[:port]}",
                  :export_directory => "/tmp/integrity-exports"             }
@@ -55,7 +56,7 @@ module Integrity
 
       migrate_db(config)
 
-      Thin::Server.start("0.0.0.0", options[:port], Integrity::App)
+      Thin::Server.start("0.0.0.0", port, Integrity::App)
     rescue LoadError => boom
       $stderr << "Make sure thin and do_sqlite3 are insatalled\n\n"
       raise

data/lib/integrity/migrations.rb

@@ -84,8 +84,8 @@ module Integrity
         create_table :integrity_commits do
           column :id,           Integer,  :serial => true
           column :identifier,   String,   :nullable => false
-          column :message,      String,   :nullable => true, :length => 255
-          column :author,       String,   :nullable => true, :length => 255
+          column :message,      String,   :nullable => false, :length => 255
+          column :author,       String,   :nullable => false, :length => 255
           column :committed_at, DateTime, :nullable => false
           column :created_at,  DateTime
           column :updated_at,  DateTime
@@ -147,5 +147,26 @@ module Integrity
         # modify_table(:integrity_notifiers) { drop_column :enabled }
       end
     end
+
+    migration 4, :nil_commit_metadata do
+      up do
+        all_commits = Commit.all.collect { |c| c.dup }
+        drop_table :integrity_commits
+
+        create_table :integrity_commits do
+          column :id,           Integer,  :serial => true
+          column :identifier,   String,   :nullable => false
+          column :message,      String,   :nullable => true, :length => 255
+          column :author,       String,   :nullable => true, :length => 255
+          column :committed_at, DateTime, :nullable => false
+          column :created_at,  DateTime
+          column :updated_at,  DateTime
+
+          column :project_id,   Integer
+        end
+
+        all_commits.each { |commit| Commit.create(commit.attributes) }
+      end
+    end
   end
 end

data/lib/integrity/notifier.rb

@@ -33,7 +33,7 @@ module Integrity
     private_class_method :valid?
 
     def notify_of_build(build)
-      to_const.notify_of_build(build, config)
+      to_const.notify_of_build(build, config) if to_const
     end
 
     private

data/lib/integrity/project.rb

@@ -17,6 +17,8 @@ module Integrity
     property :created_at, DateTime
     property :updated_at, DateTime
 
+    default_scope(:default).update(:order => [:name.asc])
+
     has n, :commits, :class_name => "Integrity::Commit"
     has n, :notifiers, :class_name => "Integrity::Notifier"
 

data/test/acceptance/build_notifications_test.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + "/../helpers/acceptance"
 require "helpers/acceptance/notifier_helper"
-require "helpers/acceptance/textfile_notifier"
 require "helpers/acceptance/email_notifier"
 
 class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
@@ -14,7 +13,11 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
 
   before(:each) do
     # This is needed before any available notifier is unset
-    # in the global #before
+    # in the global #before.
+    # But, we need the reload this one because we remove_const
+    # it in a test case. Sigh.
+    load "helpers/acceptance/textfile_notifier.rb"
+
     Notifier.register(Integrity::Notifier::Textfile)
     Notifier.register(Integrity::Notifier::Email)
   end
@@ -79,6 +82,27 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
     assert_have_email_notifier
   end
 
+  scenario "an admin enables the Textfile notifier and get rid of it later" do
+    git_repo(:my_test_project).add_successful_commit
+    Project.gen(:my_test_project, :uri => git_repo(:my_test_project).path)
+
+    login_as "admin", "test"
+    visit "/my-test-project"
+
+    click_link "Edit Project"
+    check "enabled_notifiers_textfile"
+    fill_in "File", :with => "/tmp/textfile_notifications.txt"
+    click_button "Update Project"
+
+    Notifier.send(:remove_const, :Textfile)
+    Notifier.available.clear
+    rm_f "/tmp/textfile_notifications.txt"
+
+    click_button "manual build"
+
+    assert ! File.file?("/tmp/textfile_notifications.txt")
+  end
+
   scenario "an admin configures various notifiers accros multiple projects" do
     Project.first(:permalink => "integrity").should be_nil
 

data/test/acceptance/manual_build_project_test.rb

@@ -53,7 +53,7 @@ class ManualBuildProjectTest < Test::Unit::AcceptanceTestCase
     click_button "Update Project"
 
     visit "/my-test-project"
-    click_button "Build the last commit"
+    click_button "Fetch and build"
 
     assert_have_tag("h1", :content => "success")
   end

data/test/acceptance/notifier_test_test.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + "/../helpers/acceptance"
+require "helpers/acceptance/email_notifier"
+require "helpers/acceptance/textfile_notifier"
+
+require "integrity/notifier/test"
+
+class NotifierTestTest < Test::Unit::TestCase
+  include Integrity::Notifier::Test
+
+  setup do
+    @notifier = Integrity::Notifier::Textfile
+    @config   = {"file" => "/tmp/integrity.txt"}
+
+    FileUtils.rm @config["file"] if File.exists?(@config["file"])
+  end
+
+  def notifier
+    "Textfile"
+  end
+
+  test "it provides a formulary to configure options" do
+    assert provides_option?("file")
+    assert provides_option?("file", @config["file"])
+  end
+
+  test "it sends notification" do
+    build = build(:successful)
+
+    @notifier.notify_of_build(build, @config)
+
+    notification = File.read(@config["file"])
+
+    assert notification.start_with?("===")
+    assert notification.include?(build.commit.identifier)
+    assert notification.include?("successful")
+  end
+end

data/test/unit/helpers_test.rb

@@ -61,6 +61,13 @@ class BrowsePublicProjectsTest < Test::Unit::TestCase
       }
     end
 
+    test "build commit" do
+      assert_equal "/ci/foo-bar/commits/#{@commit.identifier}/builds",
+        @h.commit_path(@build.commit, :builds)
+      assert_equal "http://example.org/ci/foo-bar/commits/#{@commit.identifier}/builds",
+        @h.commit_url(@build.commit, :builds).to_s
+    end
+
     test "compat" do
       silence_warnings {
         assert_equal @h.build_path(@build), @h.commit_path(@build.commit)

data/test/unit/migrations_test.rb

@@ -31,18 +31,20 @@ class MigrationsTest < Test::Unit::TestCase
   test "upgrading a pre migration database" do
     capture_stdout { Integrity.migrate_db }
 
-    current_migrations.should == ["initial", "add_commits", "add_enabled_column"]
+    current_migrations.should == ["initial", "add_commits",
+      "add_enabled_column", "nil_commit_metadata"]
     assert table_exists?("integrity_projects")
     assert table_exists?("integrity_builds")
     assert table_exists?("integrity_notifiers")
     assert table_exists?("integrity_commits")
   end
 
-  test "migrating data from initial to add_commits migration" do
+  test "migrating data up from initial to the last migration" do
     load_initial_migration_fixture
-
     capture_stdout { Integrity.migrate_db }
-    current_migrations.should == ["initial", "add_commits", "add_enabled_column"]
+
+    current_migrations.should == ["initial", "add_commits",
+      "add_enabled_column", "nil_commit_metadata"]
 
     sinatra = Project.first(:name => "Sinatra")
     sinatra.should have(1).commits

data/test/unit/project_test.rb

@@ -145,6 +145,20 @@ class ProjectTest < Test::Unit::TestCase
     end
   end
 
+  describe "Finding any project" do
+    before(:each) do
+      @rails   = Project.gen(:name => "rails",   :public => true)
+      @merb    = Project.gen(:name => "merb",    :public => true)
+      @sinatra = Project.gen(:name => "sinatra", :public => true)
+      @camping = Project.gen(:name => "camping", :public => false)
+    end
+
+    it "should always be ordered by name" do
+      Project.all.should == [@camping, @merb, @rails, @sinatra]
+      Project.all(:public => true).should == [@merb, @rails, @sinatra]
+    end
+  end
+
   describe "When finding its previous builds" do
     before(:each) do
       @project = Project.generate(:commits => 5.of { Commit.gen })
@@ -212,8 +226,10 @@ class ProjectTest < Test::Unit::TestCase
 
       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
+
+      notifier_names = project.notifiers.map { |n| n.name }
+      assert notifier_names.include?("IRC")
+      assert notifier_names.include?("Twitter")
 
       project.update_notifiers(["Twitter"],
           {"IRC"     => {"uri" => "irc://irc.freenode.net/integrity"},

data/views/project.haml

@@ -14,9 +14,8 @@
 
   %form{ :action => project_path(@project, :builds), :method => :post }
     %p.submit.manual-build
-      %button{ :type => :submit, :title => "Fetch the last commit and build it" }<
-        Build the last commit
-      in the repository (or rebuild the latest)
+      %button{ :type => :submit, :title => "Fetch the last commit from the remote repository and build it" }<
+        Fetch and build
 
   - unless @project.previous_commits.empty?
     %h2 Previous builds

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: integrity-integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.9.3
+  version: 0.1.10
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.9.1.1
     version: 
@@ -203,7 +203,9 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- AUTHORS
 - CHANGES
+- LICENSE
 - README.md
 - Rakefile
 - bin/integrity
@@ -256,6 +258,7 @@ files:
 - test/acceptance/installer_test.rb
 - test/acceptance/manual_build_project_test.rb
 - test/acceptance/not_found_page_test.rb
+- test/acceptance/notifier_test_test.rb
 - test/acceptance/project_syndication_test.rb
 - test/acceptance/stylesheet_test.rb
 - test/acceptance/unauthorized_page_test.rb