lll 1.13.1 → 1.13.2

data/CHANGELOG

@@ -1,2 +1,5 @@
-0.12.0
+1.13.2
+	- Fix bug preventing output on multiple lines
+	- Debug output to show when using dumb terminal
+1.12.0
   - Use Awesome Print if available (Jay Levitt)

data/VERSION

@@ -1 +1 @@
-1.13.1
+1.13.2

data/lib/lll.rb

@@ -9,9 +9,10 @@ def lll msg = nil, &block
   Lll.lll msg, block
 end
 
+$using_dumb_terminal = ENV['TERM'] == 'dumb'
+
 module Lll
   def self.lll msg, block = nil
-    using_dumb_terminal = ENV['TERM'] == 'dumb'
     output_string = " "
     expression_value = 0
     if block
@@ -19,9 +20,9 @@ module Lll
       expression_string = block.call
       expression_value = eval(expression_string, block.binding)
       output_string << expression_string + ' = '
-      if defined?(AwesomePrint) && !using_dumb_terminal
+      if defined?(AwesomePrint) && !$using_dumb_terminal
         output_string << expression_value.awesome_inspect << " \n"
-      elsif enumerable? expression_value
+      elsif display_on_separate_lines? expression_value
         output_string << " \n"
         expression_value.each { |e| output_string << ' ' << e.inspect << " \n" }
       else
@@ -32,7 +33,7 @@ module Lll
       output_string << " \n"
     end
 
-    $stderr.puts format(output_string, !using_dumb_terminal)
+    $stderr.puts format(output_string, !$using_dumb_terminal)
     Rails.logger.debug(format(output_string)) if defined?(Rails) && Rails.logger
 
     expression_value
@@ -41,14 +42,15 @@ module Lll
   def self.format output_string, colorize = true
     string = output_string
     string =  "\e[7m" + string + "\e[0m" if colorize
-    string + "lll: #{caller[2].to_s} #{Time.now.strftime('%X')}"
+    string + "lll: #{caller[2].to_s} #{Time.now.strftime('%X')} #{$using_dumb_terminal}"
+  end
+
+  def self.display_on_separate_lines? value
+    value.respond_to?(:each) && !value.is_a?(String) && !nokogiri?(value)
   end
 
-  def self.enumerable? value
-    value.respond_to?(:each) &&
-    !value.is_a?(String) &&
-    (!defined? Nokogiri ||
-     (!value.is_a?(Nokogiri::HTML::Document) &&
-      !value.is_a?(Nokogiri::XML::Element)))
+  def self.nokogiri? value
+    return false unless defined? Nokogiri
+    return value.is_a?(Nokogiri::HTML::Document) || value.is_a?(Nokogiri::XML::Element)
   end
 end

data/lll.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lll}
-  s.version = "1.13.1"
+  s.version = "1.13.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Mark Wilden}]
-  s.date = %q{2011-10-30}
+  s.date = %q{2012-01-31}
   s.email = %q{mark@mwilden.com}
   s.extra_rdoc_files = [
     "README.md"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lll
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-30 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lll
-  requirement: &2161408840 !ruby/object:Gem::Requirement
+  requirement: &2166230660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161408840
+  version_requirements: *2166230660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161408260 !ruby/object:Gem::Requirement
+  requirement: &2166230120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161408260
+  version_requirements: *2166230120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161407740 !ruby/object:Gem::Requirement
+  requirement: &2166229240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161407740
+  version_requirements: *2166229240
 description: 
 email: mark@mwilden.com
 executables: []
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -795088451905350541
+      hash: 3697825161958318298
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: