flashsdk 1.0.27.pre → 1.0.28.pre

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'sprout', '>= 1.1.11.pre'
+gem 'sprout', '>= 1.1.13.pre'
 
 group :development do
   gem "shoulda"

data/Gemfile.lock

@@ -2,13 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    mocha (0.9.10)
-      rake
+    mocha (0.9.12)
     open4 (1.0.1)
-    rake (0.8.7)
+    rake (0.9.0)
     rubyzip (0.9.4)
     shoulda (2.11.3)
-    sprout (1.1.11.pre)
+    sprout (1.1.13.pre)
       archive-tar-minitar (= 0.5.2)
       bundler (>= 0.9.19)
       open4 (>= 0.9.6)
@@ -21,4 +20,4 @@ PLATFORMS
 DEPENDENCIES
   mocha
   shoulda
-  sprout (>= 1.1.11.pre)
+  sprout (>= 1.1.13.pre)

data/VERSION

@@ -1 +1 @@
-1.0.27.pre
+1.0.28.pre

data/lib/flashsdk.rb

@@ -3,6 +3,7 @@ require 'sprout'
 lib = File.expand_path File.dirname(__FILE__)
 $:.unshift lib unless $:.include?(lib)
 
+require 'rake/dsl'
 require 'benchmark'
 require 'flashsdk/module'
 require 'flashsdk/generators/flash_helper'

data/lib/flashsdk/adl.rb

@@ -8,9 +8,9 @@ module FlashSDK
 
     add_param :nodebug, Boolean
 
-    add_param :profile, String
+    add_param :profile, String, { :delimiter => ' ' }
 
-    add_param :screensize, String
+    add_param :screensize, String, { :delimiter => ' ' }
 
     add_param :app_desc, String, { :hidden_name => true, :delimiter => ' ' }
 
@@ -37,9 +37,20 @@ module FlashSDK
     # The default executable target.
     #
     set :executable, :adl
+
+		##
+		# The default prefix
+		#
+		set :default_prefix, '-'
   end
 end
 
+def adl *args, &block
+  exe = FlashSDK::ADL.new
+  exe.to_rake(*args, &block)
+  exe
+end
+
 ##
 # TODO: This should NOT be here!
 # This is preventing that method from working

data/lib/flashsdk/adt.rb

@@ -39,12 +39,42 @@ module FlashSDK
     # Please do not alphabetize or rearrange unless you're
     # fixing a bug related to how ADT actually expects
     # the arguments...
-
+		
+		##
+		# Install an app on a device
+		#
+		add_param :installApp, Boolean, { :hidden_value => true }
+
+		##
+		# Uninstall an app from a device
+		#
+		add_param :uninstallApp, Boolean, { :hidden_value => true }
+		
+		##
+		# Launch an app on a device
+		#
+		add_param :launchApp, Boolean, { :hidden_value => true }
+		
+		##
+		# The platform to use (ex: android)
+		#
+		add_param :platform, String, { :delimiter => ' ' }
+
+		##
+		# The appid of the app being installed/uninstalled (ex: com.foo.Bar)
+		#
+		add_param :appid, String, { :delimiter => ' ' }
+		
     ##
     # Create an AIR package.
     #
     add_param :package, Boolean, { :hidden_value => true }
 
+		##
+		# Use a specific target, like apk-debug for Android or ipa-debug for iOS
+		#
+		add_param :target, String, { :delimiter => ' ' }
+
     ##
     # Set true to create a certificate.
     #
@@ -102,6 +132,11 @@ module FlashSDK
     #
     add_param :checkstore, String
 
+		##
+		# Provisioning profile for iOS apps
+		#
+		add_param :provisioning_profile, String, { :delimiter => ' ' }
+
     ##
     # Expects two files:
     #

data/lib/flashsdk/asdoc.rb

@@ -131,7 +131,7 @@ module FlashSDK
     # to get recreated with every run, instead of failing to
     # create when the outer folder still exists.
     def create_outer_task *args
-      task *args do
+      Rake::Task.define_task *args do
         execute
       end
     end

data/lib/flashsdk/compiler_base.rb

@@ -735,8 +735,6 @@ module FlashSDK
     # The {#mxmlc} Rake task uses a Rake::File task under the covers, and
     # will automatically set this value with the string passed into the task name.
     #
-    # This parameter should not be set directly within the task body.
-    #
     add_param :output, File, { :file_task_name => true }
     
     ##

data/lib/flex4.rb

@@ -30,13 +30,14 @@ Sprout::Specification.new do |s|
   #   end
   #
   s.name    = 'flex4'
-  s.version = '4.1.0.16076'
+  s.version = '4.5.0.20967'
 
   s.add_remote_file_target do |t|
     t.platform     = :universal
     t.archive_type = :zip
-    t.url          = "http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4/flex_sdk_4.1.0.16076.zip"
-    t.md5          = "4c5f3d3fa4e1f5be244679210cd852c0"
+    
+    t.url = "http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.5/flex_sdk_4.5.0.20967.zip"
+    t.md5 = "c92b661eb7b00bb568262851885274dc"
 
     # Executables: (add .exe suffix if it was passed in)
     t.add_executable :aasdoc,     "bin/aasdoc"

data/test/fixtures/air/simple/SomeProject.apk

@@ -0,0 +1 @@
+#dummy

data/test/fixtures/sdk/mxmlc

@@ -12,12 +12,15 @@ class FakeMXMLC
 
   def initialize args
     #puts ">> ARGS: #{args.inspect}"
-    if(args.size == 2 && 
-       args[0] == "-static-link-runtime-shared-libraries" && 
-       args[1] == "test/fixtures/mxmlc/simple/SomeFile.as")
+    if(args.size == 3 && 
+       args[0].include?('SomeFile.swf') &&
+       args[1].include?('-static-link-runtime-shared-libraries') &&
+       args[2].include?('SomeFile.as'))
       compile_simple_swf args
     elsif args == ["-output=test/fixtures/air/simple/bin/SomeProject.swf", "-static-link-runtime-shared-libraries", "test/fixtures/air/simple/SomeProject.as"]
       compile_amxmlc_swf args
+    else
+      raise "Unexpected args sent to mxmlc stub #{args.join(', ')}"
     end
   end
 
@@ -33,7 +36,7 @@ class FakeMXMLC
   # Loading configuration file /Users/lbayes/Library/Sprouts/1.0/cache/flex4/4.1.0.16076/frameworks/flex-config.xml
   # /Users/lbayes/Projects/Sprouts/flashsdk/test/fixtures/mxmlc/simple/SomeFile.swf (558 bytes)
   def compile_simple_swf args
-    path = File.expand_path(args[1].gsub(/\.as$/, '.swf'))
+    path = File.expand_path(args[0].gsub(/-output=/, ''))
     compile_swf path
   end
 

data/test/unit/adl_test.rb

@@ -8,6 +8,8 @@ class ADLTest < Test::Unit::TestCase
     setup do
       @fixture  = File.join 'test', 'fixtures', 'air', 'simple'
       @app_desc = File.join @fixture, 'SomeProject.xml'
+			@profile = 'mobileDevice'
+			@screensize = 'NexusOne'
     end
 
     teardown do
@@ -17,7 +19,9 @@ class ADLTest < Test::Unit::TestCase
       adl = FlashSDK::ADL.new
       adl.app_desc = @app_desc
       adl.root_dir = Dir.pwd
-      assert_equal "#{@app_desc} #{Dir.pwd}", adl.to_shell
+			adl.screensize = @screensize
+			adl.profile = @profile
+      assert_equal "-profile #{@profile} -screensize #{@screensize} #{@app_desc} #{Dir.pwd}", adl.to_shell
       # Uncomment to actually launch
       # the AIR application:
       #adl.execute

data/test/unit/adt_test.rb

@@ -9,10 +9,17 @@ class ADTTest < Test::Unit::TestCase
       @fixture         = File.join 'test', 'fixtures', 'air', 'simple'
       @application_xml = File.join @fixture, 'SomeProject.xml'
       @expected_output = File.join @fixture, 'SomeProject.air'
+      @apk_input 			 = File.join @fixture, 'SomeProject.apk'
+      @ipa_output 		 = File.join @fixture, 'SomeProject.ipa'
       @swf_input       = File.join @fixture, 'SomeProject.swf'
       @swf_main        = File.join @fixture, 'SomeProject.mxml'
 
       @certificate     = File.join @fixture, 'SomeProject.pfx'
+      @ipa_cert	       = File.join @fixture, 'SomeProject.p12'
+			@provisioning_profile = File.join @fixture, 'Profile.mobileprovision'
+			@platform				 = 'android'
+			@target					 = 'apk-debug'
+      @appid   			 	 = 'com.foo.bar.SomeProject'
       @cert_password   = 'samplePassword'
     end
 
@@ -25,6 +32,7 @@ class ADTTest < Test::Unit::TestCase
       as_a_unix_system do
         t = adt @expected_output do |t|
           t.package        = true
+          t.target         = @target
           t.package_input  = @application_xml
           t.package_output = @expected_output
           t.storetype      = 'PKCS12'
@@ -32,7 +40,70 @@ class ADTTest < Test::Unit::TestCase
           t.storepass      = @cert_password
           t.included_files << @swf_input
         end
-        assert_equal '-package -storetype PKCS12 -keystore test/fixtures/air/simple/SomeProject.pfx -storepass samplePassword test/fixtures/air/simple/SomeProject.air test/fixtures/air/simple/SomeProject.xml test/fixtures/air/simple/SomeProject.swf', t.to_shell
+        assert_equal "-package -target #{@target} -storetype PKCS12 -keystore test/fixtures/air/simple/SomeProject.pfx -storepass samplePassword test/fixtures/air/simple/SomeProject.air test/fixtures/air/simple/SomeProject.xml test/fixtures/air/simple/SomeProject.swf", t.to_shell
+
+        #t.execute
+        #assert_file @expected_output
+      end
+    end
+
+		should "package an iOS swf with a provisioning profile" do
+      as_a_unix_system do
+        t = adt @ipa_output do |t|
+          t.package        = true
+          t.target         = 'ipa-test'
+          t.package_input  = @application_xml
+          t.package_output = @ipa_output
+          t.storetype      = 'PKCS12'
+          t.keystore       = @ipa_cert
+          t.storepass      = @cert_password
+					t.provisioning_profile = @provisioning_profile
+          t.included_files << @swf_input
+        end
+        assert_equal "-package -target ipa-test -storetype PKCS12 -keystore #{@ipa_cert} -storepass #{@cert_password} -provisioning-profile #{@provisioning_profile} #{@ipa_output} #{@application_xml} #{@swf_input}", t.to_shell
+
+        #t.execute
+        #assert_file @expected_output
+      end
+    end
+
+		should "install an APK" do
+      as_a_unix_system do
+        t = adt @expected_output do |t|
+					t.installApp		 = true
+					t.platform			 = @platform
+          t.package        = true
+          t.package_input  = @apk_input
+        end
+        assert_equal "-installApp -platform #{@platform} -package #{@apk_input}", t.to_shell
+
+        #t.execute
+        #assert_file @expected_output
+      end
+    end
+
+		should "uninstall an APK" do
+      as_a_unix_system do
+        t = adt @expected_output do |t|
+					t.uninstallApp	 = true
+					t.platform			 = @platform
+          t.appid					 = @appid
+        end
+        assert_equal "-uninstallApp -platform #{@platform} -appid #{@appid}", t.to_shell
+
+        #t.execute
+        #assert_file @expected_output
+      end
+    end
+
+		should "launch an app" do
+      as_a_unix_system do
+        t = adt @expected_output do |t|
+					t.launchApp			 = true
+					t.platform			 = @platform
+          t.appid					 = @appid
+        end
+        assert_equal "-launchApp -platform #{@platform} -appid #{@appid}", t.to_shell
 
         #t.execute
         #assert_file @expected_output

data/test/unit/fcsh_socket_test.rb

@@ -14,6 +14,10 @@ class FCSHSocketTest < Test::Unit::TestCase
       @test_port = 12543
     end
 
+    teardown do
+      clear_tasks
+    end
+
     should "be instantiable" do
       service_ready = false
       # Create the remote side of the connection:

data/test/unit/flashplayer_task_test.rb

@@ -54,7 +54,7 @@ class TaskTest < Test::Unit::TestCase
       t = flashplayer :run do |t|
         t.input = @swf
       end
-      file @swf
+      Rake::FileTask.define_task @swf
       configure_task t
       t.invoke
       assert_equal @swf, t.input
@@ -62,7 +62,7 @@ class TaskTest < Test::Unit::TestCase
 
     should "work with swf as prerequisite" do
       t = flashplayer :run => @swf
-      file @swf
+      Rake::FileTask.define_task @swf
       configure_task t
       t.invoke
       assert_equal @swf, t.input
@@ -70,9 +70,9 @@ class TaskTest < Test::Unit::TestCase
 
     should "fire when declared as a dependency" do
       t = flashplayer :run => @swf
-      file @swf
+      Rake::FileTask.define_task @swf
       configure_task t
-      other = task :parent => :run
+      other = Rake::Task.define_task :parent => :run
       other.invoke
     end
   end

data/test/unit/mxmlc_test.rb

@@ -9,7 +9,7 @@ class MXMLCTest < Test::Unit::TestCase
       @original_use_fcsh_value = ENV['USE_FCSH']
       @fixture                 = File.join fixtures, 'mxmlc', 'simple'
       @input                   = File.join @fixture, 'SomeFile.as'
-      @expected_output         = File.join @fixture, 'SomeFile.swf'
+      @expected_output         = File.join @fixture, "SomeFile.swf"
     end
 
     teardown do
@@ -17,6 +17,18 @@ class MXMLCTest < Test::Unit::TestCase
       ENV['USE_FCSH'] = @original_use_fcsh_value
     end
 
+    should "compile a swf" do
+      as_a_unix_system do
+        mxmlc = FlashSDK::MXMLC.new
+        # Comment out following line to use REAL Mxmlc:
+        mxmlc.binary_path = File.join fixtures, 'sdk', 'mxmlc'
+        mxmlc.input = @input
+        mxmlc.output = @expected_output
+        mxmlc.execute
+        assert_file @expected_output
+      end
+    end
+
     should "accept input" do
       as_a_unix_system do
         mxmlc = FlashSDK::MXMLC.new
@@ -26,14 +38,6 @@ class MXMLCTest < Test::Unit::TestCase
       end
     end
 
-    should "compile a swf" do
-      mxmlc = FlashSDK::MXMLC.new
-      mxmlc.binary_path = File.join fixtures, 'sdk', 'mxmlc'
-      mxmlc.input = @input
-      mxmlc.execute
-      assert_file @expected_output
-    end
-
     should "assign default-size" do
       mxmlc = FlashSDK::MXMLC.new
       mxmlc.default_size = '800,500'
@@ -59,15 +63,5 @@ class MXMLCTest < Test::Unit::TestCase
     end
 
   end
-
-  private
-
-  def configure_mxmlc_fake exe_name
-    # Comment the following and install the flashsdk
-    # to run test against actual mxmlc:
-    @fake = File.join(fixtures, 'mxmlc', exe_name)
-    path_response = OpenStruct.new(:path => @fake)
-    Sprout::Executable.expects(:load).with(:fdb, 'flex4', '>= 4.1.0.pre').returns path_response
-  end
 end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 27
+  - 28
   - pre
-  version: 1.0.27.pre
+  version: 1.0.28.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -07:00
+date: 2011-06-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +28,9 @@ dependencies:
         segments: 
         - 1
         - 1
-        - 11
+        - 13
         - pre
-        version: 1.1.11.pre
+        version: 1.1.13.pre
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -124,6 +124,7 @@ files:
 - POSTINSTALL.rdoc
 - rakefile.rb
 - README.textile
+- test/fixtures/air/simple/SomeProject.apk
 - test/fixtures/air/simple/SomeProject.as
 - test/fixtures/air/simple/SomeProject.mxml
 - test/fixtures/air/simple/SomeProject.pfx