foca-integrity 0.1.8 → 0.1.9.0

data/lib/integrity/migrations.rb

@@ -2,13 +2,38 @@ require "dm-migrations"
 require "migration_runner"
 
 module Integrity
-  class Migrations
-    include DataMapper::Types
+  def self.migrate_db
+    setup_initial_migration if pre_migrations?
+    Integrity::Migrations.migrate_up!
+  end
+
+  def self.setup_initial_migration
+    database_adapter.execute %q(CREATE TABLE "migration_info" ("migration_name" VARCHAR(255));)
+    database_adapter.execute %q(INSERT INTO "migration_info" ("migration_name") VALUES ("initial"))
+  end
+
+  def self.pre_migrations?
+    !table_exists?("migration_info") &&
+      ( table_exists?("integrity_projects") &&
+        table_exists?("integrity_builds")   &&
+        table_exists?("integrity_notifiers") )
+  end
+
+  def self.table_exists?(table_name)
+    database_adapter.storage_exists?(table_name)
+  end
+
+  def self.database_adapter
+    DataMapper.repository(:default).adapter
+  end
+
+  module Migrations
+    # This is what is actually happening:
+    # include DataMapper::MigrationRunner
 
-    # not strictly necessary, but it makes it clear what is going on.
-    include DataMapper::MigrationRunner
+    include DataMapper::Types
 
-    migration 1, :initial, :verbose => false do
+    migration 1, :initial, :verbose => true do
       up do
         create_table :integrity_projects do
           column :id,          Integer,  :serial => true
@@ -46,15 +71,9 @@ module Integrity
           column :project_id, Integer
         end
       end
-
-      down do
-        drop_table :integrity_notifiers
-        drop_table :integrity_projects
-        drop_table :integrity_builds
-      end
     end
 
-    migration 2, :add_commits, :verbose => false do
+    migration 2, :add_commits, :verbose => true do
       up do
         class ::Integrity::Build
           property :commit_identifier, String
@@ -116,42 +135,6 @@ module Integrity
                        :output       => build.output)
         end
       end
-
-      down do
-        modify_table :integrity_builds do
-          add_column :commit_identifier, String, :nullable => false
-          add_column :commit_metadata,   Yaml,   :nullable => false
-          add_column :project_id,        Integer
-        end
-
-        # sqlite hodgepockery
-        all_builds = Build.all.map {|b| b.freeze }
-        drop_table :integrity_builds
-        create_table :integrity_builds do
-          column :id,                Integer,  :serial => true
-          column :output,            Text,     :nullable => false, :default => ""
-          column :successful,        Boolean,  :nullable => false, :default => false
-          column :commit_identifier, String,   :nullable => false
-          column :commit_metadata,   Yaml,     :nullable => false
-          column :created_at,        DateTime
-          column :updated_at,        DateTime
-          column :project_id,        Integer
-        end
-
-        all_builds.each do |build|
-          Build.create(:project_id => build.commit.project_id,
-                       :output => build.output,
-                       :successful => build.successful,
-                       :commit_identifier => build.commit.identifier,
-                       :commit_metadata => {
-            :message => build.commit.message,
-            :author => build.commit.author.full,
-            :date => commit.committed_at
-          }.to_yaml)
-        end
-
-        drop_table :commits
-      end
     end
   end
 end

data/lib/integrity/notifier.rb

@@ -1,38 +1,40 @@
+require File.dirname(__FILE__) + "/notifier/base"
+
 module Integrity
   class Notifier
     include DataMapper::Resource
-    
-    property :id,      Serial
+
+    property :id,      Integer,  :serial => true
     property :name,    String,   :nullable => false
     property :config,  Yaml,     :nullable => false, :lazy => false
-    
+
     belongs_to :project, :class_name => "Integrity::Project"
-    
+
     validates_is_unique :name, :scope => :project_id
     validates_present :project_id
-    
+
     def self.available
-      @available ||= constants.map { |name| const_get(name) }.select { |notifier| valid_notifier?(notifier) }
+      constants.map { |name| const_get(name) }.select { |notifier| valid_notifier?(notifier) }
     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
-      
+
     end
-    
+
     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
@@ -44,7 +46,3 @@ module Integrity
       private_class_method :valid_notifier?
   end
 end
-
-require File.dirname(__FILE__) / "notifier" / "base"
-
-Dir["#{File.dirname(__FILE__)}/notifier/*.rb"].each &method(:require)

data/lib/integrity/notifier/base.rb

@@ -8,47 +8,57 @@ module Integrity
       def self.to_haml
         raise NoMethodError, "you need to implement this method in your notifier"
       end
-      
-      attr_reader :build
-      
-      def initialize(build, config)
-        @build = build
+
+      attr_reader :commit
+
+      def initialize(commit, config)
+        @commit = commit
         @config = config
       end
-      
+
+      def build
+        warn "Notifier::Base#build is deprecated, use Notifier::Base#commit instead"
+        commit
+      end
+
       def deliver!
         raise NoMethodError, "you need to implement this method in your notifier"
       end
-      
+
       def short_message
-        "Build #{build.short_commit_identifier} #{build.successful? ? "was successful" : "failed"}"
+        commit.human_readable_status
       end
-      
+
       def full_message
         <<-EOM
-"Build #{build.commit_identifier} #{build.successful? ? "was successful" : "failed"}"
+"Build #{commit.identifier} #{commit.successful? ? "was successful" : "failed"}"
 
-Commit Message: #{build.commit_message}
-Commit Date: #{build.commited_at}
-Commit Author: #{build.commit_author.name}
+Commit Message: #{commit.message}
+Commit Date: #{commit.committed_at}
+Commit Author: #{commit.author.name}
 
-Link: #{build_url}
+Link: #{commit_url}
 
 Build Output:
 
-#{stripped_build_output}
+#{stripped_commit_output}
 EOM
       end
-      
-      def build_url
+
+      def commit_url
         raise if Integrity.config[:base_uri].nil?
-        Integrity.config[:base_uri] / build.project.permalink / "builds" / build.commit_identifier
+        Integrity.config[:base_uri] / commit.project.permalink / "commits" / commit.identifier
       end
 
       private
 
