tidyflash 0.9.5 → 0.9.6

data/Manifest

@@ -8,11 +8,11 @@ lib/script/generate
 lib/script/server
 lib/script/server.rb
 lib/tasks/assets.rb
-lib/tasks/demo_config.rb
 lib/tasks/deploy.rb
 lib/tidy/air_packager.rb
 lib/tidy/axml.rb
 lib/tidy/compile.rb
+lib/tidy/demo_config.rb
 lib/tidy/generate.rb
 lib/tidy/template.rb
 lib/tidy/template_binding.rb

data/lib/tidy/air_packager.rb

@@ -9,15 +9,19 @@ module Tidy
       FileUtils.mkdir_p("../releases")
       Dir.chdir "bin" do
         certificate_command = "adt -certificate -cn SelfSigned 1024-RSA #{certificate} #{password}"
-        puts `#{certificate_command}`
-        package_command= "adt -package -storetype pkcs12 -keystore ../config/air_cert.pfx -storepass #{password} ../../releases/#{id}.air #{id}.axml #{id}.swf #{files.join(' ')}"
+        unless File.exists?(certificate)
+        	puts `#{certificate_command}`
+        end
+        package_command= "adt -package -storetype pkcs12 -keystore #{certificate} -storepass #{password} ../../releases/#{id}.air #{id}.axml #{id}.swf #{files.join(' ')}"
         puts `#{package_command}`
       end
-      unless RUBY_PLATFORM =~ /linux/
-  	    `open ../releases/#{id}.air`
-  	  else
-  		  `gnome-open ../releases/#{id}.air`
-  	  end
+      unless options[:do_not_launch]
+	      unless RUBY_PLATFORM =~ /linux/
+	  	    `open ../releases/#{id}.air`
+	  	  else
+	  		  `gnome-open ../releases/#{id}.air`
+	  	  end
+	  end
     end
   end
 end

data/lib/tidy/axml.rb

@@ -37,7 +37,7 @@ module Tidy
     			return file
     		end
     	end
-    	puts "CAN'T find existing file in #{files}"
+    	raise "CAN'T find existing file in #{files.inspect} running in #{File.expand_path('.')}"
     	# throw error
     end
   

data/lib/tidy/compile.rb

@@ -15,6 +15,7 @@ require 'sprout/user'
 require 'sprout/fcsh_socket'
 require "#{File.expand_path(File.dirname(__FILE__))}/axml"
 require "#{File.expand_path(File.dirname(__FILE__))}/version"
+require "#{File.expand_path(File.dirname(__FILE__))}/demo_config"
 
 def method_name
   
@@ -61,8 +62,8 @@ module Tidy
     def self.demo(args)
       DemoConfig.new(:vars=>args[:vars] || {}, 
                     :class=>'DemoConfig', 
-                    :output=>"demos/#{args[:output]}/DemoConfig.as")
-      air(args.merge(:paths=>["demos/#{args[:output]}"]))
+                    :output=>"src/DemoConfig.as")
+      air(args.merge(:paths=>["src"]))
     end
     
     def self.get_compile_command(args, initial_command)
@@ -82,7 +83,7 @@ module Tidy
 =end
       IO.popen(command){ |process| process.each { |line| puts line } }
     end
-    DEFAULT_PATHS = %w[src assets ~/.tidy/tidy-as3]
+    DEFAULT_PATHS = %w[src ~/.tidy/tidy-as3]
     def self.parse_options(args)
       options = DEFAULTS.dup()
       options.each_pair do |k,v|

data/lib/{tasks → tidy}/demo_config.rb

@@ -14,7 +14,7 @@ class String
 end
 class DemoConfig
   def initialize(options)
-    template = File.read( 'lib/tasks/templates/demo_config.as.erb' )
+    template = File.read( "#{File.expand_path(File.dirname(__FILE__))}/templates/demo_config.as.erb" )
     @vars = options[:vars]
     @class  = options[:class]
     @package = ""

data/lib/tidy/templates/demo_config.as.erb

