tidyflash 0.9.2 → 0.9.3

data/lib/tidy/compile.rb

@@ -64,34 +64,29 @@ module Tidy
                     :output=>"demos/#{args[:output]}/DemoConfig.as")
       air(args.merge(:paths=>["demos/#{args[:output]}"]))
     end
+    
+    def self.get_compile_command(args, initial_command)
+    	command = initial_command + " " + parse_options(args)
+    	command_result = command
+      	return command
+    end
   
     def self.build(args,command)
       puts "Compiling with TidyFlash #{Tidy::Version.number}"
       #puts "cd #{FileUtils.pwd} && #{command}"
+=begin
       command_result = command
       filtered_result = command_result.to_a.map{|l| l unless l.match(/^Reason|^Recompile/)}.compact
       puts filtered_result
-      
-      unless File.exists?(swf_url args)
-        puts "Building for first time"
-        IO.popen(command){ |process| process.each { |line| puts line } }
-        return
-      end
-      begin
-        result =  Sprout::FCSHSocket.execute command
-      rescue
-      #if (result =~ /Connection refused/)
-          puts "*******************"
-          puts "* Starting FCSH   *"
-          puts "*******************"
-          Dir.chdir("script/fcsh") do
-            IO.popen("rake fcsh:start"){ |process| process.each { |line| puts line } }
-          end
-      end
+=end
+      IO.popen(command){ |process| process.each { |line| puts line } }
     end
     DEFAULT_PATHS = %w[src assets ~/.tidy/tidy-as3]
     def self.parse_options(args)
-      options = args[:options] ? DEFAULTS.merge(args[:options]) : DEFAULTS
+      options = DEFAULTS.dup()
+      options.each_pair do |k,v|
+		options[k] = args[k] unless args[k].nil?
+	  end
       paths = DEFAULT_PATHS
       paths = args[:paths].concat(DEFAULT_PATHS) unless args[:paths].nil?
       paths = paths.map{|path| "-source-path+=#{File.expand_path path}" }.join(" ")

data/lib/tidy/version.rb

@@ -1,7 +1,7 @@
 module Tidy
   class Version
     def self.number
-      '0.9.2'
+      '0.9.3'
     end
   end
 end

data/test/test_tidy_project.rb

@@ -17,6 +17,23 @@ class TestTidyProject < Test::Unit::TestCase
     end
   end
   
+  def test_parse_options
+  	#ENV['SPROUT_FLEX4SDK_TOOL'] = "/Users/christian/Library/Sprouts/cache/0.7/sprout-flex3sdk-tool-3.5.1"	
+  	
+  	args = {:main=>'src/app/views/MainView.as', 
+              :output=>"multi_touch_window_02", 
+              :version=> "0.1",
+              :width=>640,
+              :height=>480,
+              :default_background_color=>"#FFFFFF",
+              :paths=>["../multi-touch-lib/src", "../as3-lib/src"]}
+    command = Tidy::Compile.parse_options(args);
+    assert_nil(command =~ /width/, "custom parameters shouldn't be passed to the compiler")
+    assert_not_nil(command =~/#FFFFFF/,"default parameters should be overriden");
+    assert_not_nil(command =~/\/multi-touch-lib\/src/,"extra path should be added");
+    assert_not_nil(command =~/\/as3-lib\/src/,"extra path should be added");
+  end
+
   def test_air_main_template
   	in_project_folder do
   		template_path = 'config/templates/air.axml.erb';
@@ -79,7 +96,6 @@ class TestTidyProject < Test::Unit::TestCase
   		i=i+1
   	end
   end
-
   #def test_add_libs
   #  in_project_folder do
   #    assert File.exists?('script'), "No script folder"

data/tidyflash.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tidyflash}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Forrest"]
-  s.date = %q{2010-07-29}
+  s.date = %q{2010-09-21}
   s.description = %q{Tidy Flash - an ActionScript framework for people who love Ruby}
   s.email = %q{mf@grimaceworks.com}
   s.executables = ["test_project.axml", "tidyflash"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tidyflash
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Michael Forrest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +01:00
+date: 2010-09-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency