nuggets 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1936682f72cb0230791ed908e37cacf43667cc
-  data.tar.gz: b5b3086d7f0edf596f76a6a2e4c2ddb8cd4a741e
+  metadata.gz: 5770eebf6f2e382109a635d9f45c9855158c5a31
+  data.tar.gz: 6894e3ab73e1b9c743b2af81e76f15003e6a5311
 SHA512:
-  metadata.gz: 198004daec45f4efccfac5dddb720dc967c6662e5744e9932d91212585c5740e763d3568840baa5e18f98ea870a4b6a818b15714ff394e7c72d561d8303a6de7
-  data.tar.gz: fdbbe46e74251556320c14784d58231eebbdc819f884a8fc8090dd4f9fd4a6894fc931558a63546adabaed849451f5ccebff7cbdaf2ded5ecde5d637b039aee1
+  metadata.gz: 1118fc142d9093d67e5e4269f7988abfbbae0d9404d120150d30b6836b6e208517f1361b55c9e44146530a54bd1cfcc57964ae6a2cc297e5f2480ce236956583
+  data.tar.gz: 96225bab56c69d06f0701e787ae6d123d383aebd6564874d0ff8f5e094a28c83561acd759b74efb2cdee512e221e1cb5a953963026af728d2061b5755bd5fa06

data/ChangeLog

@@ -2,9 +2,17 @@
 
 = Revision history for nuggets
 
+== 1.1.0 [2014-11-26]
+
+* Nuggets::LogParser::Rails no longer <tt>eval</tt>s the params hash; set the
+  environment variable +NUGGETS_LOG_PARSER_RAILS_EVAL_PARAMS+ to restore this
+  behaviour.
+* Added Object#rescue_if and Object#rescue_unless.
+* Added JRuby variant of Process.ruby.
+
 == 1.0.1 [2014-08-27]
 
-* Added DATA.{consume,reposition,update}.
+* Added <tt>DATA.{consume,reposition,update}</tt>.
 * Added Module#query_attr.
 * Added Module#lazy_attr.
 * Added Integer#to_roman.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to nuggets version 1.0.1.
+This documentation refers to nuggets version 1.1.0.
 
 
 == DESCRIPTION

data/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path(%q{../lib/nuggets/version}, __FILE__)
+require_relative 'lib/nuggets/version'
 
 begin
   require 'hen'

data/lib/nuggets/log_parser/rails.rb

@@ -94,7 +94,7 @@ module Nuggets
               eval("$SAFE = 3\n#{md[3].gsub(/#<.*?>/, '%q{\&}')}", nil, __FILE__, __LINE__)  # !!!
             rescue SyntaxError, SecurityError
               {}
-            end
+            end if ENV['NUGGETS_LOG_PARSER_RAILS_EVAL_PARAMS']
           }
         }],
         [:client_info, {

data/lib/nuggets/object/rescue_if.rb

@@ -0,0 +1,5 @@
+require 'nuggets/object/rescue_if_mixin'
+
+class Object
+  include Nuggets::Object::RescueIfMixin
+end

data/lib/nuggets/object/rescue_if_mixin.rb

@@ -0,0 +1,61 @@
+#--
+###############################################################################
+#                                                                             #
+# nuggets -- Extending Ruby                                                   #
+#                                                                             #
+# Copyright (C) 2007-2014 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# nuggets is free software; you can redistribute it and/or modify it under    #
+# the terms of the GNU Affero General Public License as published by the Free #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# nuggets is distributed in the hope that it will be useful, but WITHOUT ANY  #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with nuggets. If not, see <http://www.gnu.org/licenses/>.             #
+#                                                                             #
+###############################################################################
+#++
+
+module Nuggets
+  class Object
+    module RescueIfMixin
+
+  # call-seq:
+  #   rescue_if([args]) { |err| ... }
+  #
+  # Rescue exceptions matching +args+, or StandardError if not given,
+  # if +block+ returns true.
+  def rescue_if(*args, &block)
+    raise ::ArgumentError, 'no block given' unless block
+
+    args = [::StandardError] if args.empty?
+
+    ::Module.new {
+      define_singleton_method(:===) { |err|
+        block[err] if args.any? { |arg| arg === err }
+      }
+    }
+  end
+
+  # call-seq:
+  #   rescue_unless([args]) { |err| ... }
+  #
+  # Rescue exceptions matching +args+, or StandardError if not given,
+  # unless +block+ returns true.
+  def rescue_unless(*args, &block)
+    raise ::ArgumentError, 'no block given' unless block
+
+    rescue_if(*args) { |err| !block[err] }
+  end
+
+    end
+  end
+end

data/lib/nuggets/ruby.rb

@@ -142,7 +142,7 @@ module Nuggets
 
     %w[gem rake rspec].each { |name| define_ruby_tool(name) }
 
-    def ruby_options_to_argv(args, ruby_command = ruby_command)
+    def ruby_options_to_argv(args, ruby_command = ruby_command())
       argv = [ruby_command]
 
       ruby_options_from_hash(args.pop, argv) if args.last.is_a?(::Hash)
@@ -216,20 +216,27 @@ end
 
 def File.ruby; ::Nuggets::Ruby.ruby_command; end
 
-begin
-  require 'open4'
-
+if RUBY_PLATFORM == 'java'
   def Process.ruby(*args, &block)
     argv = ::Nuggets::Ruby.ruby_options_to_argv(args)
-    ::Open4.popen4(*argv, &block)
+    ::IO.popen4(*argv, &block); $?
   end
+else
+  begin
+    require 'open4'
+
+    def Process.ruby(*args, &block)
+      argv = ::Nuggets::Ruby.ruby_options_to_argv(args)
+      ::Open4.popen4(*argv, &block)
+    end
 
-  require 'nuggets/io/interact'
+    require 'nuggets/io/interact'
 
-  def Process.interact_ruby(input, *args)
-    ruby(*args) { |_, i, o, e|
-      ::IO.interact({ input => i }, { o => $stdout, e => $stderr })
-    }
+    def Process.interact_ruby(input, *args)
+      ruby(*args) { |_, i, o, e|
+        ::IO.interact({ input => i }, { o => $stdout, e => $stderr })
+      }
+    end
+  rescue ::LoadError
   end
-rescue ::LoadError
 end

data/lib/nuggets/version.rb

@@ -3,8 +3,8 @@ module Nuggets
   module Version
 
     MAJOR = 1
-    MINOR = 0
-    TINY  = 1
+    MINOR = 1
+    TINY  = 0
 
     class << self
 

data/spec/nuggets/object/rescue_if_spec.rb

@@ -0,0 +1,109 @@
+require 'nuggets/object/rescue_if'
+
+describe_extended Object, Nuggets::Object::RescueIfMixin do
+
+  example {
+    expect(rescue_if {}).to be_a(Module)
+  }
+
+  example {
+    expect(rescue_unless {}).to be_a(Module)
+  }
+
+  example {
+    expect { rescue_if }.to raise_error(ArgumentError)
+  }
+
+  example {
+    expect { rescue_unless }.to raise_error(ArgumentError)
+  }
+
+  example {
+    expect(begin
+      raise 'foo'
+    rescue rescue_if { true }
+      42
+    end).to eq(42)
+  }
+
+  example {
+    expect(begin
+      raise 'foo'
+    rescue rescue_if { |e| e.message == 'foo' }
+      42
+    end).to eq(42)
+  }
+
+  example {
+    expect { begin
+      raise 'bar'
+    rescue rescue_if { |e| e.message == 'foo' }
+      42
+    end }.to raise_error(RuntimeError, 'bar')
+  }
+
+  example {
+    expect(begin
+      raise 'bar'
+    rescue rescue_unless { |e| e.message == 'foo' }
+      42
+    end).to eq(42)
+  }
+
+  example {
+    expect(begin
+      raise 'foo'
+    rescue rescue_if(RuntimeError) { true }
+      42
+    end).to eq(42)
+  }
+
+  example {
+    expect(begin
+      raise 'foo'
+    rescue rescue_if(StandardError) { true }
+      42
+    end).to eq(42)
+  }
+
+  example {
+    expect(begin
+      raise 'foo'
+    rescue rescue_if(RuntimeError, NameError) { true }
+      42
+    end).to eq(42)
+  }
+
+  example {
+    expect { begin
+      raise 'foo'
+    rescue rescue_if(NameError) { true }
+      42
+    end }.to raise_error(RuntimeError, 'foo')
+  }
+
+  example {
+    expect(begin
+      raise 'foo'
+    rescue rescue_if { true } => e
+      e
+    end).to be_a(RuntimeError)
+  }
+
+  example {
+    expect { begin
+      raise Exception, 'foo'
+    rescue rescue_if { true }
+      42
+    end }.to raise_error(Exception, 'foo')
+  }
+
+  example {
+    expect(begin
+      raise Exception, 'foo'
+    rescue rescue_if(Exception) { true }
+      42
+    end).to eq(42)
+  }
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuggets
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -42,16 +42,22 @@ dependencies:
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +227,8 @@ files:
 - lib/nuggets/object/metaclass.rb
 - lib/nuggets/object/msend.rb
 - lib/nuggets/object/msend_mixin.rb
+- lib/nuggets/object/rescue_if.rb
+- lib/nuggets/object/rescue_if_mixin.rb
 - lib/nuggets/object/silence.rb
 - lib/nuggets/object/silence_mixin.rb
 - lib/nuggets/object/singleton_class.rb
@@ -312,6 +320,7 @@ files:
 - spec/nuggets/object/blank_spec.rb
 - spec/nuggets/object/boolean_spec.rb
 - spec/nuggets/object/msend_spec.rb
+- spec/nuggets/object/rescue_if_spec.rb
 - spec/nuggets/object/silence_spec.rb
 - spec/nuggets/object/singleton_class_spec.rb
 - spec/nuggets/proc/bind_spec.rb
@@ -335,18 +344,17 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  nuggets-1.0.1 [2014-08-27]:
+  nuggets-1.1.0 [2014-11-26]:
 
-  * Added DATA.{consume,reposition,update}.
-  * Added Module#query_attr.
-  * Added Module#lazy_attr.
-  * Added Integer#to_roman.
-  * Added Numeric#signum_s.
-  * Added Array#interpolate.
+  * Nuggets::LogParser::Rails no longer <tt>eval</tt>s the params hash; set the
+    environment variable +NUGGETS_LOG_PARSER_RAILS_EVAL_PARAMS+ to restore this
+    behaviour.
+  * Added Object#rescue_if and Object#rescue_unless.
+  * Added JRuby variant of Process.ruby.
 
 rdoc_options:
 - "--title"
-- nuggets Application documentation (v1.0.1)
+- nuggets Application documentation (v1.1.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -367,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Extending Ruby.