integrity 0.1.8 → 0.1.9.0

data/lib/integrity/helpers/urls.rb

@@ -2,15 +2,7 @@ module Integrity
   module Helpers
     module Urls
       def url(path)
-        url = "#{request.scheme}://#{request.host}"
-
-        if request.scheme == "https" && request.port != 443 ||
-            request.scheme == "http" && request.port != 80
-          url << ":#{request.port}"
-        end
-
-        url << "/" unless path.index("/").zero?
-        url << path
+        Addressable::URI.parse(request.url).join(path).to_s
       end
 
       def root_url
@@ -35,13 +27,23 @@ module Integrity
         end.to_s
       end
 
-      def build_path(build)
-        "/#{build.project.permalink}/builds/#{build.commit_identifier}"
+      def commit_path(commit, *path)
+        project_path(commit.project, "commits", commit.identifier, *path)
+      end
+
+      def build_path(build, *path)
+        warn "#build_path is deprecated, use #commit_path instead"
+        commit_path build.commit, *path
+      end
+
+      def commit_url(commit)
+        url commit_path(commit)
       end
 
       def build_url(build)
-        url build_path(build)
+        warn "#build_url is deprecated, use #commit_url instead"
+        commit_url build.commit
       end
     end
   end
-end
+end

data/lib/integrity/installer.rb

@@ -6,63 +6,73 @@ module Integrity
     include FileUtils
 
     desc "install [PATH]",
-       "Copy template files to PATH. Next, go there and edit them."
+       "Copy template files to PATH for desired deployement strategy
+       (either Thin or Passenger). Next, go there and edit them."
+    method_options :passenger => false, :thin => false
     def install(path)
-      @root = File.expand_path(path)
+      @root = Pathname(path).expand_path
 
       create_dir_structure
       copy_template_files
       edit_template_files
-      create_db(root / "config.yml")
+      migrate_db(root.join("config.yml"))
       after_setup_message
     end
 
-    desc "create_db [CONFIG]",
-         "Checks the `database_uri` in CONFIG and creates and bootstraps a database for integrity"
-    def create_db(config, direction="up")
+    desc "migrate_db [CONFIG]",
+         "Checks the `database_uri` in CONFIG and migrates the
+          database up to the lastest version."
+    def migrate_db(config)
       Integrity.new(config)
-      migrate_db(direction, 1)
-    end
 
-    desc "version",
-         "Print the current integrity version"
-    def version
-      puts Integrity.version
+      require "integrity/migrations"
+      Integrity.migrate_db
     end
 
-    private
-      attr_reader :root
+    desc "launch [CONFIG]",
+         "Launch Integrity real quick."
+    method_options :config => :optional, :port => 4567
+    def launch
+      require "thin"
+      require "do_sqlite3"
+
+      if File.file?(options[:config].to_s)
+        Integrity.new(options[:config])
+      else
+        DataMapper.setup(:default, "sqlite3::memory:")
+      end
 
-      def migrate_db(direction, level=nil)
-        require "integrity/migrations"
+      DataMapper.auto_migrate!
 
-        set_up_migrations unless migrations_already_set_up?
-        add_initial_migration if tables_from_before_migrations_exist?
+      Thin::Server.start("0.0.0.0", options[:port], Integrity::App)
+    rescue LoadError => boom
+      missing_dependency = boom.message.split("--").last.lstrip
+      puts "Please install #{missing_dependency} to launch Integrity"
+    end
 
-        case direction
-        when "up"   then Integrity::Migrations.migrate_up!(level)
-        when "down" then Integrity::Migrations.migrate_down!(level)
-        else raise ArgumentError, "DIRECTION must be either up or down"
-        end
-      end
+    private
+      attr_reader :root
 
       def create_dir_structure
         mkdir_p root
         mkdir_p root / "builds"
         mkdir_p root / "log"
-        mkdir_p root / "public" # this one is to play nice with Passenger
-        mkdir_p root / "tmp"    # this one is to play nice with Passenger
+
+        if options[:passenger]
+          mkdir_p root / "public"
+          mkdir_p root / "tmp"
+        end
       end
 
       def copy_template_files
-        cp Integrity.root / "config" / "config.sample.ru",  root / "config.ru"
-        cp Integrity.root / "config" / "config.sample.yml", root / "config.yml"
-        cp Integrity.root / "config" / "thin.sample.yml",   root / "thin.yml"
+        copy "config/config.sample.ru"
+        copy "config/config.sample.yml"
+        copy "config/thin.sample.yml" if options[:thin]
       end
 
       def edit_template_files
         edit_integrity_configuration
-        edit_thin_configuration
+        edit_thin_configuration if options[:thin]
       end
 
       def edit_integrity_configuration
@@ -97,36 +107,9 @@ module Integrity
         puts %Q(Don't forget to tweak #{root / "config.yml"} to your needs.)
       end
 
-      def set_up_migrations
-        database_adapter.execute %q(CREATE TABLE "migration_info" ("migration_name" VARCHAR(255));)
-      end
-
-      def add_initial_migration
-        database_adapter.execute %q(INSERT INTO "migration_info" ("migration_name") VALUES ("initial"))
-      end
-
-      def tables_from_before_migrations_exist?
-        table_exists?("integrity_projects") &&
-          table_exists?("integrity_builds") &&
-          table_exists?("integrity_notifiers")
-      end
-
-      def migrations_already_set_up?
-        table_exists?("migration_info")
-      end
-
-      def without_pluralizing_table_names
-        database_adapter.resource_naming_convention = DataMapper::NamingConventions::Resource::Underscored
-        yield
-        database_adapter.resource_naming_convention = DataMapper::NamingConventions::Resource::UnderscoredAndPluralized
-      end
-
-      def table_exists?(table_name)
-        database_adapter.storage_exists?(table_name)
-      end
-
-      def database_adapter
-        DataMapper.repository(:default).adapter
+      def copy(path)
+        cp(File.dirname(__FILE__) + "/../../#{path}",
+          root.join(File.basename(path).gsub(/\.sample/, "")))
       end
   end
 end

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