lib/spackle.rb in spackle-0.0.1 vs lib/spackle.rb in spackle-0.0.2
- old
+ new
@@ -1,12 +1,13 @@
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
+require 'project_scout'
+
require 'spackle/configuration'
require 'spackle/error'
require 'spackle/output'
require 'spackle/spec' if defined? Spec
-require 'spackle/helpers/ruby_project_root'
module Spackle
class << self
def already_initialized?
@already_initialized == true
@@ -60,11 +61,11 @@
# SPACKLE_CONFIG is mostly intended for use with the integration tests
config_files << File.expand_path(ENV['SPACKLE_CONFIG'])
else
config_files << File.expand_path("~/.spackle")
- project_root = Spackle::Helpers::RubyProjectRoot.search Dir.pwd
+ project_root = ProjectScout.scan Dir.pwd
if project_root
config_files << File.join(project_root, ".spackle")
end
end
@@ -76,10 +77,10 @@
config_loaded
end
end
def spackle_file
- projectname = Spackle::Helpers::RubyProjectRoot.search Dir.pwd
+ projectname = ProjectScout.scan Dir.pwd
projectname = File.basename(projectname) + ".spackle" if projectname
filename = configuration.spackle_file || projectname || "default.spackle"
File.join(tempdir, filename)
end