shooting_star 2.0.2 → 3.0.0

data/History.txt

@@ -1,8 +1,28 @@
+*** 3.0.0 / 2007-06-22
++ 3 major enhancements:
+  + Added flush client.
+  + Implemented reconnection for flash client.
+  + Server side event notification.
+
++ 2 minor enhancements:
+  + Sending policy file in response to flash client's request.
+  + Cleaning up source code.
+
++ 1 major bugfix:
+  + Suppressed EBADF while flushing execution buffer.
+
++ 1 minor bugfix:
+  + Closed a hole leaking messages.
+
++ 2 minor spec changes:
+  + send_message returns true if succeeded.
+  + Renamed local variable 'channel' to 'channel_path'
+
 *** 2.0.2 / 2007-06-09
 + 1 major enhancement:
   + Added chat generator.
 
-+ 1 minor enhancement:
++ 2 minor enhancements:
   + Default client configuration.
   + Changed reconnecting interval from 1 sec to 3 sec.
 

data/Manifest.txt

@@ -37,6 +37,7 @@ vendor/plugins/meteor_strike/generators/meteor/templates/view.rhtml
 vendor/plugins/meteor_strike/generators/meteor/templates/migration.rb
 vendor/plugins/meteor_strike/generators/meteor/templates/unit_test.rb
 vendor/plugins/meteor_strike/generators/meteor/templates/functional_test.rb
+vendor/plugins/meteor_strike/generators/meteor/templates/meteor_strike.swf
 vendor/plugins/meteor_strike/generators/chat
 vendor/plugins/meteor_strike/generators/chat/chat_generator.rb
 vendor/plugins/meteor_strike/generators/chat/templates

data/ext/asteroid.c

@@ -206,18 +206,26 @@ static VALUE asteroid_s_stop(VALUE Self){
 
 static VALUE asteroid_server_send_data(VALUE Self, VALUE Data){
   VALUE Fd = rb_iv_get(Self, "@fd");
-  int fd = FIX2INT(Fd), remain = RSTRING(Data)->len, len;
+  int fd = FIX2INT(Fd), remain = RSTRING(Data)->len, len, trial = 100;
   char *data = StringValuePtr(Data);
-  while((len = send(fd, data, remain, MSG_NOSIGNAL)) > 0){
-    remain -= len;
-    data += len;
-  }
-  if(len == -1 && errno != EAGAIN){
-    if(rb_respond_to(Self, rb_intern("unbind"))){
-      rb_funcall(Self, rb_intern("unbind"), 0);
+  while(remain){
+    len = send(fd, data, remain, MSG_NOSIGNAL);
+    if(len == -1){
+      if(errno == EAGAIN && --trial){
+        rb_thread_schedule();
+        CHECK_INTS;
+      }else{
+        if(rb_respond_to(Self, rb_intern("unbind"))){
+          rb_funcall(Self, rb_intern("unbind"), 0);
+        }
+        return Qnil;
+      }
+    }else{
+      remain -= len;
+      data += len;
     }
   }
-  return Qnil;
+  return Qtrue;
 }
 
 static VALUE asteroid_server_write_and_close(VALUE Self){

data/lib/shooting_star.rb

@@ -7,7 +7,7 @@ require 'shooting_star/config'
 require 'shooting_star/shooter'
 
 module ShootingStar
-  VERSION = '2.0.2'
+  VERSION = '3.0.0'
   CONFIG = Config.new(
     :config => 'config/shooting_star.yml',
     :pid_file => 'log/shooting_star.pid',
@@ -113,11 +113,11 @@ module ShootingStar
   def self.report
     puts "#{'-' * 79}\nconnections channel name\n#{'-' * 79}"
     total_connections = 0
-    shooter.channels.each do |channel|
-      count = shooter.count(channel)
-      puts "%11d %s" % [count, channel]
-      puts shooter.listeners(channel).join(',') if CONFIG.with_uid
-      puts shooter.signatures(channel).join(',') if CONFIG.with_sig
+    shooter.channels.each do |channel_path|
+      count = shooter.count(channel_path)
+      puts "%11d %s" % [count, channel_path]
+      puts shooter.listeners(channel_path).join(',') if CONFIG.with_uid
+      puts shooter.signatures(channel_path).join(',') if CONFIG.with_sig
       total_connections +=  count
     end
     puts "#{'-' * 79}\n%11d %s\n#{'-' * 79}" % [total_connections, 'TOTAL']

data/lib/shooting_star/channel.rb

@@ -2,18 +2,23 @@ require 'set'
 
 module ShootingStar
   class Channel
-    class InvalidIdError < StandardError; end
     attr_reader :path, :waiters
     @@channels = {}
 
-    def initialize(path)
-      @path = path
+    def initialize(channel_path)
+      @path = channel_path
       @waiters = Hash.new
-      @event_id = 0
+      @observers = Set.new
       @@channels[path] = self
     end
 
     def transmit(id, params)
+      if event = params[:event]
+        @observers.each do |obs|
+          begin obs.__send__(event, params) if obs.respond_to?(event)
+          rescue Exception; @observers.delete(obs) end
+        end
+      end
       @waiters.each do |signature, server|
         server.commit if server.respond(id, params)
       end
@@ -24,19 +29,19 @@ module ShootingStar
       server.commit
     end
 
-    def leave(server)
-      @waiters.delete(server.signature)
-    end
+    def leave(server) @waiters.delete(server.signature) end
+    def observe(observer) @observers << observer end
+    def ignore(observer) @observers.delete(observer) end
 
-    def self.[](channel); @@channels[channel] end
+    def self.[](channel_path); @@channels[channel_path] end
     def self.list; @@channels.keys end
     def self.sweep; @@channels.delete_if{|k,v| v.waiters.empty?} end
 
-    def self.cleanup(channel)
-      if @@channels[channel] && @@channels[channel].waiters.empty?
-        @@channels.delete(channel)
+    def self.cleanup(channel_path)
+      if @@channels[channel_path] && @@channels[channel_path].waiters.empty?
+        @@channels.delete(channel_path)
       end
-      !@@channels.include?(channel)
+      !@@channels.include?(channel_path)
     end
   end
 end

data/lib/shooting_star/server.rb

@@ -11,7 +11,7 @@ module ShootingStar
   module Server
     class MethodNotAcceptable < StandardError; end
 
-    attr_reader :signature
+    attr_reader :signature, :type
     @@servers = {}
     @@uids = {}
     @@tags = {}
@@ -25,6 +25,8 @@ module ShootingStar
 
     # receive the data sent from client.
     def receive_data(data)
+      return send_policy_file if @data.length == 0 &&
+        data == "<policy-file-request/>"
       @data += data
       header, body = @data.split(/\n\n|\r\r|\n\r\n\r|\r\n\r\n/, 2)
       return unless body
@@ -50,14 +52,15 @@ module ShootingStar
       end
       # load or create session informations
       @signature ||= @params['sig']
-      @channel ||= path[1..-1].split('?', 2)[0]
-      @query = "channel=#{@channel}&sig=#{@signature}"
+      @channel_path ||= path[1..-1].split('?', 2)[0]
+      @query = "channel=#{@channel_path}&sig=#{@signature}"
+      @type = @params['__t__']
       # process verb
-      unless @params['__t__']
+      if !@type
         make_connection(path)
       else
-        prepare_channel(@channel)
-        unless @@servers[@signature] || @params['__t__'] == 'rc'
+        prepare_channel(@channel_path)
+        unless @@servers[@signature] || @type == 'rc'
           notify(:event => :enter, :uid => @uid, :tag => @tag)
           log "Connected: #{@uid}"
         end
@@ -78,7 +81,7 @@ module ShootingStar
     # detect disconnection from the client and clean it up.
     def unbind
       @unbound = true
-      if channel = Channel[@channel]
+      if channel = Channel[@channel_path]
         channel.leave(self)
         notify(:event => :leave, :uid => @uid, :tag => @tag)
       end
@@ -87,14 +90,14 @@ module ShootingStar
       @@tags.delete(@signature)
       @@executings.delete(@signature)
       log "Disconnected: #{@uid}:#{@signature}"
-      if Channel.cleanup(@channel)
-        log "Channel closed: #{@channel}"
+      if Channel.cleanup(@channel_path)
+        log "Channel closed: #{@channel_path}"
       end
     end
 
-    # respond to an execution command. it'll be buffered.
+    # respond to an execution command.
     def respond(id, params)
-      return unbind && false unless @waiting || !session_timeout?
+      return unbind && false if !@waiting && session_timeout?
       @executing = @@executings[@signature] ||= Hash.new
       if params[:tag] && !params[:tag].empty? && !@tag.empty?
         return false if (params[:tag] & @tag).empty?
@@ -105,17 +108,19 @@ module ShootingStar
 
     # perform buffered executions.
     def commit
-      return false if @unbound
+      return false if @unbound || !@waiting
       @executing.each{|id, params| execute(id, params)}
       return false if @execution.empty?
-      send_data "HTTP/1.1 200 OK\nContent-Type: text/javascript\n\n"
-      send_data @execution
+      return false unless send_data(@type == 'f' ? "#{@execution}\0" :
+        "HTTP/1.1 200 OK\nContent-Type: text/javascript\n\n#{@execution}")
       @committed_at = Time.now
-      @waiting = nil
       @execution = ''
       @executing = Hash.new
       @@executings.delete(@signature)
-      write_and_close
+      unless @type == 'f'
+        @waiting = nil
+        write_and_close
+      end
       true
     end
 
@@ -155,29 +160,29 @@ module ShootingStar
 
     # broadcast event to clients.
     def notify(params = {})
-      return unless Channel[@channel]
+      return unless Channel[@channel_path]
       event_id = ShootingStar::timestamp
-      log "Event(#{event_id}): #{@channel}:#{params.inspect}"
-      Channel[@channel].transmit("event-#{event_id}", params)
+      log "Event(#{event_id}): #{@channel_path}:#{params.inspect}"
+      Channel[@channel_path].transmit("event-#{event_id}", params)
     end
 
     # wait for commands or events until they occur. if they're already in
     # the execution buffer, they'll be flushed and return on the spot.
     def wait_for
-      log "Wait for: #{@channel}:#{@uid}:#{@tag.join(',')}:#{@signature}"
-      if prepare_channel(@channel).join(self)
-        log "Flushed: #{@channel}:#{@uid}:#{@tag.join(',')}:#{@signature}"
-      end
       @waiting = true
+      log "Wait for: #{@channel_path}:#{@uid}:#{@tag.join(',')}:#{@signature}"
+      if prepare_channel(@channel_path).join(self)
+        log "Flushed: #{@channel_path}:#{@uid}:#{@tag.join(',')}:#{@signature}"
+      end
     end
 
     # prepare channel object.
-    def prepare_channel(channel)
-      unless Channel[channel]
-        Channel.new(channel)
-        log "Channel opened: #{channel}"
+    def prepare_channel(channel_path)
+      unless Channel[channel_path]
+        Channel.new(channel_path)
+        log "Channel opened: #{channel_path}"
       end
-      Channel[channel]
+      Channel[channel_path]
     end
 
     # add execution line to the buffer.
@@ -233,5 +238,15 @@ module ShootingStar
     ensure
       write_and_close
     end
+
+    # respond to policy file request.
+    def send_policy_file
+      send_data <<-"EOH" + "\0"
+      <cross-domain-policy>
+        <allow-access-from domain="*" to-ports="*" />
+      </cross-domain-policy>
+      EOH
+      write_and_close
+    end
   end
 end

data/lib/shooting_star/shooter.rb

@@ -3,12 +3,14 @@ require 'shooting_star/channel'
 # DRbObject
 module ShootingStar
   class Shooter
-    def shoot(channel, id, tag)
-      return unless Channel[channel]
-      log "Shot: #{channel}:#{id}:#{tag.join(',')}"
-      Channel[channel].transmit(id, :tag => tag)
+    # broadcast message
+    def shoot(channel_path, id, tag)
+      return unless Channel[channel_path]
+      log "Shot: #{channel_path}:#{id}:#{tag.join(',')}"
+      Channel[channel_path].transmit(id, :tag => tag)
     end
 
+    # update client properties
     def update(sig, uid, tag)
       ::ShootingStar::Server[sig].update(uid, tag || [])
     rescue Exception
@@ -18,40 +20,56 @@ module ShootingStar
     def channels; Channel.list end
     def sweep; Channel.sweep end
 
-    def count(channel, tag = nil)
-      servers(channel, tag).size
+    # count up listeners
+    def count(channel_path, tag = nil)
+      servers(channel_path, tag).size
     end
 
-    def count_with(sig, channel, tag = nil)
-      (signatures(channel, tag) | [sig]).size
+    # count up listeners with specified user.
+    def count_with(sig, channel_path, tag = nil)
+      (signatures(channel_path, tag) | [sig]).size
     end
 
-    def listeners(channel, tag = nil)
-      servers(channel, tag).map{|s| s.uid}
+    # lookup listeners
+    def listeners(channel_path, tag = nil)
+      servers(channel_path, tag).map{|s| s.uid}
     end
 
-    def listeners_with(uid, sig, channel, tag = nil)
-      servers(channel, tag).inject([uid]) do |result, server|
+    # lookup listeners with specified user.
+    def listeners_with(uid, sig, channel_path, tag = nil)
+      servers(channel_path, tag).inject([uid]) do |result, server|
         result << server.uid unless server.signature == sig
         result
       end
     end
 
-    def signatures(channel, tag = nil)
-      servers(channel, tag).map{|s| s.signature}
+    # lookup signatures on specified channel.
+    def signatures(channel_path, tag = nil)
+      servers(channel_path, tag).map{|s| s.signature}
     end
 
+    # notification entry point of message execution.
     def executed(sig, id)
       ::ShootingStar::Server[sig].executed(id)
     rescue Exception
     end
 
+    # observe server side events
+    def observe(channel_path, observer)
+      Channel[channel_path].observe(observer)
+    end
+
+    # ignore server side events
+    def ignore(channel_path, observer)
+      Channel[channel_path].ignore(observer)
+    end
+
   private
     def log(*arg, &block) ShootingStar::log(*arg, &block) end
 
-    def servers(channel, tag = nil)
-      return [] unless Channel[channel]
-      result = Channel[channel].waiters.values
+    def servers(channel_path, tag = nil)
+      return [] unless Channel[channel_path]
+      result = Channel[channel_path].waiters.values
       if tag && !tag.empty?
         result = result.select do |server|
           server.tag.empty? || !(server.tag & tag).empty?

data/test/lib/shooting_star_test.rb

@@ -6,6 +6,11 @@ require 'thread'
 $command_line = 'echo "testing"'
 
 class ShootingStarTest < Test::Unit::TestCase
+  module TestObserver
+    def self.enter(params) @params = params end
+    def self.params; @params end
+  end
+
   def setup
     @config = ShootingStar.configure :silent => true,
       :pid_file => 'log/shooting_star.test.pid',
@@ -16,6 +21,8 @@ class ShootingStarTest < Test::Unit::TestCase
     mutex.lock
     @thread = Thread.new{ShootingStar.start{mutex.unlock}}
     mutex.lock
+    @query = "sig=0123456789&execute=http://127.0.0.1:4001/meteor/strike"
+    @query2 = "sig=1123456789&execute=http://127.0.0.1:4001/meteor/strike"
   end
 
   def teardown
@@ -25,10 +32,70 @@ class ShootingStarTest < Test::Unit::TestCase
     @thread.join
   end
 
-  def test_connection
+  def test_connection_with_invalid_method
     client = TCPSocket.open('127.0.0.1', 8081)
     assert_not_nil client
-    send client, "GET", "test/channel"
+    send(client, "GET", "test/channel", @query)
+    assert client.read.empty?
+  end
+
+  def test_connection
+    client = TCPSocket.open('127.0.0.1', 8081)
+    send(client, "POST", "test/channel", @query)
+    assert_not_nil result = client.read
+    assert_not_nil result.index('xhr.getResponseHeader')
+    assert_not_nil result.index('test\/channel')
+    client.close
+
+    mutex = Mutex.new
+    mutex.lock
+    Thread.new do
+      client = TCPSocket.open('127.0.0.1', 8081)
+      send(client, "POST", "test/channel", "#{@query}&__t__=c")
+      mutex.unlock
+    end
+    mutex.lock
+    shooter = DRbObject.new_with_uri('druby://127.0.0.1:7124')
+    assert_not_nil shooter
+    shooter.shoot("test/channel", 12, [])
+    assert_not_nil result = client.read
+    assert_not_nil result.index('meteor/strike/12')
+  end
+
+  def test_multi_user_communication
+    client1 = TCPSocket.open('127.0.0.1', 8081)
+    client2 = TCPSocket.open('127.0.0.1', 8081)
+    assert_not_nil client1
+    assert_not_nil client2
+    shooter = DRbObject.new_with_uri('druby://127.0.0.1:7124')
+    assert_not_nil shooter
+    shooter.observe('test/channel', TestObserver)
+    mutex = Mutex.new
+    mutex.lock
+    assert_nil TestObserver.params
+    Thread.new do
+      send(client1, "POST", "test/channel", "#{@query}&__t__=c")
+      mutex.unlock
+    end
+    mutex.lock
+    assert_nil TestObserver.params
+    Thread.new do
+      send(client2, "POST", "test/channel", "#{@query2}&__t__=c")
+      mutex.unlock
+    end
+    mutex.lock
+    assert_equal :enter, TestObserver.params[:event]
+    assert_not_nil result1 = client1.read
+    assert_not_nil result1.index('meteor/strike/event-')
+    shooter.shoot("test/channel", 12, [])
+    assert_not_nil result2 = client2.read
+    assert_not_nil result2.index('meteor/strike/12')
+  end
+
+  def test_xmlsocket_server
+    client = TCPSocket.open('127.0.0.1', 8081)
+    client.write("<policy-file-request/>\0")
+    assert_not_nil client.read.index('allow-access-from')
   end
 
   def test_shooter_exists
@@ -46,10 +113,11 @@ class ShootingStarTest < Test::Unit::TestCase
   end
 
 private
-  def send(client, method, path)
-    client.write "#{method} #{path} HTTP/1.1\n\r" +
+  def send(client, method, path, body)
+    client.write "#{method} /#{path} HTTP/1.1\n\r" +
       "Host: #{@config.server.host}:#{@config.server.port}\n\r" +
       "Keep-Alive: 300\n\r" +
-      "Connection: keep-alive\n\r\n\r"
+      "Content-length: #{body.length}\n\r" +
+      "Connection: keep-alive\n\r\n\r#{body}"
   end
 end

data/vendor/plugins/meteor_strike/generators/meteor/meteor_generator.rb

@@ -34,6 +34,8 @@ class MeteorGenerator < Rails::Generator::NamedBase
       m.template 'unit_test.rb',
         File.join('test/unit', class_path, "#{file_name}_test.rb")
 
+      m.file 'meteor_strike.swf', 'public/meteor_strike.swf'
+
       m.migration_template 'migration.rb', 'db/migrate',
         :migration_file_name => "create_#{file_name.pluralize}"
     end

data/vendor/plugins/meteor_strike/lib/meteor_strike.rb

@@ -10,15 +10,14 @@ module MeteorStrike
     end
 
     def meteor_strike(channel, options = {})
-      unless options[:cache] || @meteor_strike
+      if !options[:cache] && !@meteor_strike
         cc = controller.headers['Cache-Control'] || ''
         cc += ', ' unless cc.empty?
         cc += 'no-store, no-cache, must-revalidate, max-age=0, '
         cc += 'post-check=0, pre-check=0'
         controller.headers['Cache-Control'] = cc
-        @meteor_strike = 0
       end
-      @meteor_strike += 1
+      @meteor_strike ||= 0 and @meteor_strike += 1
       config = ActiveRecord::Base.configurations[RAILS_ENV]['shooting_star']
       config ||= {}
       config['server'] ||= 'localhost:8080'
@@ -37,8 +36,10 @@ module MeteorStrike
       update_uri = "#{uri}/meteor/update"
       sig = Meteor.shooter.signature
       iframe_id = "meteor-strike-#{@meteor_strike}"
-      iframe_body = <<-"EOH"
-      EOH
+      flash_vars = [
+        "channel=#{channel}", "tag=#{tag}", "uid=#{uid}", "sig=#{sig}",
+        "base_uri=#{uri}", "server=#{server}"].join('&')
+      flash_html = flash_tag(flash_vars) unless options[:noflash]
       <<-"EOH"
       <div style="position: absolute; top: -99999px; left: -99999px">
       <iframe id="#{iframe_id}" name="#{iframe_id}"></iframe>
@@ -46,7 +47,7 @@ module MeteorStrike
         action="http://#{shooting_star_uri}">
         <input name="execute" value="#{uri}/meteor/strike" />
         <input name="tag" /><input name="uid" /><input name="sig" />
-      </form></div>
+      </form>#{flash_html}</div>
       <script type="text/javascript">
       //<![CDATA[
       var meteorStrike = meteorStrike || $H();
@@ -75,15 +76,36 @@ module MeteorStrike
         ms.tuneOut = function(tags){
           ms.update(UID, Array.prototype.without.apply(TAGS, tags));
         };
-        setTimeout(function(){ 
-          var form = $("#{iframe_id}-form");
-          form.uid.value = #{uid.to_json};
-          form.tag.value = #{tag.to_json};
-          form.sig.value = #{sig.to_json};
-          form.submit();
-          setTimeout(function(){#{options[:connected]}}, 0);
-        }, 0);
+        try{
+          var noflash = #{options[:noflash].to_json};
+          if(noflash || !flashVersion || flashVersion < 6){
+            setTimeout(function(){ 
+              var form = $("#{iframe_id}-form");
+              form.uid.value = #{uid.to_json};
+              form.tag.value = #{tag.to_json};
+              form.sig.value = #{sig.to_json};
+              form.submit();
+              setTimeout(function(){#{options[:connected]}}, 0);
+            }, 0);
+          }
+        }catch(e){}
       });
+      function meteor_strike_#{@meteor_strike}_DoFSCommand(command, args){
+        if(command == 'execute') eval(args);
+      }
+      if(navigator.appName && navigator.appName.indexOf("Microsoft") != -1 &&
+        navigator.userAgent.indexOf("Windows") != -1 &&
+        navigator.userAgent.indexOf("Windows 3.1") == -1)
+      {
+        document.write([
+          '<script language="VBScript"\\>',
+          'On Error Resume Next',
+          ['Sub meteor_strike_', #{@meteor_strike},
+           '_FSCommand(ByVal command, ByVal args)'].join(''),
+          ['  Call meteor_strike_', #{@meteor_strike},
+           '_DoFSCommand(command, args)'].join(''),
+          'End Sub', '</script\\>'].join(#{"\n".to_json}));
+      }
       //]]>
       </script>
       EOH
@@ -106,5 +128,31 @@ module MeteorStrike
       ]) unless /^get$/i === options['method']
       form_tag_without_timestamp(urlop, options, *arg, &block)
     end 
+
+    def flash_tag(flash_vars)
+      flash_code_base = ['http://fpdownload.macromedia.com/',
+        'pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0'].join('')
+      swf_path = File.join(RAILS_ROOT, 'public/meteor_strike.swf')
+      swf_timestamp = File.mtime(swf_path).to_i
+      <<-"EOH"
+      <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+       codebase="#{flash_code_base}" width="0" height="0"
+       id="meteor_strike_#{@meteor_strike}">
+      <param name="allowScriptAccess" value="sameDomain" />
+      <param name="FlashVars" value="#{flash_vars}" />
+      <param name="movie" value="/meteor_strike.swf?#{swf_timestamp}" />
+      <param name="menu" value="false" />
+      <param name="quality" value="high" />
+      <param name="devicefont" value="true" />
+      <param name="bgcolor" value="#ffffff" />
+      <embed src="/meteor_strike.swf?#{swf_timestamp}" menu="false"
+       quality="high" devicefont="true" bgcolor="#ffffff" width="0" height="0"
+       swLiveConnect="true" id="meteor_strike_#{@meteor_strike}"
+       name="meteor_strike_#{@meteor_strike}" flashvars="#{flash_vars}"
+       allowScriptAccess="sameDomain" type="application/x-shockwave-flash"
+       pluginspage="http://www.macromedia.com/go/getflashplayer" />
+      </object>
+      EOH
+    end
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: shooting_star
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
-date: 2007-06-08 00:00:00 +09:00
+  version: 3.0.0
+date: 2007-06-22 00:00:00 +09:00
 summary: Our goal is development of practical comet server which will be achieving over 100,000 simultaneous connections per host. On this purpose, we abandon portability and use system calls depending on particular OS such as epoll and kqueue.
 require_paths: 
 - lib
@@ -69,6 +69,7 @@ files:
 - vendor/plugins/meteor_strike/generators/meteor/templates/migration.rb
 - vendor/plugins/meteor_strike/generators/meteor/templates/unit_test.rb
 - vendor/plugins/meteor_strike/generators/meteor/templates/functional_test.rb
+- vendor/plugins/meteor_strike/generators/meteor/templates/meteor_strike.swf
 - vendor/plugins/meteor_strike/generators/chat
 - vendor/plugins/meteor_strike/generators/chat/chat_generator.rb
 - vendor/plugins/meteor_strike/generators/chat/templates
@@ -83,7 +84,6 @@ files:
 - vendor/plugins/meteor_strike/generators/chat/templates/functional_test.rb
 test_files: 
 - test/test_helper.rb
-- test/test_shooting_star.rb
 rdoc_options: 
 - -S
 - --template

data/test/test_shooting_star.rb

@@ -1,64 +0,0 @@
-$: << File.join(File.dirname(__FILE__), '../lib')
-require 'test/unit'
-require 'shooting_star'
-require 'socket'
-require 'thread'
-require 'redgreen' rescue nil
-
-COMMAND_LINE = 'echo "testing"'
-
-class ShootingStarTest < Test::Unit::TestCase
-  def setup
-    @config = ShootingStar.configure(
-      :silent => true,
-      :server => {:host => '127.0.0.1', :port => 8080},
-      :shooter => {:uri => 'druby://127.0.0.1:7123'})
-    @thread = Thread.new do
-      ShootingStar.start
-    end
-    Thread.pass while !File.exist?(@config.pid_file)
-    @client = TCPSocket.open('127.0.0.1', 8080)
-    @shooter = ShootingStar.shooter
-  end
-
-  def teardown
-    ShootingStar.stop
-    @thread.join
-    File.rm_f(@config.pid_file)
-  end
-
-  def test_activation
-    assert_not_nil @thread
-  end
-
-  def test_shooter
-    assert_not_nil @shooter
-  end
-
-  def test_client
-    assert_not_nil @client
-  end
-
-  def test_disconnection
-    @client.close
-  end
-
-  def test_communication
-    mutex = Mutex.new
-    mutex.lock
-    thread = Thread.new do
-      #send 'GET', 'test_application/test_channel_name'
-      mutex.unlock
-    end
-    mutex.lock
-    thread.join
-  end
-
-private
-  def send(method, path)
-    @client.write "#{method} #{path} HTTP/1.1\n" +
-      "Host: #{ShootingStar.host}:#{ShootingStar.port}\n" +
-      "Keep-Alive: 300\n" +
-      "Connection: keep-alive\n\n"
-  end
-end