buildr-as3 0.1.16 → 0.1.17

data/README.rdoc

@@ -4,17 +4,25 @@
 
 = Changelog
 
+== 0.1.17
+
+* [FXIED]
+Actually no files were updated in version 0.1.16 because of a git hick-up,
+now the changes meant for 0.1.16 are applied in 0.1.17.
+
 == 0.1.16
 
 * [FEATURE]
- API for Framworks and Toolkits integration has been refactored and updated.
+API for Framworks and Toolkits integration has been refactored and updated.
 
 * [FIXED] Issue 15
- Zip file extraction is now handled with gnuwin32 unzip on Windows, and the equivalent on *nix platforms as a fallback for rubyzip.
- On Windows gnuwin32 unzip needs to be installed and added to the PATH variable.
+Zip file extraction is now handled with gnuwin32 unzip on Windows, and the equivalent
+on *nix platforms as a fallback for rubyzip.
+On Windows gnuwin32 unzip needs to be installed and added to the PATH variable.
 
 * [FIXED] Issue 16
- Binarymode was not set on target-file, which caused the downloaded archive to be corrupt. This is an issue of buildr and was reported.
+Binarymode was not set on target-file, which caused the downloaded archive to be corrupt.
+This is an issue of buildr and was reported.
 
 == 0.1.13
 

data/VERSION

@@ -1 +1 @@
-0.1.16
+0.1.17

data/buildr-as3.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-as3}
-  s.version = "0.1.16"
+  s.version = "0.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]

data/lib/buildr/as3/alchemy.rb

@@ -26,7 +26,9 @@ module Buildr
 
         attr_reader :home, :achacks, :gcc, :flex_sdk, :alchemy_setup, :bin
 
-        def initialize( flex_sdk )
+        def initialize(flex_sdk)
+
+          fail("Alchemy support currently only on *nix based systems.") if Buildr::Util.win_os?
 
           @flex_sdk = flex_sdk
 
@@ -64,55 +66,55 @@ module Buildr
 
       module Compiler
         class AlcGcc < Buildr::Compiler::Base
-        specify :language => :c,
-                :sources => :c, :source_ext => :c,
-                :target => "bin", :target_ext => "swc",
-                :packaging => :swc
-
-        attr_reader :project
-
-        def initialize(project, options)
-          super
-          @project = project
-        end
-
-        include Buildr::AS3::Compiler::CompilerUtils
+          specify :language => :c,
+                  :sources => :c, :source_ext => :c,
+                  :target => "bin", :target_ext => "swc",
+                  :packaging => :swc
 
-        def compile(sources, target, dependencies)
-          alchemy_tk = options[:alchemy]
-          flex_sdk = alchemy_tk.flex_sdk
-          output =  Buildr::AS3::Compiler::CompilerUtils::get_output(project,target,:swc,options)
+          attr_reader :project
 
-          # gcc stringecho.c -O3 -Wall -swc -o stringecho.swc
-          cmd_args = []
-          cmd_args << "gcc"
-          cmd_args << File.basename(options[:main])
-          cmd_args << "-O3 -Wall -swc"
-          cmd_args << "-o #{File.basename output}"
-
-          reserved = [:flexsdk,:main,:alchemy]
-          options.to_hash.reject { |key, value| reserved.include?(key) }.
-              each do |key, value|
-                cmd_args << "-#{key}=#{value}"
+          def initialize(project, options)
+            super
+            @project = project
           end
 
