From 8d5a7b39751139a08cfc681f59cb6f0e40f37137 Mon Sep 17 00:00:00 2001 From: Steve Tooke Date: Wed, 9 Apr 2008 11:31:20 +0100 Subject: [PATCH] fix up rakefile tasks for freezing merb --- merb-gen/app_generators/merb/templates/Rakefile | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/merb-gen/app_generators/merb/templates/Rakefile b/merb-gen/app_generators/merb/templates/Rakefile index 2ceffbc..a502364 100644 --- a/merb-gen/app_generators/merb/templates/Rakefile +++ b/merb-gen/app_generators/merb/templates/Rakefile @@ -74,20 +74,20 @@ class Freezer exit 1 end - unless File.directory?(framework_dir) + unless File.directory?(Freezer.framework_dir) puts "Creating framework directory ..." - FileUtils.mkdir_p(framework_dir) + FileUtils.mkdir_p(Freezer.framework_dir) end if managed? puts "#{@component} seems to be already managed by git-submodule." if @update puts "Trying to update #{@component} ..." - sh "cd #{framework_dir}/#{@component} && git-pull" + sh "cd #{Freezer.framework_dir}/#{@component} && git-pull" end else puts "Creating submodule for #{@component} ..." - sh "git-submodule --quiet add #{components[@component.gsub("merb-", '')]} #{File.basename(framework_dir)}/#{@component}" + sh "git-submodule --quiet add #{Freezer.components[@component.gsub("merb-", '')]} #{File.basename(Freezer.framework_dir)}/#{@component}" if $?.success? sh("git-submodule init") else @@ -100,12 +100,12 @@ class Freezer protected def in_submodule? - return false unless File.exists?(gitmodules) - File.read(gitmodules) =~ %r![submodule "#{framework_dir}/#{@component}"]! + return false unless File.exists?(Freezer.gitmodules) + File.read(Freezer.gitmodules) =~ %r!\[submodule.+#{@component}\"\]! end def managed? - File.directory?(File.join(framework_dir, @component)) || in_submodule? + File.directory?(File.join(Freezer.framework_dir, @component)) || in_submodule? end def in_path?(bin) -- 1.5.4.3