rubysl-drb 1.0.0 → 2.0.1

data/lib/drb/timeridconv.rb

@@ -2,87 +2,97 @@ require 'drb/drb'
 require 'monitor'
 
 module DRb
+
+  # Timer id conversion keeps objects alive for a certain amount of time after
+  # their last access.  The default time period is 600 seconds and can be
+  # changed upon initialization.
+  #
+  # To use TimerIdConv:
+  #
+  #  DRb.install_id_conv TimerIdConv.new 60 # one minute
+
   class TimerIdConv < DRbIdConv
-    class TimerHolder2
+    class TimerHolder2 # :nodoc:
       include MonitorMixin
 
       class InvalidIndexError < RuntimeError; end
 
       def initialize(timeout=600)
-	super()
-	@sentinel = Object.new
-	@gc = {}
-	@curr = {}
-	@renew = {}
-	@timeout = timeout
-	@keeper = keeper
+        super()
+        @sentinel = Object.new
+        @gc = {}
+        @curr = {}
+        @renew = {}
+        @timeout = timeout
+        @keeper = keeper
       end
 
       def add(obj)
-	synchronize do 
-	  key = obj.__id__
-	  @curr[key] = obj
-	  return key
-	end
+        synchronize do
+          key = obj.__id__
+          @curr[key] = obj
+          return key
+        end
       end
 
       def fetch(key, dv=@sentinel)
-	synchronize do 
-	  obj = peek(key)
-	  if obj == @sentinel
-	    return dv unless dv == @sentinel
-	    raise InvalidIndexError
-	  end
-	  @renew[key] = obj # KeepIt
-	  return obj
-	end
+        synchronize do
+          obj = peek(key)
+          if obj == @sentinel
+            return dv unless dv == @sentinel
+            raise InvalidIndexError
+          end
+          @renew[key] = obj # KeepIt
+          return obj
+        end
       end
 
       def include?(key)
-	synchronize do 
-	  obj = peek(key)
-	  return false if obj == @sentinel
-	  true
-	end
+        synchronize do
+          obj = peek(key)
+          return false if obj == @sentinel
+          true
+        end
       end
 
       def peek(key)
-	synchronize do 
-	  return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
-	end
+        synchronize do
+          return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
+        end
       end
 
       private
       def alternate
-	synchronize do
-	  @gc = @curr       # GCed
-	  @curr = @renew
-	  @renew = {}
-	end
+        synchronize do
+          @gc = @curr       # GCed
+          @curr = @renew
+          @renew = {}
+        end
       end
 
       def keeper
-	Thread.new do
-	  loop do
-	    size = alternate
-	    sleep(@timeout)
-	  end
-	end
+        Thread.new do
+          loop do
+            alternate
+            sleep(@timeout)
+          end
+        end
       end
     end
 
+    # Creates a new TimerIdConv which will hold objects for +timeout+ seconds.
     def initialize(timeout=600)
       @holder = TimerHolder2.new(timeout)
     end
 
-    def to_obj(ref)
+    def to_obj(ref) # :nodoc:
       return super if ref.nil?
       @holder.fetch(ref)
     rescue TimerHolder2::InvalidIndexError
       raise "invalid reference"
     end
 
-    def to_id(obj)
+    def to_id(obj) # :nodoc:
       return @holder.add(obj)
     end
   end

data/lib/drb/unix.rb

@@ -6,33 +6,39 @@ raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer)
 
 module DRb
 
+  # Implements DRb over a UNIX socket
+  #
+  # DRb UNIX socket URIs look like <code>drbunix:<path>?<option></code>.  The
+  # option is optional.
+
   class DRbUNIXSocket < DRbTCPSocket
+    # :stopdoc:
     def self.parse_uri(uri)
-      if /^drbunix:(.*?)(\?(.*))?$/ =~ uri 
-	filename = $1
-	option = $3
-	[filename, option]
+      if /^drbunix:(.*?)(\?(.*))?$/ =~ uri
+        filename = $1
+        option = $3
+        [filename, option]
       else
-	raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
-	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+        raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
+        raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
 
     def self.open(uri, config)
-      filename, option = parse_uri(uri)
+      filename, = parse_uri(uri)
       filename.untaint
       soc = UNIXSocket.open(filename)
       self.new(uri, soc, config)
     end
 
     def self.open_server(uri, config)
-      filename, option = parse_uri(uri)
+      filename, = parse_uri(uri)
       if filename.size == 0
-	soc = temp_server
+        soc = temp_server
         filename = soc.path
-	uri = 'drbunix:' + soc.path
+        uri = 'drbunix:' + soc.path
       else
-	soc = UNIXServer.open(filename)
+        soc = UNIXServer.open(filename)
       end
       owner = config[:UNIXFileOwner]
       group = config[:UNIXFileGroup]
@@ -59,7 +65,7 @@ module DRb
       @server_mode = server_mode
       @acl = nil
     end
-    
+
     # import from tempfile.rb
     Max_try = 10
     private
@@ -67,18 +73,18 @@ module DRb
       tmpdir = Dir::tmpdir
       n = 0
       while true
-	begin
-	  tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
-	  lock = tmpname + '.lock'
-	  unless File.exist?(tmpname) or File.exist?(lock)
-	    Dir.mkdir(lock)
-	    break
-	  end
-	rescue
-	  raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
-	  #sleep(1)
-	end
-	n += 1
+        begin
+          tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
+          lock = tmpname + '.lock'
+          unless File.exist?(tmpname) or File.exist?(lock)
+            Dir.mkdir(lock)
+            break
+          end
+        rescue
+          raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
+          #sleep(1)
+        end
+        n += 1
       end
       soc = UNIXServer.new(tmpname)
       Dir.rmdir(lock)
@@ -100,9 +106,10 @@ module DRb
     end
 
     def set_sockopt(soc)
-      soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
+      soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
     end
   end
 
   DRbProtocol.add_protocol(DRbUNIXSocket)
+  # :startdoc:
 end

data/lib/rubysl/drb/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module DRb
-    VERSION = "1.0.0"
+    VERSION = "2.0.1"
   end
 end

data/rubysl-drb.gemspec

@@ -16,8 +16,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.0"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
+  spec.add_development_dependency "rubysl-prettyprint", "~> 2.0"
 end

data/spec/drbserver/here_spec.rb

@@ -0,0 +1,6 @@
+
+require 'drb'
+
+describe "DRb::DRbServer#here?" do
+  it "needs to be reviewed for spec completeness"
+end

data/spec/drbserver/verbose_spec.rb

@@ -1,18 +1,18 @@
 
 require 'drb'
 
-describe "DRb::DRbServer#verbose" do
+describe "DRb::DRbServer.verbose" do
   it "needs to be reviewed for spec completeness"
 end
 
-describe "DRb::DRbServer#verbose=" do
+describe "DRb::DRbServer.verbose=" do
   it "needs to be reviewed for spec completeness"
 end
 
-describe "DRb::DRbServer.verbose" do
+describe "DRb::DRbServer#verbose" do
   it "needs to be reviewed for spec completeness"
 end
 
-describe "DRb::DRbServer.verbose=" do
+describe "DRb::DRbServer#verbose=" do
   it "needs to be reviewed for spec completeness"
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-drb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubysl-prettyprint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: Ruby standard library drb.
 email:
 - brixen@gmail.com
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -142,6 +142,7 @@ files:
 - spec/drbserver/default_load_limit_spec.rb
 - spec/drbserver/default_safe_level_spec.rb
 - spec/drbserver/front_spec.rb
+- spec/drbserver/here_spec.rb
 - spec/drbserver/invokemethod/perform_spec.rb
 - spec/drbserver/invokemethod18mixin/block_yield_spec.rb
 - spec/drbserver/invokemethod18mixin/perform_with_block_spec.rb
@@ -212,12 +213,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -274,6 +275,7 @@ test_files:
 - spec/drbserver/default_load_limit_spec.rb
 - spec/drbserver/default_safe_level_spec.rb
 - spec/drbserver/front_spec.rb
+- spec/drbserver/here_spec.rb
 - spec/drbserver/invokemethod/perform_spec.rb
 - spec/drbserver/invokemethod18mixin/block_yield_spec.rb
 - spec/drbserver/invokemethod18mixin/perform_with_block_spec.rb
@@ -334,3 +336,4 @@ test_files:
 - spec/to_id_spec.rb
 - spec/to_obj_spec.rb
 - spec/uri_spec.rb
+has_rdoc: