buildr-as3 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/buildr-as3.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-as3}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   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

@@ -21,98 +21,100 @@
 #
 module Buildr
   module AS3
-    class AlchemyToolkit
-      
-      attr_reader :home, :achacks, :gcc, :flex_sdk, :alchemy_setup, :bin
-      
-      def initialize( flex_sdk )
+    module Alchemy
+      class AlchemyToolkit
 
-        @flex_sdk = flex_sdk
+        attr_reader :home, :achacks, :gcc, :flex_sdk, :alchemy_setup, :bin
 
-        toolkit_version = "1.0.0"
-        toolkit_url = "http://download.macromedia.com/pub/labs/alchemy/alchemy_sdk_darwin_p1_121008.zip"
-                
-        toolkit_zip = Buildr::artifact("com.adobe.alchemy:toolkit:zip:#{toolkit_version}").from(Buildr::download(toolkit_url))
-        toolkit_zip.invoke unless File.exists? toolkit_zip.to_s
+        def initialize( flex_sdk )
 
-        toolkit_dir = File.join(File.dirname(toolkit_zip.to_s), "toolkit-#{toolkit_version}")
+          @flex_sdk = flex_sdk
 
-        unless File.exists? toolkit_dir
-          puts "Unzipping Alchemy Toolkit, this may take a while."
-          Buildr::unzip("#{toolkit_dir}"=>toolkit_zip.to_s).target.invoke
-        end
+          toolkit_version = "1.0.0"
+          toolkit_url = "http://download.macromedia.com/pub/labs/alchemy/alchemy_sdk_darwin_p1_121008.zip"
 
-        @home = "#{toolkit_dir}/alchemy-darwin-v0.5a"
-        @achacks = "#{@home}/achacks"
-        @gcc = "#{@achacks}/gcc"
-        @alchemy_setup = "#{@home}/alchemy-setup"
-        @config = "#{@home}/config"
-        @bin = "#{@home}/bin"
-
-        # Run config script if alchemy-setup doesn't exist
-        unless File.exists? @alchemy_setup
-          project_dir = Dir.getwd
-          ENV["PATH"] = "#{ENV["PATH"]}:#{flex_sdk.bin}"
-          Dir.chdir @home
-          system("sh ./config")
-          Dir.chdir project_dir
-        end
+          toolkit_zip = Buildr::artifact("com.adobe.alchemy:toolkit:zip:#{toolkit_version}").from(Buildr::download(toolkit_url))
+          toolkit_zip.invoke unless File.exists? toolkit_zip.to_s
 
-      end
-    end
+          toolkit_dir = File.join(File.dirname(toolkit_zip.to_s), "toolkit-#{toolkit_version}")
 
-    module Compiler
-      class AlcGcc < Buildr::Compiler::Base
-      specify :language => :c,
-              :sources => :c, :source_ext => :c,
-              :target => "bin", :target_ext => "swc",
-              :packaging => :swc
+          unless File.exists? toolkit_dir
+            puts "Unzipping Alchemy Toolkit, this may take a while."
+            Buildr::unzip("#{toolkit_dir}"=>toolkit_zip.to_s).target.invoke
+          end
 
-      attr_reader :project
+          @home = "#{toolkit_dir}/alchemy-darwin-v0.5a"
+          @achacks = "#{@home}/achacks"
+          @gcc = "#{@achacks}/gcc"
+          @alchemy_setup = "#{@home}/alchemy-setup"
+          @config = "#{@home}/config"
+          @bin = "#{@home}/bin"
 
-      def initialize(project, options)
-        super
-        @project = project
-      end
+          # Run config script if alchemy-setup doesn't exist
+          unless File.exists? @alchemy_setup
+            project_dir = Dir.getwd
+            ENV["PATH"] = "#{ENV["PATH"]}:#{flex_sdk.bin}"
+            Dir.chdir @home
+            system("sh ./config")
+            Dir.chdir project_dir
+          end
 
-      include CompilerUtils
+        end
+      end
 
-      def compile(sources, target, dependencies)
-        alchemy_tk = options[:alchemytk]
-        flex_sdk = alchemy_tk.flex_sdk
-        output =  CompilerUtils::get_output(project,target,:swc,options)
+      module Compiler
+        class AlcGcc < Buildr::Compiler::Base
+        specify :language => :c,
+                :sources => :c, :source_ext => :c,
+                :target => "bin", :target_ext => "swc",
+                :packaging => :swc
 
-        # 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}"
+        attr_reader :project
 
-        reserved = [:flexsdk,:main,:alchemytk]
-        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
 end
-Buildr::Compiler.compilers << Buildr::AS3::Compiler::AlcGcc
+Buildr::Compiler.compilers << Buildr::AS3::Alchemy::Compiler::AlcGcc

data/lib/buildr/as3/apparat.rb

@@ -21,78 +21,82 @@
 #
 module Buildr
   module AS3
-      class ApparatToolkit
-        attr_reader :home, :asmifier, :concrete, :coverage, :dump,
-                    :jitb, :reducer, :stripper, :tdsi, :asm_swc,
-                    :ersatz_swc, :lzma_decoder_swc
+      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)
+          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
+            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
 
-          @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"
+            @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
         end
-      end
-      module Apparat
-        include Extension
+        module Tasks
+          include Extension
 
-        first_time do
-          Project.local_task('apparat_tdsi')
-          Project.local_task('apparat_reducer')
-        end
+          first_time do
+            Project.local_task('apparat_tdsi')
+            Project.local_task('apparat_reducer')
+          end
 
-        before_define do |project|
-        end
+          before_define do |project|
+          end
 
-        after_define do |project|
-        end
+          after_define do |project|
+          end
 
-        def apparat_tdsi(apparat_tk,options = {})
-          output = Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,compile.packaging,compile.options)
-          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}"
+          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) }.
+              each do |key, value|
+                cmd_args << "-#{key} #{value}"
+            end
+            system(cmd_args.join " ")
           end
-          system(cmd_args.join " ")
-        end
 
-        def apparat_reducer(apparat_tk,quality)
-          output = Buildr::AS3::Compiler::CompilerUtils::get_output(project,compile.target,compile.packaging,compile.options)
-          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 " ")
+          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
         end
       end
   end
   class Project
-    include Buildr::AS3::Apparat
+    include Buildr::AS3::Apparat::Tasks
   end
 end

data/lib/buildr/as3/compiler.rb

@@ -104,7 +104,7 @@ module Buildr
           cmd_args << "-load-config" << flex_sdk.flex_config
           cmd_args << "-source-path" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-          reserved = [:flexsdk,:main]
+          reserved = [:flexsdk,:main,:apparat]
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
                 cmd_args << "-#{key}=#{value}"
@@ -148,7 +148,7 @@ module Buildr
           cmd_args << "-load-config" << flex_sdk.air_config
           cmd_args << "-source-path" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-          reserved = [:flexsdk,:main]
+          reserved = [:flexsdk,:main,:apparat]
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
                 cmd_args << "-#{key}=#{value}"
@@ -186,7 +186,7 @@ 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]
+          reserved = [:flexsdk,:main,:apparat]
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
                 cmd_args << "-#{key}=#{value}"
@@ -225,7 +225,7 @@ module Buildr
           cmd_args << "+configname" << "air"
           cmd_args << "-include-sources" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-          reserved = [:flexsdk, :main]
+          reserved = [:flexsdk,:main,:apparat]
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
                 cmd_args << "-#{key}=#{value}"

data/lib/buildr/as3/flexsdk.rb

@@ -21,45 +21,47 @@
 #
 module Buildr
   module AS3
-    class Flex4SDK
-      
-      attr_reader :home, :mxmlc_jar, :compc_jar, :asdoc_jar, :fcsh_jar, :flex_config,
-                  :asdoc_templates, :default_options, :air_config, :bin
-      
-      attr_writer :flex_config, :air_config, :asdoc_templates
-      
-      def initialize(sdk_opts = {})
+    module Flex
+      class FlexSDK
 
-        @default_options = {}
+        attr_reader :home, :mxmlc_jar, :compc_jar, :asdoc_jar, :fcsh_jar, :flex_config,
+                    :asdoc_templates, :default_options, :air_config, :bin
 
-        generate_url(sdk_opts)
-                
-        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]}")
+        attr_writer :flex_config, :air_config, :asdoc_templates
 
-        unless File.exists? sdk_dir
-          puts "Unzipping FlexSDK, this may take a while."
-          Buildr::unzip("#{sdk_dir}"=>sdk_zip.to_s).target.invoke
+        def initialize(sdk_opts = {})
+
+          @default_options = {}
+
+          generate_url(sdk_opts)
+
+          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
+          end
+
+          @home = sdk_dir
+          @mxmlc_jar = "#{@home}/lib/mxmlc.jar"
+          @compc_jar = "#{@home}/lib/compc.jar"
+          @asdoc_jar = "#{@home}/lib/asdoc.jar"
+          @asdoc_templates = "#{@home}/asdoc/templates"
+          @fcsh_jar = "#{@home}/lib/fcsh.jar"
+          @flex_config = "#{@home}/frameworks/flex-config.xml"
+          @air_config = "#{@home}/frameworks/air-config.xml"
+          @bin = "#{@home}/bin"
         end
 
-        @home = sdk_dir
-        @mxmlc_jar = "#{@home}/lib/mxmlc.jar"
-        @compc_jar = "#{@home}/lib/compc.jar"
-        @asdoc_jar = "#{@home}/lib/asdoc.jar"
-        @asdoc_templates = "#{@home}/asdoc/templates"
-        @fcsh_jar = "#{@home}/lib/fcsh.jar"
-        @flex_config = "#{@home}/frameworks/flex-config.xml"
-        @air_config = "#{@home}/frameworks/air-config.xml"
-        @bin = "#{@home}/bin"
-      end
+        protected
 
-      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
 
-      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.rb

@@ -24,4 +24,7 @@ require "#{File.dirname(__FILE__)}/as3/packaging"
 require "#{File.dirname(__FILE__)}/as3/flexsdk"
 require "#{File.dirname(__FILE__)}/as3/doc"
 require "#{File.dirname(__FILE__)}/as3/alchemy"
-require "#{File.dirname(__FILE__)}/as3/apparat"
+require "#{File.dirname(__FILE__)}/as3/apparat"
+include Buildr::AS3::Flex
+include Buildr::AS3::Apparat
+include Buildr::AS3::Alchemy

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-as3
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Dominic Graefen