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,3 +1,27 @@
+0.1.10 / 2009-05-14
+====================
+
+* 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 fellowing 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/Rakefile

@@ -29,16 +29,10 @@ namespace :test do
   end
 end
 
-begin
-  require "mg"
-  require "metric_fu"
-
-  MG.new("integrity.gemspec")
-rescue LoadError
-end
-
 desc "Special task for running tests on <http://builder.integrityapp.com>"
 task :ci do
+  require "metric_fu"
+
   Rake::Task["test"].invoke
 
   metrics = %w(flay flog:all reek roodi saikuro)
@@ -55,3 +49,10 @@ task :ci do
     f.puts "</ul>"
   }
 end
+
+begin
+  require "mg"
+  MG.new("integrity.gemspec")
+rescue LoadError
+end
+

data/config/config.sample.yml

@@ -23,6 +23,10 @@
 # Path to the integrity log file
 :log: /var/log/integrity.log
 
+# If set to true integrity will do a build for each commit.  Otherwise
+# it will only do a build for each set of commits (i.e. each push)
+:build_all_commits: true
+
 # Enable or disable HTTP authentication for the app. BE AWARE that if you
 # disable this anyone can delete and alter projects, so do it only if your
 # app is running in a controlled environment (ie, behind your company's

data/config/heroku/.gems

@@ -1 +1 @@
-integrity --version 0.1.9.0
+integrity --version 0.1.9.3

data/config/heroku/integrity-config.rb

