foca-integrity 0.1.8 → 0.1.9.0

data/lib/integrity/author.rb

@@ -0,0 +1,39 @@
+module Integrity
+  class Author < DataMapper::Type
+    primitive String
+    size      65535
+    lazy      true
+
+    class AuthorStruct < Struct.new(:name, :email)
+      def self.parse(string)
+        raise ArgumentError.new("invalid author string") unless string =~ /^(.*) <(.*)>$/
+
+        new($1.strip, $2.strip)
+      end
+
+      def to_s
+        @full ||= "#{name} <#{email}>"
+      end
+
+      alias_method :full, :to_s
+    end
+
+    def self.load(value, property)
+      AuthorStruct.parse(value) unless value.nil?
+    end
+
+    def self.dump(value, property)
+      return nil if value.nil?
+
+      value.to_s
+    end
+
+    def self.typecast(value, property)
+      case value
+      when AuthorStruct then value
+      when NilClass     then load(nil, property)
+      else load(value.to_s, property)
+      end
+    end
+  end
+end

data/lib/integrity/build.rb

@@ -2,60 +2,83 @@ module Integrity
   class Build
     include DataMapper::Resource
 
-    property :id,                Serial
-    property :output,            Text,     :nullable => false, :default => ""
-    property :successful,        Boolean,  :nullable => false, :default => false
-    property :commit_identifier, String,   :nullable => false
-    property :commit_metadata,   Yaml,     :nullable => false, :lazy => false
-    property :created_at,        DateTime
-    property :updated_at,        DateTime
+    property :id,           Integer,  :serial => true
+    property :output,       Text,     :default => "", :lazy => false
+    property :successful,   Boolean,  :default => false
+    property :commit_id,    Integer,  :nullable => false
+    property :created_at,   DateTime
+    property :updated_at,   DateTime
+    property :started_at,   DateTime
+    property :completed_at, DateTime
 
-    belongs_to :project, :class_name => "Integrity::Project"
+    belongs_to :commit, :class_name => "Integrity::Commit"
+
+    def self.pending
+      all(:started_at => nil)
+    end
+
+    def pending?
+      started_at.nil?
+    end
 
     def failed?
       !successful?
     end
 
     def status
-      successful? ? :success : :failed
+      case
+      when pending?    then :pending
+      when successful? then :success
+      when failed?     then :failed
+      end
     end
 
-    def human_readable_status
-      successful? ? "Build Successful" : "Build Failed"
+    def start!(time=Time.now)
+      self.started_at = time
     end
 
+    def complete!(time=Time.now)
+      self.completed_at = time
+    end
+
+    #
+    # Deprecated methods
+    #
     def short_commit_identifier
-      sha1?(commit_identifier) ? commit_identifier[0..6] : commit_identifier
+      warn "Build#short_commit_identifier is deprecated, use Commit#short_identifier"
+      commit.short_identifier
     end
-    
-    def commit_metadata
-      case data = attribute_get(:commit_metadata)
-        when String; YAML.load(data)
-        else data
-      end
+
+    def commit_identifier
+      warn "Build#commit_identifier is deprecated, use Commit#identifier"
+      commit.identifier
     end
 
     def commit_author
-      @author ||= begin
-        commit_metadata[:author] =~ /^(.*) <(.*)>$/
-        OpenStruct.new(:name => $1.strip, :email => $2.strip, :full => commit_metadata[:author])
-      end
+      warn "Build#commit_author is deprecated, use Commit#author"
+      commit.author
     end
 
     def commit_message
-      commit_metadata[:message]
+      warn "Build#commit_message is deprecated, use Commit#message"
+      commit.message
     end
 
     def commited_at
-      case commit_metadata[:date]
-        when String then Time.parse(commit_metadata[:date])
-        else commit_metadata[:date]
-      end
+      warn "Build#commited_at is deprecated, use Commit#committed_at"
+      commit.committed_at
     end
 
-    private
-      def sha1?(string)
-        string =~ /^[a-f0-9]{40}$/
-      end
+    def project_id
+      warn "Build#project_id is deprecated, use Commit#project_id"
+      commit.project_id
+    end
+
+    def commit_metadata
+      warn "Build#commit_metadata is deprecated, use the different methods in Commit instead"
+      { :message => commit.message,
+        :author  => commit.author,
+        :date    => commit.committed_at }
+    end
   end
 end

data/lib/integrity/commit.rb

@@ -0,0 +1,71 @@
+module Integrity
+  class Commit
+    include DataMapper::Resource
+
+    property :id,           Integer,  :serial => true
+    property :identifier,   String,   :nullable => false
+    property :message,      String,   :length => 255
+    property :author,       Author,   :length => 255
+    property :committed_at, DateTime
+    property :created_at,   DateTime
+    property :updated_at,   DateTime
+
+    has 1,     :build,   :class_name => "Integrity::Build", :order => [:created_at.desc]
+    belongs_to :project, :class_name => "Integrity::Project"
+
+    def message
+      attribute_get(:message) || "<Commit message not loaded>"
+    end
+
+    def author
+      attribute_get(:author) || Author.load('<Commit author not loaded> <<Commit author not loaded>>', :author)
+    end
+
+    def short_identifier
+      identifier.to_s[0..6]
+    end
+
+    def status
+      build.nil? ? :pending : build.status
+    end
+
+    def successful?
+      status == :success
+    end
+
+    def failed?
+      status == :failed
+    end
+
+    def pending?
+      status == :pending
+    end
+
+    def human_readable_status
+      case status
+      when :success; "Built #{short_identifier} successfully"
+      when :failed;  "Built #{short_identifier} and failed"
+      when :pending; "#{short_identifier} hasn't been built yet"
+      end
+    end
+
+    def output
+      build && build.output
+    end
+
+    def queue_build
+      self.build = Build.create(:commit_id => id)
+      self.save
+
+      # Build on foreground (this will move away, I promise)
+      ProjectBuilder.new(project).build(self)
+    end
+
+    # Deprecation layer
+    alias :short_commit_identifier :short_identifier
+    alias :commit_identifier       :identifier
+    alias :commit_author           :author
+    alias :commit_message          :message
+    alias :commited_at             :committed_at
+  end
+end

data/lib/integrity/helpers.rb

@@ -1,7 +1,7 @@
 Dir["#{File.dirname(__FILE__)}/helpers/*.rb"].each &method(:require)
 
 module Integrity
-  module Helpers  
+  module Helpers
     include Authorization
     include Breadcrumbs
     include Forms
@@ -9,8 +9,8 @@ module Integrity
     include Rendering
     include Resources
     include Urls
-    
+
     include Rack::Utils
     alias :h :escape_html
   end
-end
+end

data/lib/integrity/helpers/authorization.rb

@@ -1,4 +1,4 @@
-require "diddies"
+require "sinatra/ditties"
 
 module Integrity
   module Helpers
@@ -30,4 +30,4 @@ module Integrity
       end
     end
   end
-end
+end

data/lib/integrity/helpers/forms.rb

@@ -12,8 +12,8 @@ module Integrity
 
       def checkbox(name, condition, extras={})
         attrs = { :name => name, :type => "checkbox", :value => "1" }
-        attrs.merge!(:checked => condition ? true : nil)
-        attrs.merge(extras)
+        attrs[:checked] = !!condition
+        attrs.update(extras)
       end
 
       def notifier_form(notifier)
@@ -25,4 +25,4 @@ module Integrity
       end
     end
   end
-end
+end

data/lib/integrity/helpers/pretty_output.rb

@@ -42,4 +42,4 @@ module Integrity
       end
     end
   end
-end
+end

data/lib/integrity/helpers/rendering.rb

@@ -1,6 +1,11 @@
 module Integrity
   module Helpers
     module Rendering
+      def stylesheet_hash
+        @_hash ||= Digest::MD5.file(
+          options.views + "/integrity.sass").tap { |file| file.hexdigest }
+      end
+
       def show(view, options={})
         @title = breadcrumbs(*options[:title])
         haml view
@@ -11,4 +16,4 @@ module Integrity
       end
     end
   end
-end
+end

data/lib/integrity/helpers/resources.rb

@@ -5,9 +5,15 @@ module Integrity
         @project ||= Project.first(:permalink => params[:project]) or raise Sinatra::NotFound
       end
 
-      def current_build
-        @build ||= current_project.builds.first(:commit_identifier => params[:build]) or raise Sinatra::NotFound
+      def current_commit
+        @commit ||= current_project.commits.first(:identifier => params[:commit]) or raise Sinatra::NotFound
+      end
+
+      def update_notifiers_of(project)
+        if params["notifiers"]
+          project.enable_notifiers(params["notifiers"].keys, params["notifiers"])
+        end
       end
     end
   end
-end
+end

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 '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