From 6d706084ac0482a9abb249493715a0169cc79b24 Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Tue, 10 Feb 2009 11:18:24 -0600 Subject: [PATCH] Update to Sprockets 0.9.0 --- Rakefile | 15 +++++++-------- vendor/sprockets | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Rakefile b/Rakefile index 3d1d726..a1c87d2 100755 --- a/Rakefile +++ b/Rakefile @@ -11,7 +11,6 @@ PROTOTYPE_TEST_UNIT_DIR = File.join(PROTOTYPE_TEST_DIR, 'unit') PROTOTYPE_TMP_DIR = File.join(PROTOTYPE_TEST_UNIT_DIR, 'tmp') PROTOTYPE_VERSION = YAML.load(IO.read(File.join(PROTOTYPE_SRC_DIR, 'constants.yml')))['PROTOTYPE_VERSION'] -$:.unshift File.join(PROTOTYPE_ROOT, 'lib') $:.unshift File.join(PROTOTYPE_ROOT, 'vendor', 'sprockets', 'lib') task :default => [:dist, :dist_helper, :package, :clean_package_source] @@ -26,13 +25,13 @@ def sprocketize(path, source, destination = source) puts "\nand you should be all set.\n\n" end - environment = Sprockets::Environment.new(File.join(PROTOTYPE_ROOT, path), [File.join(PROTOTYPE_ROOT, "src")]) - preprocessor = Sprockets::Preprocessor.new(environment) - preprocessor.require(environment.find(source).source_file) - - File.open(File.join(PROTOTYPE_DIST_DIR, destination), 'w+') do |dist| - dist.write(preprocessor.output_file) - end + secretary = Sprockets::Secretary.new( + :root => File.join(PROTOTYPE_ROOT, path), + :load_path => [PROTOTYPE_SRC_DIR], + :source_files => [source] + ) + + secretary.concatenation.save_to(File.join(PROTOTYPE_DIST_DIR, destination)) end desc "Builds the distribution." diff --git a/vendor/sprockets b/vendor/sprockets index 05108e6..225b17f 160000 --- a/vendor/sprockets +++ b/vendor/sprockets @@ -1 +1 @@ -Subproject commit 05108e6ca76352b8954b066cf041865415fd6bf9 +Subproject commit 225b17f7ee1926d6e9b63a4e2cddbcd2e534ba01