integrity 0.1.8 → 0.1.9

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

data/lib/integrity/project_builder.rb

@@ -1,23 +1,24 @@
 module Integrity
   class ProjectBuilder
-    attr_reader :build_script
-
     def initialize(project)
+      @project = project
       @uri = project.uri
       @build_script = project.command
       @branch = project.branch
       @scm = SCM.new(@uri, @branch, export_directory)
-      @build = Build.new(:project => project)
     end
 
     def build(commit)
-      Integrity.log "Building #{commit} (#{@branch}) of #{@build.project.name} in #{export_directory} using #{scm_name}"
-      @scm.with_revision(commit) { run_build_script }
+      @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
     ensure
-      @build.commit_identifier = @scm.commit_identifier(commit)
-      @build.commit_metadata = @scm.commit_metadata(commit)
-      @build.save
+      @build.complete!
+      @commit.update_attributes(@scm.info(commit.identifier))
+      send_notifications
     end
 
     def delete_code
@@ -27,18 +28,26 @@ module Integrity
     end
 
     private
-      def export_directory
-        Integrity.config[:export_directory] / "#{SCM.working_tree_path(@uri)}-#{@branch}"
+      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 scm_name
-        @scm.name
+      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}"
+        Integrity.log "Running `#{@build_script}` in #{@scm.working_directory}"
 
-        IO.popen "(cd #{@scm.working_directory} && #{build_script}) 2>&1", "r" do |pipe|
+        IO.popen "(cd #{@scm.working_directory} && #{@build_script}) 2>&1", "r" do |pipe|
           @build.output = pipe.read
         end
         @build.successful = $?.success?

data/lib/integrity/scm/git.rb

@@ -9,8 +9,8 @@ module Integrity
         Git::URI.new(uri).working_tree_path
       end
 
-      def initialize(uri, branch, working_directory)
-        @uri = uri.to_s
+      def initialize(uri, branch, working_directory=nil)
+        @uri    = uri.to_s
         @branch = branch.to_s
         @working_directory = working_directory
       end
@@ -21,27 +21,28 @@ module Integrity
         yield
       end
 
-      def commit_identifier(sha1)
-        `cd #{working_directory} && git show -s --pretty=format:%H #{sha1}`.chomp
+      def name
+        self.class.name.split("::").last
       end
 
-      def commit_metadata(sha1)
-        format  = %Q(---%n:author: %an <%ae>%n:message: >-%n  %s%n:date: %ci%n)
-        YAML.load(`cd #{working_directory} && git show -s --pretty=format:"#{format}" #{sha1}`)
+      def head
+        log "Getting the HEAD of '#{uri}' at '#{branch}'"
+        `git ls-remote --heads #{uri} #{branch} | awk '{print $1}'`.chomp
       end
-      
-      def name
-        self.class.name.split("::").last
+
+      def info(revision)
+        format  = %Q(---%n:author: %an <%ae>%n:message: >-%n  %s%n:committed_at: %ci%n)
+        YAML.load(`cd #{working_directory} && git show -s --pretty=format:"#{format}" #{revision}`)
       end
 
       private
 
         def fetch_code
-          clone unless cloned?
+          clone    unless cloned?
           checkout unless on_branch?
           pull
         end
-    
+
         def clone
           log "Cloning #{uri} to #{working_directory}"
           `git clone #{uri} #{working_directory} &>/dev/null`
@@ -51,11 +52,11 @@ module Integrity
           strategy = case
             when treeish                         then treeish
             when local_branches.include?(branch) then branch
-            else                                      "-b #{branch} origin/#{branch}"
+            else                                      "origin/#{branch}"
           end
 
           log "Checking-out #{strategy}"
-          `cd #{working_directory} && git checkout #{strategy} &>/dev/null`
+          `cd #{working_directory} && git reset --hard #{strategy} &>/dev/null`
         end
 
         def pull

data/lib/integrity/scm/git/uri.rb

@@ -13,13 +13,13 @@ module Integrity
       #     ssh://[user@]host.xz/path/to/repo.git/
       #     ssh://[user@]host.xz/~user/path/to/repo.git/
       #     ssh://[user@]host.xz/~/path/to/repo.git
-      # 
-      #   SSH is the default transport protocol over the network. You can optionally 
-      #   specify which user to log-in as, and an alternate, scp-like syntax is also 
+      #
+      #   SSH is the default transport protocol over the network. You can optionally
+      #   specify which user to log-in as, and an alternate, scp-like syntax is also
       #   supported
       #
-      #   Both syntaxes support username expansion, as does the native git protocol, 
-      #   but only the former supports port specification. The following three are 
+      #   Both syntaxes support username expansion, as does the native git protocol,
+      #   but only the former supports port specification. The following three are
       #   identical to the last three above, respectively:
       #
       #     [user@]host.xz:/path/to/repo.git/
@@ -30,13 +30,13 @@ module Integrity
         def initialize(uri_string)
           @uri = Addressable::URI.parse(uri_string)
         end
-    
+
         def working_tree_path
           strip_extension(path).gsub("/", "-")
         end
-    
+
       private
-    
+
         def strip_extension(string)
           uri = Pathname.new(string)
           if uri.extname.any?
@@ -46,7 +46,7 @@ module Integrity
             string
           end
         end
-    
+
         def path
           path = @uri.path
           path.gsub(/\~[a-zA-Z0-9]*\//, "").gsub(/^\//, "")

data/test/acceptance/api_test.rb

@@ -0,0 +1,97 @@
+require File.dirname(__FILE__) + "/helpers"
+
+class ApiTest < Test::Unit::AcceptanceTestCase
+  story <<-EOF
+    As a project owner,
+    I want to be able to use GitHub as a build triggerer
+    So that my project is built everytime I push to the Holy Hub
+  EOF
+
+  def payload(after, branch="master", commits=[])
+    payload = { "after" => "#{after}", "ref" => "refs/heads/#{branch}" }
+    payload["commits"] = commits if commits.any?
+    payload.to_json
+  end
+
+  def post(path, data)
+    request_page(path, "post", data)
+  end
+
+  scenario "it only build commits for the branch being monitored" do
+    repo = git_repo(:my_test_project) # initial commit && successful commit
+    Project.gen(:my_test_project, :uri => repo.path, :branch => "my-branch")
+
+    basic_auth "admin", "test"
+
+    lambda do
+      post "/my-test-project/push", :payload => payload(repo.head, "master", repo.commits)
+      response_code.should == 422
+    end.should_not change(Build, :count)
+
+    visit "/my-test-project"
+
+    assert_contain("No builds for this project")
+  end
+
+  it "receiving a build request with build_all_commits *enabled* builds all commits, most recent first" do
+    Integrity.config[:build_all_commits] = true
+
+    repo = git_repo(:my_test_project) # initial commit && successful commit
+    3.times do |i|
+      repo.add_commit("commit #{i}") do
+        system "echo commit_#{i} >> test-file"
+        system "git add test-file &>/dev/null"
+      end
+    end
+
+    Project.gen(:my_test_project, :uri => repo.path, :command => "echo successful", :branch => "master")
+
+    basic_auth "admin", "test"
+    post "/my-test-project/push", :payload => payload(repo.head, "master", repo.commits)
+
+    visit "/my-test-project"
+
+    assert_have_tag("h1", :content => "Built #{git_repo(:my_test_project).short_head} successfully")
+    assert_have_tag(".attribution", :content => "by John Doe")
+
+    assert_have_tag("#previous_builds li", :count => 4)
+  end
+
+  scenario "receiving a build request with build_all_commits *disabled* only builds the last commit passed" do
+    Integrity.config[:build_all_commits] = false
+
+    Project.gen(:my_test_project, :uri => git_repo(:my_test_project).path)
+
+    git_repo(:my_test_project).add_failing_commit
+    git_repo(:my_test_project).add_successful_commit
+    head = git_repo(:my_test_project).head
+
+    basic_auth "admin", "test"
+    post "/my-test-project/push", :payload => payload(head, "master", git_repo(:my_test_project).commits)
+
+    response_code.should == 201
+
+    visit "/my-test-project"
+
+    assert_have_tag("h1", :content => "Built #{git_repo(:my_test_project).short_head} successfully")
+
+    assert_have_no_tag("#previous_builds li")
+  end
+
+  scenario "an unauthenticated request returns a 401" do
+    Project.gen(:my_test_project, :uri => git_repo(:my_test_project).path)
+    head = git_repo(:my_test_project).head
+    post "/my-test-project/push", :payload => payload(head, "master")
+
+    response_code.should == 401
+  end
+
+  scenario "receiving a build request with an invalid payload returns an Invalid Request error" do
+    Project.gen(:my_test_project, :uri => git_repo(:my_test_project).path)
+
+    basic_auth "admin", "test"
+
+    post "/my-test-project/push", :payload => "foo"
+    response_code.should == 422
+  end
+end

data/test/acceptance/browse_project_builds_test.rb

@@ -0,0 +1,65 @@
+require File.dirname(__FILE__) + "/helpers"
+
+class BrowseProjectBuildsTest < Test::Unit::AcceptanceTestCase
+  story <<-EOS
+    As a user,
+    I want to browse the builds of a project in Integrity
+    So I can see the history of a project
+  EOS
+
+  scenario "a project with no builds should say so in a friendly manner" do
+    Project.gen(:integrity, :public => true, :commits => [])
+
+    visit "/integrity"
+
+    assert_have_no_tag("#last_build")
+    assert_have_no_tag("#previous_builds")
+    assert_contain("No builds for this project, buddy")
+  end
+
+  scenario "a user can see the last build and the list of previous builds on a project page" do
+    Project.gen(:integrity, :public => true, :commits => \
+                3.of { Commit.gen(:successful) } +
+                2.of { Commit.gen(:failed) }     +
+                2.of { Commit.gen(:pending) })
+
+    visit "/integrity"
+
+    assert_have_tag("#last_build")
+
+    within("ul#previous_builds") do
+      assert_have_tag("li.pending", :count => 2)
+      assert_have_tag("li.failed",  :count => 2)
+      assert_have_tag("li.success", :count => 2)
+    end
+  end
+
+  scenario "a user can see details about the last build on the project page" do
+    commit = Commit.gen(:successful, :identifier   => "7fee3f0014b529e2b76d591a8085d76eab0ff923",
+                                     :author       => "Nicolas Sanguinetti <contacto@nicolassanguinetti.info>",
+                                     :message      => "No more pending tests :)",
+                                     :committed_at => Time.mktime(2008, 12, 15, 18))
+    commit.build.update_attributes(:output => "This is the build output")
+    Project.gen(:integrity, :public => true, :commits => [commit])
+
+    visit "/integrity"
+
+    assert_have_tag("h1", :content => "Built 7fee3f0 successfully")
+    assert_have_tag("blockquote p", :content => "No more pending tests")
+    assert_have_tag("span.who",     :content => "by: Nicolas Sanguinetti")
+    assert_have_tag("span.when",    :content => "Dec 15th")
+    assert_have_tag("pre.output",   :content => "This is the build output")
+  end
+
+  scenario "a user can browse to individual build pages" do
+    Project.gen(:integrity, :public => true, :commits => [
+      Commit.gen(:successful, :identifier => "7fee3f0014b529e2b76d591a8085d76eab0ff923"),
+      Commit.gen(:successful, :identifier => "87e673a83d273ecde121624a3fcfae57a04f2b76")
+    ])
+
+    visit "/integrity"
+    click_link(/Build 87e673a/)
+
+    assert_have_tag("h1", :content => "Built 87e673a successfully")
+  end
+end