foca-integrity 0.1.2 → 0.1.3

data/VERSION.yml

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

data/bin/integrity

@@ -48,14 +48,15 @@ class WithIntegrity < Thor
 
     def edit_integrity_configuration
       config = File.read(root / "config.yml")
-      config.gsub!(%r(sqlite3:///var/integrity.db), "sqlite3://#{root}/integrity.db")
-      config.gsub!(%r(/path/to/scm/exports),        "#{root}/builds")
-      File.open(root / "config.yml", "w") {|f| f.puts config }
+      config.gsub! %r(sqlite3:///var/integrity.db), "sqlite3://#{root}/integrity.db"
+      config.gsub! %r(/path/to/scm/exports),        "#{root}/builds"
+      config.gsub! %r(/var/log),                    "#{root}/log"
+      File.open(root / "config.yml", "w") { |f| f.puts config }
     end
 
     def edit_thin_configuration
       config = File.read(root / 'thin.yml')
-      config.gsub!(%r(/apps/integrity), root)
+      config.gsub! %r(/apps/integrity), root
       File.open(root / 'thin.yml', 'w') { |f| f.puts config }
     end
 

data/config/config.sample.yml

@@ -13,6 +13,9 @@
 # writable by the user that runs Integrity.
 :export_directory: /path/to/scm/exports
 
+# Path to the integrity log file
+:log: /var/log/integrity.log
+
 # Enable or disable HTTP authentication for the app. BE AWARE that if you 
 # disable this anyone can delete and alter projects, so do it only if your 
 # app is running in a controlled environment (ie, behind your company's

data/integrity.gemspec

@@ -1,10 +1,12 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{integrity}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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-20}
+  s.date = %q{2008-11-22}
   s.default_executable = %q{integrity}
   s.description = %q{Your Friendly Continuous Integration server. Easy, fun and painless!}
   s.email = %q{contacto@nicolassanguinetti.info}
@@ -14,14 +16,14 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.1}
   s.summary = %q{The easy and fun Continuous Integration server}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') 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"])

data/lib/integrity.rb

@@ -1,6 +1,5 @@
-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
+__DIR__ = File.dirname(__FILE__)
+$:.unshift "#{__DIR__}/integrity", *Dir["#{__DIR__}/../vendor/**/lib"].to_a
 
 require 'rubygems'
 require 'json'
@@ -38,9 +37,9 @@ module Integrity
   def self.default_configuration
     @defaults ||= { :database_uri     => 'sqlite3::memory:',
                     :export_directory => root / 'exports',
-                    :log      => STDOUT,
-                    :base_uri => 'http://localhost:8910',
-                    :use_basic_auth => false }
+                    :log              => STDOUT,
+                    :base_uri         => 'http://localhost:8910',
+                    :use_basic_auth   => false }
   end
 
   def self.config

data/lib/integrity/project.rb

@@ -80,6 +80,7 @@ module Integrity
           begin
             notifier.notify_of_build last_build
           rescue Timeout::Error
+            Integrity.logger.info "#{notifier.name} notifier timed out"
             next
           end
         end

data/lib/integrity/scm/git.rb

@@ -43,6 +43,7 @@ module Integrity
         end
     
         def clone
+          log "Cloning #{uri} to #{working_directory}"
           `git clone #{uri} #{working_directory}`
         end
 
@@ -52,11 +53,13 @@ module Integrity
             when local_branches.include?(branch) then branch
             else                                      "-b #{branch} origin/#{branch}"
           end
-          
+
+          log "Checking-out #{strategy}"
           `cd #{working_directory} && git checkout #{strategy}`
         end
 
         def pull
+          log "Pull-ing in #{working_directory}"
           `cd #{working_directory} && git pull`
         end
 
@@ -71,6 +74,10 @@ module Integrity
         def on_branch?
           File.basename(`cd #{working_directory} && git symbolic-ref HEAD`).chomp == branch
         end
+
+        def log(message)
+          Integrity.logger.info("Git") { message }
+        end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: foca-integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-20 00:00:00 -08:00
+date: 2008-11-22 00:00:00 -08:00
 default_executable: integrity
 dependencies: 
 - !ruby/object:Gem::Dependency