ruby-ldapserver 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abccbde672eeae57c5376073590192d391e524c9
-  data.tar.gz: 51a8549b288719b8740f8f9804ae68d1dac8785c
+  metadata.gz: fb487768946c1d6ad6532ed0f6a1f993202ba23b
+  data.tar.gz: 34e4d89ac933c6d4916d8df082d9e02e8ac48d02
 SHA512:
-  metadata.gz: 2a63a336eb6f1f79432459af9b847b86f4742c4e16dd7541569bf7dafbbcc8c2cb34183cae6cfcd4817f6bf4a3e1057d7b1bcb7f7fcaa5515ff5fd995bdd3cdb
-  data.tar.gz: 1d98bfe14ea67c0794ce696fd0f45b05d9b734bc672f7dbfa72b1ed3bd8bded79e18105c287b217a348fa4c066f270f72720fa8d0ecb321670cf6abd63663eb0
+  metadata.gz: 019f96b0e7586bc91c578db37c0a10b58aa9a6599879d9483c2651d9f7704742d80640dd17ed88dad60fa1a3c7e4501fde1c53167edfa1dc886136c279f6d04a
+  data.tar.gz: d571397a73402c511890a01c59d35469bcd461acb929b3535658d2e7eb0c0e03573fc9bdbc5a96a7ca7b37de4c820ed361df9bc09605e125095c988be605019b

data/ChangeLog

@@ -1,3 +1,6 @@
+0.5.2
+* Make sure the exception used to stop the child doesn't propagate up (patch by Kasumi Hanazuki)
+
 0.3.1 - 2008-01-16
 * First release as a gem [Brandon Keepers]
 

data/lib/ldap/server/server.rb

@@ -97,7 +97,11 @@ class Server
 
   def stop
     @thread.raise Interrupt, "" # <= temporary fix for 1.8.6
-    @thread.join
+    begin
+      @thread.join
+    rescue Interrupt
+      # nop
+    end
   end
 
 end # class Server

data/lib/ldap/server/version.rb

@@ -1,5 +1,5 @@
 module LDAP #:nodoc:
   class Server #:nodoc:
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
   end
 end

data/ruby-ldapserver.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'ruby-ldap', '~> 0.9.16'
+  s.add_development_dependency 'ruby-ldap', '~> 0.9.16' unless RUBY_PLATFORM == 'java'
+  s.add_development_dependency 'jruby-ldap', '~> 0.0' if RUBY_PLATFORM == 'java'
   s.add_development_dependency 'rspec', '~> 3.1'
 end

data/test/encoding_test.rb

@@ -62,13 +62,60 @@ class TestLdap < Test::Unit::TestCase
   HOST = '127.0.0.1'
   PORT = 1389
 
+  def open_child_posix
+    IO.popen("-","w+").tap do |io|
+      unless io
+        do_child Kernel, Kernel
+        exit!
+      end
+    end
+  end
+
+  class DoubleIO < IO
+    def initialize out, inio
+      @out_io = out
+      @in_io = inio
+    end
+
+    def read *a
+      @out_io.read *a
+    end
+
+    def write *a
+      @in_io.write *a
+    end
+
+    def gets
+      @out_io.gets
+    end
+
+    def close
+      @in_io.close
+      @out_io.close
+    end
+  end
+
+  def open_child_java
+    in_rd, in_wr = IO.pipe
+    out_rd, out_wr = IO.pipe
+    Thread.new do
+      do_child in_rd, out_wr
+    end
+    DoubleIO.new(out_rd, in_wr)
+  end
+
+  def open_child
+    case RUBY_PLATFORM
+    when 'java'
+      open_child_java
+    else
+      open_child_posix
+    end
+  end
+
   def setup
     @ppid = $$
-    @io = IO.popen("-","w+") # this is a fork()
-    unless @io
-      do_child
-      exit!
-    end
+    @io = open_child
 
     # back to a single process (the parent). Now we start our
     # listener thread
@@ -96,10 +143,10 @@ class TestLdap < Test::Unit::TestCase
 
   # Process commands on stdin in child
 
-  def do_child
+  def do_child in_, out
     while true
       begin
-        a = gets.chomp
+        a = in_.gets.chomp
         conn ||= LDAP::Conn.new(HOST,PORT)
         case a
         when "bind2"
@@ -129,14 +176,14 @@ class TestLdap < Test::Unit::TestCase
           begin
             case conn.compare("cn=Takaaki Tateishi, dc=localhost, dc=localdomain",
                          "cn", $1)
-            when true; puts "OK true"; next
-            when false; puts "OK false"; next
+            when true; out.puts "OK true"; next
+            when false; out.puts "OK false"; next
             end
           rescue LDAP::ResultError => e
             # For older versions of ruby-ldap
             case e.message
-            when /Compare True/i; puts "OK true"; next
-            when /Compare False/i; puts "OK false"; next
+            when /Compare True/i; out.puts "OK true"; next
+            when /Compare False/i; out.puts "OK false"; next
             end
             raise
           end
@@ -178,15 +225,15 @@ class TestLdap < Test::Unit::TestCase
             res[dn] = entry
           end
         when "quit"
-          puts "OK"
+          out.puts "OK"
           break
         else
           raise "Bad command! #{a.inspect}"
         end
-        puts "OK"
+        out.puts "OK"
       rescue Exception => e
         $stderr.puts "Child exception: #{e}\n\t#{e.backtrace.join("\n\t")}"
-        puts "ERR #{e}"
+        out.puts "ERR #{e}"
       end
     end
   end

data/test/util_test.rb

@@ -25,7 +25,7 @@ class TestLdapUtil < Test::Unit::TestCase
 
     # Just for fun, let's try parsing it as UTF8
     chars = res[0]["sn"].force_encoding('utf-8').scan(/./u)
-    assert_equal(["L", "u", "\xc4\x8d", "i", "\xc4\x87"], chars)
+    assert_equal(["L", "u", "\u010d", "i", "\u0107"], chars)
   end
 
   def test_join_dn

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ldapserver
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Brian Candler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A pure-Ruby framework for building LDAP servers
@@ -146,3 +146,4 @@ test_files:
 - test/syntax_test.rb
 - test/test_helper.rb
 - test/util_test.rb
+has_rdoc: