Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed all references to Rake::DSL methods and replaced with Rake gl…

…obals
  • Loading branch information...
commit be93e38d0940b054de58acbea879e2d44f281d94 1 parent 41805ec
@lukebayes authored
View
2  Gemfile
@@ -1,7 +1,7 @@
source "http://rubygems.org"
gem "bundler", ">= 0.9.19"
-gem "rake", ">= 0.9.0"
+gem "rake", ">= 0.9.2"
gem "rubyzip", "0.9.4"
gem "archive-tar-minitar", "0.5.2"
View
2  VERSION
@@ -1 +1 @@
-1.1.14.pre
+1.1.15.pre
View
1  lib/sprout.rb
@@ -4,7 +4,6 @@
# External tools and std libs:
require 'rake'
-require 'rake/dsl'
require 'delegate'
require 'logger'
View
2  lib/sprout/executable/base.rb
@@ -288,7 +288,7 @@ def to_rake *args
# Add the library resolution rake task
# as a prerequisite
- outer_task.prerequisites << task(Sprout::Library::TASK_NAME)
+ outer_task.prerequisites << Rake::Task.define_task(Sprout::Library::TASK_NAME)
prerequisites.each do |prereq|
outer_task.prerequisites << prereq
end
View
2  lib/sprout/executable/file_param.rb
@@ -42,7 +42,7 @@ def prepare_prerequisites
end
if prerequisite?(value)
- file value
+ Rake::FileTask.define_task value
belongs_to.prerequisites << value
end
end
View
2  lib/sprout/executable/files.rb
@@ -20,7 +20,7 @@ def to_shell_value
def prepare_prerequisites
value.each do |f|
- file f
+ Rake::FileTask.define_task f
belongs_to.prerequisites << f
end
end
View
2  lib/sprout/executable/path.rb
@@ -16,7 +16,7 @@ def prepare_prerequisites
if(value && !file_is_output?(value))
files = FileList[value + file_expression]
files.each do |f|
- file f
+ Rake::FileTask.define_task f
belongs_to.prerequisites << f
end
end
View
2  lib/sprout/executable/paths.rb
@@ -15,7 +15,7 @@ def prepare_prerequisites
value.each do |path|
files = FileList[path + file_expression]
files.each do |f|
- file f
+ Rake::FileTask.define_task f
belongs_to.prerequisites << f
end
end
View
4 lib/sprout/library.rb
@@ -254,10 +254,10 @@ def define_file_copy_task path, install_path
end
def define_file_task name
- file name do |t|
+ Rake::FileTask.define_task name do |t|
yield if block_given?
end
- task Sprout::Library::TASK_NAME => name
+ Rake::Task.define_task Sprout::Library::TASK_NAME => name
end
end
View
9 test/unit/executable_test.rb
@@ -236,9 +236,8 @@ def write_custom(value)
should "add libraries as provided" do
as_a_unix_system do
-
- task 'abcd'
- task 'bin/OtherFileTask.swf'
+ Rake::Task.define_task 'abcd'
+ Rake::Task.define_task 'bin/OtherFileTask.swf'
asunit_lib = Sprout::Library.new :name => :swc, :pkg_name => :asunit4, :path => 'lib/AsUnit-4.4.2.swc'
Sprout::Library.register asunit_lib
@@ -256,8 +255,8 @@ def write_custom(value)
should "accept configuration with prereqs as a file task" do
as_a_unix_system do
- task :clean
- task :other_task
+ Rake::Task.define_task :clean
+ Rake::Task.define_task :other_task
@tool = mxmlc 'bin/SomeFile.swf' => [:clean, :other_task] do |t|
t.source_path << 'test/fixtures/executable/src'
t.input = 'test/fixtures/executable/src/Main.as'
Please sign in to comment.
Something went wrong with that request. Please try again.