sprout 0.7.171 → 0.7.182

data/lib/sprout.rb

@@ -69,7 +69,7 @@ module Sprout
   # == Sprout
   #
   # Tools, Libraries and Bundles are distributed as RubyGems and given a specific gem name suffix. For some examples:
-  #   sprout-flex2sdk-tool
+  #   sprout-flex3sdk-tool
   #   sprout-asunit-library
   #   sprout-as3-bundle
   #
@@ -230,7 +230,7 @@ EOF
     # * +archive_path+ Optional parameter for tools that contain more than one executable, or for
     # when you don't want to use the default executable presented by the tool. For example, the Flex 2 SDK
     # has many executables, when this method is called for them, one might use something like:
-    #   Sprout::Sprout.get_executable('sprout-flex2sdk-tool', 'bin/mxmlc')
+    #   Sprout::Sprout.get_executable('sprout-flex3sdk-tool', 'bin/mxmlc')
     # * +version+ Optional parameter to specify a particular gem version for this executable
     def self.get_executable(name, archive_path=nil, version=nil)
       target = self.sprout(name, version)
@@ -238,7 +238,7 @@ EOF
         # If caller sent in a relative path to an executable (e.g., bin/mxmlc), use it
         exe = File.join(target.installed_path, archive_path)
         if(User.new.is_a?(WinUser) && !archive_path.match(/.exe$/))
-          # If we're on Win (even Cygwin), add .exe to support custom binaries (see sprout-flex2sdk-tool)
+          # If we're on Win (even Cygwin), add .exe to support custom binaries (see sprout-flex3sdk-tool)
           exe << '.exe'
         end
       elsif(target.url)
@@ -414,11 +414,14 @@ EOF
     # of that rakefile should be returned.
     # If no rakefile is found, it should return Dir.pwd
     def self.project_path
-      @@project_path ||= get_implicit_project_path(Dir.pwd)
+      @@project_path ||= self.project_path = get_implicit_project_path(Dir.pwd)
     end
     
     # Return the rakefile in the current +project_path+
     def self.project_rakefile
+      if(!defined?(@@project_rakefile))
+        path = project_path
+      end
       return @@project_rakefile ||= nil
     end
 

data/lib/sprout/generator/named_base.rb

@@ -108,11 +108,22 @@ module Sprout
       def full_test_dir
         @full_test_dir ||= full_class_dir.gsub(src_dir, test_dir)
       end
-        
+      
       # Filesystem path to the TestCase file
       def full_test_case_path
         @full_test_case_path ||= File.join(full_test_dir, test_case_name + '.as')
       end
+
+      # Path to the in-project generate script
+      # pulled out for DOS branching
+      def generate_script_path
+        usr = User.new
+        if(usr.is_a?(WinUser) && !usr.is_a?(CygwinUser))
+          return File.join(class_name, 'script', "generate.rb")
+        else
+          return File.join(class_name, 'script', "generate")
+        end
+      end
       
       def instance_name
         name = class_name.dup;

data/lib/sprout/project_model.rb

@@ -1,6 +1,5 @@
 
 module Sprout
-  
   # The ProjectModel gives you a place to describe your project so that you
   # don't need to repeat yourself throughout a rakefile.
   #
@@ -17,13 +16,42 @@ module Sprout
   #   end
   #
   class ProjectModel < Hash
-  
+    
+    @@DEFAULT_TEST_WIDTH  = 1000
+    @@DEFAULT_TEST_HEIGHT = 550
+    
     # Relative path to the folder where compile time assets will be stored
     attr_accessor :asset_dir
     # The folder where binary files will be created. Usually this is where any build artifacts like SWF files get placed.
     attr_accessor :bin_dir
-    # The technology language that is being used, right now this is either 'as2' or 'as3'.
-    # Code generators take advantage of this setting to determine which templates to use.
+    # The Background Color of the SWF file
+    attr_accessor :background_color
+    # Contributors to the SWF file
+    attr_accessor :contributors
+    # If you don't want to use the default compiler for your language
+    # set it manually here.
+    # Possible values are:
+    # * sprout-flex2sdk-tool
+    # * sprout-flex3sdk-tool
+    # * sprout-mtasc-tool
+    attr_accessor :compiler_gem_name
+    # The version number of the compiler gem to use
+    attr_accessor :compiler_gem_version
+    # The primary creator of the SWF file
+    attr_accessor :creator
+    # Directory where documentation should be placed.
+    attr_accessor :doc_dir
+    # CSS documents that should be individually compiled
+    # for runtime stylesheet loading.
+    attr_accessor :external_css
+    # The default frame rate of the SWF file
+    attr_accessor :frame_rate
+    # The default height of the SWF file
+    # _(This value is overridden when embedded in an HTML page)_
+    attr_accessor :height
+    # The technology language that is being used, right now this value can be 'as2', 'as3' or 'mxml'.
+    # Code generators take advantage of this setting to determine which templates to use
+    # and build tasks use this setting to determin the input file suffix (.as or .mxml).
     attr_accessor :language
     # The relative path to your library directory. Defaults to 'lib'
     #
@@ -31,6 +59,19 @@ module Sprout
     # into this directory. Source libraries will be placed in a folder that matches the library name,
     # while SWCs will be simply placed directly into the lib_dir.
     attr_accessor :lib_dir
+    # Array of sprout library symbols
+    attr_accessor :libraries
+    # The Array of SWC paths to add to all compilation tasks
+    attr_accessor :library_path
+    # The locale for the SWF file
+    attr_accessor :locale
+    # A collection of Flex Module root source files. If this collection
+    # has items added to it, the deploy task will generate a 'link_report' from
+    # the main application compilation and then consume it as 'load_externs' for 
+    # each module compilation.
+    attr_accessor :modules
+    # Organization responsible for this SWF file
+    attr_accessor :organization
     # The production file that this Project will generate
     attr_accessor :output
     # The real name of the project, usually capitalized like a class name 'SomeProject'
@@ -39,17 +80,27 @@ module Sprout
     attr_accessor :skin_dir
     # The skin file that will be generated
     attr_accessor :skin_output
+    # The Array of source paths to add to all compilation tasks
+    # _Do not add task-specific paths (like lib/asunit) to this value_
+    attr_accessor :source_path
     # The relative path to your main source directory. Defaults to 'src'
     attr_accessor :src_dir
+    # Enforce strict type checking
+    attr_accessor :strict
     # The relative path to the directory where swc files should be kept.
     # This value defaults to lib_dir
     attr_accessor :swc_dir
-    # Directory where documentation should be placed.
-    attr_accessor :doc_dir
     # Relative path to the folder that contains your test cases
     attr_accessor :test_dir
     # The test executable
     attr_accessor :test_output
+    # The test runner SWF width
+    attr_writer :test_width
+    # The test runner SWF height
+    attr_writer :test_height
+    # The default width of the SWF file
+    # _(This value is overridden when embedded in an HTML page)_
+    attr_accessor :width
 
     # TODO: Add clean hash interface so that users
     # can simply add to this object's properties like:
@@ -59,6 +110,8 @@ module Sprout
     # external generators...  
     def self.instance
       @@instance ||= ProjectModel.new
+      yield @@instance if block_given?
+      return @@instance
     end
     
     def self.destroy # :nodoc:
@@ -67,9 +120,10 @@ module Sprout
 
     # Patch submitted by Thomas Winkler
     def self.setup(&block)
-      yield instance
+      yield instance if block_given?
+      return instance
     end
-      
+
     def initialize
       super
       @project_name   = ''
@@ -81,12 +135,20 @@ module Sprout
       @test_dir       = 'test'
       @asset_dir      = 'assets'
       @skin_dir       = File.join(@asset_dir, 'skins')
-
+      @frame_rate     = 24
       @language       = 'as3'
 
+      @external_css   = []
+      @libraries      = []
+      @library_path   = []
+      @modules        = []
+      @source_path    = []
+
       @model_dir      = nil
       @view_dir       = nil
       @controller_dir = nil
+      
+      @@instance      = self
     end
     
     # Path to the project directory from which all other paths are created
@@ -136,5 +198,44 @@ module Sprout
       return @controller_dir
     end
     
+    def test_width
+      @test_width ||= @@DEFAULT_TEST_WIDTH
+    end
+    
+    def test_height
+      @test_height ||= @@DEFAULT_TEST_HEIGHT
+    end
+    
+    def name=(name)
+      @project_name = name
+    end
+    
+    def name
+      @project_name
+    end
+    
+    def to_s
+      return "[Sprout::ProjectModel project_name=#{project_name}]"
+    end
+    
   end
 end
+
+def project_model(args)
+  model = Sprout::ProjectModel.new
+  yield model if block_given?
+
+  t = task args
+
+  def t.project_model=(model)
+    @model = model
+  end
+
+  def t.project_model
+    return @model
+  end
+    
+  t.project_model = model
+  return model
+end
+

data/lib/sprout/tasks/tool_task.rb

@@ -30,8 +30,15 @@ module Sprout
   #
   class ToolTask < Rake::FileTask
     
+    # Arguments to be prepended in front of the command line output
+    attr_accessor :prepended_args
+    # Arguments to appended at the end of the command line output
+    attr_accessor :appended_args
+    
     def initialize(name, app) # :nodoc:
       super
+      @prepended_args   = nil
+      @appended_args    = nil
       @default_gem_name = nil
       @default_gem_path = nil
       initialize_task
@@ -48,7 +55,7 @@ module Sprout
     end
     
     # Full name of the sprout tool gem that this tool task will use. For example, the MXMLCTask
-    # uses the sprout-flex2sdk-tool at the time of this writing, but will at some point 
+    # uses the sprout-flex3sdk-tool at the time of this writing, but will at some point 
     # change to use the sprout-flex3sdk-tool. You can combine this value with gem_version
     # in order to specify exactly which gem your tool task is executing.
     def gem_name
@@ -81,7 +88,7 @@ module Sprout
     def gem_path
       return @gem_path ||= @default_gem_path
     end
-
+    
     # Create a string that can be turned into a file
     # that rdoc can parse to describe the customized
     # or generated task using param name, type and
@@ -118,11 +125,13 @@ module Sprout
     # Create a string that represents this configured tool for shell execution
     def to_shell
       result = []
+      result << @prepended_args unless @prepended_args.nil?
       params.each do |param|
         if(param.visible?)
           result << param.to_shell
         end
       end
+      result << @appended_args unless @appended_args.nil?
       return result.join(' ')
     end
 

data/lib/sprout/version.rb

@@ -2,7 +2,7 @@ module Sprout
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 7
-    TINY  = 171
+    TINY  = 182
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     MAJOR_MINOR = [MAJOR, MINOR].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprout
 version: !ruby/object:Gem::Version 
-  version: 0.7.171
+  version: 0.7.182
 platform: ruby
 authors: 
 - Luke Bayes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-09 00:00:00 -07:00
+date: 2008-05-17 00:00:00 -07:00
 default_executable: sprout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - doc
 - lib
 - MIT-LICENSE
+- pkg
 - rakefile.rb
 - samples
 - script