@@ -3,6 +3,7 @@ gem "integrity"
 require "integrity"
 
 Integrity.config = {
+  :base_uri         => nil, # Edit this! Like :base_uri => 'http://awesome-subdomain-13.heroku.com'
   :database_uri     => ENV["DATABASE_URL"],
   :export_directory => File.dirname(__FILE__) + "/tmp",
   :log              => File.dirname(__FILE__) + "/log/integrity.log",

data/integrity.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "integrity"
-  s.version = "0.1.9.3"
+  s.version = "0.1.10"
   s.date    = "2009-04-06"
 
   s.description = "Your Friendly Continuous Integration server. Easy, fun and painless!"
@@ -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
@@ -63,7 +65,6 @@ lib/integrity/core_ext/object.rb
 lib/integrity/helpers.rb
 lib/integrity/helpers/authorization.rb
 lib/integrity/helpers/breadcrumbs.rb
-lib/integrity/helpers/forms.rb
 lib/integrity/helpers/pretty_output.rb
 lib/integrity/helpers/rendering.rb
 lib/integrity/helpers/resources.rb
@@ -96,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
@@ -117,7 +119,6 @@ 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
 test/unit/project_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/app.rb

@@ -32,7 +32,7 @@ module Integrity
     end
 
     get "/?" do
-      @projects = Project.only_public_unless(authorized?)
+      @projects = authorized? ? Project.all : Project.all(:public => true)
       show :home, :title => "projects"
     end
 

data/lib/integrity/helpers.rb

@@ -4,7 +4,6 @@ module Integrity
   module Helpers
     include Authorization
     include Breadcrumbs
-    include Forms
     include PrettyOutput
     include Rendering
     include Resources

data/lib/integrity/helpers/rendering.rb

@@ -20,6 +20,30 @@ module Integrity
       def partial(template, locals={})
         haml("_#{template}".to_sym, :locals => locals, :layout => false)
       end
+
+      def errors_on(object, field)
+        return "" unless errors = object.errors.on(field)
+        errors.map {|e| e.gsub(/#{field} /i, "") }.join(", ")
+      end
+
+      def error_class(object, field)
+        object.errors.on(field).nil? ? "" : "with_errors"
+      end
+
+      def checkbox(name, condition, extras={})
+        attrs = { :name => name, :type => "checkbox", :value => "1" }
+        attrs[:checked] = !!condition
+        attrs.update(extras)
+      end
+
+      def notifier_form
+        Notifier.available.each_pair { |name, klass|
+          haml_concat haml(klass.to_haml, :layout => :notifier, :locals => {
+            :notifier => name,
+            :enabled  => current_project.notifies?(name),
+            :config   => current_project.config_for(name) })
+        }
+      end
     end
   end
 end

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

@@ -5,6 +5,11 @@ module Integrity
   class Installer < Thor
     include FileUtils
 
+    def self.database_path
+      File.join(ENV["HOME"], ".integrity.sqlite3")
+    end
+    private_class_method :database_path
+
     desc "install [PATH]",
        "Copy template files to PATH for desired deployement strategy
        (either Thin, Passenger or Heroku). Next, go there and edit them."
@@ -36,22 +41,25 @@ module Integrity
     end
 
     desc "launch [CONFIG]",
-         "Launch Integrity real quick."
-    method_options :config => :optional, :port => 4567
+         "Launch Integrity real quick. Database is saved in #{database_path}."
+    method_options :config => :optional, :port => :optional
     def launch
       require "thin"
       require "do_sqlite3"
 
-      File.file?(options[:config].to_s) ?
-        Integrity.new(options[:config]) : Integrity.new
-      Integrity.config[:base_uri] = "http://0.0.0.0:#{options[:port]}"
+      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"             }
+      config.merge!(YAML.load_file(options[:config])) if options[:config]
 
-      DataMapper.auto_migrate!
+      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
-      missing_dependency = boom.message.split("--").last.lstrip
-      puts "Please install #{missing_dependency} to launch Integrity"
+      $stderr << "Make sure thin and do_sqlite3 are insatalled\n\n"
+      raise
     end
 
     private
@@ -100,8 +108,9 @@ Your Integrity install is ready to be deployed onto Heroku. Next steps:
 
   1. git init && git add . && git commit -am "Initial import"
   2. heroku create
-  3. git push heroku master
-  4. heroku rake db:migrate
+  3. Add heroku-given domain as :base_uri in integrity-config.rb
+  4. git push heroku master
+  5. heroku rake db:migrate
 EOF
       end
 

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/notifier/base.rb

@@ -2,7 +2,7 @@ module Integrity
   class Notifier
     class Base
       def self.notify_of_build(build, config)
-        Integrity.log "Notifying of build #{build.commit.short_identifier} using the #{self.class} notifier"
+        Integrity.log "Notifying of build #{build.commit.short_identifier} using the #{to_s} notifier"
         Timeout.timeout(8) { new(build.commit, config).deliver! }
       rescue Timeout::Error
         Integrity.log "#{notifier.name} notifier timed out"

data/lib/integrity/notifier/test.rb

@@ -11,49 +11,42 @@ module Integrity
         DataMapper.auto_migrate!
       end
 
-      def notifier_class
-        Integrity::Notifier.const_get(notifier)
-      end
-
-      def notification(commit)
-        notifier_class.new(commit).full_message
-      end
-
-      def notification_successful
-        notification(Integrity::Commit.gen(:successful))
+      def build(state=:successful)
+        Integrity::Build.gen(state)
       end
 
-      def notification_failed
-        notification(Integrity::Commit.gen(:failed))
+      def notifier_class
+        Integrity::Notifier.const_get(notifier)
       end
 
-      def assert_form_have_option(option, value=nil)
+      def provides_option?(option, value=nil)
         selector = "input##{notifier.downcase}_notifier_#{option}"
         selector << "[@name='notifiers[#{notifier}][#{option}]']"
         selector << "[@value='#{value}']" if value
 
-        assert_form_have_tag(selector, option => value)
+        form_have_tag?(selector, option => value)
       end
 
-      def assert_form_have_options(*options)
+      def provides_options(*options)
         options.each { |option| assert_form_have_option(option) }
       end
 
-      def assert_form_have_tag(selector, options={})
-        content = options.delete(:content)
-        assert_have_tag(form(options), selector, content)
-      end
+      private
+        def form(config={})
+          Haml::Engine.new(notifier_class.to_haml).
+            render(OpenStruct.new(:config => config))
+        end
 
-      def assert_have_tag(html, selector, content=nil)
-        matcher = HpricotMatcher.new(html)
-        assert_equal content, matcher.tag(selector) if content
-        assert matcher.tag(selector)
-      end
+        def form_have_tag?(selector, options={})
+          content = options.delete(:content)
+          have_tag?(form(options), selector, content)
+        end
 
-      def form(config={})
-        Haml::Engine.new(notifier_class.to_haml).
-          render(OpenStruct.new(:config => config))
-      end
+        def have_tag?(html, selector, content=nil)
+          matcher = HpricotMatcher.new(html)
+          assert_equal content, matcher.tag(selector) if content
+          matcher.tag(selector)
+        end
     end
   end
 end

data/lib/integrity/project.rb

@@ -4,9 +4,7 @@ require "integrity/project/push"
 module Integrity
   class Project
     include DataMapper::Resource
-
-    include Helpers::Notifiers
-    include Helpers::Push
+    include Notifiers, Push
 
     property :id,         Integer,  :serial => true
     property :name,       String,   :nullable => false
@@ -19,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"
 
@@ -27,17 +27,10 @@ module Integrity
 
     validates_is_unique :name
 
-    def self.only_public_unless(condition)
-      if condition
-        all
-      else
-        all(:public => true)
-      end
-    end
-
     def build(commit_identifier="HEAD")
       commit_identifier = head_of_remote_repo if commit_identifier == "HEAD"
       commit = find_or_create_commit_with_identifier(commit_identifier)
+
       Build.queue(commit)
     end
 
@@ -46,7 +39,8 @@ module Integrity
     end
 
     def previous_commits
-      commits.all(:project_id => id, :order => [:committed_at.desc]).tap {|commits| commits.shift }
+      commits.all(:project_id => id, :order => [:committed_at.desc]).
+        tap {|commits| commits.shift }
     end
 
     def status
@@ -65,7 +59,7 @@ module Integrity
     end
 
     private
-      def find_or_create_commit_with_identifier(commit_identifier)
+      def find_or_create_commit_with_identifier(identifier)
         # We abuse +committed_at+ here setting it to Time.now because we use it
         # to sort (for last_commit and previous_commits). I don't like this
         # very much, but for now it's the only solution I can find.
@@ -75,7 +69,8 @@ module Integrity
         #
         # This might also make your commit listings a little jumpy, if some
         # commits change place every time a build finishes =\
-        commits.first_or_create({ :identifier => commit_identifier, :project_id => id }, :committed_at => Time.now)
+        commits.first_or_create({:identifier => identifier, :project_id => id},
+          :committed_at => Time.now)
       end
 
       def head_of_remote_repo
@@ -83,15 +78,15 @@ module Integrity
       end
 
       def set_permalink
-        self.permalink = (name || "").downcase.
+        attribute_set(:permalink, (name || "").downcase.
           gsub(/'s/, "s").
           gsub(/&/, "and").
           gsub(/[^a-z0-9]+/, "-").
-          gsub(/-*$/, "")
+          gsub(/-*$/, ""))
       end
 
       def delete_working_directory
-        commits.all(:project_id => id).destroy!
+        commits.destroy!
         ProjectBuilder.delete_working_directory(self)
       rescue SCM::SCMUnknownError => error
         Integrity.log "Problem while trying to deleting code: #{error}"

data/lib/integrity/project/notifiers.rb

@@ -1,32 +1,30 @@
 module Integrity
   class Project
-    module Helpers
-      module Notifiers
-        def notifies?(notifier)
-          return false unless notifier = notifiers.first(:name => notifier)
+    module Notifiers
+      def notifies?(notifier)
+        return false unless notifier = notifiers.first(:name => notifier)
 
-          notifier.enabled?
-        end
+        notifier.enabled?
+      end
 
-        def enabled_notifiers
-          notifiers.all(:enabled => true)
-        end
+      def enabled_notifiers
+        notifiers.all(:enabled => true)
+      end
 
-        def config_for(notifier)
-          notifier = notifiers.first(:name => notifier)
-          notifier ? notifier.config : {}
-        end
+      def config_for(notifier)
+        notifier = notifiers.first(:name => notifier)
+        notifier ? notifier.config : {}
+      end
 
-        def update_notifiers(to_enable, config)
-          config.each_pair { |name, config|
-            notifier = notifiers.first(:name => name)
-            notifier ||= notifiers.new(:name => name)
+      def update_notifiers(to_enable, config)
+        config.each_pair { |name, config|
+          notifier = notifiers.first(:name => name)
+          notifier ||= notifiers.new(:name => name)
 
-            notifier.enabled = to_enable.include?(name)
-            notifier.config  = config
-            notifier.save
-          }
-        end
+          notifier.enabled = to_enable.include?(name)
+          notifier.config  = config
+          notifier.save
+        }
       end
     end
   end

data/lib/integrity/project/push.rb

@@ -1,44 +1,43 @@
 module Integrity
   class Project
-    module Helpers
-      module Push
-        def push(payload)
-          payload = parse_payload(payload)
-          raise ArgumentError unless valid_payload?(payload)
+    module Push
+      def push(payload)
+        payload = parse_payload(payload)
+        raise ArgumentError unless valid_payload?(payload)
 
-          commits =
-            if Integrity.config[:build_all_commits]
-              payload["commits"]
-            else
-              [ payload["commits"].first ]
-            end
-
-          commits.each do |commit_data|
-            create_commit_from(commit_data)
-            build(commit_data["id"])
+        commits =
+          if Integrity.config[:build_all_commits]
+            payload["commits"]
+          else
+            [ payload["commits"].first ]
           end
-        end
 
-        private
-          def create_commit_from(data)
-            commits.create(:identifier => data["id"],
-              :author  => "#{data["author"]["name"]} <#{data["author"]["email"]}>",
-              :message => data["message"],
-              :committed_at => data["timestamp"])
-          end
+        commits.each { |commit_data|
+          commit = commit_from(commit_data)
+          commit.create
+          build(commit.identifier)
+        }
+      end
 
-          def valid_payload?(payload)
-            payload && payload["ref"].to_s.include?(branch) &&
-                                 !payload["commits"].nil? &&
-                                 !payload["commits"].to_a.empty?
-          end
+      private
+        def commit_from(data)
+          commits.new(:identifier => data["id"],
+            :author  => "#{data["author"]["name"]} <#{data["author"]["email"]}>",
+            :message => data["message"],
+            :committed_at => data["timestamp"])
+        end
 
-          def parse_payload(payload)
-            JSON.parse(payload.to_s)
-          rescue JSON::ParserError
+        def valid_payload?(payload)
+          payload && payload["ref"].to_s.include?(branch) &&
+                               !payload["commits"].nil? &&
+                               !payload["commits"].to_a.empty?
+        end
+
+        def parse_payload(payload)
+          JSON.parse(payload.to_s)
+        rescue JSON::ParserError
           false
-          end
-      end
+        end
     end
   end
 end

data/lib/integrity/project_builder.rb

@@ -17,7 +17,7 @@ module Integrity
 
     def initialize(project)
       @project = project
-      @scm = SCM.new(uri, branch, export_directory)
+      @scm     = SCM.new(uri, branch, export_directory)
     end
 
     def build(commit)
@@ -39,7 +39,7 @@ module Integrity
     ensure
       build.complete!
       commit.update_attributes(scm.info(commit.identifier) || {})
-      project.notifiers.each { |notifier| notifier.notify_of_build(build) }
+      project.enabled_notifiers.each { |notifier| notifier.notify_of_build(build) }
     end
 
     def delete_code

data/test/acceptance/build_notifications_test.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + "/../helpers/acceptance"
 require "helpers/acceptance/notifier_helper"
+require "helpers/acceptance/email_notifier"
 
 class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
   include NotifierHelper
@@ -12,9 +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"
-    load "helpers/acceptance/email_notifier.rb"
+
     Notifier.register(Integrity::Notifier::Textfile)
     Notifier.register(Integrity::Notifier::Email)
   end
@@ -46,6 +49,25 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
     notification.should =~ /Build Output:\n\nRunning tests...\n/
   end
 
+  scenario "an admin sets up the Textfile notifier but do not enable it" do
+    git_repo(:my_test_project).add_successful_commit
+    Project.gen(:my_test_project, :uri => git_repo(:my_test_project).path)
+    rm_f "/tmp/textfile_notifications.txt"
+
+    login_as "admin", "test"
+
+    visit "/my-test-project"
+
+    click_link "Edit Project"
+    uncheck "enabled_notifiers_textfile"
+    fill_in "File", :with => "/tmp/textfile_notifications.txt"
+    click_button "Update Project"
+
+    click_button "manual build"
+
+    assert ! File.file?("/tmp/textfile_notifications.txt")
+  end
+
   scenario "an admin can setup a notifier without enabling it" do
     Project.gen(:integrity)
 
@@ -60,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/error_page_test.rb

@@ -7,8 +7,11 @@ class ErrorPageTest < Test::Unit::AcceptanceTestCase
     So that I can understand what's going on
   EOS
 
+  before { app.disable :raise_errors }
+  after  { app.enable  :raise_errors }
+
   scenario "an error happen while I am browsing my Integrity install" do
-    stub(Project).only_public_unless(false) { raise ArgumentError }
+    stub(Project).all { raise ArgumentError }
     lambda { visit "/" }.should raise_error(Webrat::PageLoadError)
 
     response_code.should == 500

data/test/acceptance/installer_test.rb

@@ -53,6 +53,8 @@ class InstallerTest < Test::Unit::AcceptanceTestCase
 
     assert root.join("public").directory?
     assert root.join("tmp").directory?
+
+    assert ! root.join("thin.yml").file?
   end
 
   scenario "Installing Integrity for Thin" do
@@ -68,7 +70,7 @@ class InstallerTest < Test::Unit::AcceptanceTestCase
   scenario "Installing Integrity for Heroku" do
     message = install("--heroku")
 
-    assert_equal "integrity --version 0.1.9.0", root.join(".gems").read.chomp
+    assert_equal "integrity --version 0.1.9.3", root.join(".gems").read.chomp
 
     assert root.join("Rakefile").file?
     assert root.join("integrity-config.rb").file?

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/not_found_page_test.rb

@@ -8,7 +8,7 @@ class NotFoundPageTest < Test::Unit::AcceptanceTestCase
   EOS
 
   scenario "chilling on some Integrity instance found via The Holy Hub" do
-    project = Project.gen
+    project = Project.gen(:public => true)
 
     visit "/42"
     assert_equal 404, response_code

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/helpers.rb

@@ -63,15 +63,8 @@ class Test::Unit::TestCase
   end
 
   before(:each) do
-    [Project, Build, Commit, Notifier].each(&:auto_migrate_down!)
+    [Project, Build, Commit, Notifier].each{ |i| i.auto_migrate_down! }
     capture_stdout { Integrity.migrate_db }
-
-    RR.reset
-
-    Notifier.available.each { |n|
-      Notifier.send(:remove_const, n.to_s.split(":").last.to_sym)
-    }
-
     Notifier.available.clear
     Integrity.instance_variable_set(:@config, nil)
   end

data/test/helpers/acceptance.rb

@@ -56,14 +56,14 @@ class Test::Unit::AcceptanceTestCase < Test::Unit::TestCase
   include Webrat::Matchers
   include Webrat::HaveTagMatcher
 
-  # TODO: does this belongs in Webrat::SinatraSession?
   Webrat::Methods.delegate_to_session :response_code
 
   def app
-    Integrity::App.tap { |app|
-      app.set     :environment, :test
-      app.disable :raise_errors, :run, :reload
-    }
+    Integrity::App
+  end
+
+  before(:all) do
+    app.set(:environment, :test)
   end
 
   before(:each) do
@@ -79,5 +79,4 @@ class Test::Unit::AcceptanceTestCase < Test::Unit::TestCase
     destroy_all_git_repos
     rm_r export_directory if File.directory?(export_directory)
   end
-
 end

data/test/helpers/acceptance/email_notifier.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'integrity'
-
 module Integrity
   class Notifier
     class Email < Notifier::Base

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

@@ -23,7 +23,7 @@ class MigrationsTest < Test::Unit::TestCase
   end
 
   before(:each) do
-    [Project, Build, Commit, Notifier].each(&:auto_migrate_down!)
+    [Project, Build, Commit, Notifier].each{ |i| i.auto_migrate_down! }
     database_adapter.execute("DROP TABLE migration_info")
     assert !table_exists?("migration_info") # just to be sure
   end
@@ -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/notifier_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + "/../helpers"
+require "helpers/acceptance/textfile_notifier"
 
 class NotifierTest < Test::Unit::TestCase
   specify "IRC fixture is valid and can be saved" do
@@ -68,8 +69,6 @@ class NotifierTest < Test::Unit::TestCase
 
   describe "Registering a notifier" do
     it "registers given notifier class" do
-      load "helpers/acceptance/textfile_notifier.rb"
-
       Notifier.register(Integrity::Notifier::Textfile)
 
       assert_equal Integrity::Notifier::Textfile,

data/test/unit/project_test.rb

@@ -145,22 +145,17 @@ class ProjectTest < Test::Unit::TestCase
     end
   end
 
-  describe "Finding public or private projects" do
+  describe "Finding any project" do
     before(:each) do
-      @public_project = Project.gen(:public => true)
-      @private_project = Project.gen(:public => false)
+      @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 "finds only public projects if the condition passed is false" do
-      projects = Project.only_public_unless(false)
-      projects.should_not include(@private_project)
-      projects.should include(@public_project)
-    end
-
-    it "finds both private and public projects if the condition passed is true" do
-      projects = Project.only_public_unless(true)
-      projects.should include(@private_project)
-      projects.should include(@public_project)
+    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
 
@@ -231,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
 version: !ruby/object:Gem::Version 
-  version: 0.1.9.3
+  version: 0.1.10
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -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
@@ -224,7 +226,6 @@ files:
 - lib/integrity/helpers.rb
 - lib/integrity/helpers/authorization.rb
 - lib/integrity/helpers/breadcrumbs.rb
-- lib/integrity/helpers/forms.rb
 - lib/integrity/helpers/pretty_output.rb
 - lib/integrity/helpers/rendering.rb
 - lib/integrity/helpers/resources.rb
@@ -257,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
@@ -278,7 +280,6 @@ files:
 - 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
 - test/unit/project_test.rb

data/lib/integrity/helpers/forms.rb

@@ -1,29 +0,0 @@
-module Integrity
-  module Helpers
-    module Forms
-      def errors_on(object, field)
-        return "" unless errors = object.errors.on(field)
-        errors.map {|e| e.gsub(/#{field} /i, "") }.join(", ")
-      end
-
-      def error_class(object, field)
-        object.errors.on(field).nil? ? "" : "with_errors"
-      end
-
-      def checkbox(name, condition, extras={})
-        attrs = { :name => name, :type => "checkbox", :value => "1" }
-        attrs[:checked] = !!condition
-        attrs.update(extras)
-      end
-
-      def notifier_form
-        Notifier.available.each_pair { |name, klass|
-          haml_concat haml(klass.to_haml, :layout => :notifier, :locals => {
-            :notifier => name,
-            :enabled  => current_project.notifies?(name),
-            :config   => current_project.config_for(name) })
-        }
-      end
-    end
-  end
-end

data/test/unit/notifier/test_test.rb

@@ -1,29 +0,0 @@
-require File.dirname(__FILE__) + "/../../helpers"
-require "helpers/acceptance/textfile_notifier"
-
-require "integrity/notifier/test"
-
-class NotifierTestTest < Test::Unit::TestCase
-  include Integrity::Notifier::Test
-
-  before(:each) do
-    # Because we unset every notifier in global setup
-    load "helpers/acceptance/textfile_notifier.rb"
-  end
-
-  def notifier
-    "Textfile"
-  end
-
-  test "it provides a formulary to configure options" do
-    assert_form_have_option("file")
-  end
-
-  test "it sends notification" do
-    commit = Integrity::Commit.gen(:build => Build.gen(:successful))
-
-    assert notification(commit).include?(commit.identifier)
-    assert notification_failed.include?("failed")
-    assert notification_successful.include?("was successful")
-  end
-end