+        def stripped_commit_output
+          commit.output.gsub("\e[0m", "").gsub(/\e\[3[1-7]m/, "")
+        end
+
         def stripped_build_output
-          build.output.gsub("\e[0m", "").gsub(/\e\[3[1-7]m/, "")
+          warn "Notifier::Base#stripped_build_output is deprecated, use Notifier::base#stripped_commit_output instead"
+          stripped_commit_output
         end
     end
   end

data/lib/integrity/notifier/test_helpers.rb

@@ -0,0 +1,100 @@
+require "hpricot"
+require "haml"
+require File.dirname(__FILE__) + "/../../integrity"
+
+module Integrity
+  class Notifier
+    module TestHelpers
+      module HpricotAssertions
+        # Thanks Harry! http://gist.github.com/39960
+
+        class HpricotMatcher
+          def initialize(html)
+            @doc = Hpricot(html)
+          end
+
+          # elements('h1') returns a Hpricot::Elements object with all h1-tags.
+          def elements(selector)
+            @doc.search(selector)
+          end
+
+          # element('h1') returns Hpricot::Elem with first h1-tag, or nil if
+          # none exist.
+          def element(selector)
+            @doc.at(selector)
+          end
+
+          # tags('h1') returns the inner HTML of all matched elements mathed.
+          def tags(selector)
+            e = elements(selector)
+            e.map {|x| x.inner_html}
+          end
+
+          # tag('h1') returns the inner HTML of the first mached element, or
+          # nil if none matched.
+          def tag(selector)
+            e = element(selector)
+            e && e.inner_html
+          end
+        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
+      end
+
+      module NotifierFormHelpers
+        include HpricotAssertions
+
+        def form(config={})
+          Haml::Engine.new(notifier_class.to_haml).
+            render(OpenStruct.new(:config => config))
+        end
+
+        def assert_form_have_tag(selector, options={})
+          content = options.delete(:content)
+          assert_have_tag(form(options), selector, content)
+        end
+
+        def assert_form_have_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)
+        end
+
+        def assert_form_have_options(*options)
+          options.each { |option| assert_form_have_option(option) }
+        end
+      end
+
+      include NotifierFormHelpers
+
+      def build
+        @build ||= Integrity::Build.gen(:successful)
+      end
+
+      def commit
+        @commit ||= build.commit
+      end
+
+      def notifier_class
+        Integrity::Notifier.const_get(notifier)
+      end
+
+      def notification
+        notifier_class.new(commit).body
+      end
+
+      def setup_database
+        DataMapper.setup(:default, "sqlite3::memory:")
+        DataMapper.auto_migrate!
+
+        require File.dirname(__FILE__) + "/../../../test/helpers/fixtures"
+      end
+    end
+  end
+end

data/lib/integrity/project.rb

@@ -2,7 +2,7 @@ module Integrity
   class Project
     include DataMapper::Resource
 
-    property :id,         Serial
+    property :id,         Integer,  :serial => true
     property :name,       String,   :nullable => false
     property :permalink,  String
     property :uri,        URI,      :nullable => false, :length => 255
@@ -13,7 +13,7 @@ module Integrity
     property :created_at, DateTime
     property :updated_at, DateTime
 
-    has n, :builds, :class_name => "Integrity::Build"
+    has n, :commits, :class_name => "Integrity::Commit"
     has n, :notifiers, :class_name => "Integrity::Notifier"
 
     before :save, :set_permalink
@@ -30,36 +30,52 @@ module Integrity
     end
 
     def build(commit_identifier="HEAD")
-      return if building?
-      update_attributes(:building => true)
-      ProjectBuilder.new(self).build(commit_identifier)
-    ensure
-      update_attributes(:building => false)
-      send_notifications
+      commit_identifier = head_of_remote_repo if commit_identifier == "HEAD"
+      commit = find_or_create_commit_with_identifier(commit_identifier)
+      commit.queue_build
     end
 
     def push(payload)
-      payload = JSON.parse(payload || "")
-
-      if Integrity.config[:build_all_commits]
-        payload["commits"].sort_by { |commit| Time.parse(commit["timestamp"]) }.each do |commit|
-          build(commit["id"]) if payload["ref"] =~ /#{branch}/
+      payload = parse_payload(payload)
+      raise ArgumentError unless valid_payload?(payload)
+
+      commits =
+        if Integrity.config[:build_all_commits]
+          payload["commits"]
+        else
+          [ payload["commits"].first ]
         end
-      else
-        build(payload["after"]) if payload["ref"] =~ /#{branch}/
+
+      commits.each do |commit_data|
+        create_commit_from(commit_data)
+        build(commit_data["id"])
       end
     end
 
+    def last_commit
+      commits.first(:project_id => id, :order => [:committed_at.desc])
+    end
+
     def last_build
-      all_builds.first
+      warn "Project#last_build is deprecated, use Project#last_commit"
+      last_commit
+    end
+
+    def previous_commits
+      commits.all(:project_id => id, :order => [:committed_at.desc]).tap {|commits| commits.shift }
     end
 
     def previous_builds
-      all_builds.tap {|builds| builds.shift }
+      warn "Project#previous_builds is deprecated, use Project#previous_commits"
+      previous_commits
     end
 
     def status
-      last_build && last_build.status
+      last_commit && last_commit.status
+    end
+
+    def human_readable_status
+      last_commit && last_commit.human_readable_status
     end
 
     def public=(flag)
@@ -70,12 +86,12 @@ module Integrity
     end
 
     def config_for(notifier)
-      notifier = notifiers.first(:name => notifier.to_s.split(/::/).last)
+      notifier = notifiers.first(:name => notifier.to_s.split(/::/).last, :project_id => id)
       notifier.blank? ? {} : notifier.config
     end
 
     def notifies?(notifier)
-      !notifiers.first(:name => notifier.to_s.split(/::/).last).blank?
+      !notifiers.first(:name => notifier.to_s.split(/::/).last, :project_id => id).blank?
     end
 
     def enable_notifiers(*args)
@@ -83,6 +99,30 @@ module Integrity
     end
 
     private
+      def find_or_create_commit_with_identifier(commit_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.
+        #
+        # This also creates a dependency, as now we *always* have to update the
+        # +committed_at+ field after building to ensure the date is correct :(
+        #
+        # 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)
+      end
+
+      def head_of_remote_repo
+        SCM.new(uri, branch).head
+      end
+
+      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
+
       def set_permalink
         self.permalink = (name || "").downcase.
           gsub(/'s/, "s").
@@ -92,26 +132,22 @@ module Integrity
       end
 
       def delete_code
-        builds.destroy!
+        commits.all(:project_id => id).destroy!
         ProjectBuilder.new(self).delete_code
       rescue SCM::SCMUnknownError => error
         Integrity.log "Problem while trying to deleting code: #{error}"
       end
 
-      def send_notifications
-        notifiers.each do |notifier|
-          begin
-            Integrity.log "Notifying of build #{last_build.short_commit_identifier} using the #{notifier.name} notifier"
-            notifier.notify_of_build last_build
-          rescue Timeout::Error
-            Integrity.log "#{notifier.name} notifier timed out"
-            next
-          end
-        end
+      def valid_payload?(payload)
+        payload && payload["ref"].to_s.include?(branch) &&
+                               !payload["commits"].nil? &&
+                               !payload["commits"].to_a.empty?
       end
 
-      def all_builds
-        builds.all.sort_by {|b| b.commited_at }.reverse
+      def parse_payload(payload)
+        JSON.parse(payload.to_s)
+      rescue JSON::ParserError
+        false
       end
   end
 end