@@ -1,7 +1,9 @@
-package <%=@package%>{
-public class <%=@class%> {
+package <%=@package%>
+{
+	public class <%=@class%>
+	{
 	<% @vars.each do |key,value| %>
 		public static var <%=key%> : <%=value.class%> = <%=value.inspect.to_actionscript%>;
 	<% end %> 
-}
+	}
 }

data/lib/tidy/version.rb

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

data/lib/tidy_project.rb

@@ -8,7 +8,7 @@ class TidyProject
   def initialize(project_name)
     unless File.exists?(File.expand_path("~/.tidy/tidy-as3"))
       puts "You don't have the tidy as3 libs installed. Attempting to pull them from github..."
-      command = "git clone git://github.com/michaelforrest/tidy-as3.git ~/.tidy/tidy-as3"
+      command = "git clone http://github.com/michaelforrest/tidy-as3.git ~/.tidy/tidy-as3"
       puts command
       IO.popen(command) { |process| process.each { |line| puts line } }
     end

data/test/test_tidy_project.rb

@@ -9,6 +9,7 @@ class TestTidyProject < Test::Unit::TestCase
    lib_path = File.expand_path('lib', __FILE__)
    $:.unshift(lib_path) unless $:.include?(lib_path)
   require 'tidy/compile'
+  require 'tidy/air_packager'
     
     Dir.chdir "tmp" do
       puts `rm -fr #{TEST_PROJECT_NAME}`
@@ -16,7 +17,21 @@ class TestTidyProject < Test::Unit::TestCase
       TidyProject.new(TEST_PROJECT_NAME)
     end
   end
-  
+
+	def test_demo
+		in_project_folder do
+		  	Tidy::Compile.demo(:main=>'src/app/views/MainView.as', 
+				:output=>TEST_PROJECT_FILE_NAME, 
+		        :version=> "0.1",
+		        :vars=>{:isTouch=>true,
+		        	:variation=>0},
+		        :do_not_launch=>true)
+			config_file = File.new('src/DemoConfig.as','r')
+	        assert file_contains_string?(config_file, 'isTouch : Boolean = true'), 'DemoConfig.as should add booleans'
+	        assert file_contains_string?(config_file, 'variation : Number = 0'), 'DemoConfig.as should add numbers'
+		end
+	end
+ 
   def test_parse_options
   	#ENV['SPROUT_FLEX4SDK_TOOL'] = "/Users/christian/Library/Sprouts/cache/0.7/sprout-flex3sdk-tool-3.5.1"	
   	
@@ -78,6 +93,21 @@ class TestTidyProject < Test::Unit::TestCase
         	"AXML config file should be generated by custom template")
   	end
   end
+
+  def test_air_packaging
+  	in_project_folder do
+  		do_silent_rake()
+  		Tidy::AirPackager.package(:id=>TEST_PROJECT_FILE_NAME, :do_not_launch=>true)
+  		f = "config/air_cert.pfx";
+  		assert File.exists?(f), "The certificate file should be created the first time the application is packaged"
+  		content1 = get_file_as_string(f)
+  		Tidy::AirPackager.package(:id=>TEST_PROJECT_FILE_NAME, :do_not_launch=>true)
+  		content2 = get_file_as_string(f)
+  		assert content1 == content2, "The certificate file shouldn't be recreated if already present"
+  		f = "../releases/#{TEST_PROJECT_FILE_NAME}.air"
+  		assert File.exists?(f), "The packaged file should be created in the releases folder"
+  	end
+  end
   
   def do_silent_rake
   	Tidy::Compile.air(:main=>'src/app/views/MainView.as', 
@@ -96,6 +126,24 @@ class TestTidyProject < Test::Unit::TestCase
   		i=i+1
   	end
   end
+
+	def file_contains_string?(file, string)
+		while (line = file.gets)
+  			if line.include? string
+  				return true
+  			end
+  		end
+  		return false
+	end
+	
+	def get_file_as_string(filename)
+	  data = ''
+	  f = File.open(filename, "r") 
+	  f.each_line do |line|
+	    data += line
+	  end
+	  return data
+	end
   #def test_add_libs
   #  in_project_folder do
   #    assert File.exists?('script'), "No script folder"

data/tidyflash.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tidyflash}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Forrest"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2011-01-04}
   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"]
