integrity 0.1.8 → 0.1.9

data/README.markdown

@@ -8,6 +8,13 @@ Integrity
 * Join us on [#integrity][irc-channel] for ideas, help, patches or something
 * Get the code on [GitHub][repo]
 
+Try it!
+-------
+
+    $ git clone git://github.com/foca/integrity.git
+    $ rake launch
+    # Navigate to <http://0.0.0.0:4567>
+
 Thanks
 ------
 

data/Rakefile

@@ -2,14 +2,43 @@ require "rake/testtask"
 require "rake/clean"
 require "rcov/rcovtask"
 
-require File.dirname(__FILE__) + "/lib/integrity"
+begin
+  require "metric_fu"
+rescue LoadError
+end
+
+module Integrity
+  def self.version
+    YAML.load_file("VERSION.yml").values.join(".")
+  end
+end
 
-desc "Run all tests and check test coverage"
-task :default => "test:coverage:verify"
+desc "Default: run all tests"
+task :default => :test
+
+desc "Special task for running tests on <http://builder.integrityapp.com>"
+task :ci do
+  sh "git submodule update --init"
+
+  Rake::Task["test"].invoke
+
+  metrics = %w(flay flog:all reek roodi saikuro)
+  metrics.each { |m| Rake::Task["metrics:#{m}"].invoke }
+
+  rm_rf "/var/www/integrity-metrics"
+  mv "tmp/metric_fu", "/var/www/integrity-metrics"
+
+  File.open("/var/www/integrity-metrics/index.html", "w") { |f|
+    f << "<ul>"
+    metrics.map { |m| m.split(":").first }.each { |m|
+      f << %Q(<li><a href="/#{m}">#{m}</a></li>)
+    }
+    f << "</ul>"
+  }
+end
 
 desc "Run tests"
 task :test => %w(test:units test:acceptance)
-
 namespace :test do
   Rake::TestTask.new(:units) do |t|
     t.test_files = FileList["test/unit/*_test.rb"]
@@ -19,110 +48,18 @@ namespace :test do
     t.test_files = FileList["test/acceptance/*_test.rb"]
   end
 
-  desc "Measure test coverage"
-  task :coverage => %w(test:coverage:units test:coverage:acceptance)
-
-  namespace :coverage do
-    desc "Measure test coverage of unit tests"
-    Rcov::RcovTask.new(:units) do |rcov|
-      rcov.pattern   = "test/unit/*_test.rb"
-      rcov.rcov_opts = %w(--html --aggregate .aggregated_coverage_report)
-      rcov.rcov_opts << ENV["RCOV_OPTS"] if ENV["RCOV_OPTS"]
-    end
-
-    desc "Measure test coverage of acceptance tests"
-    Rcov::RcovTask.new(:acceptance) do |rcov|
-      rcov.pattern   = "test/acceptance/*_test.rb"
-      rcov.rcov_opts = %w(--html --aggregate .aggregated_coverage_report)
-      rcov.rcov_opts << ENV["RCOV_OPTS"] if ENV["RCOV_OPTS"]
-    end
-
-    desc "Verify test coverage"
-    task :verify => "test:coverage" do
-      File.read("coverage/index.html") =~ /<tt class='coverage_total'>\s*(\d+\.\d+)%\s*<\/tt>/
-      coverage = $1.to_f
-
-      puts
-      if coverage == 100
-        puts "\e[32m100% coverage! Awesome!\e[0m"
-      else
-        puts "\e[31mOnly #{coverage}% code coverage. You can do better ;)\e[0m"
-      end
-    end
-  end
-
   desc "Install all gems on which the tests depend on"
   task :install_dependencies do
-    system 'gem install redgreen rr mocha ruby-debug dm-sweatshop webrat'
-    system 'gem install -s http://gems.github.com jeremymcanally-context jeremymcanally-matchy jeremymcanally-pending foca-storyteller'
-  end
-end
-
-namespace :db do
-  desc "Setup connection."
-  task :connect do
-    config = File.expand_path(ENV['CONFIG']) if ENV['CONFIG']
-    config = Integrity.root / 'config.yml' if File.exists?(Integrity.root / 'config.yml')
-    Integrity.new(config)
-  end
-
-  desc "Automigrate the database"
-  task :migrate => :connect do
-    require "project"
-    require "build"
-    require "notifier"
-    DataMapper.auto_migrate!
+    system "gem install rr mocha dm-sweatshop ZenTest"
+    system "gem install -s http://gems.github.com jeremymcanally-context \
+jeremymcanally-matchy jeremymcanally-pending foca-storyteller"
+    system "git submodule update --init"
   end
 end
 
-# tx RMT :)
-namespace :rubyforge do
-  def package(ext="")
-    "dist/integrity-#{Integrity.version}" + ext
-  end
-
-  directory "dist/"
-  CLOBBER.include("dist")
-
-  desc "Build packages"
-  task :package => %w[.gem .tar.gz].map { |ext| package(ext) } << :changelog
-
-  desc "Build and install as local gem"
-  task :install => package(".gem") do
-    sh "gem install #{package(".gem")}"
-  end
-
-  file package(".gem") => %w[dist/ integrity.gemspec] do |f|
-    sh "gem build integrity.gemspec"
-    mv File.basename(f.name), f.name
-  end
-
-  file package('.tar.gz') => %w[dist/] do |f|
-    sh <<-SH
-      git archive \
-        --prefix=integrity-#{Integrity.version}/ \
-        --format=tar \
-        HEAD | gzip > #{f.name}
-    SH
-  end
-
-  desc "Publish gem and tarball to rubyforge"
-  task "publish:gem" => [package(".gem"), package(".tar.gz")] do |t|
-    sh <<-end
-      rubyforge add_release integrity integrity #{Integrity.version} #{package('.gem')} &&
-      rubyforge add_file    integrity integrity #{Integrity.version} #{package('.tar.gz')}
-    end
-  end
-
-  file "dist/git-changelog.py" => %w[dist/] do
-    sh "cd dist && wget http://gist.github.com/raw/62837/bc6d2c6102933c3eac5fa33afd3effd7ab97edb7/git-changelog.py"
-  end
-
-  task :changelog => ["dist/git-changelog.py"] do
-    sh "python git-changelog.py"
-    sh "git add ChangeLog"
-    sh 'git commit -m "Regenerated ChangeLog"'
-  end
+desc "Launch Integrity real quick"
+task :launch do
+  ruby "bin/integrity launch"
 end
 
 begin
@@ -130,36 +67,26 @@ begin
 
   namespace :jeweler do
     Jeweler::Tasks.new do |s|
-      files  = `git ls-files`.split("\n").reject {|f| f =~ %r(^test/acceptance) || f =~ %r(^test/unit) || f =~ /^\.git/ }
-
-      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.9.0.3']
-      s.add_dependency 'haml',    ['>= 2.0.0']
-      s.add_dependency 'dm-core', ['>= 0.9.5']
-      s.add_dependency 'dm-validations', ['>= 0.9.5']
-      s.add_dependency 'dm-types', ['>= 0.9.5']
-      s.add_dependency 'dm-timestamps', ['>= 0.9.5']
-      s.add_dependency 'dm-aggregates', ['>= 0.9.5']
-      s.add_dependency 'dm-migrations', ['>= 0.9.5']
-      s.add_dependency 'data_objects', ['>= 0.9.5']
-      s.add_dependency 'do_sqlite3', ['>= 0.9.5']
-      s.add_dependency 'json'
-      s.add_dependency 'foca-sinatra-diddies', ['>= 0.0.2']
-      s.add_dependency 'thor'
-      s.add_dependency 'uuidtools' # required by dm-types
-      s.add_dependency 'bcrypt-ruby' # required by dm-types
+      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                = FileList["[A-Z]*", "{bin,lib,views,public,config,test,vendor}/**/*"]
+      s.executables          = ["integrity"]
+      s.post_install_message = "Run `integrity help` for information on how to setup Integrity."
+
+      s.add_dependency "sinatra", [">= 0.9.1.1"]
+      s.add_dependency "haml",    [">= 2.0.0"]
+      s.add_dependency "data_mapper", [">= 0.9.10"]
+      s.add_dependency "uuidtools"   # required by dm-types
+      s.add_dependency "bcrypt-ruby" # required by dm-types
+      s.add_dependency "json"
+      s.add_dependency "foca-sinatra-ditties", [">= 0.0.3"]
+      s.add_dependency "thor"
     end
   end
 rescue LoadError
 end
-

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 major: 0
-patch: 8
+patch: 9
 minor: 1

data/config/config.ru

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + "/../lib/integrity"
+require "rack/lobster"
+# If you want to add any notifiers, install the gems and then require them here
+# For example, to enable the Email notifier: install the gem (from github:
+#
+#   sudo gem install -s http://gems.github.com foca-integrity-email
+#
+# And then uncomment the following line:
+#
+# require "notifier/email"
+
+# Load configuration and initialize Integrity
+Integrity.new#(File.dirname(__FILE__) + "/config.yml")
+DataMapper.auto_migrate!
+
+# You probably don't want to edit anything below
+Integrity::App.set :environment, ENV["RACK_ENV"] || :production
+Integrity::App.set :port,        8910
+rack = proc do |env|
+  [200, { 'Content-Type' => 'text/html' }, "#{env['rack.session'].inspect}"]
+end
+
+map "/foo" do
+  run Integrity::App
+end
+map "/" do
+  run rack
+end

data/config/config.sample.ru

@@ -11,21 +11,11 @@ require "integrity"
 #
 # require "notifier/email"
 
-# Load integrity's configuration.
-Integrity.config = File.expand_path("./config.yml")
+# Load configuration and initialize Integrity
+Integrity.new(File.dirname(__FILE__) + "/config.yml")
 
-#######################################################################
-##                                                                   ##
-## == DON'T EDIT ANYTHING BELOW UNLESS YOU KNOW WHAT YOU'RE DOING == ##
-##                                                                   ##
-#######################################################################
-require Integrity.root / "app"
+# You probably don't want to edit anything below
+Integrity::App.set :environment, ENV["RACK_ENV"] || :production
+Integrity::App.set :port,        8910
 
-set     :environment, ENV["RACK_ENV"] || :production
-set     :public,      Integrity.root / "public"
-set     :views,       Integrity.root / "views"
-set     :port,        8910
-disable :run, :reload
-
-use Rack::CommonLogger, Integrity.logger if Integrity.config[:log_debug_info]
-run Sinatra::Application
+run Integrity::App

data/config/config.sample.yml

@@ -4,24 +4,27 @@
 #   http://builder.integrityapp.com
 :base_uri: http://integrity.domain.tld
 
-# This should be a complete connection string to your database. For example 
-# `mysql://user@localhost/integrity` (you need an `integrity` db created in 
-# localhost, of course).
+# This should be a complete connection string to your database.
+#
+# Examples:
+# * `mysql://user:password@localhost/integrity`
+# * `postgres://user:password@localhost/integrity`
+# * `sqlite3:///home/integrity/db/integrity.sqlite`
+#
+# Note:
+# * The appropriate data_objects adapter must be installed (`do_mysql`, etc)
+# * You must create the `integrity` database on localhost, of course.
 :database_uri: sqlite3:///var/integrity.db
 
-# This is where your project's code will be checked out to. Make sure it's 
+# This is where your project's code will be checked out to. Make sure it's
 # 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/Disable debug logging. Turning this on will log queries made to the
-# database and web requests (if using the provided rackup file)
-:log_debug_info: false
-
-# 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 
+# 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
 # firewall.)
 :use_basic_auth: false
@@ -29,10 +32,10 @@
 # When `use_basic_auth` is true, the admin's username for HTTP authentication.
 :admin_username: username
 
-# When `use_basic_auth` is true, the admin's password. Usually saved as a 
+# When `use_basic_auth` is true, the admin's password. Usually saved as a
 # SHA1 hash. See the next option.
 :admin_password: a94a8fe5ccb19ba61c4c0873d391e987982fbbd3
 
-# If this is true, then whenever we authenticate the admin user, will hash 
+# If this is true, then whenever we authenticate the admin user, will hash
 # it using SHA1. If not, we'll assume the provided password is in plain text.
 :hash_admin_password: true

data/config/config.yml

@@ -0,0 +1,34 @@
+# Domain where integrity will be running from. This is used to have
+# nice URLs in your notifications.
+# For example:
+#   http://builder.integrityapp.com
+:base_uri: http://0.0.0.0:1234
+
+# This should be a complete connection string to your database. For example
+# `mysql://user@localhost/integrity` (you need an `integrity` db created in
+# localhost, of course).
+:database_uri: sqlite3:///home/simon/tmp/integrity.db
+
+# This is where your project's code will be checked out to. Make sure it's
+# writable by the user that runs Integrity.
+:export_directory: /home/simon/tmp/integrity_exports
+
+# Path to the integrity log file
+:log: /tmp/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
+# firewall.)
+:use_basic_auth: false
+
+# When `use_basic_auth` is true, the admin's username for HTTP authentication.
+:admin_username: username
+
+# When `use_basic_auth` is true, the admin's password. Usually saved as a
+# SHA1 hash. See the next option.
+:admin_password: a94a8fe5ccb19ba61c4c0873d391e987982fbbd3
+
+# If this is true, then whenever we authenticate the admin user, will hash
+# it using SHA1. If not, we'll assume the provided password is in plain text.
+:hash_admin_password: true

data/lib/integrity.rb

@@ -6,33 +6,36 @@ require "dm-validations"
 require "dm-types"
 require "dm-timestamps"
 require "dm-aggregates"
+require "sinatra/base"
 
 require "yaml"
 require "logger"
 require "digest/sha1"
 require "timeout"
 require "ostruct"
-require "fileutils"
+require "pathname"
 
 require "integrity/core_ext/object"
-require "integrity/core_ext/string"
 
 require "integrity/project"
+require "integrity/author"
+require "integrity/commit"
 require "integrity/build"
 require "integrity/project_builder"
 require "integrity/scm"
 require "integrity/scm/git"
 require "integrity/notifier"
+require "integrity/helpers"
+require "integrity/app"
 
 module Integrity
   def self.new(config_file = nil)
-    self.config = config_file unless config_file.nil?
-    DataMapper.logger = self.logger if config[:log_debug_info]
+    self.config = YAML.load_file(config_file) unless config_file.nil?
     DataMapper.setup(:default, config[:database_uri])
   end
 
   def self.root
-    File.expand_path(File.join(File.dirname(__FILE__), ".."))
+    Pathname.new(File.dirname(__FILE__)).join("..").expand_path
   end
 
   def self.default_configuration
@@ -42,15 +45,15 @@ module Integrity
                     :base_uri          => "http://localhost:8910",
                     :use_basic_auth    => false,
                     :build_all_commits => true,
-                    :log_debug_info    => false }
+                    :log_debug_info    => false }.dup
   end
 
   def self.config
     @config ||= default_configuration
   end
 
-  def self.config=(file)
-    @config = default_configuration.merge(YAML.load_file(file))
+  def self.config=(options)
+    @config = default_configuration.merge(options)
   end
 
   def self.log(message, &block)
@@ -64,14 +67,11 @@ module Integrity
   end
 
   def self.version
-    @version ||= begin
-      file = YAML.load_file(Integrity.root / "VERSION.yml")
-      "#{file['major']}.#{file['minor']}.#{file['patch']}"
-    end
+    YAML.load_file(File.dirname(__FILE__) + "/../VERSION.yml").
+      values.join(".")
   end
 
   private
-
     class LogFormatter < Logger::Formatter
       def call(severity, time, progname, msg)
         time.strftime("[%H:%M:%S] ") + msg2str(msg) + "\n"