foca-integrity 0.1.9.1 → 0.1.9.2

data/lib/integrity/helpers/authorization.rb

@@ -1,4 +1,4 @@
-require "sinatra/ditties"
+require "sinatra/authorization"
 
 module Integrity
   module Helpers

data/lib/integrity/helpers/breadcrumbs.rb

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

data/lib/integrity/helpers/rendering.rb

@@ -1,9 +1,15 @@
 module Integrity
   module Helpers
     module Rendering
+      def stylesheets(*sheets)
+        sheets.each { |sheet|
+          haml_tag(:link, :href => root_path("/#{sheet}.css"),
+            :type => "text/css", :rel => "stylesheet")
+        }
+      end
+
       def stylesheet_hash
-        @_hash ||= Digest::MD5.file(
-          options.views + "/integrity.sass").tap { |file| file.hexdigest }
+        @_hash ||= Digest::MD5.file(options.views + "/integrity.sass").hexdigest
       end
 
       def show(view, options={})

data/lib/integrity/helpers/urls.rb

@@ -1,49 +1,59 @@
 module Integrity
   module Helpers
     module Urls
-      def url(path)
-        Addressable::URI.parse(request.url).join(path).to_s
-      end
-
       def root_url
-        url("/")
+        @url ||= Addressable::URI.parse(base_url)
       end
 
-      def project_path(project, *path)
-        "/" << [project.permalink, *path].join("/")
+      def root_path(path="")
+        url(path).path
       end
 
       def project_url(project, *path)
-        url project_path(project, *path)
+        url("/" << [project.permalink, *path].flatten.join("/"))
       end
 
-      def push_url_for(project)
-        Addressable::URI.parse(project_url(project, "push")).tap do |url|
-          if Integrity.config[:use_basic_auth]
-            url.user     = Integrity.config[:admin_username]
-            url.password = Integrity.config[:hash_admin_password] ?
-              "<password>" : Integrity.config[:admin_password]
-          end
-        end.to_s
+      def project_path(project, *path)
+        project_url(project, path).path
+      end
+
+      def commit_url(commit)
+        project_url(commit.project, "commits", commit.identifier)
       end
 
       def commit_path(commit, *path)
-        project_path(commit.project, "commits", commit.identifier, *path)
+        commit_url(commit).path
       end
 
       def build_path(build, *path)
-        warn "#build_path is deprecated, use #commit_path instead"
+        warn "#build_path is deprecated, use #commit_path instead (#{caller[0]})"
         commit_path build.commit, *path
       end
 
-      def commit_url(commit)
-        url commit_path(commit)
-      end
-
       def build_url(build)
-        warn "#build_url is deprecated, use #commit_url instead"
+        warn "#build_url is deprecated, use #commit_url instead (#{caller[0]})"
         commit_url build.commit
       end
+
+      def push_url_for(project)
+        Addressable::URI.parse(project_url(project, "push")).tap do |url|
+          if Integrity.config[:use_basic_auth]
+            url.user     = Integrity.config[:admin_username]
+            url.password = Integrity.config[:hash_admin_password] ?
+              "<password>" : Integrity.config[:admin_password]
+          end
+        end.to_s
+      end
+
+      private
+        def url(path="")
+          root_url.dup.tap { |url| url.path = root_url.path + path }
+        end
+
+        def base_url
+          Integrity.config[:base_uri] || ((respond_to?(:request) &&
+            request.respond_to?(:url)) ? request.url : fail("set base_uri"))
+        end
     end
   end
 end

data/lib/integrity/installer.rb

@@ -16,20 +16,13 @@ module Integrity
 
       if options[:heroku]
         cp_r Pathname(__FILE__).join("../../../config/heroku"), root
-        puts <<EOF
-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
-EOF
+        puts post_heroku_install_message
       else
         create_dir_structure
         copy_template_files
         edit_template_files
         migrate_db(root.join("config.yml"))
-        after_setup_message
+        puts post_install_message
       end
     end
 
@@ -50,11 +43,8 @@ EOF
       require "thin"
       require "do_sqlite3"
 
-      if File.file?(options[:config].to_s)
-        Integrity.new(options[:config])
-      else
-        DataMapper.setup(:default, "sqlite3::memory:")
-      end
+      File.file?(options[:config].to_s) ?
+        Integrity.new(options[:config]) : Integrity.new
 
       DataMapper.auto_migrate!
 
@@ -104,8 +94,19 @@ EOF
         File.open(root / "thin.yml", 'w') { |f| f.puts config }
       end
 
-      def after_setup_message
-        puts <<EOF
+      def post_heroku_install_message
+        <<EOF
+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
+EOF
+      end
+
+      def post_install_message
+        <<EOF
 Awesome! Integrity was installed successfully!
 
 If you want to enable notifiers, install the gems and then require them
@@ -113,7 +114,7 @@ in #{root}/config.ru
 
 For example:
 
-    sudo gem install -s http://gems.github.com foca-integrity-email)
+    sudo gem install -s http://gems.github.com foca-integrity-email
 
 And then in #{root}/config.ru add:
 

data/lib/integrity/notifier/base.rb

@@ -2,7 +2,11 @@ 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
@@ -17,7 +21,7 @@ module Integrity
       end
 
       def build
-        warn "Notifier::Base#build is deprecated, use Notifier::Base#commit instead"
+        warn "Notifier::Base#build is deprecated, use Notifier::Base#commit instead (#{caller[0]})"
         commit
       end
 
@@ -50,6 +54,11 @@ EOM
         Integrity.config[:base_uri] / commit.project.permalink / "commits" / commit.identifier
       end
 
+      def build_url
+        warn "Notifier::Base#build_url is deprecated, use Notifier::Base#commit_url instead (#{caller[0]})"
+        commit_url
+      end
+
       private
 
         def stripped_commit_output
@@ -57,7 +66,7 @@ EOM
         end
 
         def stripped_build_output
-          warn "Notifier::Base#stripped_build_output is deprecated, use Notifier::base#stripped_commit_output instead"
+          warn "Notifier::Base#stripped_build_output is deprecated, use Notifier::base#stripped_commit_output instead (#{caller[0]})"
           stripped_commit_output
         end
     end

data/lib/integrity/project.rb

@@ -17,7 +17,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,7 +32,7 @@ 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
+      Build.queue(commit)
     end
 
     def push(payload)
@@ -57,7 +57,7 @@ module Integrity
     end
 
     def last_build
-      warn "Project#last_build is deprecated, use Project#last_commit"
+      warn "Project#last_build is deprecated, use Project#last_commit (#{caller[0]})"
       last_commit
     end
 
@@ -66,7 +66,7 @@ module Integrity
     end
 
     def previous_builds
-      warn "Project#previous_builds is deprecated, use Project#previous_commits"
+      warn "Project#previous_builds is deprecated, use Project#previous_commits (#{caller[0]})"
       previous_commits
     end
 
@@ -131,9 +131,9 @@ 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

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class ApiTest < Test::Unit::AcceptanceTestCase
   story <<-EOF

data/test/acceptance/browse_project_builds_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class BrowseProjectBuildsTest < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/browse_project_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class BrowsePublicProjectsTest < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/build_notifications_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 require "helpers/acceptance/textfile_notifier"
 
 class BuildNotificationsTest < Test::Unit::AcceptanceTestCase

data/test/acceptance/create_project_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class CreateProjectTest < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/delete_project_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class DeleteProjectTest < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/edit_project_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class EditProjectTest < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/error_page_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class ErrorPageTest < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/installer_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 require "integrity/installer"
 
 class InstallerTest < Test::Unit::AcceptanceTestCase
@@ -65,11 +65,7 @@ class InstallerTest < Test::Unit::AcceptanceTestCase
   scenario "Installing Integrity for Heroku" do
     message = install("--heroku")
 
-    gemifest = root.join(".gems").read
-    assert gemifest.include?("mailfactory")
-    assert gemifest.include?("tlsmail")
-    assert gemifest.include?("foca-sinatra-ditties")
-    assert gemifest.include?("integrity")
+    assert_equal "integrity --version 0.1.9.0", 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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class ManualBuildProjectTest < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/not_found_page_test.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + "/../helpers/acceptance"
+
+class NotFoundPageTest < Test::Unit::AcceptanceTestCase
+  story <<-EOS
+    As an visitor,
+    I want to be shown a friendly four oh four
+    So that I DON'T HAVE TO THINK.
+  EOS
+
+  scenario "chilling on some Integrity instance found via The Holy Hub" do
+    project = Project.gen
+
+    visit "/42"
+    assert_equal 404, response_code
+
+    click_link "list of projects"
+    assert_contain(project.name)
+
+    visit "/42"
+
+    click_link "the projects list"
+    assert_contain(project.name)
+
+    visit "/42"
+
+    click_link "back from whence you came"
+    assert_contain("Add a new project")
+  end
+end