buildr-as3 0.2.19 → 0.2.20.pre

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -10,5 +10,9 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "buildr", "~> 1.4.6"
-  gem "rcov", ">= 0"
+  #gem "rcov", ">= 0"
+  gem "simplecov", :require => false
+  gem "simplecov-rcov", :require => false
+  gem "rspec", "~> 2.1.0"
+  gem "ci_reporter", "~> 1.6.5"
 end

data/Rakefile

@@ -10,6 +10,7 @@ end
 require 'rake'
 
 require 'jeweler'
+require File.dirname(__FILE__)+"/rake/jeweler_prerelease_tasks"
 Jeweler::Tasks.new do |gem|
   gem.name = "buildr-as3"
   gem.homepage = "http://github.com/devboy/buildr_as3"
@@ -21,22 +22,29 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency("buildr",">=1.4.5")
 end
 Jeweler::RubygemsDotOrgTasks.new
+Jeweler::PrereleaseTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+task :prerelease => 'rubygems:release'
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+require 'ci/reporter/rake/rspec'
+
+ENV["CI_REPORTS"] ||= File.expand_path( File.join( File.dirname(__FILE__), "test", "report" ) )
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+task :spec => "ci:setup:rspec"
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :default => :test
+task :test => :spec
+task :default => :spec
+
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.2.19
+0.2.20.pre

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-as3}
-  s.version = "0.2.19"
+  s.version = "0.2.20.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = %q{2011-07-26}
+  s.date = %q{2011-09-24}
   s.default_executable = %q{buildr-as3}
   s.description = %q{Build like you code - now supporting ActionScript 3 & Flex}
   s.email = %q{dominic @nospam@ devboy.org}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     "Gemfile",
     "LICENSE.txt",
     "README.rdoc",
@@ -53,8 +54,18 @@ Gem::Specification.new do |s|
     "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"
+    "rake/jeweler.rb",
+    "rake/jeweler_prerelease_tasks.rb",
+    "rake/pre_release_gemspec.rb",
+    "rake/pre_release_to_git.rb",
+    "spec/as3/compiler/aircompc_spec.rb",
+    "spec/as3/compiler/airmxmlc_spec.rb",
+    "spec/as3/compiler/compc_spec.rb",
+    "spec/as3/compiler/mxmlc_spec.rb",
+    "spec/as3/compiler/task_spec.rb",
+    "spec/as3/project_spec.rb",
+    "spec/sandbox.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/devboy/buildr_as3}
   s.licenses = ["MIT"]
@@ -62,8 +73,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Buildr extension to allow ActionScript3/Flex development.}
   s.test_files = [
-    "test/helper.rb",
-    "test/test_buildr_as3.rb"
+    "spec/as3/compiler/aircompc_spec.rb",
+    "spec/as3/compiler/airmxmlc_spec.rb",
+    "spec/as3/compiler/compc_spec.rb",
+    "spec/as3/compiler/mxmlc_spec.rb",
+    "spec/as3/compiler/task_spec.rb",
+    "spec/as3/project_spec.rb",
+    "spec/sandbox.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -74,14 +91,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<buildr>, ["~> 1.4.6"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov-rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<ci_reporter>, ["~> 1.6.5"])
       s.add_runtime_dependency(%q<buildr>, [">= 1.4.5"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<buildr>, ["~> 1.4.6"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<simplecov-rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
+      s.add_dependency(%q<ci_reporter>, ["~> 1.6.5"])
       s.add_dependency(%q<buildr>, [">= 1.4.5"])
     end
   else
@@ -89,7 +112,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<buildr>, ["~> 1.4.6"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<simplecov-rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
+    s.add_dependency(%q<ci_reporter>, ["~> 1.6.5"])
     s.add_dependency(%q<buildr>, [">= 1.4.5"])
   end
 end

data/lib/buildr/as3/compiler.rb

@@ -29,4 +29,6 @@ require "#{File.dirname(__FILE__)}/compiler/aircompc"
 Buildr::Compiler << Buildr::AS3::Compiler::Mxmlc
 Buildr::Compiler << Buildr::AS3::Compiler::Compc
 Buildr::Compiler << Buildr::AS3::Compiler::AirMxmlc
-Buildr::Compiler << Buildr::AS3::Compiler::AirCompc
+Buildr::Compiler << Buildr::AS3::Compiler::AirCompc
+
+require "#{File.dirname(__FILE__)}/compiler/task"

data/lib/buildr/as3/compiler/aircompc.rb

@@ -42,10 +42,12 @@ module Buildr
                 :target => "bin", :target_ext => "swc",
                 :packaging => :swc
 
-        def compile(sources, target, dependencies) #:nodoc:
-          @air = true
-          super
+        private
+
+        def air
+          true
         end
+
       end
     end
   end

data/lib/buildr/as3/compiler/airmxmlc.rb

@@ -44,10 +44,12 @@ module Buildr
                 :target => "bin", :target_ext => "swf",
                 :packaging => :swf
 
-        def compile(sources, target, dependencies) #:nodoc:
-          @air = true
-          super
+        private
+
+        def air
+          true
         end
+
       end
     end
   end

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

@@ -28,7 +28,7 @@ module Buildr
     module Compiler
       class FlexCompilerBase < Buildr::Compiler::Base #:nodoc:
 
-        COMPILE_OPTIONS = [:warnings, :debug, :other, :flexsdk, :apparat]
+        COMPILE_OPTIONS = [:warnings, :debug, :other, :flexsdk, :apparat, :output]
 
         def initialize(project, options) #:nodoc:
           super
@@ -40,19 +40,7 @@ module Buildr
           check_options options, COMPILE_OPTIONS
           flex_sdk = options[:flexsdk].invoke
           output = @project.get_as3_output( is_test(sources,target,dependencies) )
-          cmd_args = []
-          cmd_args << "-jar" << @compiler_jar
-          cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
-          cmd_args << "-output" << output
-          cmd_args << "+configname=air" if @air
-          cmd_args << @main unless @main.nil?
-          cmd_args << "-define+=CONFIG::debug,#{options[:debug]}"
-          cmd_args << "-define+=CONFIG::environment,\"#{Buildr.environment}\""
-          cmd_args << "-load-config" << flex_sdk.flex_config unless @air
-          cmd_args << "-load-config" << flex_sdk.air_config if @air
-          cmd_args += generate_source_args sources
-          cmd_args += generate_dependency_args dependencies
-          cmd_args += flex_compiler_args
+          cmd_args = compiler_args(dependencies, flex_sdk, output, sources)
           unless Buildr.application.options.dryrun
             trace(cmd_args.join(' '))
             Java::Commands.java cmd_args
@@ -71,6 +59,23 @@ module Buildr
 
         private
 
+        def compiler_args(dependencies, flex_sdk, output, sources)
+          cmd_args = []
+          cmd_args << "-jar" << compiler_jar
+          cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
+          cmd_args << "-output" << output
+          cmd_args << "+configname=air" if air
+          cmd_args << @main unless @main.nil?
+          cmd_args << "-define+=CONFIG::debug,#{options[:debug]}"
+          cmd_args << "-define+=CONFIG::environment,\"#{Buildr.environment}\""
+          cmd_args << "-load-config" << flex_sdk.flex_config unless air
+          cmd_args << "-load-config" << flex_sdk.air_config if air
+          cmd_args += generate_source_args sources
+          cmd_args += generate_dependency_args dependencies
+          cmd_args += flex_compiler_args
+          cmd_args
+        end
+
         def flex_compiler_args #:nodoc:
           args = []
           args << '-warnings=false' unless options[:warnings]

data/lib/buildr/as3/compiler/compc.rb

@@ -40,12 +40,19 @@ module Buildr
                 :packaging => :swc
 
         def compile(sources, target, dependencies) #:nodoc:
-          @compiler_jar = options[:flexsdk].compc_jar
           super
         end
 
         private
 
+        def compiler_jar
+          options[:flexsdk].compc_jar
+        end
+
+        def air
+          false
+        end
+
         def generate_source_args(sources) #:nodoc:
           source_args = []
           sources.each { |source|
@@ -57,7 +64,9 @@ module Buildr
 
         def generate_dependency_args(dependencies) #:nodoc:
           dependency_args = []
-          dependencies.each { |source| dependency_args << "-library-path+=#{source}" }
+          dependencies[:library].each { |source| dependency_args << "-library-path+=#{source}" }
+          dependencies[:external].each { |source| dependency_args << "-external-library-path+=#{source}" }
+          dependencies[:include].each { |source| dependency_args << "-include-libraries+=#{source}" }
           dependency_args
         end
 

data/lib/buildr/as3/compiler/mxmlc.rb

@@ -47,7 +47,6 @@ module Buildr
                 :packaging => :swf
 
         def compile(sources, target, dependencies) #:nodoc:
-          @compiler_jar = options[:flexsdk].mxmlc_jar
           COMPILE_OPTIONS << :main
           @main = options[:main]
           super
@@ -55,6 +54,14 @@ module Buildr
 
         private
 
+        def compiler_jar
+          options[:flexsdk].mxmlc_jar
+        end
+
+        def air
+          false
+        end
+
         def generate_source_args(sources) #:nodoc:
           source_args = []
           sources.each { |source| source_args << "-source-path+=#{source}" }
@@ -63,7 +70,9 @@ module Buildr
 
         def generate_dependency_args(dependencies) #:nodoc:
           dependency_args = []
-          dependencies.each { |source| dependency_args << "-library-path+=#{source}" }
+          dependencies[:library].each { |source| dependency_args << "-library-path+=#{source}" }
+          dependencies[:external].each { |source| dependency_args << "-external-library-path+=#{source}" }
+          dependencies[:include].each { |source| dependency_args << "-include-libraries+=#{source}" }
           dependency_args
         end
 

data/lib/buildr/as3/compiler/task.rb

@@ -20,4 +20,35 @@
 # THE SOFTWARE.
 #
 
-# Let's enhance the CompileTask here!
+# Let's enhance the CompileTask here!
+
+require "buildr/core/compile"
+
+class Buildr::CompileTask
+
+  attr_accessor :as3_dependencies
+
+  def with(*specs)
+
+    @as3_dependencies ||= {}
+    @as3_dependencies[:library] ||= FileList[]
+    @as3_dependencies[:external] ||= FileList[]
+    @as3_dependencies[:include] ||= FileList[]
+
+    specs.each do |spec|
+      case spec
+        when Hash
+          spec.each{ |key,value|
+            raise "key needs to be :library, :external or :include" unless [:library, :external, :include].include? key
+            @as3_dependencies[key] |= Buildr.artifacts(value).uniq
+            @dependencies |= Buildr.artifacts(value).uniq
+          }
+        else
+          @as3_dependencies[:library] |= Buildr.artifacts(spec).uniq
+          @dependencies |= Buildr.artifacts(spec).uniq
+      end
+    end
+    self
+  end
+
+end

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

@@ -65,7 +65,7 @@ module Buildr
               if File.dirname(item) == source
                 candidates << File.basename(item, '.*')
               else
-                candidates << File.dirname(item).gsub!(source+"/", "").gsub!("/", ".")+"."+File.basename(item, '.*')
+                candidates << "#{File.dirname(item).gsub!(source+"/", "").gsub!("/", ".")}.#{File.basename(item, '.*')}"
               end
             }
           end

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

@@ -60,6 +60,26 @@ module Buildr
           self
         end
 
+        def copy_locale(locale,opts={})
+          opts = {:force => false, :based_on => "en_US"}.merge opts
+          
+          return if !opts[:force] && File.directory?("#{@home}/frameworks/projects/framework/bundles/#{locale}")
+
+          # gotta download it
+          invoke
+
+          cmd_args = []
+          cmd_args << "-Dsun.io.useCanonCaches=false"
+          cmd_args << "-Dapplication.home=#{@home}"
+          cmd_args << "-jar" << @copylocale_jar
+          cmd_args << opts[:based_on] 
+          cmd_args << locale
+          unless Buildr.application.options.dryrun
+            trace(cmd_args.join(' '))
+            Java::Commands.java cmd_args
+          end
+  
+        end
         private
 
         def generate_url_from_version(version)
@@ -71,6 +91,7 @@ module Buildr
 
         def generate_paths(home_dir)
           @home = home_dir
+          @copylocale_jar = "#{@home}/lib/copylocale.jar"
           @mxmlc_jar = "#{@home}/lib/mxmlc.jar"
           @compc_jar = "#{@home}/lib/compc.jar"
           @asdoc_jar = "#{@home}/lib/asdoc.jar"

data/rake/jeweler.rb

@@ -0,0 +1,17 @@
+class Jeweler
+  require File.dirname(__FILE__)+'/pre_release_to_git'
+  require File.dirname(__FILE__)+'/pre_release_gemspec'
+
+  def prerelease_to_git
+    Jeweler::Commands::PreReleaseToGit.build_for(self).run
+  end
+
+  def prerelease_gemspec
+    Jeweler::Commands::PreReleaseGemspec.build_for(self).run
+  end
+
+  def is_prerelease_version?
+    version.end_with? ".pre"
+  end
+
+end

data/rake/jeweler_prerelease_tasks.rb

@@ -0,0 +1,50 @@
+require 'rake'
+require 'rake/tasklib'
+require File.dirname(__FILE__)+"/jeweler"
+
+class Jeweler
+  class PrereleaseTasks < Rake::TaskLib
+    attr_accessor :jeweler
+
+    def initialize
+      yield self if block_given?
+
+      define
+    end
+
+    def jeweler
+      @jeweler ||= Rake.application.jeweler
+    end
+
+    def define
+      namespace :git do
+        desc "Tag and push prerelease to git. (happens by default with `rake prerelease`)"
+        task :prerelease do
+          jeweler.prerelease_to_git
+        end
+      end
+
+      namespace :gemspec do
+        desc "Regenerate and validate gemspec, and then commits and pushes to git on develop branch"
+        task :prerelease do
+          jeweler.prerelease_gemspec
+        end
+      end
+
+      desc "Verifies that it is a prerelease version."
+      task :is_prerelease_version => :version_required do
+        abort "it's not a prerelease version" unless jeweler.is_prerelease_version?
+      end
+
+      namespace :rubygems do
+        desc "Release gem to Gemcutter"
+        task :release => [:gemspec, :build] do
+          jeweler.release_gem_to_rubygems
+        end
+      end
+
+      desc "Make a prerelease to rubygems."
+      task :prerelease => [:is_prerelease_version, 'gemspec:prerelease', 'git:prerelease', 'rubygems:release']
+    end
+  end
+end