@@ -1,6 +1,7 @@ -require File.dirname(__FILE__) + "/lib/integrity" require "sinatra" -require "helpers" + +require File.dirname(__FILE__) + "/lib/integrity" +require "integrity/helpers" set :root, Integrity.root set :public, Integrity.root / "public" app.rb @@ -1,28 +1,28 @@ #!/usr/bin/env ruby -require 'rubygems' -require 'integrity' +require "rubygems" +require "integrity" # 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: +# 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 integrity's configuration. -Integrity.config = File.expand_path('./config.yml') +Integrity.config = File.expand_path("./config.yml") ####################################################################### ## ## ## == DON'T EDIT ANYTHING BELOW UNLESS YOU KNOW WHAT YOU'RE DOING == ## ## ## ####################################################################### -require Integrity.root / 'app' +require Integrity.root / "app" -set :public, Integrity.root / 'public' -set :views, Integrity.root / 'views' +set :public, Integrity.root / "public" +set :views, Integrity.root / "views" set :port, 8910 set :env, :production disable :run, :reload config/config.sample.ru @@ -1,7 +1,5 @@ -__DIR__ = File.dirname(__FILE__) -$:.unshift "#{__DIR__}/integrity", *Dir["#{__DIR__}/../vendor/**/lib"].to_a +$:.unshift File.expand_path(File.dirname(__FILE__)) -require "rubygems" require "json" require "dm-core" require "dm-validations" @@ -16,15 +14,15 @@ require "timeout" require "ostruct" require "fileutils" -require "core_ext/object" -require "core_ext/string" +require "integrity/core_ext/object" +require "integrity/core_ext/string" -require "project" -require "build" -require "project_builder" -require "scm" -require "scm/git" -require "notifier" +require "integrity/project" +require "integrity/build" +require "integrity/project_builder" +require "integrity/scm" +require "integrity/scm/git" +require "integrity/notifier" module Integrity def self.new(config_file = nil) lib/integrity.rb @@ -34,7 +34,7 @@ module Integrity attr_reader :root def migrate_db(direction, level=nil) - require 'migrations' + require "integrity/migrations" set_up_migrations unless migrations_already_set_up? add_initial_migration if tables_from_before_migrations_exist? lib/integrity/installer.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + "/../helpers" -require "installer" +require "integrity/installer" class InstallerTest < Test::Unit::AcceptanceTestCase story <<-EOS test/acceptance/installer_test.rb a236502e30f92b5296b4cadc55657afa054f35ea Simon Rozet simon@rozet.name http://github.com/edavis10/integrity/commit/ed04ce345ca010216acb91935261f74b09f74248 ed04ce345ca010216acb91935261f74b09f74248 2009-02-12T09:39:32-08:00 2009-02-04T11:22:30-08:00 Clean up $LOAD_PATH Dedicated to Ryan "Middleware" Tomayko ;-) See "Why "require 'rubygems'" In Your Library/App/Tests Is Wrong" <http://gist.github.com/54177> 930b51f3cb02d535674ae1139f21c189dbf9243e Simon Rozet simon@rozet.name