drbqs 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/drbqs-node

@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby
+
+require 'drbqs'
+require 'optparse'
+
+Version = '0.0.1'
+
+help_message =<<HELP
+#{File.basename(__FILE__)} [uri] [process_number]
+HELP
+
+LOG_PREFIX_DEFAULT = 'drbqs_node'
+LOG_LEVEL_DEFAULT = Logger::ERROR
+
+options = {
+  :log_prefix => LOG_PREFIX_DEFAULT,
+  :log_level => LOG_LEVEL_DEFAULT,
+  :load => []
+}
+
+begin
+  OptionParser.new(help_message) do |opt|
+    opt.on('-l', '--load FILE', String, 'Add a file to load.') do |v|
+      options[:load] << File.expand_path(v)
+    end
+    opt.on('--log-prefix STR', String, "Set the prefix of log files. The default is '#{LOG_PREFIX_DEFAULT}'.") do |v|
+      options[:log_prefix] = v
+    end
+    opt.on('--log-level LEVEL', String,
+           "Set the log level. The value accepts 'fatal', 'error', 'warn', 'info', and 'debug'. The default is 'error'.") do |v|
+      if /^(fatal)|(error)|(warn)|(info)|(debug)$/i =~ v
+        options[:log_level] = eval("Logger::#{v.upcase}")
+      else
+        raise "Invalid log level."
+      end
+    end
+    opt.on('--log-stdout', 'Use stdout for outputting logs. This option cancels --log-prefix.') do |v|
+      options[:log_prefix] = nil
+    end
+    opt.parse!(ARGV)
+  end
+rescue OptionParser::InvalidOption
+  $stderr.print <<MES
+error: Invalid Option
+#{help_message}
+MES
+  exit(2)
+rescue OptionParser::InvalidArgument
+  $stderr.print <<MES
+error: Invalid Argument
+#{help_message}
+MES
+  exit(2)
+end
+
+if ARGV.size > 2
+  raise "Too many arguments. Please refer '#{File.basename(__FILE__)} -h'."
+end
+
+process_num = 1
+uri = "druby://localhost:#{DRbQS::ROOT_DEFAULT_PORT}"
+
+ARGV.each do |arg|
+  if /^\d+$/ =~ arg
+    process_num = arg.to_i
+  else
+    uri = arg
+  end
+end
+
+options[:load].each do |v|
+  puts "load #{v}"
+  load v
+end
+
+puts "Connect to #{uri}"
+puts "Execute #{process_num} processes"
+
+if options[:log_prefix]
+  if /\/$/ =~ options[:log_prefix]
+    options[:log_prefix] += 'out'
+  end
+  options[:log_prefix] = File.expand_path(options[:log_prefix])
+  FileUtils.mkdir_p(File.dirname(options[:log_prefix]))
+end
+
+process_num.times do |i|
+  fork do
+    if options[:log_prefix]
+      logfile = "#{options[:log_prefix]}_#{Time.now.strftime("%Y%m%d%H%M")}_#{Process.pid}.log"
+    else
+      logfile = STDOUT
+    end
+    client = DRbQS::Client.new(uri, :log_level => options[:log_level], :log_file => logfile)
+    client.connect
+    client.calculate
+  end
+end
+
+Process.waitall

data/drbqs.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{drbqs}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takayuki YAMAGUCHI"]
-  s.date = %q{2011-02-27}
+  s.date = %q{2011-02-28}
+  s.default_executable = %q{drbqs-node}
   s.description = %q{Queuing system over network that is implemented by dRuby.}
   s.email = %q{d@ytak.info}
