sprout 1.1.14.pre → 1.1.15.pre

data/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"
 

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ParseTree (3.0.6)
+    ParseTree (3.0.7)
       RubyInline (>= 3.7.0)
       sexp_processor (>= 3.0.0)
-    RubyInline (3.8.6)
+    RubyInline (3.9.0)
       ZenTest (~> 4.3)
-    ZenTest (4.4.0)
+    ZenTest (4.5.0)
     archive-tar-minitar (0.5.2)
-    flay (1.4.1)
+    flay (1.4.2)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    flog (2.5.0)
+    flog (2.5.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
     heckle (1.4.3)
@@ -20,17 +20,17 @@ GEM
       ruby2ruby (>= 1.1.6)
     mocha (0.9.12)
     open4 (1.0.1)
-    rake (0.9.0)
+    rake (0.9.2)
     rcov (0.9.9)
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.5)
+    ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
     rubyzip (0.9.4)
     sexp_processor (3.0.5)
     shoulda (2.11.3)
-    yard (0.6.8)
+    yard (0.7.1)
 
 PLATFORMS
   ruby
@@ -43,7 +43,7 @@ DEPENDENCIES
   heckle
   mocha
   open4 (>= 0.9.6)
-  rake (>= 0.9.0)
+  rake (>= 0.9.2)
   rcov
   rubyzip (= 0.9.4)
   shoulda

data/VERSION

@@ -1 +1 @@
-1.1.14.pre
+1.1.15.pre

data/lib/sprout.rb

@@ -4,7 +4,6 @@ $:.unshift lib unless $:.include?(lib)
 
 # External tools and std libs:
 require 'rake'
-require 'rake/dsl'
 require 'delegate'
 require 'logger'
 

data/lib/sprout/executable/base.rb

@@ -288,7 +288,7 @@ module Sprout
 
         # 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

data/lib/sprout/executable/file_param.rb

@@ -42,7 +42,7 @@ module Sprout
         end
 
         if prerequisite?(value)
-          file value
+          Rake::FileTask.define_task value
           belongs_to.prerequisites << value
         end
       end

data/lib/sprout/executable/files.rb

@@ -20,7 +20,7 @@ module Sprout
 
       def prepare_prerequisites
         value.each do |f|
-          file f
+          Rake::FileTask.define_task f
           belongs_to.prerequisites << f
         end
       end

data/lib/sprout/executable/path.rb

@@ -16,7 +16,7 @@ module Sprout
         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

data/lib/sprout/executable/paths.rb

@@ -15,7 +15,7 @@ module Sprout
         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

data/lib/sprout/library.rb

@@ -254,10 +254,10 @@ module Sprout
     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
 

data/test/unit/executable_test.rb

@@ -236,9 +236,8 @@ class ExecutableTest < Test::Unit::TestCase
 
     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 @@ class ExecutableTest < Test::Unit::TestCase
 
     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'

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 14
+  - 15
   - pre
-  version: 1.1.14.pre
+  version: 1.1.15.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 -07:00
+date: 2011-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,8 +43,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        - 2
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: *id002