integrity 0.1.9.2 → 0.1.9.3

data/CHANGES

@@ -1,4 +1,18 @@
-0.1.9.2 / unreleased
+0.1.9.3 / 2009-04-06
+====================
+
+* Fix one more URL issue
+* Fix that notifiers are always enabled
+* Fix for when the commit identifier can't be retrieved
+* Fix the schema to accept NULL commit author and message
+* Upgrade to DataMapper 0.9.11
+* Remove all of deprecation code, except on Notifier::Base
+* Notifiers were refactored and now require to be registered:
+    Integrity.register(Integrity::Notifier::IRC)
+* The installer do not migrate the database automagically after
+  a successful install anymore
+
+0.1.9.2 / 2009-03-28
 ====================
 
 * Add development dependencies to gemspec
@@ -25,4 +39,4 @@
 * Fix the installer to work with the current Thor gem
 
 
-**There is no changelog for previous release :-)**
+(There is no changelog for previous release)

data/{README.markdown → README.md}

@@ -18,8 +18,11 @@ Try it!
 Run the test suite
 ------------------
 
-Install the test dependencies with `rake test:setup` and
-run the test suite with `rake test`.
+1. Ensure you have `gems.github.com` in your gem sources:
+   `gem sources -a http://gems.github.com`
+2. Install the runtime and development dependencies:
+   `gem build integrity.gemspec && gem install *.gem --development`.
+3. Run the test suite: `rake test`
 
 Thanks
 ------

data/Rakefile

@@ -1,5 +1,4 @@
 require "rake/testtask"
-require "rake/clean"
 
 def spec
   @spec ||= begin
@@ -11,15 +10,6 @@ end
 desc "Default: run all tests"
 task :default => :test
 
-desc "Install Integrity dependencies"
-task :setup do
-  puts "NOTE: assuming you have gems.github.com in your gem sources"
-
-  system "gem install " +
-    spec.dependencies.select { |dep| dep.type == :runtime }.
-      collect(&:name).join(" ")
-end
-
 desc "Launch Integrity real quick"
 task :launch do
   ruby "bin/integrity launch"
@@ -28,39 +18,27 @@ end
 desc "Run tests"
 task :test => %w(test:units test:acceptance)
 namespace :test do
+  desc "Run unit tests"
   Rake::TestTask.new(:units) do |t|
     t.test_files = FileList["test/unit/*_test.rb"]
   end
 
+  desc "Run acceptance tests"
   Rake::TestTask.new(:acceptance) do |t|
     t.test_files = FileList["test/acceptance/*_test.rb"]
   end
-
-  desc "Install tests dependencies"
-  task :setup do
-    puts "NOTE: assuming you have gems.github.com in your gem sources"
-
-    system "gem install " +
-      spec.dependencies.select { |dep| dep.type  == :development }.
-        collect(&:name).join(" ")
-  end
 end
 
 begin
   require "mg"
-  MG.new("integrity.gemspec")
-rescue LoadError
-end
-
-begin
   require "metric_fu"
+
+  MG.new("integrity.gemspec")
 rescue LoadError
 end
 
 desc "Special task for running tests on <http://builder.integrityapp.com>"
 task :ci do
-  sh "git submodule update --init"
-
   Rake::Task["test"].invoke
 
   metrics = %w(flay flog:all reek roodi saikuro)
