ladle 0.2.0 → 1.0.0.pre

data/lib/ladle/jruby_process.rb

@@ -49,7 +49,11 @@ module Ladle
     #
     # @return [void]
     def stop_gracefully
-      Process.kill 15, pid
+      begin
+        Process.kill 15, pid
+      rescue Errno::ESRCH
+        # already gone
+      end
     end
 
     ##

data/lib/ladle/server.rb

@@ -4,6 +4,8 @@ module Ladle
   ##
   # Controller for Ladle's core feature, the embedded LDAP server.
   class Server
+    ERROR_LEVELS = %w(ERROR WARN)
+
     ##
     # The port from which this server will be available.
     # @return [Fixnum]
@@ -66,7 +68,7 @@ module Ladle
     # @option opts [Boolean] :quiet (false) if true _no_ information
     #   about regular execution will be printed.  Error information
     #   will still be printed.  This trumps `:verbose`.
-    # @option opts [Fixnum] :timeout (15) the amount of time to wait
+    # @option opts [Fixnum] :timeout (60) the amount of time to wait
     #   (seconds) for the server process to start before giving up.
     # @option opts [String] :tmpdir (ENV['TMPDIR'] or ENV['TEMPDIR'])
     #   the temporary directory to use for the server's files.  If not
@@ -75,6 +77,11 @@ module Ladle
     # @option opts [String] :java_bin ("java" or
     #   File.join(ENV["JAVA_HOME"], "bin", "java")) the java
     #   executable to use to run the embedded server.
+    # @option opts [String,Array<String>] :custom_schemas ([]) the
+    #   names of classes representing custom schemas to use in the
+    #   server.
+    # @option opts [String,Array<String>] :additional_classpath
+    #   ([]) entries to add to the classpath for the embedded server.
     def initialize(opts={})
       @port = opts[:port] || 3897
       @domain = opts[:domain] || "dc=example,dc=org"
@@ -82,7 +89,7 @@ module Ladle
       @allow_anonymous = opts[:allow_anonymous].nil? ? true : opts[:allow_anonymous]
       @quiet = opts[:quiet]
       @verbose = opts[:verbose]
-      @timeout = opts[:timeout] || 15
+      @timeout = opts[:timeout] || 60
       @tmpdir = opts[:tmpdir] || ENV['TMPDIR'] || ENV['TEMPDIR']
       @java_bin = opts[:java_bin] ||
         (ENV['JAVA_HOME'] ? File.join(ENV['JAVA_HOME'], "bin", "java") : "java")
@@ -94,7 +101,7 @@ module Ladle
       # process.  Used for testing only, so not documented.
       @additional_args = opts[:more_args] || []
 
-      unless @domain =~ /^dc=/
+      unless @domain =~ /^dc=/i
         raise "The domain component must start with 'dc='.  '#{@domain}' does not."
       end
 
@@ -238,6 +245,7 @@ module Ladle
       [
         java_bin,
         "-cp", classpath,
+        ('-Dlog4j.configuration=log4j-quiet.properties' if quiet?),
         "net.detailedbalance.ladle.Main",
         "--port", port,
         "--domain", domain,
@@ -278,7 +286,7 @@ module Ladle
       end
 
       def watch
-        while (line = @ds_out.readline) && !error?
+        while ( !@ds_out.eof? && line = @ds_out.readline ) && !error?
           case line
           when /^STARTED/
             @started = true
@@ -304,8 +312,12 @@ module Ladle
         unless @ds_in.closed?
           @ds_in.puts("STOP")
           @ds_in.flush
-          @ds_in.close
         end
+      rescue Errno::EPIPE
+        # ignore broken pipes when the process dies
+        # right before sending the stop
+      ensure
+        @ds_in.close unless @ds_in.closed?
       end
 
       private
@@ -346,8 +358,12 @@ module Ladle
       private
 
       def is_error?(line)
-        kind = (line =~ /^([A-Z]+):/) ? $1 : nil
-        (kind.nil? || %w(ERROR WARN).include?(kind)) && !bogus?(line)
+        kind = line[/^([A-Z]+):/, 1]
+
+        @current_log_level = kind if kind
+        return true if ERROR_LEVELS.include?(@current_log_level) && kind.nil?
+
+        ERROR_LEVELS.include?(kind) && !bogus?(line)
       end
 
       ##

data/lib/ladle/version.rb

@@ -1,5 +1,5 @@
 module Ladle
   ##
   # The current version number for Ladle.
-  VERSION = "0.2.0"
+  VERSION = "1.0.0.pre"
 end

data/spec/ladle/animals-custom-schema.ldif

@@ -0,0 +1,26 @@
+version: 1
+
+dn: m-oid=1.3.6.1.4.1.18055.0.4.1.2.1001,ou=attributeTypes,cn=other,ou=schema
+objectClass: metaAttributeType
+objectClass: metaTop
+objectClass: top
+m-collective: FALSE
+m-description: The species of the animal
+m-equality: caseIgnoreMatch
+m-name: species
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
+m-usage: USER_APPLICATIONS
+m-oid: 1.3.6.1.4.1.18055.0.4.1.2.1001
+
+dn: m-oid=1.3.6.1.4.1.18055.0.4.1.3.1001,ou=objectClasses,cn=other,ou=schema
+objectClass: metaObjectClass
+objectClass: metaTop
+objectClass: top
+m-description: Animal
+m-may: cn
+m-may: sn
+m-must: species
+m-supobjectclass: top
+m-name: animal
+m-oid: 1.3.6.1.4.1.18055.0.4.1.3.1001
+m-typeobjectclass: STRUCTURAL

data/spec/ladle/animals-custom.ldif

@@ -7,7 +7,6 @@ ou: animals
 
 dn: cn=Ada Aardvark,ou=animals,dc=example,dc=net
 objectClass: top
-objectClass: person
 objectClass: animal
 cn: Ada Aardvark
 sn: Aardvark
@@ -15,7 +14,6 @@ species: Orycteropus afer
 
 dn: cn=Bob Badger,ou=animals,dc=example,dc=net
 objectClass: top
-objectClass: person
 objectClass: animal
 cn: Bob Badger
 sn: Badger

data/spec/ladle/server_spec.rb

@@ -114,12 +114,12 @@ describe Ladle, "::Server" do
     end
 
     describe ":timeout" do
-      it "defaults to 15 seconds" do
-        Ladle::Server.new.timeout.should == 15
+      it "defaults to 60 seconds" do
+        Ladle::Server.new.timeout.should == 60
       end
 
       it "can be overridden" do
-        Ladle::Server.new(:timeout => 27).timeout.should == 27
+        Ladle::Server.new(:timeout => 87).timeout.should == 87
       end
     end
 
@@ -199,7 +199,7 @@ describe Ladle, "::Server" do
         Ladle::Server.new.custom_schemas.should == []
       end
 
-      it "can be set from one class name" do
+      it "can be set from one file name" do
         Ladle::Server.new(:custom_schemas => "net.example.HappySchema").
           custom_schemas.should == %w(net.example.HappySchema)
       end
@@ -285,10 +285,6 @@ describe Ladle, "::Server" do
   end
 
   describe "LDAP implementation" do
-    before do
-      pending "Net::LDAP doesn't work on 1.9" if RUBY_VERSION =~ /1.9/
-    end
-
     def with_ldap(params={})
       @server.start
       # We don't use Net::LDAP.open because it seems to leak sockets,
@@ -361,8 +357,7 @@ describe Ladle, "::Server" do
           @server = create_server(
             :ldif => File.expand_path("../animals-custom.ldif", __FILE__),
             :domain => "dc=example,dc=net",
-            :custom_schemas => %w(net.detailedbalance.ladle.test.AnimalSchema),
-            :additional_classpath => File.expand_path("../animal-schema.jar", __FILE__)
+            :custom_schemas => File.expand_path("../animals-custom-schema.ldif", __FILE__)
           )
         end
 
@@ -398,7 +393,7 @@ describe Ladle, "::Server" do
             # anonymous bind is successful even with anonymous access
             # off, but searches fail appropriately
             ldap.search(:filter => Net::LDAP::Filter.pres('uid'), :base => 'dc=example,dc=org')
-            ldap.get_operation_result.code.should == 50 # insufficient access
+            ldap.get_operation_result.code.should == 49 # invalid credentials
           end
         end
 

metadata

@@ -1,158 +1,144 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ladle
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0.pre
 platform: ruby
-authors: 
+authors:
 - Rhett Sutphin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-29 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-05-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: open4
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ruby-net-ldap
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ldap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 0
-        - 4
-        version: 0.0.4
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
   name: ci_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  version_requirements: *id006
-description: Provides an embedded LDAP server for BDD.  The embedded server is built with ApacheDS.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+description: Provides an embedded LDAP server for BDD.  The embedded server is built
+  with ApacheDS.
+email:
 - rhett@detailedbalance.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/ladle/apacheds/antlr-2.7.6.jar
-- lib/ladle/apacheds/apacheds-core-1.0.2.jar
-- lib/ladle/apacheds/apacheds-core-shared-1.0.2.jar
-- lib/ladle/apacheds/apacheds-kerberos-shared-1.0.2.jar
-- lib/ladle/apacheds/apacheds-protocol-changepw-1.0.2.jar
-- lib/ladle/apacheds/apacheds-protocol-kerberos-1.0.2.jar
-- lib/ladle/apacheds/apacheds-protocol-ldap-1.0.2.jar
-- lib/ladle/apacheds/apacheds-protocol-ntp-1.0.2.jar
-- lib/ladle/apacheds/apacheds-protocol-shared-1.0.2.jar
-- lib/ladle/apacheds/apacheds-server-jndi-1.0.2.jar
-- lib/ladle/apacheds/apacheds-server-main-1.0.2.jar
-- lib/ladle/apacheds/apacheds-server-ssl-1.0.2.jar
-- lib/ladle/apacheds/backport-util-concurrent-2.2.jar
-- lib/ladle/apacheds/commons-cli-1.0.jar
-- lib/ladle/apacheds/commons-collections-3.2.jar
+files:
+- ASL20-LICENSE
+- CHANGELOG.md
+- CUSTOM-SCHEMA.md
+- LICENSE
+- NOTICE
+- README.md
+- lib/ladle.rb
+- lib/ladle/apacheds/annotations-1.0.0.jar
+- lib/ladle/apacheds/apacheds-all-2.0.0-M16.jar
+- lib/ladle/apacheds/apacheds-jdbm2-2.0.0-M2.jar
+- lib/ladle/apacheds/bcel-5.1.jar
+- lib/ladle/apacheds/commons-cli-1.2.jar
 - lib/ladle/apacheds/commons-io-1.4.jar
-- lib/ladle/apacheds/commons-lang-2.1.jar
-- lib/ladle/apacheds/jcl-over-slf4j-1.5.6.jar
-- lib/ladle/apacheds/jdbm-1.0.jar
-- lib/ladle/apacheds/log4j-1.2.14.jar
-- lib/ladle/apacheds/mina-core-1.0.2.jar
-- lib/ladle/apacheds/mina-filter-ssl-1.0.2.jar
-- lib/ladle/apacheds/shared-asn1-0.9.5.5.jar
-- lib/ladle/apacheds/shared-asn1-codec-0.9.5.5.jar
-- lib/ladle/apacheds/shared-ldap-0.9.5.5.jar
-- lib/ladle/apacheds/slf4j-api-1.5.6.jar
-- lib/ladle/apacheds/slf4j-log4j12-1.5.6.jar
-- lib/ladle/apacheds/spring-beans-1.2.8.jar
-- lib/ladle/apacheds/spring-context-1.2.8.jar
-- lib/ladle/apacheds/spring-core-1.2.8.jar
-- lib/ladle/apacheds/xercesImpl-2.0.2.jar
+- lib/ladle/apacheds/coreplugin-1.0.0.jar
+- lib/ladle/apacheds/findbugs-1.0.0.jar
+- lib/ladle/apacheds/findbugs-ant-1.0.0.jar
+- lib/ladle/apacheds/findbugsGUI-1.0.0.jar
+- lib/ladle/apacheds/log4j-1.2.17.jar
+- lib/ladle/apacheds/regexp-1.2.jar
+- lib/ladle/apacheds/slf4j-api-1.7.7.jar
+- lib/ladle/apacheds/slf4j-log4j12-1.7.7.jar
 - lib/ladle/default.ldif
+- lib/ladle/java/log4j-quiet.properties
 - lib/ladle/java/net/detailedbalance/ladle/LadleFatalException.class
 - lib/ladle/java/net/detailedbalance/ladle/LadleFatalException.java
 - lib/ladle/java/net/detailedbalance/ladle/Main$1.class
@@ -161,59 +147,40 @@ files:
 - lib/ladle/java/net/detailedbalance/ladle/Server.class
 - lib/ladle/java/net/detailedbalance/ladle/Server.java
 - lib/ladle/jruby_process.rb
-- lib/ladle/Ladle.iml
 - lib/ladle/ruby_process.rb
 - lib/ladle/server.rb
 - lib/ladle/version.rb
-- lib/ladle.rb
-- spec/ladle/animal-schema.jar
+- spec/ladle/animals-custom-schema.ldif
 - spec/ladle/animals-custom.ldif
 - spec/ladle/animals.ldif
 - spec/ladle/server_spec.rb
 - spec/ladle/version_spec.rb
 - spec/spec_helper.rb
-- CHANGELOG.md
-- CUSTOM-SCHEMA.md
-- README.md
-- ASL20-LICENSE
-- LICENSE
-- NOTICE
-has_rdoc: true
-homepage: http://github.com/rsutphin/ladle
+homepage: http://github.com/NUBIC/ladle
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Dishes out steaming helpings of LDAP for fluid testing
-test_files: 
-- spec/ladle/animal-schema.jar
+test_files:
+- spec/ladle/animals-custom-schema.ldif
 - spec/ladle/animals-custom.ldif
 - spec/ladle/animals.ldif
 - spec/ladle/server_spec.rb