sprout 1.0.26.pre → 1.0.29.pre

data/lib/sprout/base.rb

@@ -70,9 +70,13 @@ module Sprout
         Sprout::System.create
       end
 
+      ##
+      # Get the file name from the 'caller' property of
+      # a Ruby exception.
+      #
+      # Note: It's a bummer that this string is colon delimited -
+      # The value on Windows can include a colon...
       def file_from_caller caller_string
-        # NOTE: It's a bummer that this string is colon delimited -
-        # The value on Windows sometimes includes a colon...
         parts = caller_string.split(':')
         str   = parts.shift
         while(parts.size > 0 && !File.exists?(str))

data/lib/sprout/executable.rb

@@ -15,7 +15,7 @@ require 'sprout/executable/parameter_factory'
 module Sprout
 
   ##
-  # The Sprout::Executable module is a Domain Specific Language
+  # The Sprout::Executable module exposes a Domain Specific Language
   # for describing Command Line Interface (CLI) applications.
   #
   # This module can be included by any class, and depending on how that class
@@ -408,19 +408,20 @@ module Sprout
       # 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
+      #
+      # It's important to note that this value can be
+      # a String path to a file (or folder), or it can
+      # be an Array of paths to files (or folders).
+      def library_added path_or_paths
       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?
+        items.each do |task_name|
+          t = Rake.application[task_name]
+          if(!t.sprout_entity.nil?)
+            library_added t.sprout_entity.installed_project_path
           end
         end
       end

data/lib/sprout/file_target.rb

@@ -43,7 +43,7 @@ module Sprout
       else
         path = expand_executable_path path
       end
-      libraries << OpenStruct.new( :name => name, :path => path, :file_target => self )
+      libraries << Sprout::Library.new( :name => name, :path => path, :file_target => self )
     end
 
     ##
@@ -59,7 +59,7 @@ module Sprout
     end
 
     def to_s
-      "[FileTarget type=#{type} platform=#{platform}]"
+      "[FileTarget pkg_name=#{pkg_name} pkg_version=#{pkg_version} platform=#{platform}]"
     end
 
     def validate

data/lib/sprout/library.rb

@@ -1,15 +1,27 @@
 
 module Sprout
-  module Library
+  class Library
+    include RubyFeature
+
     TASK_NAME = :resolve_sprout_libraries
 
-    include RubyFeature
+    attr_accessor :file_target
+    attr_accessor :installed_project_path
+    attr_accessor :name
+    attr_accessor :path
+    attr_accessor :pkg_name
+    attr_accessor :pkg_version
 
     class << self
-
       ##
       # Set the path within a project
       # where libraries should be loaded.
+      #
+      # From top of your Rakefile, you can 
+      # set this value with:
+      #
+      #   Sprout::Library.project_path = 'libs'
+      #
       def project_path=(path)
         @project_path = path
       end
@@ -19,82 +31,122 @@ module Sprout
       # libraries should be added.
       #
       # Defaults to 'lib'
+      #
+      # From anywhere in your Rakefile, you can output
+      # this value with:
+      #
+      #   puts ">> Library Project Path: #{Sprout::Library.project_path}"
+      #
       def project_path
         @project_path ||= 'lib'
       end
 
       ##
       # Create Rake tasks that will load and install
-      # a particular library.
-      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.collect { |p| define_path_task pkg_name, library, p }
-        else
-          define_path_task pkg_name, library, path_or_paths
-        end
-        library
+      # a particular library into the current project.
+      #
+      # This method is usually accessed from the global
+      # library helper.
+      #
+      #   library :asunit4
+      #
+      def define_task name=nil, pkg_name=nil, pkg_version=nil
+        library = Sprout::Library.load name, pkg_name, pkg_version
+        library.create_installation_tasks
       end
+    end
 
-      protected
+    def initialize params=nil
+      params.each {|key,value| self.send("#{key}=", value)} unless params.nil?
+      super()
+    end
+
+    ##
+    # Returns the outer Rake::Task which is invokable.
+    def create_installation_tasks
+      define_lib_dir_task_if_necessary project_path
+      create_project_tasks
+      create_outer_task
+    end
 
-      def define_lib_dir_task_if_necessary
-        if !File.exists?(project_path)
-          define_file_task project_path do
-            FileUtils.mkdir_p project_path
-            Sprout::Log.puts ">> Created directory at: #{project_path}"
-          end
+    def create_outer_task
+      t = task pkg_name
+      # This helps executable rake tasks decide if they
+      # want to do something special for library tasks.
+      t.sprout_entity = self
+      class << t
+        def sprout_library?
+          !sprout_entity.nil? &&
+            sprout_entity.is_a?(Sprout::Library)
         end
       end
+      t
+    end
 
-      def define_path_task pkg_name, library, path
-        installation_path = "#{project_path}/#{pkg_name}"
-        if File.directory?(path)
-          define_directory_copy_task path, installation_path
-        else
-          define_file_copy_task path, installation_path
-        end
+    private
+
+    def project_path
+      Sprout::Library.project_path
+    end
+
+    def create_project_tasks
+      if path.is_a?(Array)
+        # TODO: Need to add support for merging these directories
+        # rather than simply clobbering...
+        @instaled_project_path = path.collect { |single_path| define_project_path_task pkg_name, single_path }
+      else
+        @installed_project_path = define_project_path_task pkg_name, path
       end
+    end
 
-      def define_directory_copy_task path, installation_path
-        define_file_task installation_path do
-          FileUtils.cp_r path, installation_path
-          Sprout::Log.puts ">> Copied files from: (#{path}) to: (#{installation_path})"
+    def define_lib_dir_task_if_necessary dir
+      if !File.exists?(dir)
+        define_file_task dir do
+          FileUtils.mkdir_p dir
+          Sprout::Log.puts ">> Created directory at: #{dir}"
         end
-        installation_path
       end
+    end
 
-      def define_file_copy_task path, installation_path
-        task_name = "#{installation_path}/#{File.basename(path)}"
-        define_file_task task_name do
-          FileUtils.mkdir_p installation_path
-          FileUtils.cp path, "#{installation_path}/"
-          Sprout::Log.puts ">> Copied file from: (#{path}) to: (#{task_name})"
-        end
-        task_name
+    def define_project_path_task pkg_name, path
+      install_path = "#{project_path}/#{pkg_name}"
+      if File.directory?(path)
+        define_directory_copy_task path, install_path
+      else
+        define_file_copy_task path, install_path
       end
+    end
 
-      def define_file_task name
-        file name do |t|
-          yield if block_given?
-        end
-        task Sprout::Library::TASK_NAME => name
+    def define_directory_copy_task path, install_path
+      define_file_task install_path do
+        FileUtils.cp_r path, install_path
+        Sprout::Log.puts ">> Copied files from: (#{path}) to: (#{install_path})"
       end
+      install_path
+    end
 
+    def define_file_copy_task path, install_path
+      task_name = "#{install_path}/#{File.basename(path)}"
+      define_file_task task_name do
+        FileUtils.mkdir_p install_path
+        FileUtils.cp path, "#{install_path}/"
+        Sprout::Log.puts ">> Copied file from: (#{path}) to: (#{task_name})"
+      end
+      task_name
     end
 
+    def define_file_task name
+      file name do |t|
+        yield if block_given?
+      end
+      task Sprout::Library::TASK_NAME => name
+    end
   end
+
 end
 
 # From within a Rakefile, you can load libraries
-# by calling this shortcut:
+# by calling this method:
 #
 #   library :asunit4
 #
@@ -107,7 +159,20 @@ end
 #
 #   library :asunit4, :swc, '>= 4.2.pre'
 #
-def library pkg_name, type=nil, version=nil
-  Sprout::Library.define_task pkg_name, type, version
+# It's important to note that libraries must also
+# be defined in your Gemfile like:
+#
+#   gem "asunit4", ">= 4.2.pre"
+#
+# Libraries are generally then added to compiler tasks
+# as Rake dependencies like:
+#
+#   mxmlc 'bin/SomeRunner.swf' => [:asunit4] do |t|
+#     t.input = 'src/SomeRunner.as'
+#     t.source_path << 'test'
+#   end
+#
+def library pkg_name, name=nil, version=nil
+  Sprout::Library.define_task name, pkg_name, version
 end
 

data/lib/sprout/remote_file_loader.rb

@@ -1,4 +1,3 @@
-require 'digest/md5'
 
 module Sprout
 
@@ -8,31 +7,15 @@ module Sprout
 
     class << self
     
-      def load uri, md5=nil, filename=nil, force=false
-        response = fetch uri.to_s, filename
-        if(force || response_is_valid?(response, md5))
-          return response
-        end
-        nil
+      def load uri, md5=nil, display_name=nil
+        fetch uri.to_s, display_name
       end
 
       private
       
-      def response_is_valid? response, expected_md5sum
-        if(expected_md5sum)
-          md5 = Digest::MD5.new
-          md5 << response
-          
-          if(expected_md5sum != md5.hexdigest)
-            return prompt_for_md5_failure md5, expected_md5sum
-          end
-        end
-        return true
-      end
-      
-      def fetch uri, name=nil
+      def fetch uri, display_name=nil
         begin
-          return open_uri uri, name
+          return open_uri uri, display_name
         rescue SocketError => sock_err
           raise Sprout::Errors::RemoteFileLoaderError.new("[ERROR] #{sock_err.to_s}")
         rescue OpenURI::HTTPError => http_err
@@ -44,16 +27,16 @@ module Sprout
 
       private
 
-      def open_uri uri, name=nil
+      def open_uri uri, display_name=nil
         uri = URI.parse(uri)
         progress = nil
         response = nil
-        name ||= uri.path.split("/").pop
+        display_name ||= uri.path.split("/").pop
         
         # Why was this here? Shouldn't the 'open' command work for other
         # protocols like https?
         #
-        #message = "The RemoteFileTask failed for #{name}. We can only handle HTTP requests at this time, it seems you were trying: '#{uri.scheme}'"
+        #message = "The RemoteFileTask failed for #{display_name}. We can only handle HTTP requests at this time, it seems you were trying: '#{uri.scheme}'"
         #raise Sprout::Errors::RemoteFileLoaderError.new(message) if uri.scheme != 'http' || uri.scheme != 'https'
 
         # This is the strangest implementation I've seen in Ruby yet.
@@ -61,7 +44,7 @@ module Sprout
         open(uri.to_s, 
           :content_length_proc => lambda {|length|
             length ||= 0
-            progress = Sprout::ProgressBar.new(name, length)
+            progress = Sprout::ProgressBar.new(display_name, length)
             progress.file_transfer_mode
             progress.set(0)
           },
@@ -75,17 +58,6 @@ module Sprout
         response
       end
 
-      def prompt_for_md5_failure md5, expected_md5sum
-        puts "The MD5 Sum of the downloaded file (#{md5.hexdigest}) does not match what was expected (#{expected_md5sum})."
-        puts "Would you like to install anyway? [Yn]"
-        response = $stdin.gets.chomp!
-        if(response.downcase == 'y')
-          return true
-        else
-          raise Sprout::Errors::RemoteFileLoaderError.new('MD5 Checksum failed')
-        end
-      end
-
     end
   end
 end

data/lib/sprout/remote_file_target.rb

@@ -1,3 +1,4 @@
+require 'digest/md5'
 
 module Sprout
 
@@ -31,8 +32,14 @@ module Sprout
 
     private
 
+    ##
+    # Do not cache this value...
+    #
+    # This response can change over time IF:
+    #  - The downloaded bytes do not match the expected MD5
+    #  - AND the user confirms the prompt that they are OK with this
     def downloaded_file
-      @downloaded_file ||= File.join(Sprout.cache, pkg_name, "#{md5}.#{archive_type}")
+      File.join(Sprout.cache, pkg_name, "#{md5}.#{archive_type}")
     end
 
     def unpacked_file
@@ -42,9 +49,19 @@ module Sprout
     def load_unpack_or_ignore_archive
       if(!unpacked_files_exist?)
         if(!File.exists?(downloaded_file))
-          write_archive download_archive
+          bytes = download_archive
+          write_archive bytes
+        end
+
+        # If we *just* downloaded the file,
+        # use the bytes directly, otherwise
+        # read them off disk from a previous
+        # download attempt:
+        bytes ||= File.open(downloaded_file, 'rb').read
+
+        if should_unpack?(bytes, md5)
+          unpack_archive
         end
-        unpack_archive
       end
     end
 
@@ -53,7 +70,7 @@ module Sprout
     end
 
     def download_archive
-      Sprout::RemoteFileLoader.load(url, md5, pkg_name)
+      Sprout::RemoteFileLoader.load url, pkg_name
     end
 
     def write_archive bytes
@@ -63,6 +80,29 @@ module Sprout
       end
     end
 
+    def should_unpack? bytes, expected_md5sum
+      if expected_md5sum
+        downloaded_md5 = Digest::MD5.new
+        downloaded_md5 << bytes
+        
+        if(expected_md5sum != downloaded_md5.hexdigest)
+          return prompt_for_md5_failure downloaded_md5, expected_md5sum
+        end
+      end
+      return true
+    end
+
+    def prompt_for_md5_failure downloaded_md5, expected_md5sum
+      puts "The MD5 Sum of the downloaded file (#{downloaded_md5.hexdigest}) does not match what was expected (#{expected_md5sum})."
+      puts "Would you like to install anyway? [Yn]"
+      user_response = $stdin.gets.chomp!
+      if(user_response.downcase == 'y')
+        return true
+      else
+        raise Sprout::Errors::RemoteFileLoaderError.new('MD5 Checksum failed')
+      end
+    end
+
     def unpack_archive
       FileUtils.mkdir_p unpacked_file
       unpacker = Sprout::ArchiveUnpacker.new
@@ -71,4 +111,3 @@ module Sprout
 
   end
 end
-

data/lib/sprout/ruby_feature.rb

@@ -98,8 +98,10 @@ module Sprout
       end
 
       def entity_for name_or_names, pkg_name, version_requirement
+        # These commented blocks help immensely when debugging
+        # loading and registration issues, please leave them here:
         #puts "+++++++++++++++++++++++++++"
-        #puts ">> entity_for #{name} pkg_name: #{pkg_name} version: #{version_requirement}"
+        #puts ">> entity_for #{name_or_names} pkg_name: #{pkg_name} version: #{version_requirement}"
         #registered_entities.each do |entity|
           #puts ">> entity: #{entity.name} pkg_name: #{entity.pkg_name} version: #{entity.pkg_version}"
         #end
@@ -172,5 +174,5 @@ end
 # can interoperate with some
 # knowledge of each other.
 class Rake::Task
-  attr_accessor :sprout_type
+  attr_accessor :sprout_entity
 end

data/lib/sprout/system/unix_system.rb

@@ -63,6 +63,9 @@ module Sprout::System
     # for the file at the provided +path+ String.
     #
     # Will this corrupt binaries? Yes... Yes. it. will.
+    #
+    # This also fails on UTF-8 files since Ruby's regex
+    # appears to choke on UTF-8??
     def should_repair_executable path
       return (File.exists?(path) && !File.directory?(path) && File.read(path).match(/^\#\!\/bin\/sh/))
     end

data/lib/sprout/version.rb

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

data/rakefile.rb

@@ -1,6 +1,11 @@
 require 'rubygems'
 require 'bundler'
 
+# Hack this dir onto path for Ruby 1.9.2
+# support:
+test_package = File.join(File.dirname(__FILE__), 'test')
+$: << test_package unless $:.include? test_package
+
 Bundler.require
 
 require 'rake/clean'

data/test/fixtures/executable/mxmlc.rb

@@ -644,12 +644,11 @@ module Sprout
     #
     add_param :warnings, Boolean
 
-    def library_added path
-      #puts ">> MXMLC.library_added with: #{path}"
-      if(path =~ /\.swc$/)
-        self.library_path << path
+    def library_added path_or_paths
+      if(path_or_paths =~ /\.swc$/)
+        self.library_path << path_or_paths
       else
-        self.source_path << path
+        self.source_path << path_or_paths
       end
     end
 

data/test/unit/archive_unpacker_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class ArchiveUnpackerTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/boolean_param_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class BooleanParamTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/executable_option_parser_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
-require 'test/fixtures/examples/echo_inputs'
+require 'test_helper'
+require 'fixtures/examples/echo_inputs'
 
 class ExecutableOptionParserTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/executable_param_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class ExecutableParamTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/executable_test.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/test_helper'
-require 'test/fixtures/executable/mxmlc'
-require 'test/unit/fake_other_executable'
-require 'test/fixtures/executable/subclass/executable_superclass'
-require 'test/fixtures/executable/subclass/executable_subclass'
+require 'test_helper'
+require 'fixtures/executable/mxmlc'
+require 'unit/fake_other_executable'
+require 'fixtures/executable/subclass/executable_superclass'
+require 'fixtures/executable/subclass/executable_subclass'
 
 class ExecutableTest < Test::Unit::TestCase
   include SproutTestCase
@@ -220,20 +220,20 @@ class ExecutableTest < Test::Unit::TestCase
     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']
+        asunit_lib = Sprout::Library.new :name => :swc, :pkg_name => :asunit4, :path => 'lib/AsUnit-4.4.2.swc'
         Sprout::Library.register asunit_lib
 
-        library :asunit4
+        t = 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
+
+        assert_equal "-library-path+=lib/asunit4/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
 
@@ -259,6 +259,10 @@ class ExecutableTest < Test::Unit::TestCase
     end
 
     should "execute the registered executable" do
+      # This test should never pass on Windows, even
+      # though it did prior to Ruby 1.9.2...
+      return if Sprout::Platform.new.windows?
+
       # Configure stub executable:
       @tool.input = 'test/fixtures/executable/src/Main.as'
       @tool.source_path << 'test/fixtures/executable/src'
@@ -274,7 +278,7 @@ class ExecutableTest < Test::Unit::TestCase
       @tool.execute
 
       # Ensure the file mode was updated:
-      assert "non-executable file mode should be updated by execute", first != File.stat(@mxmlc_executable).mode
+      assert first != File.stat(@mxmlc_executable).mode, "non-executable file mode should be updated by execute" 
     end
 
     should "include prerequisites" do

data/test/unit/file_param_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class FileParamTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/file_target_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class FileTargetTest < Test::Unit::TestCase
   include SproutTestCase
@@ -11,6 +11,8 @@ class FileTargetTest < Test::Unit::TestCase
     context "that is created with a constructor block" do
       should "have the provided values" do
         target = Sprout::FileTarget.new do |t|
+          t.pkg_name    = 'asunit4'
+          t.pkg_version = '4.2.2.pre'
           t.add_library :swc, @asunit_swc
         end
         assert_provided_values target
@@ -20,6 +22,8 @@ class FileTargetTest < Test::Unit::TestCase
     context "that is created with no constructor block" do
       should "have the provided values" do
         target = Sprout::FileTarget.new
+        target.pkg_name    = 'asunit4'
+        target.pkg_version = '4.2.2.pre'
         target.add_library :swc, @asunit_swc
         assert_provided_values target
       end
@@ -36,6 +40,7 @@ class FileTargetTest < Test::Unit::TestCase
     library = t.libraries.first
     assert_equal :swc, library.name
     assert_equal File.join('.', @asunit_swc), library.path
+    assert_equal '[FileTarget pkg_name=asunit4 pkg_version=4.2.2.pre platform=universal]', t.to_s
   end
 
 end

data/test/unit/files_param_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class FilesParamTest < Test::Unit::TestCase
   include SproutTestCase
@@ -63,7 +63,7 @@ class FilesParamTest < Test::Unit::TestCase
 
       @param.value << 'abcd'
 
-      assert "Should be visible", @param.visible?
+      assert @param.visible?, "Should be visible" 
       assert_equal 'proc:inputs:abcd', @param.to_shell
     end
 

data/test/unit/generator_generator_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 require 'sprout/generators/generator/generator_generator'
 

data/test/unit/generator_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class GeneratorTest < Test::Unit::TestCase
   include SproutTestCase
@@ -289,8 +289,8 @@ class GeneratorTest < Test::Unit::TestCase
 
   context "a generator that is a subclass of another" do
     # Require the source files for this context
-    require 'test/fixtures/generators/song_generator'
-    require 'test/fixtures/generators/song_subclass/least_favorite'
+    require 'fixtures/generators/song_generator'
+    require 'fixtures/generators/song_subclass/least_favorite'
 
     setup do
       @path = File.join(fixtures, 'generators', 'tmp')

data/test/unit/library_generator_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
-
+require 'test_helper'
 require 'sprout/generators/library/library_generator'
 
 class LibraryGeneratorTest < Test::Unit::TestCase

data/test/unit/library_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class LibraryTest < Test::Unit::TestCase
   include SproutTestCase
@@ -7,11 +7,11 @@ class LibraryTest < Test::Unit::TestCase
     setup do
       @path = File.join fixtures, 'library', 'archive'
       @archive = File.join @path, 'Archive.swc'
-      create_and_register_library :fake_archive_lib, @archive
+      create_and_register_library :fake_archive_lib, :swc, @archive
     end
 
     should "be able to load registered libraries" do
-      lib = Sprout::Library.load :fake_archive_lib
+      lib = Sprout::Library.load :swc, :fake_archive_lib
       assert_not_nil lib
     end
   end
@@ -22,12 +22,13 @@ class LibraryTest < Test::Unit::TestCase
       @lib_dir = File.join fixture, 'project_lib'
       sources  = File.join fixture, 'sources'
       @src     = File.join sources, 'src', 'Source.as'
-      Sprout::Library.project_path = @lib_dir
-      create_and_register_library :fake_swc_lib, @src
+
+      Sprout::Library.any_instance.stubs(:project_path).returns @lib_dir
+      create_and_register_library :fake_swc_lib, :swc, @src
     end
 
     should "create rake file tasks for single files" do
-      Sprout::Library.define_task :fake_swc_lib
+      Sprout::Library.define_task :swc, :fake_swc_lib
     end
   end
 
@@ -39,17 +40,16 @@ class LibraryTest < Test::Unit::TestCase
       @lib_a   = File.join sources, 'lib', 'a'
       @lib_b   = File.join sources, 'lib', 'b'
       @src     = File.join sources, 'src'
-      Sprout::Library.project_path = @lib_dir
-      create_and_register_library :fake_source_lib, [@src, @lib_a, @lib_b]
+      Sprout::Library.any_instance.stubs(:project_path).returns @lib_dir
+      create_and_register_library :fake_source_lib, :src, [@src, @lib_a, @lib_b]
     end
 
     teardown do
-      Sprout::Library.project_path = nil
       remove_file @lib_dir
     end
 
     should "be able to load registered libraries" do
-      lib = Sprout::Library.load :fake_source_lib
+      lib = Sprout::Library.load :src, :fake_source_lib
       assert_not_nil lib
       paths = lib.path.dup
       assert_equal @src, paths.shift
@@ -58,7 +58,7 @@ class LibraryTest < Test::Unit::TestCase
     end
 
     should "create rake file tasks for directories" do
-      Sprout::Library.define_task :fake_source_lib
+      Sprout::Library.define_task :src, :fake_source_lib
       Rake::application[:resolve_sprout_libraries].invoke
 
       library_dir = File.join(@lib_dir, 'fake_source_lib')
@@ -68,20 +68,16 @@ class LibraryTest < Test::Unit::TestCase
       assert_file File.join(library_dir, 'b')
     end
 
-    should "load the library from the load_path" do
-    end
-
   end
 
   private
 
-  def create_and_register_library name, path, pkg_name=nil, pkg_version=nil
-    lib             = OpenStruct.new
+  def create_and_register_library pkg_name, name, path, pkg_version=nil
+    lib             = Sprout::Library.new
     lib.name        = name
     lib.path        = path
     lib.pkg_name    = pkg_name unless pkg_name.nil?
     lib.pkg_version = pkg_version unless pkg_version.nil?
-
     Sprout::Library.register lib
   end
 end

data/test/unit/osx_system_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class OSXSystemTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/path_param_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class PathParamTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/paths_param_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class PathsParamTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/platform_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class PlatformTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/process_runner_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class ProcessRunnerTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/rdoc_parser_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
-require 'test/fixtures/examples/echo_inputs'
+require 'test_helper'
+require 'fixtures/examples/echo_inputs'
 
 class ExecutableOptionParserTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/remote_file_loader_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class RemoteFileLoaderTest <  Test::Unit::TestCase
   include SproutTestCase
@@ -19,16 +19,6 @@ class RemoteFileLoaderTest <  Test::Unit::TestCase
       assert_equal 310, bytes.size
     end
 
-    should "fail if md5 doesn't match" do
-      Sprout::RemoteFileLoader.expects(:prompt_for_md5_failure)
-      Sprout::RemoteFileLoader.load @uri, 'abcd'
-    end
-
-    should "pass if md5 isn't provided" do
-      Sprout::RemoteFileLoader.expects(:prompt_for_md5_failure).never
-      Sprout::RemoteFileLoader.load @uri
-    end
   end
-
 end
 

data/test/unit/remote_file_target_test.rb

@@ -1,14 +1,10 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class RemoteFileTargetTest < Test::Unit::TestCase
   include SproutTestCase
 
   context "an improperly configured remote file target" do
-
-    setup do
-      Sprout::RemoteFileTarget.any_instance.stubs(:load_archive).returns true
-    end
-
+  
     should "throw validation error on archive_type" do
       assert_raises Sprout::Errors::ValidationError do
         t = Sprout::RemoteFileTarget.new
@@ -54,7 +50,7 @@ class RemoteFileTargetTest < Test::Unit::TestCase
     setup do
       @target = Sprout::RemoteFileTarget.new do |t|
         t.archive_type = :zip
-        t.md5          = 'd6939117f1df58e216f365a12fec64f9'
+        t.md5          = 'd41d8cd98f00b204e9800998ecf8427e'
         t.url          = 'http://github.com/downloads/lukebayes/project-sprouts/echochamber-test.zip'
         t.pkg_name     = 'echochamber'
         t.pkg_version  = '1.0.pre'
@@ -66,10 +62,17 @@ class RemoteFileTargetTest < Test::Unit::TestCase
 
       @downloaded_file = File.join(temp_cache, 'downloaded.zip')
       @target.stubs(:downloaded_file).returns @downloaded_file
+	  
+	  downloaded_bytes = File.join(fixtures, 'remote_file_target', 'echochamber-test.zip')
+      @archive_bytes = File.open(downloaded_bytes, 'rb').read
 
-      @archive_bytes = File.read(File.join(fixtures, 'remote_file_target', 'echochamber-test.zip'))
-    end
+      @target.stubs(:download_archive).returns @archive_bytes
+	end
 
+    teardown do
+	  remove_file File.join(fixtures, 'sprout')
+    end
+	
     context "that has already been UNPACKED" do
       should "not be DOWNLOADED or unpacked" do
         create_file File.join(@unpacked_file, 'unpacked')
@@ -79,36 +82,42 @@ class RemoteFileTargetTest < Test::Unit::TestCase
       end
     end
 
-    context "that had an unpacking failure" do
+    context "that had an unpack failure" do
       should "still unpack the file" do
+	    # Create the expected unpacked_file:
         FileUtils.mkdir_p @unpacked_file
-        @target.expects(:download_archive)
+        @target.stubs('should_unpack?').returns true
         @target.expects(:unpack_archive)
         @target.resolve
       end
     end
 
     context "that has been DOWNLOADED, but not UNPACKED" do
+
+      should "not unpack if md5 doesn't match, and user responds in negative" do
+        @target.stubs('should_unpack?').returns false
+        @target.expects(:unpack_archive).never
+        @target.resolve
+      end
+
       should "unpack but not download" do
-        create_file @downloaded_file
-        @target.expects(:download_archive).never
-        @target.expects(:unpack_archive)
+        @target.stubs('should_unpack?').returns true
         @target.resolve
+        assert_not_empty @unpacked_file
       end
     end
 
     context "that has not yet been DOWNLOADED, or UNPACKED" do
       should "download and unpack the remote archive" do
-        @target.expects(:download_archive).returns @archive_bytes
+	    @target.stubs('should_unpack?').returns true
+		#@target.expects(:download_archive)
         #@target.expects(:unpack_archive)
-
         @target.resolve
+
         assert_file @downloaded_file
-        assert_file @unpacked_file
-        #assert_not_empty @unpacked_file
+        assert_not_empty @unpacked_file
       end
     end
 
   end
 end
-

data/test/unit/ruby_feature_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class RubyFeatureTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/ruby_generator_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 require 'sprout/generators/ruby/ruby_generator'
 

data/test/unit/specification_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class SpecificationTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/sprout_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class SproutTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/string_param_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class StringParamTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/string_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class StringTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/strings_param_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class StringsParamTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/tool_generator_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 require 'sprout/generators/tool/tool_generator'
 

data/test/unit/unix_system_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class UnixSystemTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/user_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class UserTest < Test::Unit::TestCase
   #include SproutTestCase

data/test/unit/vista_system_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class VistaSystemTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/win_nix_system_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class WinNixSystemTest < Test::Unit::TestCase
   include SproutTestCase

data/test/unit/win_system_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
 
 class WinSystemTest < Test::Unit::TestCase
   include SproutTestCase
@@ -44,7 +44,7 @@ class WinSystemTest < Test::Unit::TestCase
 
       should "find library outside home" do
         File.stubs(:exists?).returns false
-        assert "Shouldn't use app data if it doesn't exist", (@user.library =~ /Application Data/).nil?
+        assert (@user.library =~ /Application Data/).nil?, "Shouldn't use app data if it doesn't exist" 
       end
 
       should "wrap paths that have spaces with escaped quotes" do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  hash: 1407429492
   prerelease: true
   segments: 
   - 1
   - 0
-  - 26
+  - 29
   - pre
-  version: 1.0.26.pre
+  version: 1.0.29.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -07:00
+date: 2010-10-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 0
         - 9
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 5
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 9
@@ -90,7 +85,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 5
@@ -106,7 +100,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
         - 0
         - 9
@@ -122,7 +115,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -136,7 +128,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -150,7 +141,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -164,7 +154,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -178,7 +167,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -192,7 +180,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -416,7 +403,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -425,7 +411,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3