sprout 1.0.9.pre → 1.0.11.pre

data/lib/sprout/archive_unpacker.rb

@@ -45,15 +45,15 @@ module Sprout
     end
 
     def is_darwin?
-      Sprout.current_system == Sprout::System::OSXSystem
+      Sprout.current_system.is_a?(Sprout::System::OSXSystem)
     end
 
     def unpack_zip_on_darwin archive, destination, clobber
       # Unzipping on OS X
       FileUtils.makedirs destination
-      zip_dir = File.expand_path File.dirname(archive)
+      zip_dir  = File.expand_path File.dirname(archive)
       zip_name = File.basename archive
-      output = File.expand_path destination
+      output   = File.expand_path destination
       # puts ">> zip_dir: #{zip_dir} zip_name: #{zip_name} output: #{output}"
       %x(cd #{zip_dir};unzip #{zip_name} -d #{output})
     end

data/lib/sprout/library.rb

@@ -27,7 +27,7 @@ module Sprout
       # 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, version
+        library = Sprout::Library.load type, pkg_name.to_s, version
         library.installation_task = task pkg_name
 
         define_lib_dir_task_if_necessary
@@ -105,7 +105,6 @@ end
 #   library :asunit4, :swc, '>= 4.2.pre'
 #
 def library pkg_name, type=nil, version=nil
-  puts ">> Library loaded!"
   Sprout::Library.define_task pkg_name, type, version
 end
 

data/lib/sprout/ruby_feature.rb

@@ -103,13 +103,14 @@ module Sprout
         #registered_entities.each do |entity|
           #puts ">> entity: #{entity.name} pkg_name: #{entity.pkg_name} version: #{entity.pkg_version}"
         #end
-        registered_entities.select do |entity|
+        registered_entities.reverse.select do |entity|
             satisfies_name?(entity, name_or_names) && 
             satisfies_platform?(entity) &&
             satisfies_pkg_name?(entity, pkg_name) &&
             satisfies_version?(entity, version_requirement)
         end.first
       end
+
       def satisfies_environment? entity, environment
         #puts ">> env: #{entity.environment} vs. #{environment}"
         environment.nil? || !entity.respond_to?(:environment) || entity.environment.to_s == environment.to_s

data/lib/sprout/specification.rb

@@ -181,7 +181,7 @@ module Sprout
       # 
       # When loading, if no name is specified, the :swc will be
       # returned to clients.
-      register_items target.libraries.reverse, Sprout::Library, target
+      register_items target.libraries, Sprout::Library, target
     end
 
     def register_items collection, source, target

data/lib/sprout/version.rb

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

data/test/fixtures/examples/rakefile.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require
+
+library :corelib
+
+# Configure the default environment:
+env :default do
+  set :input, 'src/SomeProject.as'
+  set :output, 'bin/SomeProject.swf'
+  set :libraries, [:corelib]
+end
+
+# Configure the deployed environment:
+env :deploy => :default do
+  set :debug, false
+end
+
+# Configure the demo environment:
+env :demo => :deploy do
+  set :debug, true
+end
+
+# Configure the test environment:
+env :test => :deploy do
+  set :input , 'src/SomeProjectRunner.as'
+  set :output, 'bin/SomeProjectRunner.swf'
+
+  library :asunit4
+  set :libraries, [:corelib, :asunit4]
+end
+
+# Configure the Continuous Integration environment:
+evn :ci => :test do
+  set :input, 'src/SomeProjectXMLRunner.as'
+  set :output, 'bin/SomeProjectXMLRunner.swf'
+end
+
+
+desc 'Build the application'
+mxmlc get(:output) => get(:libraries) do |t|
+  t.input = get(:input)
+  t.debug = get(:debug)
+end
+
+desc 'Compile and run the application'
+flashplayer :run => get(:output)
+
+desc 'Compile and debug the application'
+fdb :debug => get(:output) do |t|
+  t.kill_on_fault = true
+end
+
+task :default => :run
+

data/test/unit/archive_unpacker_test.rb

@@ -41,9 +41,10 @@ class ArchiveUnpackerTest < Test::Unit::TestCase
     end
 
     should "unpack zip on darwin specially" do
-      @unpacker.stubs(:is_darwin?).returns true
-      @unpacker.expects(:unpack_zip_on_darwin)
-      @unpacker.unpack @zip_file, temp_path
+      as_a_mac_system do
+        @unpacker.expects(:unpack_zip_on_darwin)
+        @unpacker.unpack @zip_file, temp_path
+      end
     end
 
     ['exe', 'swc', 'rb'].each do |format|
@@ -87,26 +88,32 @@ class ArchiveUnpackerTest < Test::Unit::TestCase
           expected_file = File.join temp_path, @file_name
           FileUtils.touch expected_file
 
-          @unpacker.unpack @archive_file, temp_path, nil, :clobber
-          assert_file expected_file
-          assert_matches /hello world/, File.read(expected_file)
+          as_a_windows_system do
+            @unpacker.unpack @archive_file, temp_path, nil, :clobber
+            assert_file expected_file
+            assert_matches /hello world/, File.read(expected_file)
+          end
         end
 
         should "not clobber if not told to do so" do
           expected_file = File.join temp_path, @file_name
           FileUtils.touch expected_file
 
-          assert_raises Sprout::Errors::DestinationExistsError do
-            @unpacker.unpack @archive_file, temp_path, nil, :no_clobber
+          as_a_windows_system do
+            assert_raises Sprout::Errors::DestinationExistsError do
+              @unpacker.unpack @archive_file, temp_path, nil, :no_clobber
+            end
           end
         end
 
         should "unpack a nested archive" do
           expected_file = File.join temp_path, 'some folder', 'child folder', 'child child folder', @file_name
 
-          @unpacker.unpack @archive_folder, temp_path
-          assert_file expected_file
-          assert_matches /hello world/, File.read(expected_file)
+          as_a_windows_system do
+            @unpacker.unpack @archive_folder, temp_path
+            assert_file expected_file
+            assert_matches /hello world/, File.read(expected_file)
+          end
         end
       end
     end

data/test/unit/ruby_feature_test.rb

@@ -88,6 +88,18 @@ class RubyFeatureTest < Test::Unit::TestCase
       FakePlugin.register(create_item)
       assert_not_nil FakePlugin.load [:bar, :baz, :foo]
     end
+
+    should "find platform-specific remote file target" do
+      osx = create_item(:platform => :osx)
+      linux = create_item(:platform => :linux)
+      FakePlugin.register osx
+      FakePlugin.register linux
+      as_a_mac_system do
+        result = FakePlugin.load :foo
+        assert_equal osx, result
+      end
+    end
+
   end
 
   private

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 9
+  - 11
   - pre
-  version: 1.0.9.pre
+  version: 1.0.11.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -07:00
+date: 2010-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -275,6 +275,7 @@ files:
 - test/fixtures/archive_unpacker/zip/some_file.zip
 - test/fixtures/examples/app_generator.rb
 - test/fixtures/examples/echo_inputs.rb
+- test/fixtures/examples/rakefile.rb
 - test/fixtures/executable/echochamber_gem/bin/echochamber
 - test/fixtures/executable/echochamber_gem/echo_chamber.rb
 - test/fixtures/executable/flex3sdk_gem/flex3sdk.rb