foca-integrity 0.1.3 → 0.1.4

data/Rakefile

@@ -75,6 +75,7 @@ begin
     s.add_dependency 'foca-sinatra-diddies', ['>= 0.0.2']
     s.add_dependency 'rspec_hpricot_matchers'
     s.add_dependency 'thor'
+    s.add_dependency 'bcrypt-ruby'
   end
 rescue LoadError
 end

data/VERSION.yml

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

data/app.rb

@@ -104,9 +104,15 @@ post "/:project/push" do
 
   begin
     payload = JSON.parse(params[:payload] || "")
-    payload['commits'].reverse.each do |commit|
-      current_project.build(commit['id']) if payload['ref'] =~ /#{current_project.branch}/
+
+    if Integrity.config[:build_all_commits]
+      payload['commits'].sort_by { |commit| Time.parse(commit['timestamp']) }.each do |commit|
+        current_project.build(commit['id']) if payload['ref'] =~ /#{current_project.branch}/
+      end
+    else
+      current_project.build(payload['after']) if payload['ref'] =~ /#{current_project.branch}/
     end
+
     'Thanks, build started.'
   rescue JSON::ParserError => exception
     invalid_payload!(exception.to_s)

data/bin/integrity

@@ -15,7 +15,7 @@ class WithIntegrity < Thor
     create_dir_structure
     copy_template_files
     edit_template_files
-    create_db(root / 'config.yml')
+    create_db(root / "config.yml")
     after_setup_message
   end
 
@@ -55,9 +55,9 @@ class WithIntegrity < Thor
     end
 
     def edit_thin_configuration
-      config = File.read(root / 'thin.yml')
+      config = File.read(root / "thin.yml")
       config.gsub! %r(/apps/integrity), root
-      File.open(root / 'thin.yml', 'w') { |f| f.puts config }
+      File.open(root / "thin.yml", 'w') { |f| f.puts config }
     end
 
     def after_setup_message

data/integrity.gemspec

@@ -1,12 +1,10 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{integrity}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   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-22}
+  s.date = %q{2008-12-08}
   s.default_executable = %q{integrity}
   s.description = %q{Your Friendly Continuous Integration server. Easy, fun and painless!}
   s.email = %q{contacto@nicolassanguinetti.info}
@@ -16,14 +14,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.3.1}
+  s.rubygems_version = %q{1.2.0}
   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 Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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"])
@@ -37,6 +35,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<foca-sinatra-diddies>, [">= 0.0.2"])
       s.add_runtime_dependency(%q<rspec_hpricot_matchers>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
+      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.3.2"])
       s.add_dependency(%q<haml>, [">= 0"])
@@ -51,6 +50,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<foca-sinatra-diddies>, [">= 0.0.2"])
       s.add_dependency(%q<rspec_hpricot_matchers>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
+      s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.3.2"])
@@ -66,5 +66,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<foca-sinatra-diddies>, [">= 0.0.2"])
     s.add_dependency(%q<rspec_hpricot_matchers>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
+    s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
   end
 end

data/lib/integrity.rb

@@ -13,9 +13,9 @@ require 'yaml'
 require 'logger'
 require 'digest/sha1'
 
-require "core_ext/object"
-require "core_ext/string"
-require "core_ext/time"
+require 'core_ext/object'
+require 'core_ext/string'
+require 'core_ext/time'
 
 require 'project'
 require 'build'
@@ -35,11 +35,12 @@ module Integrity
   end
 
   def self.default_configuration
-    @defaults ||= { :database_uri     => 'sqlite3::memory:',
-                    :export_directory => root / 'exports',
-                    :log              => STDOUT,
-                    :base_uri         => 'http://localhost:8910',
-                    :use_basic_auth   => false }
+    @defaults ||= { :database_uri      => 'sqlite3::memory:',
+                    :export_directory  => root / 'exports',
+                    :log               => STDOUT,
+                    :base_uri          => 'http://localhost:8910',
+                    :use_basic_auth    => false,
+                    :build_all_commits => true}
   end
 
   def self.config
@@ -49,12 +50,22 @@ module Integrity
   def self.config=(file)
     @config = default_configuration.merge(YAML.load_file(file))
   end
-
-  def self.logger
-    @logger ||= Logger.new(config[:log])
+  
+  def self.log(message, &block)
+    logger.info(message, &block)
   end
 
-  def self.logger=(file)
-    @logger = Logger.new(file)
+  def self.logger
+    @logger ||= Logger.new(config[:log], "daily").tap do |logger|
+      logger.formatter = LogFormatter.new
+    end
   end
+  
+  private
+  
+    class LogFormatter < Logger::Formatter
+      def call(severity, time, progname, msg)
+        time.strftime("[%H:%M:%S] ") + msg2str(msg) + "\n"
+      end
+    end
 end

data/lib/integrity/builder.rb

@@ -13,7 +13,7 @@ module Integrity
     end
 
     def build(commit)
-      Integrity.logger.info "Building #{commit} (#{@branch}) of #{@build.project.name} in #{export_directory} using #{scm_name}"
+      Integrity.log "Building #{commit} (#{@branch}) of #{@build.project.name} in #{export_directory} using #{scm_name}"
       @scm.with_revision(commit) { run_build_script }
       @build
     ensure
@@ -38,7 +38,7 @@ module Integrity
       end
 
       def run_build_script
-        Integrity.logger.info "Running `#{build_script}` in #{@scm.working_directory}"
+        Integrity.log "Running `#{build_script}` in #{@scm.working_directory}"
 
         IO.popen "(cd #{@scm.working_directory} && #{build_script}) 2>&1", "r" do |pipe|
           @build.output = pipe.read

data/lib/integrity/notifier.rb

@@ -12,16 +12,15 @@ module Integrity
     validates_present :project_id
     
     def self.available
-      @available ||= constants.map {|name| const_get(name) }.select do |notifier|
-        notifier.respond_to?(:to_haml) && notifier.respond_to?(:notify_of_build)
-      end - [Notifier::Base]
+      @available ||= constants.map { |name| const_get(name) }.select { |notifier| valid_notifier?(notifier) }
     end
     
     def self.enable_notifiers(project, enabled, config={})
-      all.destroy!
+      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)
@@ -35,12 +34,14 @@ module Integrity
       end
       
       def self.list_of_enabled_notifiers(names)
-        case names
-          when Array then names
-          when NilClass then []
-          else [names]
-        end
+        [*names].reject { |n| n.nil? }
+      end
+      private_class_method :list_of_enabled_notifiers
+
+      def self.valid_notifier?(notifier)
+        notifier.respond_to?(:to_haml) && notifier.respond_to?(:notify_of_build) && notifier != Notifier::Base
       end
+      private_class_method :valid_notifier?
   end
 end
 

data/lib/integrity/project.rb

@@ -78,9 +78,10 @@ module Integrity
       def send_notifications
         notifiers.each do |notifier|
           begin
+            Integrity.log "Notifying of build #{last_build.short_commit_identifier} using the #{notifier.name} notifier"
             notifier.notify_of_build last_build
           rescue Timeout::Error
-            Integrity.logger.info "#{notifier.name} notifier timed out"
+            Integrity.log "#{notifier.name} notifier timed out"
             next
           end
         end

data/lib/integrity/scm/git.rb

@@ -76,7 +76,7 @@ module Integrity
         end
 
         def log(message)
-          Integrity.logger.info("Git") { message }
+          Integrity.log("Git") { message }
         end
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 require File.dirname(__FILE__) + '/../lib/integrity'
 require 'spec'
 
+module LoggingSpecHelper
+  def self.included(mod)
+    mod.before(:each) { Integrity.stub!(:log) }
+  end
+end
+
 module NotifierSpecHelper
   def self.included(mod)
     mod.before(:each) { Integrity.stub!(:config).and_return(:base_uri => "http://localhost:4567") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: foca-integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-22 00:00:00 -08:00
+date: 2008-12-08 00:00:00 -08:00
 default_executable: integrity
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Your Friendly Continuous Integration server. Easy, fun and painless!
 email: contacto@nicolassanguinetti.info
 executables: