@@ -49,7 +49,8 @@ module Limelight end def process - Limelight::Producer.open(@production_path, :drb_port => @drb_port ) + Studio.publish_on_drb(@drb_port.to_i) if @drb_port + Studio.open(@production_path) end end lib/limelight/commands/open_command.rb @@ -77,7 +77,6 @@ module Limelight end @casting_director = nil - @production.publish_on_drb(options[:drb_port]) if options[:drb_port] @production.production_opened end lib/limelight/producer.rb @@ -128,12 +128,6 @@ module Limelight self.production_closed end - # Publish the production, using DRb, on the specified port. - # - def publish_on_drb(port) - @drb_server = DRb.start_service("druby://0.0.0.0:#{port}", self) - end - end end \ No newline at end of file lib/limelight/production.rb @@ -95,6 +95,12 @@ module Limelight return @index.nil? ? [] : @index.dup end + # Publish the Studio, using DRb, on the specified port. + # + def publish_on_drb(port) + @drb_server = DRb.start_service("druby://0.0.0.0:#{port}", self) + end + private ############################################# def assign_unique_name(production) #:nodoc: @@ -103,7 +109,7 @@ module Limelight while name_taken?(name) name = "#{production.name}_#{count}" count += 1 - end + end production.name = name end lib/limelight/studio.rb @@ -18,14 +18,14 @@ describe Limelight::Commands::OpenCommand do it "should open a production" do Limelight::Main.should_receive(:initialize_context) - Limelight::Producer.should_receive(:open).with("production_name", :drb_port => nil ) + Limelight::Studio.should_receive(:open).with("production_name") @command.run(["production_name"]) end it "should open the default production" do Limelight::Main.should_receive(:initialize_context) - Limelight::Producer.should_receive(:open).with(@command_class::DEFAULT_PRODUCTION, :drb_port => nil ) + Limelight::Studio.should_receive(:open).with(@command_class::DEFAULT_PRODUCTION) @command.run([]) end @@ -41,4 +41,12 @@ describe Limelight::Commands::OpenCommand do @command.drb_port.should == "4321" end + it "should start the studio on drb" do + Limelight::Main.should_receive(:initialize_context) + Limelight::Studio.should_receive(:publish_on_drb).with(1234) + Limelight::Studio.should_receive(:open).with("some_prod") + + @command.run ["-d", "1234", "some_prod"] + end + end \ No newline at end of file spec/commands/open_command_spec.rb @@ -184,11 +184,4 @@ describe Limelight::Producer do @producer.builtin_styles.should_not be(@producer.builtin_styles) end - it "should publish a production" do - @producer.stub!(:open_scene) - @producer.production.should_receive(:publish_on_drb).with("1234") - - @producer.open(:drb_port => "1234") - end - end spec/producer_spec.rb @@ -56,14 +56,6 @@ describe Limelight::Production, "Instance methods" do @production.scene_directory(:root).should == "/tmp" end - it "should publish on drb" do - @production.publish_on_drb("9876") - - DRb.start_service - proxy = DRbObject.new(nil, "druby://127.0.0.1:9876") - proxy.path.should == "/tmp" - end - it "should allow close by default" do @production.allow_close?.should == true end spec/production_spec.rb @@ -14,7 +14,7 @@ describe Limelight::Studio do before do Studio.reset - @production = TestProduction.new + @production = TestProduction.new end it "should install itsself" do @@ -72,7 +72,7 @@ describe Limelight::Studio do Studio.production_closed(@production) - Thread.pass + sleep(0.1) end it "should add productions to the index" do @@ -121,7 +121,15 @@ describe Limelight::Studio do Limelight::Context.instance().should_receive(:shutdown) Studio.shutdown - Thread.sleep(0.1) + sleep(0.1) + end + + it "should publish on drb" do + Studio.publish_on_drb("9876") + + DRb.start_service + proxy = DRbObject.new(nil, "druby://127.0.0.1:9876") + proxy.instance.should_not == nil end end \ No newline at end of file spec/studio_spec.rb 199fcd6e4ec9934459181cf3b7bd6b77a05e6cad Micah Martin micah@8thlight.com http://github.com/slagyr/limelight/commit/acaa22adce39057f848fb052047f58d48cb727f2 acaa22adce39057f848fb052047f58d48cb727f2 2009-05-30T00:04:56-07:00 2009-05-30T00:04:56-07:00 using the studio to publish on drb d19a1eabb0fd6816f34e1773febfbb8f1a04ef71 Micah Martin micah@8thlight.com