integrity 0.1.9.2 → 0.1.9.3

data/lib/integrity/notifier/base.rb

@@ -2,11 +2,15 @@ module Integrity
   class Notifier
     class Base
       def self.notify_of_build(build, config)
-        Timeout.timeout(8) { new(build, config).deliver! }
+        Integrity.log "Notifying of build #{build.commit.short_identifier} using the #{self.class} notifier"
+        Timeout.timeout(8) { new(build.commit, config).deliver! }
+      rescue Timeout::Error
+        Integrity.log "#{notifier.name} notifier timed out"
+        false
       end
 
       def self.to_haml
-        raise NoMethodError, "you need to implement this method in your notifier"
+        raise NotImplementedError, "you need to implement this method in your notifier"
       end
 
       attr_reader :commit
@@ -22,7 +26,7 @@ module Integrity
       end
 
       def deliver!
-        raise NoMethodError, "you need to implement this method in your notifier"
+        raise NotImplementedError, "you need to implement this method in your notifier"
       end
 
       def short_message

data/lib/integrity/project.rb

@@ -1,7 +1,13 @@
+require "integrity/project/notifiers"
+require "integrity/project/push"
+
 module Integrity
   class Project
     include DataMapper::Resource
 
+    include Helpers::Notifiers
+    include Helpers::Push
+
     property :id,         Integer,  :serial => true
     property :name,       String,   :nullable => false
     property :permalink,  String
@@ -17,7 +23,7 @@ module Integrity
     has n, :notifiers, :class_name => "Integrity::Notifier"
 
     before :save, :set_permalink
-    before :destroy, :delete_code
+    before :destroy, :delete_working_directory
 
     validates_is_unique :name
 
@@ -32,44 +38,17 @@ module Integrity
     def build(commit_identifier="HEAD")
       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 = 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"])
-      end
+      Build.queue(commit)
     end
 
     def last_commit
       commits.first(:project_id => id, :order => [:committed_at.desc])
     end
 
-    def last_build
-      warn "Project#last_build is deprecated, use Project#last_commit (#{caller[0]})"
-      last_commit
-    end
-
     def previous_commits
       commits.all(:project_id => id, :order => [:committed_at.desc]).tap {|commits| commits.shift }
     end
 
-    def previous_builds
-      warn "Project#previous_builds is deprecated, use Project#previous_commits (#{caller[0]})"
-      previous_commits
-    end
-
     def status
       last_commit && last_commit.status
     end
@@ -85,19 +64,6 @@ module Integrity
       end)
     end
 
-    def config_for(notifier)
-      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, :project_id => id).blank?
-    end
-
-    def enable_notifiers(*args)
-      Notifier.enable_notifiers(id, *args)
-    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
@@ -116,13 +82,6 @@ module Integrity
         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").
@@ -131,23 +90,11 @@ module Integrity
           gsub(/-*$/, "")
       end
 
-      def delete_code
+      def delete_working_directory
         commits.all(:project_id => id).destroy!
-        ProjectBuilder.new(self).delete_code
+        ProjectBuilder.delete_working_directory(self)
       rescue SCM::SCMUnknownError => error
         Integrity.log "Problem while trying to deleting code: #{error}"
       end
-
-      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

data/lib/integrity/project/notifiers.rb

@@ -0,0 +1,33 @@
+module Integrity
+  class Project
+    module Helpers
+      module Notifiers
+        def notifies?(notifier)
+          return false unless notifier = notifiers.first(:name => notifier)
+
+          notifier.enabled?
+        end
+
+        def enabled_notifiers
+          notifiers.all(:enabled => true)
+        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)
+
+            notifier.enabled = to_enable.include?(name)
+            notifier.config  = config
+            notifier.save
+          }
+        end
+      end
+    end
+  end
+end

data/lib/integrity/project/push.rb

@@ -0,0 +1,44 @@
+module Integrity
+  class Project
+    module Helpers
+      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"])
+          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
+
+          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

data/lib/integrity/project_builder.rb

@@ -1,24 +1,45 @@
+require "forwardable"
+
 module Integrity
   class ProjectBuilder
+    extend Forwardable
+
+    attr_accessor  :project, :scm
+    def_delegators :project, :name, :uri, :command, :branch
+
+    def self.build(commit)
+      new(commit.project).build(commit)
+    end
+
+    def self.delete_working_directory(project)
+      new(project).delete_code
+    end
+
     def initialize(project)
       @project = project
-      @uri = project.uri
-      @build_script = project.command
-      @branch = project.branch
-      @scm = SCM.new(@uri, @branch, export_directory)
+      @scm = SCM.new(uri, branch, export_directory)
     end
 
     def build(commit)
-      @commit = commit
-      @build = commit.build
-      @build.start!
-      Integrity.log "Building #{commit.identifier} (#{@branch}) of #{@project.name} in #{export_directory} using #{@scm.name}"
-      @scm.with_revision(commit.identifier) { run_build_script }
-      @build
+      build = commit.build
+      build.start!
+
+      Integrity.log "Building #{commit.identifier} (#{branch}) of #{name} in" +
+        "#{export_directory} using #{scm.name}"
+
+      scm.with_revision(commit.identifier) do
+        Integrity.log "Running `#{command}` in #{scm.working_directory}"
+
+        IO.popen("(cd #{scm.working_directory} && #{command}) 2>&1", "r") {
+          |output| build.output = output.read }
+        build.successful = $?.success?
+      end
+
+      build
     ensure
-      @build.complete!
-      @commit.update_attributes(@scm.info(commit.identifier))
-      send_notifications
+      build.complete!
+      commit.update_attributes(scm.info(commit.identifier) || {})
+      project.notifiers.each { |notifier| notifier.notify_of_build(build) }
     end
 
     def delete_code
@@ -28,29 +49,8 @@ module Integrity
     end
 
     private
-      def send_notifications
-        @project.notifiers.each do |notifier|
-          begin
-            Integrity.log "Notifying of build #{@commit.short_identifier} using the #{notifier.name} notifier"
-            notifier.notify_of_build @commit
-          rescue Timeout::Error
-            Integrity.log "#{notifier.name} notifier timed out"
-            next
-          end
-        end
-      end
-
       def export_directory
-        Integrity.config[:export_directory] / "#{SCM.working_tree_path(@uri)}-#{@branch}"
-      end
-
-      def run_build_script
-        Integrity.log "Running `#{@build_script}` in #{@scm.working_directory}"
-
-        IO.popen "(cd #{@scm.working_directory} && #{@build_script}) 2>&1", "r" do |pipe|
-          @build.output = pipe.read
-        end
-        @build.successful = $?.success?
+        Integrity.config[:export_directory] / "#{SCM.working_tree_path(uri)}-#{branch}"
       end
   end
 end

data/test/acceptance/browse_project_test.rb

@@ -48,6 +48,10 @@ class BrowsePublicProjectsTest < Test::Unit::AcceptanceTestCase
     click_link "My Test Project"
 
     assert_have_tag("h1", :content => "My Test Project")
+
+    # He can then go back to the project listing
+    click_link "projects"
+    assert_have_tag("a", :content => "My Test Project")
   end
 
   scenario "a user gets a 404 when browsing to an unexisting project" do

data/test/acceptance/build_notifications_test.rb

@@ -1,7 +1,9 @@
 require File.dirname(__FILE__) + "/../helpers/acceptance"
-require "helpers/acceptance/textfile_notifier"
+require "helpers/acceptance/notifier_helper"
 
 class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
+  include NotifierHelper
+
   story <<-EOS
     As an administrator,
     I want to setup notifiers on my projects
@@ -12,11 +14,14 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
     # This is needed before any available notifier is unset
     # in the global #before
     load "helpers/acceptance/textfile_notifier.rb"
+    load "helpers/acceptance/email_notifier.rb"
+    Notifier.register(Integrity::Notifier::Textfile)
+    Notifier.register(Integrity::Notifier::Email)
   end
 
-  scenario "an admin sets up a notifier for a project that didn't have any" do
+  scenario "an admin sets up a notifier and issue a manual build" do
     git_repo(:my_test_project).add_successful_commit
-    Project.gen(:my_test_project, :notifiers => [], :uri => git_repo(:my_test_project).path)
+    Project.gen(:my_test_project, :uri => git_repo(:my_test_project).path)
     rm_f "/tmp/textfile_notifications.txt"
 
     login_as "admin", "test"
@@ -33,10 +38,58 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase
     notification = File.read("/tmp/textfile_notifications.txt")
     notification.should =~ /=== Built #{git_repo(:my_test_project).short_head} successfully ===/
     notification.should =~ /Build #{git_repo(:my_test_project).head} was successful/
-    notification.should =~ %r(http://www.example.com/my-test-project/commits/#{git_repo(:my_test_project).head})
+    notification.should =~
+      %r(http://www.example.com/my-test-project/commits/#{git_repo(:my_test_project).head})
     notification.should =~ /Commit Author: John Doe/
     notification.should =~ /Commit Date: (.+)/
     notification.should =~ /Commit Message: This commit will work/
     notification.should =~ /Build Output:\n\nRunning tests...\n/
   end
+
+  scenario "an admin can setup a notifier without enabling it" do
+    Project.gen(:integrity)
+
+    login_as "admin", "test"
+
+    visit "/integrity"
+    click_link "Edit Project"
+    fill_in_email_notifier
+    click_button "Update Project"
+
+    visit "/integrity/edit"
+    assert_have_email_notifier
+  end
+
+  scenario "an admin configures various notifiers accros multiple projects" do
+    Project.first(:permalink => "integrity").should be_nil
+
+    login_as "admin", "test"
+
+    visit "/"
+
+    add_project "Integrity", "git://github.com/foca/integrity.git"
+    click_link  "projects"
+
+    add_project "Webrat", "git://github.com/brynary/webrat.git"
+    click_link  "projects"
+
+    add_project "Rails", "git://github.com/rails/rails.git"
+    click_link  "projects"
+
+    edit_project "integrity"
+    edit_project "webrat"
+    edit_project "rails"
+
+    visit "/integrity"
+    click_link "Edit Project"
+    assert_have_email_notifier
+
+    visit "/webrat"
+    click_link "Edit Project"
+    assert_have_email_notifier
+
+    visit "/rails"
+    click_link "Edit Project"
+    assert_have_email_notifier
+  end
 end

data/test/acceptance/installer_test.rb

@@ -24,7 +24,10 @@ class InstallerTest < Test::Unit::AcceptanceTestCase
   end
 
   scenario "Installing integrity into a given directory" do
-    assert install.include?("Awesome")
+    post_install_message = install
+
+    assert post_install_message.include?("Awesome")
+    assert post_install_message.include?("integrity migrate_db #{root.join("config.yml")}")
 
     assert root.join("builds").directory?
     assert root.join("log").directory?

data/test/helpers.rb

@@ -1,27 +1,24 @@
 $:.unshift File.dirname(__FILE__) + "/../lib", File.dirname(__FILE__)
 
-%w(test/unit
-context
-pending
-matchy
-storyteller
-webrat/sinatra
-rr
-mocha
-dm-sweatshop).each { |dependency|
-  begin
-    require dependency
-  rescue LoadError => e
-    puts "You're missing some gems required to run the tests."
-    puts "Please run `rake test:setup`"
-    puts "NOTE: You'll probably need to run that command as root or with sudo."
-
-    puts "Thanks :)"
-    puts
-
-    raise
-  end
-}
+require "rubygems"
+
+require "test/unit"
+require "rr"
+require "mocha"
+require "dm-sweatshop"
+require "webrat/sinatra"
+
+gem "jeremymcanally-context"
+gem "jeremymcanally-matchy"
+gem "jeremymcanally-pending"
+require "context"
+require "matchy"
+require "pending"
+
+require "integrity"
+require "integrity/notifier/test/fixtures"
+
+require "helpers/expectations"
 
 begin
   require "ruby-debug"
@@ -29,22 +26,25 @@ begin
 rescue LoadError
 end
 
-require "integrity"
-require "helpers/expectations"
-require "integrity/notifier/test/fixtures"
-
 module TestHelper
   def ignore_logs!
     Integrity.config[:log] = "/tmp/integrity.test.log"
   end
 
-  def util_capture
+  def capture_stdout
     output = StringIO.new
     $stdout = output
     yield
     $stdout = STDOUT
     output
   end
+
+  def silence_warnings
+    $VERBOSE, v = nil, $VERBOSE
+    yield
+  ensure
+    $VERBOSE = v
+  end
 end
 
 class Test::Unit::TestCase
@@ -58,29 +58,25 @@ class Test::Unit::TestCase
 
   before(:all) do
     DataMapper.setup(:default, "sqlite3::memory:")
+
+    require "integrity/migrations"
   end
 
   before(:each) do
+    [Project, Build, Commit, Notifier].each(&:auto_migrate_down!)
+    capture_stdout { Integrity.migrate_db }
+
     RR.reset
-    DataMapper.auto_migrate!
-    Integrity.instance_variable_set(:@config, nil)
+
     Notifier.available.each { |n|
       Notifier.send(:remove_const, n.to_s.split(":").last.to_sym)
     }
 
-    repository(:default) do
-      transaction = DataMapper::Transaction.new(repository)
-      transaction.begin
-      repository.adapter.push_transaction(transaction)
-    end
+    Notifier.available.clear
+    Integrity.instance_variable_set(:@config, nil)
   end
 
   after(:each) do
-    repository(:default) do
-      while repository.adapter.current_transaction
-        repository.adapter.current_transaction.rollback
-        repository.adapter.pop_transaction
-      end
-    end
+    capture_stdout { Integrity::Migrations.migrate_down! }
   end
 end