sprout 1.0.25.pre → 1.0.26.pre

data/lib/sprout/executable.rb

@@ -305,7 +305,7 @@ module Sprout
       end
 
       def to_rake *args
-        # Define the file task for - so that
+        # Define the file task first - so that
         # desc blocks hook up to it...
         file_task = file *args do
           execute
@@ -313,6 +313,14 @@ module Sprout
         update_rake_task_name_from_args *args
         yield self if block_given?
         prepare
+        
+        # TODO: Tried auto-updating with library
+        # prerequisites, but this led to strange
+        # behavior with multiple registrations.
+        handle_library_prerequisites file_task.prerequisites
+
+        # Add the library resolution rake task
+        # as a prerequisite
         file_task.prerequisites << task(Sprout::Library::TASK_NAME)
         prerequisites.each do |prereq|
           file_task.prerequisites << prereq
@@ -396,8 +404,27 @@ module Sprout
         end
       end
 
+      ##
+      # This method will generally be overridden
+      # by subclasses and they can do whatever customization
+      # is necessary for a particular library type.
+      def library_added library
+      end
+
       private
 
+      def handle_library_prerequisites items
+        items.each do |item|
+          t = Rake.application[item]
+          if(t.sprout_type == :library)
+            lib = Sprout::Library.load nil, item.to_s
+            lib.project_paths.each do |path|
+              library_added path
+            end unless lib.project_paths.nil?
+          end
+        end
+      end
+
       def help_requested? options
         options.include? '--help'
       end

data/lib/sprout/library.rb

@@ -29,13 +29,14 @@ module Sprout
       def define_task pkg_name, type=nil, version=nil
         library = Sprout::Library.load type, pkg_name.to_s, version
         library.installation_task = task pkg_name
+        library.installation_task.sprout_type = :library
 
         define_lib_dir_task_if_necessary
         path_or_paths = library.path
         if path_or_paths.is_a?(Array)
           # TODO: Need to add support for merging these directories
           # rather than simply clobbering...
-          path_or_paths.each { |p| define_path_task pkg_name, library, p }
+          path_or_paths.collect { |p| define_path_task pkg_name, library, p }
         else
           define_path_task pkg_name, library, path_or_paths
         end
@@ -67,6 +68,7 @@ module Sprout
           FileUtils.cp_r path, installation_path
           Sprout::Log.puts ">> Copied files from: (#{path}) to: (#{installation_path})"
         end
+        installation_path
       end
 
       def define_file_copy_task path, installation_path
@@ -76,6 +78,7 @@ module Sprout
           FileUtils.cp path, "#{installation_path}/"
           Sprout::Log.puts ">> Copied file from: (#{path}) to: (#{task_name})"
         end
+        task_name
       end
 
       def define_file_task name
@@ -96,7 +99,7 @@ end
 #   library :asunit4
 #
 # Or, if you would like to specify which registered
-# library to pull from the identified package:
+# library to pull from the identified package (by name):
 #
 #   library :asunit4, :src
 #

data/lib/sprout/ruby_feature.rb

@@ -166,3 +166,11 @@ module Sprout
   end
 end
 
+##
+# Mixin on the Rake::Task so
+# that our concrete entities
+# can interoperate with some
+# knowledge of each other.
+class Rake::Task
+  attr_accessor :sprout_type
+end

data/lib/sprout/version.rb

@@ -6,7 +6,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 0
-      TINY  = 25
+      TINY  = 26
       RELEASE = 'pre'
 
       STRING = [MAJOR, MINOR, TINY, RELEASE].join('.')

data/test/fixtures/executable/mxmlc.rb

@@ -644,6 +644,15 @@ module Sprout
     #
     add_param :warnings, Boolean
 
+    def library_added path
+      #puts ">> MXMLC.library_added with: #{path}"
+      if(path =~ /\.swc$/)
+        self.library_path << path
+      else
+        self.source_path << path
+      end
+    end
+
     ##
     # Main source file to send compiler"
     # This must be the last item in this list

data/test/unit/executable_test.rb

@@ -217,8 +217,29 @@ class ExecutableTest < Test::Unit::TestCase
       end
     end
 
+    should "add libraries as provided" do
+      as_a_unix_system do
+
+        Sprout::Library.stubs(:define_path_task)
+        task 'abcd'
+        task 'bin/OtherFileTask.swf'
+
+        asunit_lib = OpenStruct.new :name => :asunit4, :project_paths => ['lib/AsUnit-4.4.2.swc']
+        Sprout::Library.register asunit_lib
+
+        library :asunit4
+
+        @tool = mxmlc 'bin/SomeFile.swf' => [:asunit4, 'abcd', 'bin/OtherFileTask.swf'] do |t|
+          t.source_path << 'test/fixtures/executable/src'
+          t.input = 'test/fixtures/executable/src/Main.as'
+        end
+        assert_equal "-library-path+=lib/AsUnit-4.4.2.swc -output=bin/SomeFile.swf -source-path+=test/fixtures/executable/src test/fixtures/executable/src/Main.as", @tool.to_shell
+      end
+    end
+
     should "accept configuration with prereqs as a file task" do
       as_a_unix_system do
+        task :clean
         task :other_task
         @tool = mxmlc 'bin/SomeFile.swf' => [:clean, :other_task] do |t|
           t.source_path << 'test/fixtures/executable/src'

data/test/unit/sprout_test_helper.rb

@@ -9,7 +9,11 @@ Bundler.setup :default, :development
 require 'shoulda'
 require 'mocha'
 
-require File.dirname(__FILE__) + '/../../lib/sprout'
+lib = File.join(File.dirname(__FILE__), '..', '..', 'lib')
+$:.unshift lib unless $:.include? lib
+
+require 'sprout'
+
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 require 'unit/fake_process_runner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  hash: -1998136109
+  hash: 1407429492
   prerelease: true
   segments: 
   - 1
   - 0
-  - 25
+  - 26
   - pre
-  version: 1.0.25.pre
+  version: 1.0.26.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -07:00
+date: 2010-07-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency