sprout 1.0.4.pre → 1.0.5.pre

data/lib/sprout/system/win_system.rb

@@ -55,7 +55,7 @@ module Sprout::System
     def get_and_execute_process_runner tool, options=nil
       tool = clean_path find_tool(tool)
       runner = get_process_runner
-      runner.execute_win32 "\"#{tool}\" #{options}"
+      runner.execute_win32 tool, options
       runner
     end
 

data/lib/sprout/test/sprout_test_case.rb

@@ -137,7 +137,6 @@ module SproutTestCase # :nodoc:[all]
     end
   end
 
-=begin
   def as_a_unix_system
     sys = Sprout::System::UnixSystem.new
     expectation = Sprout::System.stubs(:create).returns sys
@@ -167,7 +166,6 @@ module SproutTestCase # :nodoc:[all]
     # TODO: Implement this feature without clobbering all stubs/mocks
     Mocha::Mockery.instance.teardown
   end
-=end
 
   
   private

data/lib/sprout/version.rb

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

data/test/fixtures/executable/mxmlc.rb

@@ -669,134 +669,16 @@ module Sprout
   end
 end
 
-=begin
-    def define # :nodoc:
-      super
-
-      if(!output)
-        if(name.match(/.swf/) || name.match(/swc/))
-          self.output = name
-        end
-      end
-      
-      if(input && !input.match(/.css/) && File.exists?(input))
-        source_path << File.dirname(input)
-      end
-      
-      if(include_path)
-        include_path.each do |path|
-          process_include_path(path) if(File.directory?(path))
-        end
-      end
-      
-      self.include_path = []
-      
-      if(link_report)
-        CLEAN.add(link_report)
-      end
-      
-      source_path.uniq!
-      param_hash['source_path'].value = clean_nested_source_paths(source_path)
-      
-      CLEAN.add(output)
-      if(incremental)
-        CLEAN.add(FileList['**/**/*.cache'])
-      end
-
-      self
-    end
-    
-    protected 
-    
-    def process_include_path(path)
-      symbols = []
-      FileList["#{path}/**/*[.as|.mxml]"].each do |file|
-        next if File.directory?(file)
-        file.gsub!(path, '')
-        file.gsub!(/^\//, '')
-        file.gsub!('/', '.')
-        file.gsub!(/.as$/, '')
-        file.gsub!(/.mxml$/, '')
-        file.gsub!(/.css$/, '')
-        symbols << file
-      end
-      
-      symbols.each do |symbol|
-        self.includes << symbol
-      end
-    end
-    
-    def clean_nested_source_paths(paths)
-      results = []
-      paths.each do |path|
-        # TODO: This should only happen if: allow_source_path_overlap != true
-        if(check_nested_source_path(results, path))
-          results << path
-        end
-      end
-      return results
-    end
-    
-    def check_nested_source_path(array, path)
-      array.each_index do |index|
-        item = array[index]
-        if(item =~ /^#{path}/)
-          array.slice!(index, 1)
-        elsif(path =~ /^#{item}/)
-          return false
-        end
-      end
-      return true
-    end
-
-    # Use the swc path if possible
-    # Otherwise add to source
-    def resolve_library(library_task)
-      #TODO: Add support for libraries that don't get
-      # copied into the project
-      path = library_task.project_path
-      if(path.match(/.swc$/))
-        library_path << library_task.project_path
-      else
-        source_path << library_task.project_path
-      end
-    end
-    
-    def execute_with_fcsh(command)
-      begin
-        display_preprocess_message
-        puts FCSHSocket.execute("mxmlc #{command}")
-      rescue FCSHError => fcsh_error
-        raise fcsh_error
-      rescue StandardError => std_error
-        # TODO: Capture a more concrete error here...
-        raise MXMLCError.new("[ERROR] There was a problem connecting to the Flex Compiler SHell, run 'rake fcsh:start' in another terminal.")
-      end
-    end
-    
-    def execute(*args)
-      begin
-        start = Time.now.to_i
-        if(@use_fcsh)
-          execute_with_fcsh(to_shell)
-        else
-          super
-        end
-        Log.puts "mxmlc finished compiling #{name} in #{Time.now.to_i - start} seconds"
-      rescue ExecutionError => e
-        if(e.message.index('Warning:'))
-          # MXMLC sends warnings to stderr....
-          Log.puts(e.message.gsub('[ERROR]', '[WARNING]'))
-        else
-          raise e
-        end
-      end
-    end
-
-  end
-end
-=end
-
+##
+# Rake task helper that delegates to
+# the MXMLC executable.
+#
+#    mxmlc 'bin/SomeProject.swf' do |t|
+#      t.input        = 'src/SomeProject.as'
+#      t.source_path  << 'lib/corelib'
+#      t.library_path << 'lib/SomeLib.swc'
+#    end
+#
 def mxmlc args, &block
   mxmlc_tool = Sprout::MXMLC.new
   mxmlc_tool.to_rake(args, &block)

data/test/unit/executable_test.rb

@@ -151,9 +151,11 @@ class ExecutableTest < Test::Unit::TestCase
     end
 
     should "accept input" do
-      @tool.input = "test/fixtures/executable/src/Main.as"
-      assert_equal "test/fixtures/executable/src/Main.as", @tool.input
-      assert_equal "test/fixtures/executable/src/Main.as", @tool.to_shell
+      as_a_unix_system do
+        @tool.input = "test/fixtures/executable/src/Main.as"
+        assert_equal "test/fixtures/executable/src/Main.as", @tool.input
+        assert_equal "test/fixtures/executable/src/Main.as", @tool.to_shell
+      end
     end
 
     should "accept default gem name" do
@@ -184,28 +186,34 @@ class ExecutableTest < Test::Unit::TestCase
     end
 
     should "accept configuration as a file task" do
-      @tool = mxmlc 'bin/SomeFile.swf' do |t|
-        t.source_path << 'test/fixtures/executable/src'
-        t.input = 'test/fixtures/executable/src/Main.as'
+      as_a_unix_system do
+        @tool = mxmlc 'bin/SomeFile.swf' do |t|
+          t.source_path << 'test/fixtures/executable/src'
+          t.input = 'test/fixtures/executable/src/Main.as'
+        end
+        assert_equal 'bin/SomeFile.swf', @tool.output
+        assert_equal "--output=bin/SomeFile.swf --source-path+=test/fixtures/executable/src test/fixtures/executable/src/Main.as", @tool.to_shell
       end
-      assert_equal 'bin/SomeFile.swf', @tool.output
-      assert_equal "--output=bin/SomeFile.swf --source-path+=test/fixtures/executable/src test/fixtures/executable/src/Main.as", @tool.to_shell
     end
 
     should "accept configuration with prereqs as a file task" do
-      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'
+      as_a_unix_system do
+        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'
+        end
+        assert_equal 'bin/SomeFile.swf', @tool.output
+        assert_equal "--output=bin/SomeFile.swf --source-path+=test/fixtures/executable/src test/fixtures/executable/src/Main.as", @tool.to_shell
       end
-      assert_equal 'bin/SomeFile.swf', @tool.output
-      assert_equal "--output=bin/SomeFile.swf --source-path+=test/fixtures/executable/src test/fixtures/executable/src/Main.as", @tool.to_shell
     end
 
     should "to_shell input" do
-      @tool.debug = true
-      @tool.source_path << "test/fixtures/executable/src"
-      assert_equal "--debug --source-path+=test/fixtures/executable/src", @tool.to_shell
+      as_a_unix_system do
+        @tool.debug = true
+        @tool.source_path << "test/fixtures/executable/src"
+        assert_equal "--debug --source-path+=test/fixtures/executable/src", @tool.to_shell
+      end
     end
 
     should "execute the registered executable" do

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 4
+  - 5
   - pre
-  version: 1.0.4.pre
+  version: 1.0.5.pre
 platform: ruby
 authors: 
 - Luke Bayes