@@ -70,10 +48,10 @@ task :ci do
   mv "tmp/metric_fu", "/var/www/integrity-metrics"
 
   File.open("/var/www/integrity-metrics/index.html", "w") { |f|
-    f << "<ul>"
+    f.puts "<ul>"
     metrics.map { |m| m.split(":").first }.each { |m|
-      f << %Q(<li><a href="/#{m}">#{m}</a></li>)
+      f.puts %Q(<li><a href="/#{m}">#{m}</a></li>)
     }
-    f << "</ul>"
+    f.puts "</ul>"
   }
 end

data/integrity.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "integrity"
-  s.version = "0.1.9.2"
-  s.date    = "2009-03-16"
+  s.version = "0.1.9.3"
+  s.date    = "2009-04-06"
 
   s.description = "Your Friendly Continuous Integration server. Easy, fun and painless!"
   s.summary     = "The easy and fun Continuous Integration server"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   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.10"]
+  s.add_dependency "data_mapper", ["= 0.9.11"]
   s.add_dependency "uuidtools"   # required by dm-types
   s.add_dependency "bcrypt-ruby" # required by dm-types
   s.add_dependency "json"
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency "dm-sweatshop"
     s.add_development_dependency "ParseTree" # required by dm-sweatshop
     s.add_development_dependency "jeremymcanally-context"
+    s.add_development_dependency "jeremymcanally-matchy"
     s.add_development_dependency "jeremymcanally-pending"
     s.add_development_dependency "foca-storyteller"
   end
@@ -42,7 +43,7 @@ Gem::Specification.new do |s|
   s.files = %w[
 .gitignore
 CHANGES
-README.markdown
+README.md
 Rakefile
 bin/integrity
 config/config.sample.ru
@@ -75,6 +76,8 @@ lib/integrity/notifier/test.rb
 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
@@ -93,7 +96,6 @@ 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.rb
 test/acceptance/project_syndication_test.rb
 test/acceptance/stylesheet_test.rb
 test/acceptance/unauthorized_page_test.rb
@@ -101,19 +103,20 @@ test/helpers.rb
 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

data/lib/integrity.rb

@@ -69,9 +69,9 @@ module Integrity
   end
   private_class_method :logger
 
-    class LogFormatter < Logger::Formatter
-      def call(severity, time, progname, msg)
-        time.strftime("[%H:%M:%S] ") + msg2str(msg) + "\n"
-      end
+  class LogFormatter < Logger::Formatter
+    def call(severity, time, progname, msg)
+      time.strftime("[%H:%M:%S] ") + msg2str(msg) + "\n"
     end
+  end
 end

data/lib/integrity/app.rb

@@ -121,7 +121,7 @@ module Integrity
     get "/:project/commits/:commit" do
       login_required unless current_project.public?
 
-      show :build, :title => ["projects", current_project.permalink, current_commit.short_commit_identifier]
+      show :build, :title => ["projects", current_project.permalink, current_commit.short_identifier]
     end
 
     get "/:project/builds/:commit" do

data/lib/integrity/build.rb

@@ -11,12 +11,20 @@ module Integrity
     property :started_at,   DateTime
     property :completed_at, DateTime
 
-    belongs_to :commit, :class_name => "Integrity::Commit"
+    belongs_to :commit, :class_name => "Integrity::Commit",
+                        :child_key => [:commit_id]
 
     def self.pending
       all(:started_at => nil)
     end
 
+    def self.queue(commit)
+      commit.update_attributes(:build => new)
+
+      # Build on foreground (this will move away, I promise)
+      ProjectBuilder.build(commit)
+    end
+
     def pending?
       started_at.nil?
     end
@@ -40,45 +48,5 @@ module Integrity
     def complete!(time=Time.now)
       self.completed_at = time
     end
-
-    #
-    # Deprecated methods
-    #
-    def short_commit_identifier
-      warn "Build#short_commit_identifier is deprecated, use Commit#short_identifier (#{caller[0]})"
-      commit.short_identifier
-    end
-
-    def commit_identifier
-      warn "Build#commit_identifier is deprecated, use Commit#identifier (#{caller[0]})"
-      commit.identifier
-    end
-
-    def commit_author
-      warn "Build#commit_author is deprecated, use Commit#author (#{caller[0]})"
-      commit.author
-    end
-
-    def commit_message
-      warn "Build#commit_message is deprecated, use Commit#message (#{caller[0]})"
-      commit.message
-    end
-
-    def commited_at
-      warn "Build#commited_at is deprecated, use Commit#committed_at (#{caller[0]})"
-      commit.committed_at
-    end
-
-    def project_id
-      warn "Build#project_id is deprecated, use Commit#project_id (#{caller[0]})"
-      commit.project_id
-    end
-
-    def commit_metadata
-      warn "Build#commit_metadata is deprecated, use the different methods in Commit instead (#{caller[0]})"
-      { :message => commit.message,
-        :author  => commit.author,
-        :date    => commit.committed_at }
-    end
   end
 end

data/lib/integrity/commit.rb

@@ -10,15 +10,19 @@ module Integrity
     property :created_at,   DateTime
     property :updated_at,   DateTime
 
-    has 1,     :build,   :class_name => "Integrity::Build", :order => [:created_at.desc]
-    belongs_to :project, :class_name => "Integrity::Project"
+    has 1,     :build,   :class_name => "Integrity::Build",
+                         :order => [:created_at.desc]
+
+    belongs_to :project, :class_name => "Integrity::Project",
+                         :child_key => [:project_id]
 
     def message
       attribute_get(:message) || "<Commit message not loaded>"
     end
 
     def author
-      attribute_get(:author) || Author.load('<Commit author not loaded> <<Commit author not loaded>>', :author)
+      attribute_get(:author) ||
+        Author.load('<Commit author not loaded> <<Commit author not loaded>>', :author)
     end
 
     def short_identifier
@@ -52,20 +56,5 @@ module Integrity
     def output
       build && build.output
     end
-
-    def queue_build
-      self.build = Build.create(:commit_id => id)
-      self.save
-
-      # Build on foreground (this will move away, I promise)
-      ProjectBuilder.new(project).build(self)
-    end
-
-    # Deprecation layer
-    alias :short_commit_identifier :short_identifier
-    alias :commit_identifier       :identifier
-    alias :commit_author           :author
-    alias :commit_message          :message
-    alias :commited_at             :committed_at
   end
 end

data/lib/integrity/helpers/breadcrumbs.rb

@@ -2,7 +2,7 @@ module Integrity
   module Helpers
     module Breadcrumbs
       def pages
-        @pages ||= [["projects", root_path], ["new project", root_path("/new")]]
+        @pages ||= [["projects", root_path("/")], ["new project", root_path("/new")]]
       end
 
       def breadcrumbs(*crumbs)

data/lib/integrity/helpers/forms.rb

@@ -16,12 +16,13 @@ module Integrity
         attrs.update(extras)
       end
 
-      def notifier_form(notifier)
-        haml(notifier.to_haml, :layout => :notifier, :locals => {
-          :config => current_project.config_for(notifier),
-          :notifier => "#{notifier.to_s.split(/::/).last}",
-          :enabled => current_project.notifies?(notifier)
-        })
+      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

data/lib/integrity/helpers/resources.rb

@@ -11,7 +11,7 @@ module Integrity
 
       def update_notifiers_of(project)
         if params["notifiers"]
-          project.enable_notifiers(params["notifiers"].keys, params["notifiers"])
+          project.update_notifiers(params["enabled_notifiers"] || [], params["notifiers"])
         end
       end
     end

data/lib/integrity/installer.rb

@@ -21,7 +21,6 @@ module Integrity
         create_dir_structure
         copy_template_files
         edit_template_files
-        migrate_db(root.join("config.yml"))
         puts post_install_message
       end
     end
@@ -45,6 +44,7 @@ module Integrity
 
       File.file?(options[:config].to_s) ?
         Integrity.new(options[:config]) : Integrity.new
+      Integrity.config[:base_uri] = "http://0.0.0.0:#{options[:port]}"
 
       DataMapper.auto_migrate!
 
@@ -109,6 +109,11 @@ EOF
         <<EOF
 Awesome! Integrity was installed successfully!
 
+To complete the installation, please configure the `database_uri` in
+#{root.join("config.yml")} and install the matching DataMapper adapter if
+necessary. Then, run `integrity migrate_db #{root.join("config.yml")}
+
+== Notifiers
 If you want to enable notifiers, install the gems and then require them
 in #{root}/config.ru
 

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 => false, :length => 255
-          column :author,       String,   :nullable => false, :length => 255
+          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
@@ -136,5 +136,16 @@ module Integrity
         end
       end
     end
+
+    migration 3, :add_enabled_column do
+      up do
+        modify_table(:integrity_notifiers) { add_column :enabled, Boolean }
+      end
+
+      down do
+        # TODO: sqlite doesn't support DROP COLUMN ...
+        # modify_table(:integrity_notifiers) { drop_column :enabled }
+      end
+    end
   end
 end

data/lib/integrity/notifier.rb

@@ -6,43 +6,39 @@ module Integrity
 
     property :id,      Integer,  :serial => true
     property :name,    String,   :nullable => false
-    property :config,  Yaml,     :nullable => false, :lazy => false
+    property :enabled, Boolean,  :nullable => false, :default => false
+    property :config,  Yaml,     :nullable => false, :lazy    => false
 
-    belongs_to :project, :class_name => "Integrity::Project"
+    belongs_to :project, :class_name => "Integrity::Project",
+                         :child_key => [:project_id]
 
     validates_is_unique :name, :scope => :project_id
     validates_present :project_id
 
     def self.available
-      constants.map { |name| const_get(name) }.select { |notifier| valid_notifier?(notifier) }
+      @@_notifiers ||= {}
+      @@_notifiers
     end
 
-    def self.enable_notifiers(project, enabled, config={})
-      all(:project_id => project).destroy!
-      list_of_enabled_notifiers(enabled).each do |name|
-        create! :project_id => project, :name => name, :config => config[name]
-      end
+    def self.register(klass)
+      raise ArgumentError unless valid?(klass)
+
+      available[klass.to_s.split(":").last] = klass
+    end
 
+    def self.valid?(notifier)
+      notifier.respond_to?(:to_haml) && notifier.respond_to?(:notify_of_build) &&
+        notifier != Notifier::Base
     end
+    private_class_method :valid?
 
     def notify_of_build(build)
       to_const.notify_of_build(build, config)
     end
 
     private
-
       def to_const
-        self.class.module_eval(name)
-      end
-
-      def self.list_of_enabled_notifiers(names)
-        [*names].reject { |n| n.nil? }
-      end
-      private_class_method :list_of_enabled_notifiers
-
-      def self.valid_notifier?(notifier)
-        notifier.respond_to?(:to_haml) && notifier.respond_to?(:notify_of_build) && notifier != Notifier::Base
+        self.class.available[name]
       end
-      private_class_method :valid_notifier?
   end
 end