react 0.0.2 → 0.1.0

data/.gitignore

@@ -1,22 +1,12 @@
-## MAC OS
 .DS_Store
-
-## TEXTMATE
 *.tmproj
 tmtags
-
-## EMACS
 *~
 \#*
 .\#*
-
-## VIM
 *.swp
-
-## PROJECT::GENERAL
 coverage
 rdoc
 pkg
-
-## PROJECT::SPECIFIC
 *.gem
+*.rdb

data/README.md

@@ -24,12 +24,9 @@ You can simply install React using rubygems:
 Firs you have to prepare file with available commands. It can look like this: 
 
     # my_commands.yml
-    restart_httpd: |
-      apache2ctl graceful
-    restart_mysql: |
-      /etc/init.d/mysql restart
-    reboot: |
-      reboot
+    restart_httpd: apache2ctl graceful
+    restart_mysql: /etc/init.d/mysql restart
+    reboot: reboot
    
 And now you can start a consumer. 
 
@@ -74,4 +71,11 @@ There are few more runtime options, which can be useful for you.
 
 ## Copyright
 
-Copyright (c) 2010 Kriss Kowalik. See LICENSE for details.    
+== Copyright
+
+Copyleft 2010 Chris Kowalik. WTFPL Baby!
+
+DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. You just DO WHAT THE FUCK YOU WANT TO. 

data/Rakefile

@@ -1,54 +1,44 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "react"
-    gem.version = "0.0.2"
-    gem.default_executable = 'react'
-    gem.executables = ['react']
-    gem.summary = %Q{Redis based remote command executor.}
-    gem.description = %Q{A simple application that allows for remote execution of commands.}
-    gem.email = "kriss.kowalik@gmail.com"
-    gem.homepage = "http://github.com/nu7hatch/react"
-    gem.authors = ["Kriss 'nu7hatch' Kowalik"]
-    gem.add_development_dependency "riot", ">= 0.11.3"
-    gem.add_dependency "daemons", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
+# -*- ruby -*-
+$:.unshift(File.expand_path('../lib', __FILE__))
+require 'react/version'
 require 'rake/testtask'
+require 'rake/rdoctask'
+
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
 begin
-  require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
+    test.pattern = 'test/**/test_*.rb'
     test.verbose = true
   end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+rescue
+  puts "Rcov is not available!"
 end
 
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "React"
+  rdoc.title = "React #{React.version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :default => :spec
+
+desc "Build current version as a rubygem"
+task :build do
+  `gem build react.gemspec`
+  `mv react-*.gem pkg/`
+end
+
+desc "Relase current version to rubygems.org"
+task :release => :build do
+  `git tag -am "Version bump to #{React.version}" v#{React.version}`
+  `git push origin master`
+  `git push origin master --tags`
+  `gem push pkg/react-#{React.version}.gem`
+end

data/bin/react

@@ -1,35 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'react'
-require 'optparse'
-require 'daemons'
-
-if ARGV.empty?
-  ARGV << '--help'
-else 
-  if File.exists?(ARGV[0])
-    options[:commands] = YAML.load_file(ARGV[0])
-  else
-    puts "ERROR: File not found: `#{ARGV[0]}`"
-    exit
-  end
+begin
+  require 'react'
+rescue LoadError
+  require 'rubygems'
+  require 'react'
 end
 
-options = { 
-  :redis => {:host => '127.0.0.1', :port => 6379, :db => 0}, 
-  :commands => {}, 
-  :queue => 'queue' 
-}
-
-opts = OptionParser.new do |opts|
-  opts.banner = "Usage: react commands.yml [options]"
-  opts.on('-q', '--queue [QUEUE]', 'Specify queue which will be consumed') {|val| val and options[:queue] = val }
-  opts.on('-h', '--host [HOST]', 'Select redis host') {|val| val and options[:redis][:host] = val }
-  opts.on('-p', '--port [PORT]', Integer, 'Select redis port') {|val| val and options[:redis][:port] = val }
-  opts.on('-D', '--db [DATABASE]', 'Select redis database number') {|val| val and options[:redis][:db] = val }
-  opts.on('-P', '--password [PASSWORD]', 'Select redis database password') {|val| val and options[:redis][:password] = val }  
-  opts.on('-d', '--daemon', 'Run in background') { options[:daemon] = true }
-end.parse(ARGV)
+require 'react/cli'
 
-React.start(options).join
+React::CLI.dispatch(ARGV)

data/lib/react.rb

@@ -1,106 +1,16 @@
 require 'redis'
-require 'thread'
+require 'daemons'
+
+begin
+  require 'fastthread' 
+rescue LoadError
+  $stderr.puts("The fastthread gem not found. Using standard ruby threads.")
+  require 'thread'
+end
 
-# React is a simple application that allows for remote execution of commands, 
-# and it uses Redis as a queue.
-#
-# == Inspiration
-#
-# It's inspired by Simon Willison's example of "Queue-activated shell scripts"
-# in his redis tutorial:
-#
-#   while [ 1 ] do
-#     redis-cli blpop restart-httpd 0
-#     apache2ctl graceful
-#   done
-#
-# == Usage
-# 
-# Firs you have to prepare file with available commands. It can look like this: 
-#
-#   # my_commands.yml
-#   restart_httpd: |
-#     apache2ctl graceful
-#   restart_mysql: |
-#     /etc/init.d/mysql restart
-#   reboot: |
-#     reboot
-#    
-# Now you can start consumer. 
-#
-#   react my_commands.yml
-#
-# == Pushing commands
-#
-# While your consumer is working, you can push any of specified command to  
-# queue (default queue name is `queue`), eg:
-#
-#   redis-cli lpush queue restart_httpd
-#   redis-cli lpush queue reboot
-#
-# After that consumer will pick up enqueued command names from and execute 
-# related commands. 
-#
-# == Configuration
-#  
-# There are few more runtime options, which can be useful for you. 
-#
-# * you can specify queue which will be consumed:
-#
-#     react my_commands.yml --queue "my:queue:name"
-#
-# * you can specify the database to which consumer should connect:
-#
-#     react my_commands.yml --host "yourhost.com" --port 6379 --db 2 --password pass
-#
-# * and finally, you can demonize the consumer:
-#
-#     react my_commands.yml --daemon
 module React
 
-  # It starts the consumer loop. 
-  def self.start(conf)
-    @config = conf
-    
-    puts "== Connected to #{redis.client.id}"
-    puts "== Waiting for commands from `#{@config[:queue]}`"
-    
-    if @config[:daemon]
-      puts "== Daemonizing..."
-      Daemons.daemonize
-    end
-    
-    loop do
-      begin 
-        cid = redis.blpop(@config[:queue], 0)[1]
-        if cmd = @config[:commands][cid.to_s]
-          puts "\e[33m[#{Time.now}]\e[0m Reacting for `#{cid}` command"
-          threads.add(Thread.new { system(cmd) })
-        end
-      rescue Interrupt
-        puts "\nCleaning up..."
-        break
-      rescue Exception => ex
-        puts "ERROR: #{ex}"
-      end
-    end
-    
-    self
-  end
-  
-  # Returns group of executor threads. 
-  def self.threads
-    @threads ||= ThreadGroup.new
-  end
-  
-  # It joins all alive threads, and it's waiting till they will finish.
-  def self.join
-    threads.list.each {|t| t.join if t.alive? }
-  end
-  
-  # Redis client instance. 
-  def self.redis
-    @redis ||= Redis.new(@config[:redis])
-  end
-  
+  require 'react/runner'
+  require 'react/version'
+
 end # React

data/lib/react/cli.rb

@@ -0,0 +1,32 @@
+require 'optitron'
+
+module React
+  class CLI < Optitron::CLI
+  
+    desc "Show used React version"
+    def version
+      puts "React v#{React.version}"
+    end
+  
+    desc "Run react executor"
+    opt 'queue',    'Specify quehe which will be consumed', :short_name => 'q'
+    opt 'host',     'Specify redis host',                   :short_name => 'h', :default => 'localhost'
+    opt 'port',     'Specify redis port',                   :short_name => 'p', :default => 6379
+    opt 'db',       'Specify redis database number',        :short_name => 'D', :default => 0
+    opt 'password', 'Specify password to redis database',   :short_name => 'P', :default => nil
+    opt 'daemon',   'Run in background',                    :short_name => 'd', :default => false
+    def start(file)
+      params[:redis] ||= {
+        :host     => params.delete(:host),
+        :port     => params.delete(:port),
+        :db       => params.delete(:db),
+        :password => params.delete(:password), 
+      }
+      Runner.new(file, params).start
+    rescue => ex
+      puts "ERROR: #{ex.to_s}"
+      exit 1
+    end
+    
+  end # CLI
+end # React

data/lib/react/runner.rb

@@ -0,0 +1,58 @@
+module React
+  class Runner
+    
+    class NoQueueError < RuntimeError; end
+    
+    attr_reader :options
+    attr_reader :commands
+    
+    def initialize(commands_file, options)
+      @options  = options
+      @commands = YAML.load_file(commands_file)
+      
+      raise NoQueueError, "Queue have to be specified!" unless options[:queue]
+    end
+    
+    # It starts the consumer loop. 
+    def start
+      puts "== Connected to #{redis.client.id}"
+      puts "== Waiting for commands from `#{options[:queue]}`"
+      
+      if options[:daemon]
+        puts "== Daemonizing..."
+        Daemons.daemonize
+      end
+      
+      loop do
+        begin 
+          cid = redis.blpop(options[:queue], 10)[1]
+          if cmd = commands[cid.to_s]
+            puts "\e[33m[#{Time.now}]\e[0m Reacting for `#{cid}` command"
+            threads.add(Thread.new { system(cmd) })
+          end
+        rescue Interrupt, SystemExit
+          puts "\nCleaning up..."
+          return 0
+        rescue => ex
+          puts "ERROR: #{ex}"
+        end
+      end
+    end
+    
+    # Returns group of executor's threads. 
+    def threads
+      @threads ||= ThreadGroup.new
+    end
+  
+    # It joins all alive threads, and it's waiting till they will finish.
+    def join
+      threads.list.each {|t| t.join if t.alive? }
+    end
+  
+    # Redis client instance. 
+    def redis
+      @redis ||= Redis.new(options[:redis].merge(:thread_safe => true))
+    end
+    
+  end # Runner
+end # React

data/lib/react/version.rb

@@ -0,0 +1,12 @@
+module React
+  module Version # :nodoc:
+    MAJOR  = 0
+    MINOR  = 1
+    PATCH  = 0
+    STRING = [MAJOR, MINOR, PATCH].join('.')
+  end
+  
+  def self.version # :nodoc:
+    Version::STRING
+  end
+end # React

data/react.gemspec

@@ -1,60 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# -*- ruby -*-
+$:.unshift(File.expand_path('../lib', __FILE__))
+require 'react/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{react}
-  s.version = "0.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kriss 'nu7hatch' Kowalik"]
-  s.date = %q{2010-08-17}
-  s.default_executable = %q{react}
-  s.description = %q{A simple application that allows for remote execution of commands.}
-  s.email = %q{kriss.kowalik@gmail.com}
-  s.executables = ["react"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "bin/react",
-     "examples/commands.yml",
-     "lib/react.rb",
-     "react.gemspec",
-     "test/react_test.rb",
-     "test/teststrap.rb"
-  ]
-  s.homepage = %q{http://github.com/nu7hatch/react}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Redis based remote command executor.}
-  s.test_files = [
-    "test/teststrap.rb",
-     "test/react_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<riot>, [">= 0.11.3"])
-      s.add_runtime_dependency(%q<daemons>, [">= 0"])
-    else
-      s.add_dependency(%q<riot>, [">= 0.11.3"])
-      s.add_dependency(%q<daemons>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<riot>, [">= 0.11.3"])
-    s.add_dependency(%q<daemons>, [">= 0"])
-  end
+  s.name               = 'react'
+  s.version            = React.version
+  s.homepage           = 'http://github.com/nu7hatch/react'
+  s.email              = ['chris@nu7hat.ch']
+  s.authors            = ['Chris Kowalik']
+  s.summary            = %q{Redis based remote commands executor.}
+  s.description        = %q{A simple application that allows for remote execution of commands.}
+  s.files              = `git ls-files`.split("\n")
+  s.test_files         = `git ls-files -- {test}/*`.split("\n")
+  s.require_paths      = %w[lib]
+  s.extra_rdoc_files   = %w[README.md]
+  s.executables        = %w[react]
+  s.default_executable = 'react'
+  
+  s.add_runtime_dependency 'daemons',  ["~> 1.0"]
+  s.add_runtime_dependency 'redis',    [">= 2.0"]
+  s.add_runtime_dependency 'optitron', [">= 2.1"]
 end
-

data/test/hepler.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+require 'react'

data/test/test_react.rb

@@ -0,0 +1,3 @@
+require File.expand_path('../helper', __FILE__)
+
+# Maybe someday it will be tested ;p

metadata

@@ -1,59 +1,78 @@
 --- !ruby/object:Gem::Specification 
 name: react
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
-- Kriss 'nu7hatch' Kowalik
+- Chris Kowalik
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +02:00
+date: 2010-11-05 00:00:00 +01:00
 default_executable: react
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: riot
+  name: daemons
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 11
-        - 3
-        version: 0.11.3
-  type: :development
+        version: "1.0"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: redis
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: optitron
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  type: :runtime
+  version_requirements: *id003
 description: A simple application that allows for remote execution of commands.
-email: kriss.kowalik@gmail.com
+email: 
+- chris@nu7hat.ch
 executables: 
 - react
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.md
 files: 
-- .document
 - .gitignore
 - LICENSE
 - README.md
@@ -61,39 +80,45 @@ files:
 - bin/react
 - examples/commands.yml
 - lib/react.rb
+- lib/react/cli.rb
+- lib/react/runner.rb
+- lib/react/version.rb
 - react.gemspec
-- test/react_test.rb
-- test/teststrap.rb
+- test/hepler.rb
+- test/test_react.rb
 has_rdoc: true
 homepage: http://github.com/nu7hatch/react
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Redis based remote command executor.
-test_files: 
-- test/teststrap.rb
-- test/react_test.rb
+summary: Redis based remote commands executor.
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.md
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/test/react_test.rb

@@ -1 +0,0 @@
-require 'teststrap'

data/test/teststrap.rb

@@ -1,6 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'rubygems'
-require 'riot'
-require 'react'