-          unless Buildr.application.options.dryrun
-            ENV["ALCHEMY_HOME"]= alchemy_tk.home
-            ENV["ALCHEMY_VER"] = "0.4a"
-            ENV["PATH"] = "#{alchemy_tk.bin}:#{ENV["PATH"]}"
-            ENV["ASC"]="#{alchemy_tk.home}/bin/asc.jar"
-            ENV["SWFBRIDGE"]="#{alchemy_tk.home}/bin/swfbridge"
-            ENV["PATH"] = "#{alchemy_tk.achacks}:#{ENV["PATH"]}"
-            ENV["PATH"] = "#{ENV["PATH"]}:#{flex_sdk.bin}"
-            project_dir = Dir.getwd
-            Dir.chdir File.dirname options[:main]
-            system(cmd_args.join(" "))
-            File.copy( File.basename(output), output)
-            File.delete File.basename(output)
-            Dir.chdir project_dir
+          include Buildr::AS3::Compiler::CompilerUtils
+
+          def compile(sources, target, dependencies)
+            alchemy_tk = options[:alchemy]
+            flex_sdk = alchemy_tk.flex_sdk
+            output = Buildr::AS3::Compiler::CompilerUtils::get_output(project, target, :swc, options)
+
+            # gcc stringecho.c -O3 -Wall -swc -o stringecho.swc
+            cmd_args = []
+            cmd_args << "gcc"
+            cmd_args << File.basename(options[:main])
+            cmd_args << "-O3 -Wall -swc"
+            cmd_args << "-o #{File.basename output}"
+
+            reserved = [:flexsdk, :main, :alchemy]
+            options.to_hash.reject { |key, value| reserved.include?(key) }.
+                each do |key, value|
+              cmd_args << "-#{key}=#{value}"
+            end
+
+            unless Buildr.application.options.dryrun
+              ENV["ALCHEMY_HOME"]= alchemy_tk.home
+              ENV["ALCHEMY_VER"] = "0.4a"
+              ENV["PATH"] = "#{alchemy_tk.bin}:#{ENV["PATH"]}"
+              ENV["ASC"]="#{alchemy_tk.home}/bin/asc.jar"
+              ENV["SWFBRIDGE"]="#{alchemy_tk.home}/bin/swfbridge"
+              ENV["PATH"] = "#{alchemy_tk.achacks}:#{ENV["PATH"]}"
+              ENV["PATH"] = "#{ENV["PATH"]}:#{flex_sdk.bin}"
+              project_dir = Dir.getwd
+              Dir.chdir File.dirname options[:main]
+              system(cmd_args.join(" "))
+              File.copy(File.basename(output), output)
+              File.delete File.basename(output)
+              Dir.chdir project_dir
+            end
           end
         end
-        end
       end
     end
   end

data/lib/buildr/as3/apparat.rb

@@ -21,80 +21,131 @@
 #
 module Buildr
   module AS3
-      module Apparat
-        class ApparatToolkit
-          attr_reader :home, :asmifier, :concrete, :coverage, :dump,
-                      :jitb, :reducer, :stripper, :tdsi, :asm_swc,
-                      :ersatz_swc, :lzma_decoder_swc
-
-          def initialize(apparat_version,apparat_url)
-
-            apparat_zip = Buildr::artifact("com.googlecode:apparat-bin:zip:#{apparat_version}").from(Buildr::download(apparat_url))
-            apparat_zip.invoke unless File.exists? apparat_zip.to_s
-            apparat_dir = File.join(File.dirname(apparat_zip.to_s), "apparat-bin-#{apparat_version}")
-            unless File.exists? apparat_dir
-              puts "Unzipping Apparat, this may take a while."
-              Buildr::unzip(apparat_dir=>apparat_zip.to_s).target.invoke
-            end
+    module Apparat
+      class ApparatToolkit
+        attr_reader :home, :asmifier, :concrete, :coverage, :dump,
+                    :jitb, :reducer, :stripper, :tdsi, :asm_swc,
+                    :ersatz_swc, :lzma_decoder_swc, :scala_home
 
-            @home = apparat_dir
-            bat_ext = Buildr::Util.win_os? ? ".bat" : ""
-            @apparat = "#{@home}/apparat#{bat_ext}"
-            @asmifier = "#{@home}/asmifier#{bat_ext}"
-            @concrete = "#{@home}/concrete#{bat_ext}"
-            @coverage = "#{@home}/coverage#{bat_ext}"
-            @dump = "#{@home}/dump#{bat_ext}"
-            @jitb = "#{@home}/jitb#{bat_ext}"
-            @reducer = "#{@home}/reducer#{bat_ext}"
-            @stripper = "#{@home}/stripper#{bat_ext}"
-            @tdsi = "#{@home}/tdsi#{bat_ext}"
-            @asm_swc = "#{@home}/apparat-asm-#{apparat_version}.swc"
-            @ersatz_swc = "#{@home}/apparat-ersatz-#{apparat_version}.swc"
-            @lzma_decoder_swc = "#{@home}/apparat-lzma-decoder-#{apparat_version}.swc"
-          end
+        def initialize(version)
+          @version = version
+          @spec = "com.googlecode:apparat-bin:zip:#{@version}"
+          @apparat_zip = Buildr.artifact(@spec)
+          @apparat_dir = File.join(File.dirname(@apparat_zip.to_s), "apparat-bin-#{@version}", "apparat-#{@version}")
+          generate_paths @apparat_dir, @version
         end