+  s.executables = ["drbqs-node"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -24,15 +26,20 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/drbqs-node",
     "drbqs.gemspec",
     "lib/drbqs.rb",
+    "lib/drbqs/acl_file.rb",
     "lib/drbqs/client.rb",
     "lib/drbqs/connection.rb",
     "lib/drbqs/message.rb",
     "lib/drbqs/queue.rb",
     "lib/drbqs/server.rb",
     "lib/drbqs/task_client.rb",
+    "spec/acl_file_spec.rb",
+    "spec/data/acl.txt",
     "spec/drbqs_spec.rb",
+    "spec/server_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/ytaka/drbqs}
@@ -41,7 +48,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{dRuby Queueing System}
   s.test_files = [
+    "spec/acl_file_spec.rb",
     "spec/drbqs_spec.rb",
+    "spec/server_spec.rb",
     "spec/spec_helper.rb"
   ]
 

data/lib/drbqs.rb

@@ -9,4 +9,6 @@ require 'rinda/rinda'
 module DRbQS
   autoload :Server, 'drbqs/server'
   autoload :Client, 'drbqs/client'
+
+  ROOT_DEFAULT_PORT = 13500
 end

data/lib/drbqs/acl_file.rb

@@ -0,0 +1,13 @@
+module DRbQS
+  module ACLFile
+
+    # Create ACL object from file.
+    # The example of file is the following:
+    # deny all
+    # allow localhost
+    # allow 127.0.0.1
+    def self.load(path)
+      ACL.new(File.read(path).split)
+    end
+  end
+end

data/lib/drbqs/server.rb

@@ -1,5 +1,6 @@
 require 'drbqs/message'
 require 'drbqs/queue'
+require 'drbqs/acl_file'
 
 module DRbQS
   class CheckAlive
@@ -17,27 +18,41 @@ module DRbQS
     end
   end
 
-  ROOT_DEFAULT_PORT = 13500
-
   class Server
     attr_reader :queue
 
     def initialize(opts = {})
       @port = opts[:port] || ROOT_DEFAULT_PORT
-      @acl = opts[:acl]
+      @acl = acl_init(opts[:acl])
       @ts = {
         :message => Rinda::TupleSpace.new,
         :queue => Rinda::TupleSpace.new,
         :result => Rinda::TupleSpace.new
       }
-      @logger = Logger.new(opts[:log_file] || 'drbqs_server.log')
-      @logger.level = opts[:log_level] || Logger::ERROR
+      if opts[:log_file]
+        @logger = Logger.new(opts[:log_file])
+        @logger.level = opts[:log_level] || Logger::ERROR
+      else
+        @logger = nil
+      end
       @message = MessageServer.new(@ts[:message], @logger)
       @queue= QueueServer.new(@ts[:queue], @ts[:result], @logger)
       @check_alive = CheckAlive.new(opts[:check_alive])
       @empty_queue_hook = nil
     end
 
+    def acl_init(acl_arg)
+      case acl_arg
+      when Array
+        ACL.new(acl_arg)
+      when String
+        ACLFile.load(acl_arg)
+      else
+        nil
+      end
+    end
+    private :acl_init
+
     def start
       DRb.install_acl(@acl) if @acl
       uri = "druby://:#{@port}"

data/spec/acl_file_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'drbqs/acl_file'
+
+describe DRbQS::ACLFile do
+  it "should return an ACL object" do
+    acl = DRbQS::ACLFile.load(File.dirname(__FILE__) + '/data/acl.txt')
+    acl.should be_an_instance_of ACL
+  end
+end

data/spec/data/acl.txt

@@ -0,0 +1,3 @@
+deny all
+allow localhost
+allow 127.0.0.1

data/spec/server_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe DRbQS::Server do
+  context "when we setup ACL objects" do
+    it "should initialize an ACL object by ACLFile.load" do
+      path = File.dirname(__FILE__) + '/data/acl.txt'
+      DRbQS::ACLFile.should_receive(:load).with(path)
+      DRbQS::Server.new(:acl => path, :log_file => nil)
+    end
+
+    it "should initialize an ACL object by ACL.new" do
+      ary = ['deny', 'all', 'allow', 'localhost']
+      ACL.should_receive(:new).with(ary)
+      DRbQS::Server.new(:acl => ary, :log_file => nil)
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: drbqs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Takayuki YAMAGUCHI
@@ -10,8 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 +09:00
-default_executable: 
+date: 2011-02-28 00:00:00 +09:00
+default_executable: drbqs-node
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -70,8 +70,8 @@ dependencies:
   version_requirements: *id005
 description: Queuing system over network that is implemented by dRuby.
 email: d@ytak.info
-executables: []
-
+executables: 
+- drbqs-node
 extensions: []
 
 extra_rdoc_files: 
@@ -85,15 +85,20 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/drbqs-node
 - drbqs.gemspec
 - lib/drbqs.rb
+- lib/drbqs/acl_file.rb
 - lib/drbqs/client.rb
 - lib/drbqs/connection.rb
 - lib/drbqs/message.rb
 - lib/drbqs/queue.rb
 - lib/drbqs/server.rb
 - lib/drbqs/task_client.rb
+- spec/acl_file_spec.rb
+- spec/data/acl.txt
 - spec/drbqs_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ytaka/drbqs
@@ -109,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1630307079048384788
+      hash: 4288822500604112980
       segments: 
       - 0
       version: "0"
@@ -127,5 +132,7 @@ signing_key:
 specification_version: 3
 summary: dRuby Queueing System
 test_files: 
+- spec/acl_file_spec.rb
 - spec/drbqs_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb