lib/bones/initializer.rb @@ -1,7 +1,5 @@ #!/usr/bin/env ruby -# $:.unshift(File.dirname(__FILE__) + '/../') -require 'fileutils' - +require File.join(File.dirname(__FILE__), '../lib/boot') path = ARGV.shift if path.nil? @@ -13,10 +11,4 @@ end path = File.expand_path(path) FileUtils.mkdir(path) unless File.directory?(path) -# Set the root to the path -BONES_ROOT = path - -require 'boot.rb' -require 'init.rb' - -BonesInitializer.run \ No newline at end of file +Bones::Initializer.run(path) \ No newline at end of file bin/bones @@ -1,30 +1,22 @@ -require File.join(File.dirname(__FILE__), 'bones.rb') +require 'rubygems' +require 'activesupport' -Bones.root = BONES_ROOT if Object.const_defined?(:BONES_ROOT) +require File.join(File.dirname(__FILE__), 'bones.rb') +require File.join(File.dirname(__FILE__), 'extensions.rb') -# $:.unshift(Bones.system_path) -# $:.unshift(File.join(Bones.root, 'lib')) +# Bones.root = BONES_ROOT if Object.const_defined?(:BONES_ROOT) +ActiveSupport::Dependencies.load_paths.push << Bones.system_path -require 'rubygems' require 'yaml' require 'rack' require 'rack/request' require 'rack/response' -require 'activesupport' - -ActiveSupport::Dependencies.load_paths.push << Bones.system_path -require 'lib/extensions' require 'fileutils' require 'optparse' require 'ostruct' require 'erb' - -# require 'bones/cache' -# require 'bones/release' -# require 'bones/template' - Bones.booted = true def directories(base) lib/boot.rb lib/init.rb acc05db5d75e7d9cb2793b8274c82276a1f19aaa Chris Scharf scharfie@gmail.com http://github.com/scharfie/bones/commit/f6abde9cadb31078d5803c9e78fb67270cbf418b f6abde9cadb31078d5803c9e78fb67270cbf418b 2009-02-05T18:15:25-08:00 2009-02-05T18:15:25-08:00 Fixing bones binary 0ffc4b81250d6e4c6fa239e0215a3117cec96759 Chris Scharf scharfie@gmail.com