chain-reactor 0.2.0 → 0.2.1

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+  - 1.8.7
+  - ree

data/CHANGELOG.rdoc

@@ -0,0 +1,10 @@
+== 0.2.1
+
+* bug fixes
+  * Refactored tests to work with JRuby, Rubinius and Ruby MRI 1.8.7
+  * Removed sys-proctable gem to use system's `ps` instead (tests only)
+
+== 0.2.0
+
+* important changes
+  * First release as a gem

data/Gemfile

@@ -1,15 +1,17 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in chain-reactor.gemspec
 gemspec
 
-gem 'json'
-gem 'mocha'
-gem 'dante'
-gem 'log4r'
+gem 'rake', '~> 0.8.7'
+gem 'main', '~> 5.1.1'
+gem 'json', '~> 1.7.5'
+gem 'dante', '~> 0.1.5'
+gem 'log4r', '~> 1.1.10'
+gem 'rdoc', '~> 3.12'
 
-gem 'xml-simple', :require => false
+gem 'xml-simple', '~> 1.1.2', :require => false
 
 group :test do
-  gem 'sys-proctable'
+  gem 'test-unit', '~> 2.5.3'
+  gem 'mocha', '~> 0.13.1'
 end

data/README.rdoc

@@ -1,5 +1,8 @@
 = Chain Reactor
 
+{<img src="https://travis-ci.org/joonty/chain-reactor.png?branch=master" alt="Build Status" />}[https://travis-ci.org/joonty/chain-reactor]
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/joonty/chain-reactor]
+
 Chain Reactor is a simple server that waits for incoming connections, then kicks off some code when one is made. Clients are locked down by IP address, so you will only recieve connections from known clients. Also, data can be passed via JSON, XML, or anything you like.
 
 The "reactions" are written in ruby code, like this:
@@ -31,7 +34,9 @@ This can be installed through ruby gems:
 
 == Usage
 
-A chain file is required to run, as this specifies which clients to accept and what to do. Fortunately, it's easy to create a template:
+Chain reactor comes with two command line tools, <tt>chain-reactor</tt> (the server) and <tt>chain-reactor-client</tt> (I think you can guess).
+
+A chain file is required to run the server, as this specifies which clients to accept and what to do. Fortunately, it's easy to create a template:
 
     $ chain-reactor template > Chainfile.rb
 
@@ -45,6 +50,8 @@ The --ontop option stops it from running as a daemon, making it easier to see wh
 
 Follow the instructions by adding key/value pair data to send to the server, then watch it react!
 
+For more information on configuration, take a look at the wiki.
+
 == Contributing
 
 1. Fork it

data/lib/chain-reactor/controller.rb

@@ -20,6 +20,11 @@ module ChainReactor
     #
     # Uses dante as the daemonizer.
     def start
+      if not @config.on_top? and RUBY_PLATFORM == 'java'
+        @log.warn { "fork() is not implemented in JRuby, chain-reactor will run on top instead of daemonizing" }
+        @config.on_top = true
+      end
+
       # Change output format for logging to file if daemonizing
       unless @config.on_top?
         @log.outputters.first.formatter = ChainReactor::PatternFormatter.new(:pattern => "[%l] %d :: %m")

data/lib/chain-reactor/reaction.rb

@@ -24,7 +24,7 @@ module ChainReactor
     attr_accessor :options
 
     # Create a new reaction, with the options and code block to run.
-    def initialize(options = {},block,logger)
+    def initialize(options,block,logger)
       @options = { :parser => :json, :required_keys => [], :keys_to_sym => true }.merge(options)
       @block = block
       @log = logger

data/lib/chain-reactor/version.rb

@@ -1,5 +1,5 @@
 # The ChainReactor module encapsulates all classes in the gem.
 module ChainReactor
   # Current gem version.
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/helpers.rb

@@ -14,6 +14,12 @@ module ChainReactor
       end
     end
 
+    # KeyError doesn't exist in ruby 1.8
+    if !defined? ::KeyError
+      class ::KeyError < ::IndexError
+      end
+    end
+
     class Params
       def initialize(hash_data)
         @hash = hash_data
@@ -26,7 +32,7 @@ module ChainReactor
       def fetch(key,&block)
         begin
           @hash.fetch(key,&block)
-        rescue KeyError => e
+        rescue ::KeyError,::IndexError => e
           raise ::Main::Parameter::NoneSuch, key
         end
       end

data/test/test_chain_reactor_options.rb

@@ -10,12 +10,18 @@ class TestChainReactorOptions < Test::Unit::TestCase
     Open3.popen3("#{bin_path} #{arg_string}")
   end
 
+  # Thread can be nil, if ruby 1.8 is used
+  def assert_exit_status(thread,expected_status)
+    unless thread.nil?
+      assert_equal expected_status, thread.value.exitstatus
+    end
+  end
+
   def test_help_returns_help_in_stdout
     out = exec_with('--help')
     help = out[1].read
-    status = out[3].value
 
-    assert_equal 1, status.exitstatus
+    assert_exit_status(out[3],1)
     assert_match(/NAME\s*chain\-reactor/, help)
     assert_match(/SYNOPSIS\s*chain\-reactor \(start|stop|template\) chainfile\.rb/, help)
   end
@@ -23,9 +29,8 @@ class TestChainReactorOptions < Test::Unit::TestCase
   def test_no_args_returns_help_in_stdout_and_fails
     out = exec_with('')
     help = out[1].read
-    status = out[3].value
 
-    assert_equal 1, status.exitstatus
+    assert_exit_status(out[3],1)
     assert_match(/NAME\s*chain\-reactor/, help)
     assert_match(/SYNOPSIS\s*chain\-reactor \(start|stop|template\) chainfile\.rb/, help)
   end
@@ -33,9 +38,8 @@ class TestChainReactorOptions < Test::Unit::TestCase
   def test_invalid_mode_returns_help_and_fails
     out = exec_with('ssaduhdui')
     help = out[1].read
-    status = out[3].value
 
-    assert_equal 1, status.exitstatus
+    assert_exit_status(out[3],1)
     assert_match(/NAME\s*chain\-reactor/, help)
     assert_match(/SYNOPSIS\s*chain\-reactor \(start|stop|template\) chainfile\.rb/, help)
   end
@@ -43,27 +47,24 @@ class TestChainReactorOptions < Test::Unit::TestCase
   def test_template_returns_chainfile_in_stdout
     out = exec_with('template')
     template = out[1].read
-    status = out[3].value
 
-    assert_equal 0, status.exitstatus
+    assert_exit_status(out[3],0)
     assert_match(/react_to\(/, template)
   end
 
   def test_start_without_chainfile_fails
     out = exec_with('start')
     error = out[2].read
-    status = out[3].value
 
-    assert_equal 1, status.exitstatus
+    assert_exit_status(out[3],1)
     assert_match(/chain-reactor: A valid chainfile must be supplied/, error)
   end
 
   def test_stop_without_chainfile_fails
     out = exec_with('stop')
     error = out[2].read
-    status = out[3].value
 
-    assert_equal 1, status.exitstatus
+    assert_exit_status(out[3],1)
     assert_match(/chain-reactor: A valid chainfile must be supplied/, error)
   end
 end

data/test/test_chain_reactor_start.rb

@@ -1,88 +1,103 @@
 require 'test/unit'
 require 'rubygems'
 require 'open3'
-require 'sys/proctable'
 require 'client'
 
 # Test case for the options of the chain reactor executable.
 class TestChainReactorStart < Test::Unit::TestCase
-  include Sys
 
-  def setup
-    @test_path = File.dirname(__FILE__) 
-    @bin_path = @test_path + '/../bin/chain-reactor'
-    @chainfile_path = @test_path + '/chainfile.test'
-    @pid_path = @test_path + '/chain-reactor.pid'
-  end
+  if RUBY_PLATFORM != 'java'
+    def setup
+      @test_path = File.dirname(__FILE__) 
+      @bin_path = @test_path + '/../bin/chain-reactor'
+      @chainfile_path = @test_path + '/chainfile.test'
+      @pid_path = @test_path + '/chain-reactor.pid'
+    end
 
-  def teardown
-    _,_,_,t = stop_chain_reactor
-    t.value
-    
-    $stdout = STDOUT
-  end
+    def teardown
+      _,_,_,t = stop_chain_reactor
+      if t.nil?
+        # Ruby 1.8
+        sleep 2
+      else
+        # Ruby 1.9+
+        t.value
+      end
+      
+      $stdout = STDOUT
+    end
 
-  def start_chain_reactor(arg_string)
-    Open3.popen3("#{@bin_path} start #{@chainfile_path} #{arg_string} --pidfile #{@pid_path}")
-  end
+    def start_chain_reactor(arg_string)
+      Open3.popen3("#{@bin_path} start #{@chainfile_path} #{arg_string} --pidfile #{@pid_path}")
+    end
 
-  def stop_chain_reactor
-    Open3.popen3("#{@bin_path} stop #{@chainfile_path} --pidfile #{@pid_path}")
-  end
+    def stop_chain_reactor
+      Open3.popen3("#{@bin_path} stop #{@chainfile_path} --pidfile #{@pid_path}")
+    end
 
-  def test_start_daemon
-    _, stdout, _, thread = start_chain_reactor('')
-    output = stdout.read
+    def test_start_daemon
+      if RUBY_VERSION.to_f < 1.9
+        # Thread is not available
+        return
+      end
+      _, stdout, _, thread = start_chain_reactor('')
+      output = stdout.read
 
-    assert_match(/Registered 1 reactions/,output)
-    assert_match(/Starting daemon, PID file => #{@pid_path}/,output)
-    assert_match(/Daemon has started successfully/,output)
+      assert_match(/Registered 1 reactions/,output)
+      assert_match(/Starting daemon, PID file => #{@pid_path}/,output)
+      assert_match(/Daemon has started successfully/,output)
 
-    # Thread stopped as it's daemonized
-    assert_equal true, thread.stop?
+      # Wait for thread to exit
+      thread.value
 
-    assert File.file? @pid_path
-    pid = File.new(@pid_path).read.to_i
-    prc = ProcTable.ps(pid)
+      # Thread stopped as it's daemonized
+      assert_equal true, thread.stop?
 
-    assert_not_nil prc
-    assert_match(/chain\-reactor start/,prc.cmdline)
-  end
+      assert File.file? @pid_path
+      pid = File.new(@pid_path).read.to_i
 
-  def test_start_daemon_and_communicate_with_client
-    _, stdout, _, _ = start_chain_reactor('')
-    output = stdout.read
-    assert_match(/Daemon has started successfully/,output)
+      ps_output = `ps p #{pid} --no-heading`
+      assert_not_equal "", ps_output
 
-    assert_nothing_raised ChainReactor::ClientError do
-      $stdout = File.new('/dev/null','w')
-      client = ChainReactor::Client.new('127.0.0.1',20000)
-      client.send_as_json({:hello => :world})
+      assert_match(/chain\-reactor start/,ps_output)
     end
-  end
 
-  def test_start_daemon_with_port_override_and_communicate_with_client
-    _, stdout, _, _ = start_chain_reactor('--port 20100')
-    output = stdout.read
-    assert_match(/Daemon has started successfully/,output)
+    def test_start_daemon_and_communicate_with_client
+      _, stdout, stderr, _ = start_chain_reactor('')
+      output = stdout.read
+      assert_match(/Daemon has started successfully/,output)
 
-    assert_nothing_raised ChainReactor::ClientError do
-      $stdout = File.new('/dev/null','w')
-      client = ChainReactor::Client.new('127.0.0.1',20100)
-      client.send({:hello => :world})
+      assert_nothing_raised ChainReactor::ClientError do
+        $stdout = File.new('/dev/null','w')
+        client = ChainReactor::Client.new('127.0.0.1',1987)
+        client.send_as_json({:hello => :world})
+      end
     end
-  end
 
-  def test_start_daemon_with_address_override_and_communicate_with_client
-    _, stdout, _, _ = start_chain_reactor('--address 0.0.0.0')
-    output = stdout.read
-    assert_match(/Daemon has started successfully/,output)
+    def test_start_daemon_with_port_override_and_communicate_with_client
+      _, stdout, _, _ = start_chain_reactor('--port 20100')
+      output = stdout.read
+      assert_match(/Daemon has started successfully/,output)
 
-    assert_nothing_raised ChainReactor::ClientError do
-      $stdout = File.new('/dev/null','w')
-      client = ChainReactor::Client.new('0.0.0.0',20000)
-      client.send({:hello => :world})
+      assert_nothing_raised ChainReactor::ClientError do
+        $stdout = File.new('/dev/null','w')
+        client = ChainReactor::Client.new('127.0.0.1',20100)
+        client.send({:hello => :world})
+      end
+    end
+
+    def test_start_daemon_with_address_override_and_communicate_with_client
+      _, stdout, _, _ = start_chain_reactor('--address 0.0.0.0')
+      output = stdout.read
+      assert_match(/Daemon has started successfully/,output)
+
+      assert_nothing_raised ChainReactor::ClientError do
+        $stdout = File.new('/dev/null','w')
+        client = ChainReactor::Client.new('0.0.0.0',1987)
+        client.send({:hello => :world})
+      end
     end
   end
+    
 end
 

data/test/test_chainfile_parser.rb

@@ -50,7 +50,7 @@ class TestChainfileParser < Test::Unit::TestCase
 
   def test_single_reaction_with_options_is_added_to_reactor
     chain = <<-chain
-    react_to('192.168.0.1', parser: :dummy, required_keys: [:hello,:world]) { |data| puts data.inspect }
+    react_to('192.168.0.1', :parser => :dummy, :required_keys => [:hello,:world]) { |data| puts data.inspect }
     chain
 
     parser = ChainReactor::ChainfileParser.new(File.new(chain),

data/test/test_reactor.rb

@@ -15,21 +15,21 @@ class TestReactor < Test::Unit::TestCase
   
   def test_adding_reaction_makes_address_allowable
     reactor = ChainReactor::Reactor.new get_logger
-    reactor.add(['127.0.0.1'],{parser: :dummy},Proc.new {})
+    reactor.add(['127.0.0.1'],{:parser => :dummy},Proc.new {})
     assert reactor.address_allowed? '127.0.0.1'
   end
 
   def test_react_raises_error
     reactor = ChainReactor::Reactor.new get_logger
     assert_raises RuntimeError, 'Address is not allowed' do
-      reactor.react('127.0.0.1',{parser: :dummy})
+      reactor.react('127.0.0.1',{:parser => :dummy})
     end
   end
 
   def test_react_calls_block
     reactor = ChainReactor::Reactor.new get_logger
     block = Proc.new { |d| 'block has been called' }
-    reactor.add(['127.0.0.1'],{parser: :dummy},block)
+    reactor.add(['127.0.0.1'],{:parser => :dummy},block)
     reactions = reactor.reactions_for('127.0.0.1')
     reactor.react('127.0.0.1','This is a string')
     assert_equal 'block has been called', reactions[0].previous_result
@@ -41,8 +41,8 @@ class TestReactor < Test::Unit::TestCase
     block1 = Proc.new { |d| 'block1' }
     block2 = Proc.new { |d| 'block2' }
 
-    reactor.add(['127.0.0.1'],{parser: :dummy},block1)
-    reactor.add(['127.0.0.1'],{parser: :dummy},block2)
+    reactor.add(['127.0.0.1'],{:parser => :dummy},block1)
+    reactor.add(['127.0.0.1'],{:parser => :dummy},block2)
 
     reactor.react('127.0.0.1','This is a string')
 
@@ -54,7 +54,7 @@ class TestReactor < Test::Unit::TestCase
   def test_react_catches_exceptions
     reactor = ChainReactor::Reactor.new get_logger
     block = Proc.new { |d| raise 'Block has been called' }
-    reactor.add(['127.0.0.1'],{parser: :dummy},block)
+    reactor.add(['127.0.0.1'],{:parser => :dummy},block)
     reactor.reactions_for('127.0.0.1')
     assert_nothing_raised do
       reactor.react('127.0.0.1','This is a string')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chain-reactor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies: []
 description: Trigger events across networks using TCP/IP sockets
 email:
@@ -21,6 +21,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- CHANGELOG.rdoc
 - Gemfile
 - LICENSE.txt
 - README.rdoc