treequel 1.8.6 → 1.9.0

data/spec/treequel_spec.rb

@@ -37,10 +37,14 @@ describe Treequel do
 	end
 
 	it "should know if its default logger is replaced" do
-		Treequel.reset_logger
-		Treequel.should be_using_default_logger
-		Treequel.logger = Logger.new( $stderr )
-		Treequel.should_not be_using_default_logger
+		begin
+			Treequel.reset_logger
+			Treequel.should be_using_default_logger
+			Treequel.logger = Logger.new( $stderr )
+			Treequel.should_not be_using_default_logger
+		ensure
+			Treequel.reset_logger
+		end
 	end
 
 
@@ -418,54 +422,6 @@ describe Treequel do
 	end
 
 
-	describe " logging subsystem" do
-		before(:each) do
-			Treequel.reset_logger
-		end
-
-		after(:each) do
-			Treequel.reset_logger
-		end
-
-
-		it "has the default logger instance after being reset" do
-			Treequel.logger.should equal( Treequel.default_logger )
-		end
-
-		it "has the default log formatter instance after being reset" do
-			Treequel.logger.formatter.should equal( Treequel.default_log_formatter )
-		end
-
-	end
-
-
-	describe " logging subsystem with new defaults" do
-		before( :all ) do
-			@original_logger = Treequel.default_logger
-			@original_log_formatter = Treequel.default_log_formatter
-		end
-
-		after( :all ) do
-			Treequel.default_logger = @original_logger
-			Treequel.default_log_formatter = @original_log_formatter
-		end
-
-
-		it "uses the new defaults when the logging subsystem is reset" do
-			logger = double( "dummy logger" ).as_null_object
-			formatter = mock( "dummy logger" )
-
-			Treequel.default_logger = logger
-			Treequel.default_log_formatter = formatter
-
-			logger.should_receive( :formatter= ).with( formatter )
-
-			Treequel.reset_logger
-			Treequel.logger.should equal( logger )
-		end
-
-	end
-
 end
 
 # vim: set nosta noet ts=4 sw=4:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treequel
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,11 +37,11 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
-  requirement: &70318636160660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,32 +49,79 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70318636160660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: loggability
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70318636160220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70318636160220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70318636159740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70318636159740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70318636159220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +129,15 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70318636159220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: ruby-termios
-  requirement: &70318636158740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,10 +145,15 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70318636158740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
-  requirement: &70318636158260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -104,10 +161,15 @@ dependencies:
         version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *70318636158260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: columnize
-  requirement: &70318636157780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +177,15 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70318636157780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sysexits
-  requirement: &70318636173720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +193,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70318636173720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70318636172900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,33 +209,39 @@ dependencies:
         version: '3.20'
   type: :development
   prerelease: false
-  version_requirements: *70318636172900
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70318636172020 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: *70318636172020
+        version: '3.20'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70318636171580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70318636171580
-description: ! "Treequel is an LDAP toolkit for Ruby. It is intended to allow quick,
-  easy\naccess to LDAP directories in a manner consistent with LDAP's hierarchical,\nfree-form
-  nature. \n\nIt's inspired by and modeled after {Sequel}[http://sequel.rubyforge.org/],
-  a\nkick-ass database library."
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: ! 'Treequel is an LDAP toolkit for Ruby. It is intended to allow quick,
+  easy
+
+  access to LDAP directories in a manner consistent with LDAP''s hierarchical,
+
+  free-form nature.
+
+
+  It''s inspired by and modeled after {Sequel}[http://sequel.rubyforge.org/], a
+
+  kick-ass database library.'
 email:
 - ged@FaerieMUD.org
 - mahlon@martini.nu
@@ -218,7 +296,6 @@ files:
 - lib/treequel/schema/objectclass.rb
 - lib/treequel/schema/table.rb
 - lib/treequel/sequel_integration.rb
-- lib/treequel/utils.rb
 - spec/data/ad_schema.yml
 - spec/data/objectClasses.yml
 - spec/data/opends.yml
@@ -258,8 +335,10 @@ post_install_message: ! "If you want to use the included 'treequel' LDAP shell,
   \   - columnize\n    - sysexits\n\nYou can install them automatically if you use
   the --development flag when\ninstalling Treequel."
 rdoc_options:
-- --main
-- README.rdoc
+- -f
+- fivefish
+- -t
+- Treequel
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -276,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: treequel
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Treequel is an LDAP toolkit for Ruby

metadata.gz.sig

@@ -1 +1 @@
-5{�����pY�)m��B}A��{,���Dm���p��|��8v;����]T�F��"xĔh�8�#����������]z}���Y�"�������"S��n��-������~��:�}�b�
��1�/�}A�ٞ(��d�`�.	���v5�'od�@��fk�m��b���N�{�e�\Y_3c�	�R�/G8ڹ��E�!)G��Sx7C��|��V�|�k�tzn��R�0^���"nBp��BoemªG��e_\m
+1�lɜ��!.���#8�{����-"U��	:��qI��u�����}E�t������ѯZo��#��#�GA��OE�	:�:�s��� �Q�UV�Z��~�yh=D~8��,��t��U8^qn�?+���LR#|R�Ӽ5jqr ?E�#r����$ͦ-0(~�Wa]}�TL=�
r��S���V $6Ap2Em�2�,��6�L�g�v�

data/lib/treequel/utils.rb

@@ -1,179 +0,0 @@
-#!/usr/bin/ruby
-
-require 'logger'
-require 'erb'
-require 'bigdecimal'
-require 'date'
-
-require 'treequel'
-require 'treequel/mixins'
-
-
-module Treequel
-
-	# A alternate formatter for Logger instances.
-	class LogFormatter < Logger::Formatter
-
-		# The format to output unless debugging is turned on
-		DEFAULT_FORMAT = "[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"
-
-		# The format to output if debugging is turned on
-		DEFAULT_DEBUG_FORMAT = "[%1$s.%2$06d %3$d/%4$s] %5$5s {%6$s} -- %7$s\n"
-
-
-		### Initialize the formatter with a reference to the logger so it can check for log level.
-		def initialize( logger, format=DEFAULT_FORMAT, debug=DEFAULT_DEBUG_FORMAT ) # :notnew:
-			@logger       = logger
-			@format       = format
-			@debug_format = debug
-
-			super()
-		end
-
-		######
-		public
-		######
-
-		# The Logger object associated with the formatter
-		attr_accessor :logger
-
-		# The logging format string
-		attr_accessor :format
-
-		# The logging format string that's used when outputting in debug mode
-		attr_accessor :debug_format
-
-
-		### Log using either the DEBUG_FORMAT if the associated logger is at ::DEBUG level or
-		### using FORMAT if it's anything less verbose.
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity,                                                     # %5$s
-				progname,                                                     # %6$s
-				msg                                                           # %7$s
-			]
-
-			if @logger.level == Logger::DEBUG
-				return self.debug_format % args
-			else
-				return self.format % args
-			end
-		end
-	end # class LogFormatter
-
-
-	# A ANSI-colorized formatter for Logger instances.
-	class ColorLogFormatter < Logger::Formatter
-		extend Treequel::ANSIColorUtilities
-
-		# Color settings
-		LEVEL_FORMATS = {
-			:debug => colorize( :bold, :black ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s {%6$s} -- %7$s\n"},
-			:info  => colorize( :normal ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:warn  => colorize( :bold, :yellow ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:error => colorize( :red ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:fatal => colorize( :bold, :red, :on_white ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-		}
-
-
-		### Initialize the formatter with a reference to the logger so it can check for log level.
-		def initialize( logger, settings={} ) # :notnew:
-			settings = LEVEL_FORMATS.merge( settings )
-
-			@logger   = logger
-			@settings = settings
-
-			super()
-		end
-
-		######
-		public
-		######
-
-		# The Logger object associated with the formatter
-		attr_accessor :logger
-
-		# The formats, by level
-		attr_accessor :settings
-
-
-		### Log using the format associated with the severity
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity,                                                     # %5$s
-				progname,                                                     # %6$s
-				msg                                                           # %7$s
-			]
-
-			return self.settings[ severity.downcase.to_sym ] % args
-		end
-	end # class LogFormatter
-
-
-	# An alternate formatter for Logger instances that outputs +div+ HTML
-	# fragments.
-	class HtmlLogFormatter < Logger::Formatter
-		include ERB::Util  # for html_escape()
-
-		# The default HTML fragment that'll be used as the template for each log message.
-		HTML_LOG_FORMAT = %q{
-		<div class="log-message %5$s">
-			<span class="log-time">%1$s.%2$06d</span>
-			[
-				<span class="log-pid">%3$d</span>
-				/
-				<span class="log-tid">%4$s</span>
-			]
-			<span class="log-level">%5$s</span>
-			:
-			<span class="log-name">%6$s</span>
-			<span class="log-message-text">%7$s</span>
-		</div>
-		}
-
-		### Override the logging formats with ones that generate HTML fragments
-		def initialize( logger, format=HTML_LOG_FORMAT ) # :notnew:
-			@logger = logger
-			@format = format
-			super()
-		end
-
-
-		######
-		public
-		######
-
-		# The HTML fragment that will be used as a format() string for the log
-		attr_accessor :format
-
-
-		### Return a log message composed out of the arguments formatted using the
-		### formatter's format string
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity.downcase,                                                     # %5$s
-				progname,                                                     # %6$s
-				html_escape( msg ).gsub(/\n/, '<br />')                       # %7$s
-			]
-
-			return self.format % args
-		end
-
-	end # class HtmlLogFormatter
-
-end # module Treequel
-
-# vim: set nosta noet ts=4 sw=4:
-