buildr-as3 0.1.20 → 0.1.28

data/lib/buildr/as3/{apparat.rb → toolkits/apparat.rb}

@@ -21,8 +21,8 @@
 #
 module Buildr
   module AS3
-    module Apparat
-      class ApparatToolkit
+    module Toolkits
+      class ApparatToolkit < Buildr::AS3::Toolkits::ZipToolkiteBase
         attr_reader :home, :asmifier, :concrete, :coverage, :dump,
                     :jitb, :reducer, :stripper, :tdsi, :asm_swc,
                     :ersatz_swc, :lzma_decoder_swc, :scala_home
@@ -30,55 +30,21 @@ module Buildr
         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
+          @zip = Buildr.artifact(@spec)
+          @zip_destination = File.join(File.dirname(@zip.to_s), "apparat-#{@version}", "apparat-#{@version}")
+          generate_paths @zip_destination, @version
         end
 
-        def invoke
-
-          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
-
-          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 scala(scala_home)
-          @scala_home = scala_home
+        def invoke #:nodoc:
+          @url ||= generate_url_from_version @version
+          super
           self
         end
 
+        private
 
-        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
+        def generate_url_from_version(version)
+          "http://apparat.googlecode.com/files/apparat-#{version}-bin.zip"
         end
 
         def generate_paths(home_dir, version)
@@ -100,7 +66,7 @@ module Buildr
         end
       end
 
-      module Tasks
+      module ApparatTasks
         include Extension
 
         first_time do
@@ -115,7 +81,7 @@ module Buildr
         end
 
         def apparat_tdsi(options = {})
-          output = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, compile.packaging, compile.options)
+          output = project.get_as3_output(compile.target, compile.options)
           apparat_tk = compile.options[:apparat].invoke
           cmd_args = []
           cmd_args << "#{apparat_tk.tdsi}"
@@ -124,14 +90,13 @@ module Buildr
           reserved = []
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-            cmd_args << "-#{key} #{value}"
+                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")
-          system(cmd_args.join " ")
+          call_system(cmd_args)
         end
 
         def apparat_reducer(quality)
-          output = Buildr::AS3::Compiler::CompilerUtils::get_output(project, compile.target, compile.packaging, compile.options)
+          output = project.get_as3_output(compile.target, compile.options)
           apparat_tk = compile.options[:apparat].invoke
           cmd_args = []
           cmd_args << "#{apparat_tk.reducer}"
@@ -139,13 +104,21 @@ module Buildr
           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 " ")
+          call_system(cmd_args)
+        end
+
+        private
+
+        def call_system(args)
+          unless system(args.join(" "))
+            puts "Failed to execute apparat:\n#{args.join(" ")}"
+          end
         end
+
       end
     end
   end
   class Project
-    include Buildr::AS3::Apparat::Tasks
+    include Buildr::AS3::Toolkits::ApparatTasks
   end
 end

data/lib/buildr/as3/toolkits/base.rb

