foca-integrity 0.1.1 → 0.1.2

data/README.markdown

@@ -3,8 +3,8 @@ Integrity
 
 Integrity is your friendly automated Continuous Integration server.
 
-It's fully usable from within its web interface (backed by [Sinatra][]), 
-allowing you to add a project, set preferences for it (where's the code 
+It's fully usable from within its web interface (backed by [Sinatra][]),
+allowing you to add a project, set preferences for it (where's the code
 repository, is it completely private or public, etc), and run the build command
 from there.
 
@@ -32,7 +32,7 @@ For deployment, we recommend [Thin][]. Provided with Integrity comes a thin.yml
 file, so all you need to do after running `integrity install` should be
 
     thin -C /path/to/my/app/thin.yml -R /path/to/my/app/config.ru start
-    
+
 And you should be up and running.
 
 If you want automatic commit processing, you currently need to be using

data/Rakefile

@@ -51,16 +51,19 @@ begin
     files  = `git ls-files`.split("\n").reject {|f| f =~ %r(^spec) || f =~ %r(^vendor/rspec) || f =~ /^\.git/ } 
     files += %w(spec/spec_helper.rb spec/form_field_matchers.rb)
 
-    s.name              = 'integrity'
-    s.summary           = 'The easy and fun Continuous Integration server'
-    s.description       = 'Your Friendly Continuous Integration server. Easy, fun and painless!'
-    s.homepage          = 'http://integrityapp.com'
-    s.rubyforge_project = 'integrity'
-    s.email             = 'contacto@nicolassanguinetti.info'
-    s.authors           = ['Nicolás Sanguinetti', 'Simon Rozet']
-    s.files             = files
+    s.name                 = 'integrity'
+    s.summary              = 'The easy and fun Continuous Integration server'
+    s.description          = 'Your Friendly Continuous Integration server. Easy, fun and painless!'
+    s.homepage             = 'http://integrityapp.com'
+    s.rubyforge_project    = 'integrity'
+    s.email                = 'contacto@nicolassanguinetti.info'
+    s.authors              = ['Nicolás Sanguinetti', 'Simon Rozet']
+    s.files                = files
+    s.executables          = ['integrity']
+    s.post_install_message = 'Run `integrity help` for information on how to setup Integrity.'
 
     s.add_dependency 'sinatra', ['>= 0.3.2']
+    s.add_dependency 'haml' # ah, you evil monkey you
     s.add_dependency 'dm-core', ['>= 0.9.5']
     s.add_dependency 'dm-validations', ['>= 0.9.5']
     s.add_dependency 'dm-types', ['>= 0.9.5']

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+patch: 2
 major: 0
 minor: 1
-patch: 1

data/app.rb

@@ -25,6 +25,12 @@ not_found do
   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

data/bin/integrity

@@ -7,11 +7,11 @@ require File.dirname(__FILE__) + "/../lib/integrity"
 class WithIntegrity < Thor
   include FileUtils
 
-  desc "Install integrity at PATH", 
-       "Copy template files at PATH. After this, edit the files to your convenience"
+  desc "install [PATH]",
+       "Copy template files to PATH. Next, go there and edit them."
   def install(path)
     @root = File.expand_path(path)
-    
+
     create_dir_structure
     copy_template_files
     edit_template_files
@@ -19,28 +19,28 @@ class WithIntegrity < Thor
     after_setup_message
   end
 
-  desc "Create database based on the config file at CONFIG",
+  desc "create_db [CONFIG]",
        "Checks the `database_uri` in CONFIG and creates and bootstraps a database for integrity"
   def create_db(config)
     Integrity.new(config)
     DataMapper.auto_migrate!
   end
-  
+
   private
     attr_reader :root
-    
+
     def create_dir_structure
       mkdir_p root
       mkdir_p root / "builds"
       mkdir_p root / "log"
     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"
     end
-    
+
     def edit_template_files
       edit_integrity_configuration
       edit_thin_configuration
@@ -58,7 +58,7 @@ class WithIntegrity < Thor
       config.gsub!(%r(/apps/integrity), root)
       File.open(root / 'thin.yml', 'w') { |f| f.puts config }
     end
-  
+
     def after_setup_message
       puts
       puts %Q(Awesome! Integrity was installed successfully!)

data/integrity.gemspec

@@ -1,20 +1,21 @@
 Gem::Specification.new do |s|
   s.name = %q{integrity}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicol\303\241s Sanguinetti", "Simon Rozet"]
-  s.date = %q{2008-11-17}
+  s.date = %q{2008-11-20}
+  s.default_executable = %q{integrity}
   s.description = %q{Your Friendly Continuous Integration server. Easy, fun and painless!}
   s.email = %q{contacto@nicolassanguinetti.info}
-  s.files = ["README.markdown", "Rakefile", "VERSION.yml", "app.rb", "bin/integrity", "config/config.sample.ru", "config/config.sample.yml", "config/thin.sample.yml", "integrity.gemspec", "lib/integrity.rb", "lib/integrity/build.rb", "lib/integrity/builder.rb", "lib/integrity/core_ext/object.rb", "lib/integrity/core_ext/string.rb", "lib/integrity/core_ext/time.rb", "lib/integrity/notifier.rb", "lib/integrity/notifier/base.rb", "lib/integrity/project.rb", "lib/integrity/scm.rb", "lib/integrity/scm/git.rb", "lib/integrity/scm/git/uri.rb", "public/buttons.css", "public/reset.css", "public/spinner.gif", "vendor/sinatra-hacks/lib/hacks.rb", "views/build.haml", "views/build_info.haml", "views/home.haml", "views/integrity.sass", "views/layout.haml", "views/new.haml", "views/not_found.haml", "views/notifier.haml", "views/project.haml", "views/unauthorized.haml", "spec/spec_helper.rb", "spec/form_field_matchers.rb"]
+  s.executables = ["integrity"]
+  s.files = ["README.markdown", "Rakefile", "VERSION.yml", "app.rb", "bin/integrity", "config/config.sample.ru", "config/config.sample.yml", "config/thin.sample.yml", "integrity.gemspec", "lib/integrity.rb", "lib/integrity/build.rb", "lib/integrity/builder.rb", "lib/integrity/core_ext/object.rb", "lib/integrity/core_ext/string.rb", "lib/integrity/core_ext/time.rb", "lib/integrity/notifier.rb", "lib/integrity/notifier/base.rb", "lib/integrity/project.rb", "lib/integrity/scm.rb", "lib/integrity/scm/git.rb", "lib/integrity/scm/git/uri.rb", "public/buttons.css", "public/reset.css", "public/spinner.gif", "vendor/sinatra-hacks/lib/hacks.rb", "views/build.haml", "views/build_info.haml", "views/error.haml", "views/home.haml", "views/integrity.sass", "views/layout.haml", "views/new.haml", "views/not_found.haml", "views/notifier.haml", "views/project.haml", "views/unauthorized.haml", "spec/spec_helper.rb", "spec/form_field_matchers.rb"]
   s.homepage = %q{http://integrityapp.com}
+  s.post_install_message = %q{Run `integrity help` for information on how to setup Integrity.}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{integrity}
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{The easy and fun Continuous Integration server}
-  s.executables          = ['integrity']
-  s.post_install_message = %q{Run `integrity help` for information on how to setup Integrity.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -22,6 +23,7 @@ Gem::Specification.new do |s|
 
     if current_version >= 3 then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<haml>, [">= 0"])
       s.add_runtime_dependency(%q<dm-core>, [">= 0.9.5"])
       s.add_runtime_dependency(%q<dm-validations>, [">= 0.9.5"])
       s.add_runtime_dependency(%q<dm-types>, [">= 0.9.5"])
@@ -35,6 +37,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.3.2"])
+      s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<dm-core>, [">= 0.9.5"])
       s.add_dependency(%q<dm-validations>, [">= 0.9.5"])
       s.add_dependency(%q<dm-types>, [">= 0.9.5"])
@@ -49,6 +52,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.3.2"])
+    s.add_dependency(%q<haml>, [">= 0"])
     s.add_dependency(%q<dm-core>, [">= 0.9.5"])
     s.add_dependency(%q<dm-validations>, [">= 0.9.5"])
     s.add_dependency(%q<dm-types>, [">= 0.9.5"])

data/lib/integrity/notifier/base.rb

@@ -2,7 +2,7 @@ module Integrity
   class Notifier
     class Base
       def self.notify_of_build(build, config)
-        new(build, config).deliver!
+        Timeout.timeout(8) { new(build, config).deliver! }
       end
 
       def self.to_haml

data/lib/integrity/project.rb

@@ -35,8 +35,9 @@ module Integrity
     end
 
     def previous_builds
-      return [] if builds.count <= 1
-      builds.all(:order => [:created_at.desc], :offset => 1, :limit => builds.count - 1)
+      builds.all(:order => [:created_at.desc]).tap do |builds|
+        builds.shift
+      end
     end
 
     def status
@@ -76,7 +77,11 @@ module Integrity
       
       def send_notifications
         notifiers.each do |notifier|
-          notifier.notify_of_build last_build
+          begin
+            notifier.notify_of_build last_build
+          rescue Timeout::Error
+            next
+          end
         end
       end
   end

data/lib/integrity.rb

@@ -1,5 +1,6 @@
-__DIR__ = File.dirname(__FILE__)
-$:.unshift "#{__DIR__}/integrity", *Dir["#{__DIR__}/../vendor/**/lib"].to_a
+current_dir = File.expand_path(File.dirname(__FILE__))
+vendor_lib_directories = Dir[File.join(current_dir, '..', 'vendor/**/lib')]
+$:.unshift File.join(current_dir, 'integrity'), *vendor_lib_directories
 
 require 'rubygems'
 require 'json'
@@ -17,7 +18,12 @@ require "core_ext/object"
 require "core_ext/string"
 require "core_ext/time"
 
-%w(project build builder scm scm/git notifier).each &method(:require)
+require 'project'
+require 'build'
+require 'builder'
+require 'scm'
+require 'scm/git'
+require 'notifier'
 
 module Integrity
   def self.new(config_file = nil)

data/views/error.haml

@@ -0,0 +1,29 @@
+.error
+  %h1
+    Whatever you do, DON'T PANIC!
+
+  %dl
+    %dt This is what happened:
+    %dd
+      %strong&= @error.message
+      %pre.backtrace= @error.backtrace.join("\n")
+
+    %dt What can I do?
+    %dd
+      Is your 
+      %a{ :href => "http://integrityapp.com/configure" } config 
+      ok? If not, try restarting integrity. If you think everything is fine,
+      then drop by our irc channel:
+      %a{ :href => "irc://irc.freenode.org:6667/integrity" } #integrity
+      on freenode, and we'll try to help.
+
+    %dt
+      What the hell is
+      = succeed "?" do
+        %strong Integrity
+    %dd
+      Integrity is your friendly
+      %a{ :href => "http://en.wikipedia.org/wiki/Continuous_integration" } Continuous Integration
+      server. If you want to know more about us, check our website at
+      = succeed "." do
+        %a{ :href => "http://integrityapp.com" } integrityapp.com

data/views/integrity.sass

@@ -213,6 +213,13 @@ a
         :family = !nice_fonts
     dd
       :line-height 1.4
+    
+    .backtrace
+      :margin 1em 0
+      :overflow scroll
+      :height 30em
+      :border = 1px solid !rule_color
+      :line-height 1.6
 
   #projects
     :margin 1em 0 2em

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: foca-integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,8 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-17 00:00:00 -08:00
-default_executable: 
+date: 2008-11-20 00:00:00 -08:00
+default_executable: integrity
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -22,6 +22,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
   version_requirement: 
@@ -157,6 +166,7 @@ files:
 - vendor/sinatra-hacks/lib/hacks.rb
 - views/build.haml
 - views/build_info.haml
+- views/error.haml
 - views/home.haml
 - views/integrity.sass
 - views/layout.haml