-        module Tasks
-          include Extension
 
-          first_time do
-            Project.local_task('apparat_tdsi')
-            Project.local_task('apparat_reducer')
-          end
+        def invoke
 
-          before_define do |project|
+          if @url
+            Buildr.artifact(@spec).from(Buildr.download(@url)).invoke unless File.exists? @apparat_zip.to_s
+          else
+            Buildr.artifact(@spec).invoke unless File.exists? @apparat_zip.to_s
           end
 
-          after_define do |project|
+          unless File.exists? @apparat_dir
+            puts "Unzipping Apparat, this might take a while."
+            unzip_dir = File.dirname @apparat_dir
+            if Buildr::Util.win_os?
+              puts "Please make sure unzip is installed and in your PATH variable!"
+              unzip @apparat_zip, unzip_dir
+            else
+              begin
+                Buildr.unzip(unzip_dir.to_s=>@apparat_zip.to_s).target.invoke
+              rescue TypeError
+                puts "RubyZip extract failed, trying system unzip now."
+                unzip @apparat_zip, unzip_dir
+              end
+            end
           end
+          self
+        end
+
+        def from(url)
+          @url = url
+          self
+        end
 
-          def apparat_tdsi(options = {})
-            output = Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,compile.packaging,compile.options)
-            apparat_tk = compile.options[:apparat]
-            cmd_args = []
-            cmd_args << apparat_tk.tdsi
-            cmd_args << "-i #{output}"
-            cmd_args << "-o #{output}"
-            reserved = []
-            options.to_hash.reject { |key, value| reserved.include?(key) }.
+        def scala(scala_home)
+          @scala_home = scala_home
+          self
+        end
+
+
+        protected
+
+        def unzip(zip, destination)
+          project_dir = Dir.getwd
+          Dir.chdir File.dirname(zip.to_s)
+          system("unzip #{File.basename(zip.to_s).to_s} -d #{File.basename(destination).to_s}")
+          Dir.chdir project_dir
+        end
+
+        def generate_paths(home_dir, version)
+          @home = home_dir
+          bat_ext = Buildr::Util.win_os? ? "" : ""
+          @apparat = "#{@home}/apparat#{bat_ext}"
+          @asmifier = "#{@home}/asmifier#{bat_ext}"
+          @concrete = "#{@home}/concrete#{bat_ext}"
+          @coverage = "#{@home}/coverage#{bat_ext}"
+          @dump = "#{@home}/dump#{bat_ext}"
+          @jitb = "#{@home}/jitb#{bat_ext}"
+          @reducer = "#{@home}/reducer#{bat_ext}"
+          @stripper = "#{@home}/stripper#{bat_ext}"
+          @tdsi = "#{@home}/tdsi#{bat_ext}"
+          @asm_swc = "#{@home}/apparat-asm-#{version}.swc"
+          @ersatz_swc = "#{@home}/apparat-ersatz-#{version}.swc"
+          @lzma_decoder_swc = "#{@home}/apparat-lzma-decoder-#{version}.swc"
+          self
+        end
+      end
+
+
+      module Tasks
+        include Extension
+
+        first_time do
+          Project.local_task('apparat_tdsi')
+          Project.local_task('apparat_reducer')
+        end
+
+        before_define do |project|
+        end
+
+        after_define do |project|
+        end
+
+        def apparat_tdsi(options = {})
+          output = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, compile.packaging, compile.options)
+          apparat_tk = compile.options[:apparat].invoke
+          cmd_args = []
+          cmd_args << "\"#{apparat_tk.tdsi}\""
+          cmd_args << "-i #{output}"
+          cmd_args << "-o #{output}"
+          reserved = []
+          options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-                cmd_args << "-#{key} #{value}"
-            end
-            system(cmd_args.join " ")
+            cmd_args << "-#{key} #{value}"
           end
+          ENV["PATH"] = "#{apparat_tk.scala_home}/bin#{File::PATH_SEPARATOR}#{ENV["PATH"]}" if apparat_tk.scala_home && !ENV["PATH"].include?("#{apparat_tk.scala_home}/bin")
+          puts "path:", ENV["PATH"]
+          puts "tdsi:",cmd_args.join(" "), system(cmd_args.join " ")
+        end
 
-          def apparat_reducer(quality)
-            output = Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,compile.packaging,compile.options)
-            apparat_tk = compile.options[:apparat]
-            cmd_args = []
-            cmd_args << apparat_tk.reducer
-            cmd_args << "-i #{output}"
-            cmd_args << "-o #{output}"
-            cmd_args << "-q"
-            cmd_args << quality || 100
-            system(cmd_args.join " ")
-          end
+        def apparat_reducer(quality)
+          output = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, compile.packaging, compile.options)
+          apparat_tk = compile.options[:apparat].invoke
+          cmd_args = []
+          cmd_args << "\"#{apparat_tk.reducer}\""
+          cmd_args << "-i #{output}"
+          cmd_args << "-o #{output}"
+          cmd_args << "-q"
+          cmd_args << quality || 100
+          ENV["PATH"] = "#{apparat_tk.scala_home}#{File::Separator}bin#{File::PATH_SEPARATOR}#{ENV["PATH"]}" if apparat_tk.scala_home && !ENV["PATH"].include?("#{apparat_tk.scala_home}/bin")
+          system(cmd_args.join " ")
         end
       end
+    end
   end
   class Project
     include Buildr::AS3::Apparat::Tasks

data/lib/buildr/as3/compiler.rb

@@ -25,15 +25,15 @@ module Buildr
   module AS3
     module Compiler
       module CompilerUtils
-        def self.get_output( project, target, package, options )
+        def self.get_output(project, target, package, options)
           return options[:output] if options.has_key? :output
           return "#{target}/#{File.basename(options[:main].to_s, File.extname(options[:main].to_s))}.swf" if package == :swf
           return "#{target}/#{project.name.gsub(":", "-")}.swc" if package == :swc
-          fail( "Could not guess output file.")
+          fail("Could not guess output file.")
         end
 
         def needed?(sources, target, dependencies)
-          output =  CompilerUtils::get_output(project,target,project.compile.packaging,options)
+          output = CompilerUtils::get_output(project, target, project.compile.packaging, options)
           sources.each do |source|
             if is_output_outdated?(output, source)
               puts "Recompile of #{project.name} needed: Sources are newer than target"
@@ -50,12 +50,12 @@ module Buildr
           false
         end
 
-        def is_output_outdated?(output,file_to_check)
+        def is_output_outdated?(output, file_to_check)
           return true unless File.exists? output
-          older(output,file_to_check)
+          older(output, file_to_check)
         end
 
-        def older(a,b) # a older than b
+        def older(a, b) # a older than b
           timestamp_from_file(a) < timestamp_from_file(b)
         end
 
@@ -93,8 +93,8 @@ module Buildr
         include CompilerUtils
 
         def compile(sources, target, dependencies)
-          flex_sdk = options[:flexsdk]
-          output =  CompilerUtils::get_output(project,target,:swf,options)
+          flex_sdk = options[:flexsdk].invoke
+          output = CompilerUtils::get_output(project, target, :swf, options)
 
           cmd_args = []
           cmd_args << "-jar" << flex_sdk.mxmlc_jar
@@ -105,13 +105,13 @@ module Buildr
           cmd_args << "-source-path" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
-          reserved = [:flexsdk,:main,:apparat]
+          reserved = [:flexsdk, :main, :apparat]
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-                cmd_args << "-#{key}=#{value}"
+            cmd_args << "-#{key}=#{value}"
           end
           flex_sdk.default_options.each do |key, value|
-                cmd_args << "-#{key}=#{value}"
+            cmd_args << "-#{key}=#{value}"
           end
 
           unless Buildr.application.options.dryrun
@@ -137,8 +137,8 @@ module Buildr
         include CompilerUtils
 
         def compile(sources, target, dependencies)
-          flex_sdk = options[:flexsdk]
-          output =  CompilerUtils::get_output(project,target,:swf,options)
+          flex_sdk = options[:flexsdk].invoke
+          output = CompilerUtils::get_output(project, target, :swf, options)
 
           cmd_args = []
           cmd_args << "-jar" << flex_sdk.mxmlc_jar
@@ -150,13 +150,13 @@ module Buildr
           cmd_args << "-source-path" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
-          reserved = [:flexsdk,:main,:apparat]
+          reserved = [:flexsdk, :main, :apparat]
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-                cmd_args << "-#{key}=#{value}"
+            cmd_args << "-#{key}=#{value}"
           end
           flex_sdk.default_options.each do |key, value|
-                cmd_args << "-#{key}=#{value}"
+            cmd_args << "-#{key}=#{value}"
           end
 
           unless Buildr.application.options.dryrun
@@ -171,6 +171,7 @@ module Buildr
                 :target => "bin", :target_ext => "swc",
                 :packaging => :swc
         attr_reader :project
+
         def initialize(project, options)
           super
           @project = project
@@ -179,8 +180,8 @@ module Buildr
         include CompilerUtils
 
         def compile(sources, target, dependencies)
-          flex_sdk = options[:flexsdk]
-          output =  CompilerUtils::get_output(project,target,:swc,options)
+          flex_sdk = options[:flexsdk].invoke
+          output = CompilerUtils::get_output(project, target, :swc, options)
           cmd_args = []
           cmd_args << "-jar" << flex_sdk.compc_jar
           cmd_args << "-output" << output
@@ -188,14 +189,14 @@ module Buildr
           cmd_args << "-load-config" << flex_sdk.flex_config
           cmd_args << "-include-sources" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-          reserved = [:flexsdk,:main,:apparat]
+          reserved = [:flexsdk, :main, :apparat]
           options[:debug] = Buildr.options.debug.to_s
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-                cmd_args << "-#{key}=#{value}"
-              end
+            cmd_args << "-#{key}=#{value}"
+          end
           flex_sdk.default_options.each do |key, value|
-                cmd_args << "-#{key}=#{value}"
+            cmd_args << "-#{key}=#{value}"
           end
 
           unless Buildr.application.options.dryrun
@@ -210,6 +211,7 @@ module Buildr
                 :target => "bin", :target_ext => "swc",
                 :packaging => :swc
         attr_reader :project
+
         def initialize(project, options)
           super
           @project = project
@@ -218,8 +220,8 @@ module Buildr
         include CompilerUtils
 
         def compile(sources, target, dependencies)
-          flex_sdk = options[:flexsdk]
-          output =  CompilerUtils::get_output(project,target,:swc,options)
+          flex_sdk = options[:flexsdk].invoke
+          output = CompilerUtils::get_output(project, target, :swc, options)
           cmd_args = []
           cmd_args << "-jar" << flex_sdk.compc_jar
           cmd_args << "-output" << output
@@ -229,13 +231,13 @@ module Buildr
           cmd_args << "-include-sources" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
-          reserved = [:flexsdk,:main,:apparat]
+          reserved = [:flexsdk, :main, :apparat]
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-                cmd_args << "-#{key}=#{value}"
-              end
+            cmd_args << "-#{key}=#{value}"
+          end
           flex_sdk.default_options.each do |key, value|
-                cmd_args << "-#{key}=#{value}"
+            cmd_args << "-#{key}=#{value}"
           end
 
           unless Buildr.application.options.dryrun

data/lib/buildr/as3/doc.rb

@@ -33,7 +33,7 @@ module Buildr
           dependencies = project.compile.dependencies
           sources = project.compile.sources
           flex_sdk = options[:flexsdk]
-          output =  (options[:output] || "#{target}")
+          output = (options[:output] || "#{target}")
           cmd_args = []
           cmd_args << "-classpath" << "#{flex_sdk.home}/lib/xalan.jar"
           cmd_args << "-classpath" << flex_sdk.asdoc_jar