-  s.extra_rdoc_files = ["README", "bin/test_project.axml", "bin/tidyflash", "lib/script/bwlimit.rb", "lib/script/generate", "lib/script/server", "lib/script/server.rb", "lib/tasks/assets.rb", "lib/tasks/demo_config.rb", "lib/tasks/deploy.rb", "lib/tidy/air_packager.rb", "lib/tidy/axml.rb", "lib/tidy/compile.rb", "lib/tidy/generate.rb", "lib/tidy/template.rb", "lib/tidy/template_binding.rb", "lib/tidy/templates/demo_config.as.erb", "lib/tidy/version.rb", "lib/tidy_project.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "bin/test_project.axml", "bin/tidyflash", "lib/script/bwlimit.rb", "lib/script/generate", "lib/script/server", "lib/script/server.rb", "lib/tasks/assets.rb", "lib/tasks/demo_config.rb", "lib/tasks/deploy.rb", "lib/tidy/air_packager.rb", "lib/tidy/axml.rb", "lib/tidy/compile.rb", "lib/tidy/generate.rb", "lib/tidy/template.rb", "lib/tidy/template_binding.rb", "lib/tidy/templates/demo_config.as.erb", "lib/tidy/version.rb", "lib/tidy_project.rb", "templates/project/config/templates/air.axml.erb", "templates/project/project.rb", "templates/project/rakefile.rb", "templates/project/script/fcsh/rakefile.rb", "templates/project/src/app/helpers/Colours.as", "templates/project/src/app/helpers/Debug.as", "templates/project/src/app/helpers/Style.as", "templates/project/src/app/helpers/Typography.as", "templates/project/src/app/models/App.as", "templates/project/src/app/models/FlashVars.as", "templates/project/src/app/views/MainView.as", "templates/project/src/app/views/PreloaderView.as", "templates/project/src/app/views/ViewBase.as", "templates/project/src/assets/fonts/Fonts.as", "templates/scaffold/bin/xml/__model.xml", "templates/scaffold/scaffold.rb", "templates/scaffold/src/models/__Model.as", "templates/scaffold/src/views/__model/__ModelDetailView.as", "templates/scaffold/src/views/__model/__ModelListItemView.as", "templates/scaffold/src/views/__model/__ModelListView.as", "templates/swfobject/bin/index.html", "templates/swfobject/bin/js/swfobject.js", "templates/swfobject/swfobject.rb", "test/test_tidy_project.rb", "tidyflash.gemspec"]
+  s.extra_rdoc_files = ["README", "bin/test_project.axml", "bin/tidyflash", "lib/script/bwlimit.rb", "lib/script/generate", "lib/script/server", "lib/script/server.rb", "lib/tasks/assets.rb", "lib/tasks/deploy.rb", "lib/tidy/air_packager.rb", "lib/tidy/axml.rb", "lib/tidy/compile.rb", "lib/tidy/demo_config.rb", "lib/tidy/generate.rb", "lib/tidy/template.rb", "lib/tidy/template_binding.rb", "lib/tidy/templates/demo_config.as.erb", "lib/tidy/version.rb", "lib/tidy_project.rb"]
+  s.files = ["Manifest", "README", "Rakefile", "bin/test_project.axml", "bin/tidyflash", "lib/script/bwlimit.rb", "lib/script/generate", "lib/script/server", "lib/script/server.rb", "lib/tasks/assets.rb", "lib/tasks/deploy.rb", "lib/tidy/air_packager.rb", "lib/tidy/axml.rb", "lib/tidy/compile.rb", "lib/tidy/demo_config.rb", "lib/tidy/generate.rb", "lib/tidy/template.rb", "lib/tidy/template_binding.rb", "lib/tidy/templates/demo_config.as.erb", "lib/tidy/version.rb", "lib/tidy_project.rb", "templates/project/config/templates/air.axml.erb", "templates/project/project.rb", "templates/project/rakefile.rb", "templates/project/script/fcsh/rakefile.rb", "templates/project/src/app/helpers/Colours.as", "templates/project/src/app/helpers/Debug.as", "templates/project/src/app/helpers/Style.as", "templates/project/src/app/helpers/Typography.as", "templates/project/src/app/models/App.as", "templates/project/src/app/models/FlashVars.as", "templates/project/src/app/views/MainView.as", "templates/project/src/app/views/PreloaderView.as", "templates/project/src/app/views/ViewBase.as", "templates/project/src/assets/fonts/Fonts.as", "templates/scaffold/bin/xml/__model.xml", "templates/scaffold/scaffold.rb", "templates/scaffold/src/models/__Model.as", "templates/scaffold/src/views/__model/__ModelDetailView.as", "templates/scaffold/src/views/__model/__ModelListItemView.as", "templates/scaffold/src/views/__model/__ModelListView.as", "templates/swfobject/bin/index.html", "templates/swfobject/bin/js/swfobject.js", "templates/swfobject/swfobject.rb", "test/test_tidy_project.rb", "tidyflash.gemspec"]
   s.homepage = %q{http://github.com/michaelforrest/tidy}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tidyflash", "--main", "README"]
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tidyflash
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Michael Forrest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +01:00
+date: 2011-01-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,11 +76,11 @@ extra_rdoc_files:
 - lib/script/server
 - lib/script/server.rb
 - lib/tasks/assets.rb
-- lib/tasks/demo_config.rb
 - lib/tasks/deploy.rb
 - lib/tidy/air_packager.rb
 - lib/tidy/axml.rb
 - lib/tidy/compile.rb
+- lib/tidy/demo_config.rb
 - lib/tidy/generate.rb
 - lib/tidy/template.rb
 - lib/tidy/template_binding.rb
@@ -98,11 +98,11 @@ files:
 - lib/script/server
 - lib/script/server.rb
 - lib/tasks/assets.rb
-- lib/tasks/demo_config.rb
 - lib/tasks/deploy.rb
 - lib/tidy/air_packager.rb
 - lib/tidy/axml.rb
 - lib/tidy/compile.rb
+- lib/tidy/demo_config.rb
 - lib/tidy/generate.rb
 - lib/tidy/template.rb
 - lib/tidy/template_binding.rb