integrity 0.1.8 → 0.1.9.0

data/lib/integrity/app.rb

@@ -0,0 +1,138 @@
+module Integrity
+  class App < Sinatra::Default
+    set :root,     File.dirname(__FILE__) + "/../.."
+    set :app_file, __FILE__
+    enable :sessions
+
+    include Integrity
+    include Integrity::Helpers
+
+    not_found do
+      status 404
+      show :not_found, :title => "lost, are we?"
+    end
+
+    error do
+      @error = request.env["sinatra.error"]
+      status 500
+      show :error, :title => "something has gone terribly wrong"
+    end
+
+    before do
+      # The browser only sends http auth data for requests that are explicitly
+      # required to do so. This way we get the real values of +#logged_in?+ and
+      # +#current_user+
+      login_required if session[:user]
+    end
+
+    get "/integrity.css" do
+      response["Content-Type"] = "text/css; charset=utf-8"
+      etag stylesheet_hash
+      sass :integrity
+    end
+
+    get "/" do
+      @projects = Project.only_public_unless(authorized?)
+      show :home, :title => "projects"
+    end
+
+    get "/login" do
+      login_required
+
+      session[:user] = current_user
+      redirect root_url
+    end
+
+    get "/new" do
+      login_required
+
+      @project = Project.new
+      show :new, :title => ["projects", "new project"]
+    end
+
+    post "/" do
+      login_required
+
+      @project = Project.new(params[:project_data])
+
+      if @project.save
+        update_notifiers_of(@project)
+        redirect project_url(@project)
+      else
+        show :new, :title => ["projects", "new project"]
+      end
+    end
+
+    get "/:project.atom" do
+      login_required unless current_project.public?
+      response["Content-Type"] = "application/rss+xml; charset=utf-8"
+      builder :project
+    end
+
+    get "/:project" do
+      login_required unless current_project.public?
+      show :project, :title => ["projects", current_project.name]
+    end
+
+    put "/:project" do
+      login_required
+
+      if current_project.update_attributes(params[:project_data])
+        update_notifiers_of(current_project)
+        redirect project_url(current_project)
+      else
+        show :new, :title => ["projects", current_project.permalink, "edit"]
+      end
+    end
+
+    delete "/:project" do
+      login_required
+
+      current_project.destroy
+      redirect root_url
+    end
+
+    get "/:project/edit" do
+      login_required
+
+      show :new, :title => ["projects", current_project.permalink, "edit"]
+    end
+
+    post "/:project/push" do
+      login_required
+
+      content_type "text/plain"
+
+      begin
+        current_project.push(params[:payload])
+        201
+      rescue ArgumentError
+        [422, "Invalid Request"]
+      end
+    end
+
+    post "/:project/builds" do
+      login_required
+
+      current_project.build
+      redirect project_url(current_project)
+    end
+
+    get "/:project/commits/:commit" do
+      login_required unless current_project.public?
+
+      show :build, :title => ["projects", current_project.permalink, current_commit.short_commit_identifier]
+    end
+
+    get "/:project/builds/:commit" do
+      redirect "/#{params[:project]}/commits/#{params[:commit]}", 301
+    end
+
+    post "/:project/commits/:commit/builds" do
+      login_required
+
+      current_project.build(params[:commit])
+      redirect commit_url(current_commit)
+    end
+  end
+end

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