@@ -0,0 +1,84 @@
+#
+# Copyright (C) 2011 by Dominic Graefen / http://devboy.org
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+module Buildr
+  module AS3
+    module Toolkits
+      class ZipToolkiteBase
+
+        def invoke #:nodoc:
+
+          if @url == :maven
+            Buildr::artifact(@spec).invoke
+          else
+            Buildr::download(Buildr::artifact(@spec) => @url).invoke
+          end unless File.exists? @zip.to_s
+
+          unzip_toolkit(@zip,@zip_destination)
+
+          self
+        end
+
+        # :call-seq:
+        #   from(url) => self
+        #
+        # * You can pass a url where the ToolkitArtifact should be downloaded from as a string:
+        # FLEX_SDK.from("http://domain.tld/flex_sdk.zip")
+        # * You can pass :maven as a parameter to download it from a maven repository:
+        # FLEX_SDK.from(:maven)
+        # * If you don't call this function at all, buildr-as3 will try and resolve a url on automatically
+        def from(url)
+          @url = url
+          self
+        end
+
+        protected
+
+        def system_unzip_toolkit(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 unzip_toolkit(zip,destination)
+          unless File.exists? destination
+            puts "Unzipping Archive, this might take a while."
+            if Buildr::Util.win_os?
+              puts "Please make sure unzip is installed and in your PATH variable!"
+              system_unzip_toolkit zip, destination
+            else
+              begin
+#                Buildr.unzip(destination.to_s=>zip.to_s).target.invoke
+#              rescue TypeError
+#                puts "RubyZip extract failed, trying system unzip now."
+                puts "Please make sure unzip is installed and in your PATH variable!"
+                system_unzip_toolkit zip, destination
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/buildr/as3/{flexsdk.rb → toolkits/flexsdk.rb}

@@ -19,14 +19,11 @@
 # 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
-      class FlexSDK
+    module Toolkits
+      class FlexSDK < Buildr::AS3::Toolkits::ZipToolkiteBase
 
         attr_reader :home, :mxmlc_jar, :compc_jar, :asdoc_jar, :fcsh_jar, :flex_config,
                     :asdoc_templates, :default_options, :air_config, :bin, :adt_jar, :adl
@@ -35,60 +32,35 @@ module Buildr
 
         def initialize(version)
           @version = version
-          @default_options = {}
+          @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
+          @zip = Buildr.artifact(@spec)
+          @zip_destination = File.join(File.dirname(@zip.to_s), "sdk-#{@version}")
+          generate_paths @zip_destination
           self
         end
 
-        def invoke
+        def invoke #:nodoc:
           @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
-
-
-          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
+          super
           self
         end
 
+        # :call-seq:
+        #   from(url) => self
+        #
+        # * You can pass a url where the FlexSDK should be downloaded from as a string:
+        # FLEX_SDK.from("http://domain.tld/flex_sdk.zip")
+        # * You can pass :maven as a parameter to download it from a maven repository:
+        # FLEX_SDK.from(:maven)
+        # * If you don't call this function at all, buildr-as3 will try and resolve a url on the adobe-website
+        # to download the FlexSDK
         def from(url)
           @url = url
           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
+        private
 
         def generate_url_from_version(version)
           "http://fpdownload.adobe.com/pub/flex/sdk/builds/flex#{version.split(".")[0]}/flex_sdk_#{version}.zip"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-as3
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 35
   prerelease: 
   segments: 
   - 0
   - 1
-  - 20
-  version: 0.1.20
+  - 28
+  version: 0.1.28
 platform: ruby
 authors: 
 - Dominic Graefen
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +01:00
-default_executable: 
+date: 2011-04-15 00:00:00 +02:00
+default_executable: buildr-as3
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -86,18 +86,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 1
         - 4
-        - 4
-        version: 1.4.4
+        - 5
+        version: 1.4.5
   name: buildr
   version_requirements: *id005
 description: Build like you code - now supporting ActionScript 3 & Flex
 email: dominic @nospam@ devboy.org
-executables: []
-
+executables: 
+- buildr-as3
 extensions: []
 
 extra_rdoc_files: 
@@ -110,16 +110,33 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/buildr-as3
 - buildr-as3.gemspec
 - lib/buildr/as3.rb
-- lib/buildr/as3/alchemy.rb
-- lib/buildr/as3/apparat.rb
 - lib/buildr/as3/compiler.rb
+- lib/buildr/as3/compiler/aircompc.rb
+- lib/buildr/as3/compiler/airmxmlc.rb
+- lib/buildr/as3/compiler/base.rb
+- lib/buildr/as3/compiler/compc.rb
+- lib/buildr/as3/compiler/mxmlc.rb
 - lib/buildr/as3/doc.rb
-- lib/buildr/as3/flexsdk.rb
+- lib/buildr/as3/doc/asdoc.rb
+- lib/buildr/as3/ide.rb
 - lib/buildr/as3/ide/fdt4.rb
 - lib/buildr/as3/packaging.rb
-- lib/buildr/as3/tests.rb
+- lib/buildr/as3/packaging/air.rb
+- lib/buildr/as3/packaging/airi.rb
+- lib/buildr/as3/packaging/swc.rb
+- lib/buildr/as3/packaging/swf.rb
+- lib/buildr/as3/project.rb
+- lib/buildr/as3/test.rb
+- lib/buildr/as3/test/base.rb
+- lib/buildr/as3/test/flexunit4.rb
+- lib/buildr/as3/toolkits.rb
+- lib/buildr/as3/toolkits/alchemy.rb
+- lib/buildr/as3/toolkits/apparat.rb
+- lib/buildr/as3/toolkits/base.rb
+- lib/buildr/as3/toolkits/flexsdk.rb
 - test/helper.rb
 - test/test_buildr_as3.rb
 has_rdoc: true
@@ -152,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Buildr extension to allow ActionScript3/Flex development.

data/lib/buildr/as3/tests.rb

@@ -1,54 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with this
-# work for additional information regarding copyright ownership.  The ASF
-# licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-require 'buildr/core/test'
-require 'buildr/core/build'
-require 'buildr/core/compile'
-require 'buildr/java/ant'
-
-
-module Buildr
-
-  class FlexUnit4 < TestFramework::Base
-
-    class << self
-      taskdef_spec = "org.flexunit:flexUnitTasks:jar:4.1.0"
-       def applies_to?(project) #:nodoc:
-        project.test.compile.language == :actionscript
-      end
-    end
-
-#    def initialize
-#      puts "FlexUnit4 init"
-#    end
-
-    def tests(dependencies) #:nodoc:
-      puts "FlexUnit4 run"
-      []
-    end
-
-    def run(tests, dependencies) #:nodoc:
-      puts "FlexUnit4 run"
-      Buildr.ant('flexunit') do |ant|
-        taskdef = Buildr.artifact(FlexUnit4.taskdef_spec)
-        taskdef.invoke
-        ant.taskdef :name=>'flexunit', :resource=>"flexUnitTasks.tasks", :classpath=>taskdef.to_s
-      end
-    end
-  end
-
-end
-
-Buildr::TestFramework.add Buildr::FlexUnit4