buildr-as3 0.2.22.pre → 0.2.23.pre

data/VERSION

@@ -1 +1 @@
-0.2.22.pre
+0.2.23.pre

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-as3"
-  s.version = "0.2.22.pre"
+  s.version = "0.2.23.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = "2011-10-03"
+  s.date = "2011-10-30"
   s.description = "Build like you code - now supporting ActionScript 3 & Flex"
   s.email = "dominic @nospam@ devboy.org"
   s.executables = ["buildr-as3"]
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
     "lib/buildr/as3/compiler/mxmlc.rb",
     "lib/buildr/as3/compiler/task.rb",
     "lib/buildr/as3/doc.rb",
-    "lib/buildr/as3/doc/asdoc.rb",
     "lib/buildr/as3/ide.rb",
     "lib/buildr/as3/ide/fdt4.rb",
     "lib/buildr/as3/packaging.rb",
@@ -69,7 +68,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/devboy/buildr_as3"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Buildr extension to allow ActionScript3/Flex development."
   s.test_files = [
     "spec/as3/compiler/aircompc_spec.rb",

data/lib/buildr/as3/doc.rb

@@ -1,29 +1,68 @@
-#
-# 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.
-#
-
-require "buildr"
-
-require "#{File.dirname(__FILE__)}/doc/asdoc"
-
-class Buildr::Project
-    include Buildr::AS3::Doc::AsDoc
-end
+require 'buildr/core/doc'
+
+module Buildr
+  module Doc
+
+    module AsdocDefaults
+      include Extension
+
+      after_define(:asdoc => :doc) do |project|
+        if project.doc.engine? Asdoc
+          options = project.doc.options
+          options[:maintitle] = (project.comment || project.name) unless options[:maintitle]
+        end
+      end
+    end
+
+    class Asdoc < Base
+
+      specify :language => :actionscript, :source_ext => ["as", "mxml"]
+
+      def generate(sources, target, options = {})
+
+        flexsdk = @project.compile.options[:flexsdk].invoke
+        cmd_args = []
+        cmd_args << "-jar" << flexsdk.asdoc_jar
+        cmd_args << "+flexlib" << "#{flexsdk.home}/frameworks"
+        cmd_args << "-load-config" << flexsdk.flex_config
+        cmd_args << "-main-title" << options[:maintitle]
+        cmd_args << "-window-title" << options[:windowtitle] if options.has_key? :windowtitle
+        cmd_args += generate_source_args @project.compile.sources
+        cmd_args += generate_dependency_args @project.compile.dependencies
+        cmd_args += options[:args] if options.has_key? :args
+        cmd_args << "-output" << target
+
+        unless Buildr.application.options.dryrun
+          info "Generating ASDoc for #{project.name}"
+          trace (['java'] + cmd_args).join(' ')
+          Java.load
+          Java::Commands.java cmd_args
+        end
+
+      end
+
+      private
+
+      def generate_source_args(sources) #:nodoc:
+        source_args = []
+        sources.each { |source|
+          source_args << "-source-path+=#{source}"
+          source_args << "-doc-sources+=#{source}"
+        }
+        source_args
+      end
+
+      def generate_dependency_args(dependencies) #:nodoc:
+        dependency_args = []
+        dependencies.each { |source| dependency_args << "-library-path+=#{source}" }
+        dependency_args
+      end
+    end
+  end
+
+  class Project
+    include AsdocDefaults
+  end
+end
+
+Buildr::Doc.engines << Buildr::Doc::Asdoc

data/lib/buildr/as3/test/flexunit4.rb

@@ -45,7 +45,7 @@ module Buildr
             "com.adobe.flexunit:flexunitUnitTasks:jar:#{VERSION}"
           end
 
-          def swc_dependencies
+          def swcs
             [
                 "com.adobe.flexunit:flexunit:swc:as3_#{FLEX_SDK_VERSION}:#{VERSION}",
                 "com.adobe.flexunit:flexunit:swc:flex_#{FLEX_SDK_VERSION}:#{VERSION}",
@@ -81,8 +81,12 @@ module Buildr
           project_dir = Dir.getwd
           Dir.chdir report_dir
 
-          taskdef = Buildr.artifact(FlexUnit4.flexunit_taskdef)
-          taskdef.invoke
+          unless options[:antjar]
+            taskdef = Buildr.artifact(FlexUnit4.flexunit_taskdef)
+            taskdef.invoke
+          else
+            taskdef = options[:antjar]
+          end
 
           player = "air" if [:airmxmlc, :airompc].include?(task.project.compile.compiler) || options[:player] == "air"
           player ||= "flash"
@@ -103,9 +107,9 @@ module Buildr
                          :display => options[:display] || 99,
                          :swf => task.project.get_as3_output(true)
 
-                         ant.taskdef :name=>'junitreport',
-                                     :classname=>'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
-                                     :classpath=>Buildr.artifacts(JUnit.ant_taskdef).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+            ant.taskdef :name=>'junitreport',
+                        :classname=>'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
+                        :classpath=>Buildr.artifacts(JUnit.ant_taskdef).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
 
             unless options[:htmlreport] == false
               ant.junitreport :todir => report_dir do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-as3
 version: !ruby/object:Gem::Version
-  version: 0.2.22.pre
+  version: 0.2.23.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2157156780 !ruby/object:Gem::Requirement
+  requirement: &2156948180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157156780
+  version_requirements: *2156948180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157155420 !ruby/object:Gem::Requirement
+  requirement: &2156946940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157155420
+  version_requirements: *2156946940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157153800 !ruby/object:Gem::Requirement
+  requirement: &2156945800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2157153800
+  version_requirements: *2156945800
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2157152500 !ruby/object:Gem::Requirement
+  requirement: &2156944600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2157152500
+  version_requirements: *2156944600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2157151460 !ruby/object:Gem::Requirement
+  requirement: &2156943180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157151460
+  version_requirements: *2156943180
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2157149740 !ruby/object:Gem::Requirement
+  requirement: &2156942020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157149740
+  version_requirements: *2156942020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157148500 !ruby/object:Gem::Requirement
+  requirement: &2156941100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2157148500
+  version_requirements: *2156941100
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2157146860 !ruby/object:Gem::Requirement
+  requirement: &2156940040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2157146860
+  version_requirements: *2156940040
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2157145020 !ruby/object:Gem::Requirement
+  requirement: &2156938780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157145020
+  version_requirements: *2156938780
 description: Build like you code - now supporting ActionScript 3 & Flex
 email: dominic @nospam@ devboy.org
 executables:
@@ -137,7 +137,6 @@ files:
 - lib/buildr/as3/compiler/mxmlc.rb
 - lib/buildr/as3/compiler/task.rb
 - lib/buildr/as3/doc.rb
-- lib/buildr/as3/doc/asdoc.rb
 - lib/buildr/as3/ide.rb
 - lib/buildr/as3/ide/fdt4.rb
 - lib/buildr/as3/packaging.rb
@@ -181,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2275844012035397510
+      hash: 727532045536068807
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Buildr extension to allow ActionScript3/Flex development.

data/lib/buildr/as3/doc/asdoc.rb

@@ -1,75 +0,0 @@
-#
-# 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.
-#
-
-require 'buildr'
-
-module Buildr
-  module AS3
-    module Doc
-      module AsDoc
-
-        include Buildr::Extension
-
-        first_time do
-          desc "Generates asdoc documentation."
-          Project.local_task('asdoc')
-        end
-
-        before_define do |project|
-          project.recursive_task("asdoc")
-        end
-
-        after_define("asdoc" => :doc) do |project|
-          project.task("asdoc") do
-
-            if project.compile.language == :actionscript
-
-              sources = project.compile.sources
-              dependencies = project.compile.dependencies
-
-              flex_sdk = project.compile.options[:flexsdk].invoke
-              output = project.base_dir + "/target/docs"
-              cmd_args = []
-              cmd_args << "-classpath" << "#{flex_sdk.home}/lib/xalan.jar"
-              cmd_args << "-classpath" << flex_sdk.asdoc_jar
-              cmd_args << "flex2.tools.ASDoc"
-              cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
-              cmd_args << "-load-config" << flex_sdk.flex_config
-              cmd_args << "-output" << output
-              sources.each { |source| cmd_args << "-source-path+=#{source}" }
-              sources.each { |source| cmd_args << "-doc-sources+=#{source}" }
-              cmd_args << "-templates-path" << flex_sdk.asdoc_templates
-              cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-
-              unless Buildr.application.options.dryrun
-                trace "java #{cmd_args.join(" ")}"
-                Java::Commands.java cmd_args
-              end
-
-            end
-          end
-
-        end
-      end
-    end
-  end
-end