@@ -45,13 +45,13 @@ module Buildr
           cmd_args << "-doc-sources" << sources.join(" ")
           cmd_args << "-templates-path" << flex_sdk.asdoc_templates
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-          reserved = [:flexsdk,:main,:classpath,:sourcepath]
+          reserved = [:flexsdk, :main, :classpath, :sourcepath]
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-                cmd_args << "-#{key}=#{value}"
-              end
+            cmd_args << "-#{key}=#{value}"
+          end
           flex_sdk.default_options.each do |key, value|
-                cmd_args << "-#{key}=#{value}"
+            cmd_args << "-#{key}=#{value}"
           end
           unless Buildr.application.options.dryrun
             Java::Commands.java cmd_args

data/lib/buildr/as3/flexsdk.rb

@@ -19,6 +19,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
+require 'tmpdir'
+require "open-uri"
+require "fileutils"
+
 module Buildr
   module AS3
     module Flex
@@ -29,22 +33,69 @@ module Buildr
 
         attr_writer :flex_config, :air_config, :asdoc_templates
 
-        def initialize(sdk_opts = {})
-
+        def initialize(version)
+          @version = version
           @default_options = {}
+          @spec = "com.adobe.flex:sdk:zip:#{@version}"
+          @sdk_zip = Buildr.artifact(@spec)
+          @sdk_dir = File.join(File.dirname(@sdk_zip.to_s), "sdk-#{@version}")
+          generate_paths @sdk_dir
+          self
+        end
 
-          generate_url(sdk_opts)
+        def invoke
+          @url ||= generate_url_from_version @version
+
+          if Buildr::Util.win_os?
+            unless File.exists? @sdk_zip.to_s
+              FileUtils.mkdir_p File.dirname(@sdk_zip.to_s) unless File.directory? File.dirname(@sdk_zip.to_s)
+              File.open @sdk_zip.to_s, 'w' do |file|
+                file.binmode()
+                URI.read(@url, {:progress=>true}) { |chunk| file.write chunk }
+              end
+            end
+          else
+            Buildr.artifact(@spec).from(Buildr.download(@url)).invoke unless File.exists? @sdk_zip.to_s
+          end
 
-          sdk_zip = Buildr::artifact("com.adobe.flex:sdk:zip:#{sdk_opts[:sdk_version]}").from(Buildr::download(sdk_opts[:sdk_url]))
-          sdk_zip.invoke unless File.exists? sdk_zip.to_s
-          sdk_dir = File.join(File.dirname(sdk_zip.to_s), "sdk-#{sdk_opts[:sdk_version]}")
 
-          unless File.exists? sdk_dir
-            puts "Unzipping FlexSDK, this may take a while."
-            Buildr::unzip("#{sdk_dir}"=>sdk_zip.to_s).target.invoke
+          unless File.exists? @sdk_dir
+            puts "Unzipping FlexSDK, this might take a while."
+            if Buildr::Util.win_os?
+              puts "Please make sure unzip is installed and in your PATH variable!"
+              unzip @sdk_zip, @sdk_dir
+            else
+              begin
+                Buildr.unzip(@sdk_dir.to_s=>@sdk_zip.to_s).target.invoke
+              rescue TypeError
+                puts "RubyZip extract failed, trying system unzip now."
+                unzip @sdk_zip, @sdk_dir
+              end
+            end
           end
+          self
+        end
+
+        def from(url)
+          @url = url
+          self
+        end
+
+        protected
 
-          @home = sdk_dir
+        def unzip(zip, destination)
+          project_dir = Dir.getwd
+          Dir.chdir File.dirname(zip.to_s)
+          system("unzip #{File.basename(zip.to_s).to_s} -d #{File.basename(destination).to_s}")
+          Dir.chdir project_dir
+        end
+
+        def generate_url_from_version(version)
+          "http://fpdownload.adobe.com/pub/flex/sdk/builds/flex#{version.split(".")[0]}/flex_sdk_#{version}.zip"
+        end
+
+        def generate_paths(home_dir)
+          @home = home_dir
           @mxmlc_jar = "#{@home}/lib/mxmlc.jar"
           @compc_jar = "#{@home}/lib/compc.jar"
           @asdoc_jar = "#{@home}/lib/asdoc.jar"
@@ -55,14 +106,8 @@ module Buildr
           @flex_config = "#{@home}/frameworks/flex-config.xml"
           @air_config = "#{@home}/frameworks/air-config.xml"
           @bin = "#{@home}/bin"
+          true
         end
-
-        protected
-
-        def generate_url(opts = {})
-          opts[:sdk_url] ||= "http://fpdownload.adobe.com/pub/flex/sdk/builds/flex#{opts[:sdk_version].split(".")[0]}/flex_sdk_#{opts[:sdk_version]}.zip"
-        end
-
       end
     end
   end

data/lib/buildr/as3/ide/fdt4.rb

@@ -40,10 +40,10 @@ module Buildr
           after_define("as3:fdt4:generate" => :package) do |project|
             project.task("as3:fdt4:generate") do
               fail("Cannot create fdt4 projects on Windows machines, no support for symlinks.") unless !Buildr::Util.win_os?
-              if [:mxmlc,:compc,:airmxmlc,:aircompc].include? project.compile.compiler
+              if [:mxmlc, :compc, :airmxmlc, :aircompc].include? project.compile.compiler
                 output = project.base_dir + "/.settings/com.powerflasher.fdt.classpath"
                 puts "Writing FDT4 classpath file: #{output}"
-                puts "WARNING: This will create symlinks in #{project.path_to(:lib,:main,:as3)} as FDT4 doesn't support referencing files outside of the project folder."
+                puts "WARNING: This will create symlinks in #{project.path_to(:lib, :main, :as3)} as FDT4 doesn't support referencing files outside of the project folder."
                 sdk_based_libs = []
                 sdk_based_libs << "frameworks/libs/player/{playerVersion}/playerglobal.swc"
                 sdk_based_libs << "frameworks/libs/flex.swc"
@@ -55,7 +55,7 @@ module Buildr
                 sdk_based_libs << "frameworks/libs/sparkskins.swc"
                 sdk_based_libs << "frameworks/libs/datavisualization.swc"
 
-                if [:airmxmlc,:aircompc].include? project.compile.compiler
+                if [:airmxmlc, :aircompc].include? project.compile.compiler
                   sdk_based_libs << "frameworks/libs/air/airglobal.swc"
                   sdk_based_libs << "frameworks/libs/air/airframework.swc"
                   sdk_based_libs << "frameworks/libs/air/airspark.swc"
@@ -69,37 +69,37 @@ module Buildr
                 classpath_xml.instruct!
                 classpath_xml.AS3Classpath do
                   sdk_based_libs.each do |sdk_lib|
-                    classpath_xml.AS3Classpath( sdk_lib, :generateProblems => false, :sdkBased => true, :type => "lib", :useAsSharedCode => "false" )
+                    classpath_xml.AS3Classpath(sdk_lib, :generateProblems => false, :sdkBased => true, :type => "lib", :useAsSharedCode => "false")
                   end
                   project.compile.sources.each do |source|
-                    classpath_xml.AS3Classpath( project.get_eclipse_relative_path(project,source), :generateProblems => true, :sdkBased => false, :type => project.get_fdt4_classpath_type(source), :useAsSharedCode => "false" )
+                    classpath_xml.AS3Classpath(project.get_eclipse_relative_path(project, source), :generateProblems => true, :sdkBased => false, :type => project.get_fdt4_classpath_type(source), :useAsSharedCode => "false")
                   end
-                  unless File.directory? project.path_to(:lib,:main,:as3)
+                  unless File.directory? project.path_to(:lib, :main, :as3)
                     #:dummy is just a bogus thing, it somehow stops creating the folders a layer to early
-                    FileUtils.mkdir_p File.dirname(project.path_to(:lib,:main,:as3,:dummy))
+                    FileUtils.mkdir_p File.dirname(project.path_to(:lib, :main, :as3, :dummy))
                   end
                   project.compile.dependencies.each do |dependency|
-                    dependency = project.create_fdt4_dependency_symlink( project, dependency )
-                    classpath_xml.AS3Classpath( project.get_eclipse_relative_path(project,dependency), :generateProblems => false, :sdkBased => false, :type => project.get_fdt4_classpath_type(dependency), :useAsSharedCode => "false" )
+                    dependency = project.create_fdt4_dependency_symlink(project, dependency)
+                    classpath_xml.AS3Classpath(project.get_eclipse_relative_path(project, dependency), :generateProblems => false, :sdkBased => false, :type => project.get_fdt4_classpath_type(dependency), :useAsSharedCode => "false")
                   end
                 end
 
                 unless File.directory? File.dirname(output)
                   Dir.mkdir File.dirname(output)
                 end
-                File.open(output, 'w') {|f| f.write(contents) }
+                File.open(output, 'w') { |f| f.write(contents) }
               end
             end
           end
 
-          def create_fdt4_dependency_symlink( project, dependency )
+          def create_fdt4_dependency_symlink(project, dependency)
             case source
               when Buildr::Artifact then
                 path = dependency.name
               else
                 path = dependency.to_s
             end
-            target = project.path_to(:lib,:main,:as3) + "/" + File.basename(path)
+            target = project.path_to(:lib, :main, :as3) + "/" + File.basename(path)
             unless target != path
               File.delete(target) if File.exists?(target)
               File.symlink path, target
@@ -107,7 +107,7 @@ module Buildr
             target
           end
 
-          def get_eclipse_relative_path( project, source )
+          def get_eclipse_relative_path(project, source)
             case source
               when Buildr::Artifact then
                 path = source.name
@@ -117,14 +117,14 @@ module Buildr
             Util.relative_path(File.expand_path(path), project.base_dir)
           end
 
-          def get_fdt4_classpath_type( source )
+          def get_fdt4_classpath_type(source)
             case source
               when Buildr::Artifact then
-                return "source" if File.directory?( source.name )
+                return "source" if File.directory?(source.name)
                 return "lib" if File.extname(source.name) == ".swc"
               else
 
-                return "source" if File.directory?( source.to_s )
+                return "source" if File.directory?(source.to_s)
                 return "lib" if File.extname(source.to_s) == ".swc"
             end
             "Could not guess type!"

data/lib/buildr/as3/packaging.rb

@@ -37,7 +37,7 @@ module Buildr
           super
           enhance do
             fail "File not found: #{src_swc}" unless File.exists? src_swc
-            File.copy( src_swc, target_swc )
+            File.copy(src_swc, target_swc)
           end
         end
 
@@ -70,7 +70,7 @@ module Buildr
           super
           enhance do
             fail "File not found: #{src_swf}" unless File.exists? src_swf
-            File.copy( src_swf, target_swf )
+            File.copy(src_swf, target_swf)
           end
         end
 
@@ -156,7 +156,7 @@ module Buildr
           args.each do |arg|
             case arg
               when Hash
-                arg.each do |key,value|
+                arg.each do |key, value|
                   @libs[key] = value
                 end
             end
@@ -183,15 +183,15 @@ module Buildr
       def package_as_swc(file_name)
         fail("Package types don't match! :swc vs. :#{compile.packaging.to_s}") unless compile.packaging == :swc
         SwcTask.define_task(file_name).tap do |swc|
-          swc.src_swc = Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,:swc,compile.options)
+          swc.src_swc = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, :swc, compile.options)
           swc.target_swc = file_name
         end
       end
 
       def package_as_swf(file_name)
-       fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
+        fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
         SwfTask.define_task(file_name).tap do |swf|
-          swf.src_swf =  Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,:swf,compile.options)
+          swf.src_swf = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, :swf, compile.options)
           swf.target_swf = file_name
         end
       end
@@ -199,7 +199,7 @@ module Buildr
       def package_as_air(file_name)
         fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
         AirTask.define_task(file_name).tap do |swf|
-          swf.src_swf =  Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,:swf,compile.options)
+          swf.src_swf = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, :swf, compile.options)
           swf.target_air = file_name
           swf.flexsdk = compile.options[:flexsdk]
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-as3
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 1
-  - 16
-  version: 0.1.16
+  - 17
+  version: 0.1.17
 platform: ruby
 authors: 
 - Dominic Graefen