limelight 0.5.2-java → 0.5.4-java

data/lib/limelight/commands/command.rb

@@ -21,7 +21,7 @@ module Limelight
 
       def load_command(name)
         begin
-          name = name.gsub('-', '')
+          name = name.gsub('-', '') 
           require "limelight/commands/#{name}_command"
         rescue LoadError => e
         end

data/lib/limelight/commands/open_command.rb

@@ -12,7 +12,7 @@ module Limelight
     #        Open a limelight production.
     #        options:
     #        -h, --help                       Prints this usage summary.
-    #        -d, --drb_port=<port>            Publish the Studio using DRb on the specified port.
+    #        -d, --drb_port=<port>            Publish productions using DRb starting with specified port.
     #
     class OpenCommand < Command
 
@@ -42,7 +42,7 @@ module Limelight
       end
 
       def build_options(spec) #:nodoc:
-        spec.on("-d <port>", "--drb_port=<port>", "Publish the Studio using DRb on the specified port.") { |value| @drb_port = value }
+        spec.on("-d <port>", "--drb_port=<port>", "Publish productions using DRb starting with specified port.") { |value| @drb_port = value }
       end
 
       def parse_remainder(args)
@@ -50,7 +50,7 @@ module Limelight
       end
 
       def process
-        Context.instance.studio.publish_on_drb(@drb_port.to_i) if @drb_port
+        Context.instance.studio.publish_productions_on_drb(@drb_port.to_i) if @drb_port
         Context.instance.studio.open(@production_path)
       end
 

data/lib/limelight/limelight_init.rb

@@ -2,7 +2,7 @@
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
 $LIMELIGHT_LIB = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-$: << $LIMELIGHT_LIB unless $:.include?($LIMELIGHT_LIB)
+$:.unshift $LIMELIGHT_LIB unless $:.include?($LIMELIGHT_LIB)
 $LIMELIGHT_HOME = File.expand_path(File.join($LIMELIGHT_LIB, ".."))
 
 if Java::java.lang.System.getProperty("limelight.home").nil?

data/lib/limelight/producer.rb

@@ -13,11 +13,13 @@ require 'limelight/production'
 require 'limelight/gems'
 require 'limelight/util/downloader'
 require 'limelight/version'
+require 'drb'
 
 module Limelight
 
   # A Producer has the hefty responsibility of producing Productions.  Given a directory, it will load the neccessary
-  # files and create all the neccessary objects to bring a Production to life.
+  # files and create all the neccessary objects to bring a Production to life.    A producer will produce only
+  # one production.
   #
   # For directory structures, see Limelight::Main
   #
@@ -47,7 +49,7 @@ module Limelight
       end
     end
 
-    attr_reader :theater, :production
+    attr_reader :theater, :production, :drb_service
     attr_writer :builtin_styles
 
     # A Production name, or root directory, must be provided. If not Theater is provided, one will be created.
@@ -174,16 +176,17 @@ module Limelight
     # to keep the production aware of it's status.  The Studio will also be informed of the closure.  If no
     # production remain opened, then the Limelight runtine will exit.
     #
-    def close(production)
-      return if production.closed?
-      production.closed = true
+    def close
+      return if @production.closed?
+      @production.closed = true
       return Thread.new do
         begin
           Thread.pass
-          production.production_closing
-          production.theater.close
-          production.production_closed
-          Context.instance.studio.production_closed(production)
+          @production.production_closing
+          @production.theater.close
+          @production.production_closed
+          @drb_service.stop_service if @drb_service
+          Context.instance.studio.production_closed(@production)
         rescue StandardError => e
           puts e
           puts e.backtrace
@@ -191,6 +194,16 @@ module Limelight
       end
     end
 
+    # Publish the production, using DRb, on the specified port.  This is useful for testing or remotely controling
+    # your production.  Publilshing productions on DRb is typically accomplished by using the --drb_port option
+    # of the open command. eg.
+    #
+    #   jruby -S limelight open --drb_port=9000 my_production
+    #
+    def publish_production_on_drb(port)
+      @drb_service = DRb.start_service("druby://localhost:#{port}", @production)
+    end
+
     def establish_production #:nodoc:
       @production.producer = self
       @production.theater = @theater

data/lib/limelight/production.rb

@@ -150,7 +150,14 @@ module Limelight
     # The production will actually delegate to it's producer and the producer will close the production down.
     #
     def close
-      @producer.close(self)
+      @producer.close
+    end
+
+    # Publish this production using DRb on the specified port.  The production will delegate to its producer to
+    # actually do the publishing.
+    #
+    def publish_on_drb(port)
+      @producer.publish_production_on_drb(port)
     end
 
     # Called when the last stage in this production's theater is closed.  If the allow_close? returns true

data/lib/limelight/specs/spec_helper.rb

@@ -9,12 +9,59 @@ require 'limelight/string'
 require 'limelight/specs/test_scene_opener'
 
 module Limelight
+
+  # Limelight comes with builtin assistance for testing your productions with rspec.
+  # See Limelight::Specs::SpecHelper
+  #
   module Specs
 
     class << self
       attr_accessor :producer
     end
-    
+
+    # Limelight comes with builtin assistance for testing your productions with rspec. To get started, add the following
+    # to your describe block...
+    #
+    #   uses_limelight :scene => "my_scene"
+    #
+    # This will add before(:each) blocks that will setup your production and load your scene before each test.
+    # It also provides some accessors to common objects like the scene and production.  Afterwards, you can
+    # write tests that look like this.
+    #
+    #   it "should do something with the scene" do
+    #     scene.name.should == "my_scene"
+    #     scene.find("title").text.should == "This is the Title"
+    #     production.theater["default_stage"].current_scene.should be(scene)
+    #   end
+    #
+    # There are several other options you can supply with 'uses_limelight':
+    #
+    # :hidden - (true or false) Defaults to true, but if you turn it off, the scene will pop open on your screen. This
+    # can be really nifty at times and really annoying at other time.
+    #
+    # :stage - The name of the stage you want the scene to be loaded on. The theater's default stage will be used by
+    # default.
+    #
+    # :scene_name - To be used instead of the :scene option.  This will create an empty scene in your production with
+    # the specified name.
+    #
+    # :scene_path - To be used in conjunction with :scene_name.  This will cause the empty scene to be loaded with
+    # the specified path.  Styles and Players associated with the path will be applied to the created scene.
+    #
+    # The 'uses_limelight' methods also accepts block using the Limelight::DSL::PropBuilder DSL.  This is convenient for building a
+    # simple prop structure sufficient to test the desired behavior.  Here's an example:
+    #
+    #   describe "my scene" do
+    #     uses_limelight :scene_name => "some_name", :scene_path => "my_scene_path" do
+    #       clicky :id => "clicky", :text => "click me", :on_mouse_clicked => "self.text = 'Hey! You clicked me!'"
+    #     end
+    #
+    #     it "should change text on clicky when clicked" do
+    #       scene.find("clicky").mouse_clicked(nil)
+    #       clicky.text.should == "Hey!  You clicked me!"
+    #     end
+    #   end
+    #
     module SpecHelper
       def scene
         if !@scene
@@ -26,10 +73,12 @@ module Limelight
   end
 end
 
-module Spec
+module Spec #:nodoc:
   module Example
     class ExampleGroup
 
+      # Deprecated
+      #
       def self.uses_scene(scene_name, options = {})
         uses_limelight({:scene => scene_name}.merge(options))
       end

data/lib/limelight/specs/test_scene_opener.rb

@@ -5,7 +5,7 @@ module Limelight
   module Specs
     module SpecHelper
 
-      class TestSceneOpener
+      class TestSceneOpener #:nodoc:
         def initialize(producer, ll_spec_options, prop_block)
           @producer = producer
           @prop_block = prop_block

data/lib/limelight/stage.rb

@@ -310,7 +310,7 @@ module Limelight
     # Invoked when the stage has lost status as the active stage.  Only 1 stage my have focus at a time.
     # System hook that should NOT be called by you.
     #
-    def deactivated(e)
+    def deactivated(e)    
       @theater.stage_deactivated(self)  
     end
 

data/lib/limelight/templates/sources/scene_spec/scene_spec.rb.template

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe "!-SCENE_TITLE-!" do
 
-  uses_scene "!-SCENE_NAME-!", :hidden => true
+  uses_limelight :scene => "!-SCENE_NAME-!", :hidden => true
 
   it "should have default text" do
     scene.children.size.should == 1

data/lib/limelight/theater.rb

@@ -2,6 +2,7 @@
 #- Limelight and all included source files are distributed under terms of the GNU LGPL.
 
 require 'limelight/limelight_exception'
+require 'thread'
 
 module Limelight
 
@@ -18,12 +19,13 @@ module Limelight
     def initialize(production)
       @production = production
       @stages = {}
+      @mutex = Mutex.new
     end
 
     # Returns an Array of Stages that belong to this Theater.
     #
     def stages
-      return @stages.values
+      return @mutex.synchronize { @stages.values }
     end
 
     # Returns true if the theater has at least one stage
@@ -35,7 +37,7 @@ module Limelight
     # Returns the Stage with the spcified name, nil if none exist with the specified name.
     #
     def [](stage_name)
-      return @stages[stage_name]
+      return @mutex.synchronize { @stages[stage_name] }
     end
 
     # Adds a Stage to the Theater.  Raises an exception is the name of the Stage is duplicated.
@@ -43,7 +45,7 @@ module Limelight
     def add_stage(name, options = {})
       raise LimelightException.new("Duplicate stage name: '#{name}'") if @stages[name]
       stage = build_stage(name, options)
-      @stages[name] = stage
+      @mutex.synchronize { @stages[name] = stage }
       return stage
     end
 
@@ -65,9 +67,9 @@ module Limelight
     # Removes the stage from this theater.
     #
     def stage_closed(stage)
-      @stages.delete(stage.name)
+      @mutex.synchronize { @stages.delete(stage.name) }
       @active_stage = nil if @active_stage == stage
-      @production.theater_empty! if @stages.empty? || !any_visible_stages?
+      @production.theater_empty! if !any_stages? || !any_visible_stages?
     end
 
     # If no Stages are added, the Theater will provide a default Stage named "Limelight".
@@ -80,8 +82,9 @@ module Limelight
     # Close this theater.  All stages in this theater will be closed and the active_stage will be nil'ed.
     #
     def close
-      @stages.values.each { |stage| stage.close }
-      @stages.clear
+      stages_to_close = @mutex.synchronize { @stages.values.dup }
+      stages_to_close.each { |stage| stage.close }
+      @mutex.synchronize { @stages.clear }
       @active_stage = nil
     end
 
@@ -93,8 +96,12 @@ module Limelight
 
     private ###############################################
 
+    def any_stages?
+      return @mutex.synchronize { @stages.empty? }
+    end
+
     def any_visible_stages?
-     return @stages.values.any? { |s| s.visible? }  
+     return @mutex.synchronize { @stages.values.any? { |s| s.visible? } }  
     end
     
   end

data/lib/limelight/version.rb

@@ -6,7 +6,7 @@ module Limelight
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 5
-      TINY   = 2
+      TINY   = 4
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/spec/limelight/commands/open_command_spec.rb

@@ -44,7 +44,7 @@ describe Limelight::Commands::OpenCommand do
 
   it "should start the studio on drb" do
     Limelight::Main.should_receive(:initialize_context)
-    @studio.should_receive(:publish_on_drb).with(1234)
+    @studio.should_receive(:publish_productions_on_drb).with(1234)
     @studio.should_receive(:open).with("some_prod")
 
     @command.run ["-d", "1234", "some_prod"]

data/spec/limelight/producer_spec.rb

@@ -215,15 +215,32 @@ describe Limelight::Producer do
 
   it "should close a production" do
     theater = mock("theater")
-    production = mock("production", :theater => theater, :closed? => false)
+    production = @producer.production
+    production.theater = theater
     production.should_receive(:closed=).with(true)
     production.should_receive(:production_closing)
     theater.should_receive(:close)
     production.should_receive(:production_closed)
     Limelight::Context.instance.studio.should_receive(:production_closed).with(production)
 
-    close_thread = @producer.close(production)
+    close_thread = @producer.close
     close_thread.join()
   end
+
+  it "should publish a production on drb" do
+    service = mock("service")
+    DRb.should_receive(:start_service).with("druby://localhost:9000", @producer.production).and_return(service)
+
+    @producer.publish_production_on_drb(9000)
+  end
+
+  it "should stop the drb service when closing the production" do
+    service = mock("service")
+    DRb.stub!(:start_service).with("druby://localhost:9000", @producer.production).and_return(service)
+    @producer.publish_production_on_drb(9000)
+
+    service.should_receive(:stop_service)
+    @producer.close.join
+  end
   
 end

data/spec/limelight/production_spec.rb

@@ -58,11 +58,16 @@ describe Limelight::Production, "Instance methods" do
   end
 
   it "should tell producer to do the closing" do
-    @producer.should_receive(:close).with(@production)
+    @producer.should_receive(:close)
 
     @production.close
   end
 
+  it "should publish on drb" do
+    @producer.should_receive(:publish_production_on_drb).with(9000)
+    @production.publish_on_drb(9000)
+  end
+
   it "should handle empty theater" do
     @production.should_receive(:allow_close?).at_least(1).and_return(true)
     @production.should_receive(:close)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: limelight
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.4
 platform: java
 authors: 
 - Micah Martin, 8th Light
@@ -9,7 +9,7 @@ autorequire: init
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -05:00
+date: 2009-11-01 01:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -159,7 +159,6 @@ files:
 - spec/limelight/scene_spec.rb
 - spec/limelight/stage_spec.rb
 - spec/limelight/string_spec.rb
-- spec/limelight/styles_spec.rb
 - spec/limelight/templates/production_templater_spec.rb
 - spec/limelight/templates/scene_templater_spec.rb
 - spec/limelight/templates/templater_logger_spec.rb
@@ -414,6 +413,6 @@ rubyforge_project: limelight
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Limelight-0.5.2 - Limelight http://limelight.8thlight.com
+summary: Limelight-0.5.4 - Limelight http://limelight.8thlight.com
 test_files: []
 

data/spec/limelight/styles_spec.rb

@@ -1,53 +0,0 @@
-#- Copyright � 2008-2009 8th Light, Inc. All Rights Reserved.
-#- Limelight and all included source files are distributed under terms of the GNU LGPL.
-
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
-require 'limelight/styles'
-
-describe Limelight::Styles do
-
-  def const_format(name)
-    return name.gsub(" ", "")
-  end
-
-  def method_format(name)
-    return name.downcase.gsub(" ", "_")
-  end
-
-  it "should have all the styles" do
-    Limelight::Styles::Style::STYLE_LIST.each do |descriptor|
-      const_name = const_format(descriptor.name)
-      Limelight::Styles.const_get(const_name)
-    end
-  end
-
-#  it "should generate code" do
-#    Limelight::Styles::Style::STYLE_LIST.each do |descriptor|
-#      const_name = const_format(descriptor.name)
-#      method_name = method_format(descriptor.name)
-#      spaces = 40 - const_name.length
-#      puts "# Specifies the #{descriptor.name} of a prop."
-#      puts "#"
-#      puts "#   style.#{method_name} = <value>"
-#      puts "#"
-#      puts "#{const_name} #{'' * spaces} = Limelight::Styles::Style::STYLE_LIST.get(#{descriptor.index})"
-#      puts ""
-#    end
-#  end
-
-#  it "should generate code" do
-#    Limelight::Styles::Style::STYLE_LIST.each do |descriptor|
-#      const_name = const_format(descriptor.name)
-#      method_name = method_format(descriptor.name)
-#      spaces = 40 - const_name.length
-#      puts "<tr>"
-#      puts "\t<td>'''#{method_name}'''</td>"
-#      puts "\t<td></td>"
-#      puts "\t<td>#{descriptor.defaultValue}</td>"
-#      puts "\t<td></td>"
-#      puts "</tr>"
-#    end
-#  end
-
-
-end