buby 1.5.0.pre3-java → 1.5.0.pre4-java

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 5
 :patch: 0
-:build: pre3
+:build: pre4

data/buby.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "buby"
-  s.version = "1.5.0.pre3"
+  s.version = "1.5.0.pre4"
   s.platform = "java"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Monti, tduehr"]
-  s.date = "2013-03-14"
+  s.date = "2013-03-24"
   s.description = "Buby is a mashup of JRuby with the popular commercial web security testing tool Burp Suite from PortSwigger.  Burp is driven from and tied to JRuby with a Java extension using the BurpExtender API.  This extension aims to add Ruby scriptability to Burp Suite with an interface comparable to the Burp's pure Java extension interface."
   s.email = "td@matasano.com"
   s.executables = ["buby"]

data/lib/buby.rb

@@ -482,8 +482,13 @@ class Buby
   # This method is only available with Burp 1.3.07+ and is deprecated in 1.5.01.
   #
   def registerMenuItem(menuItemCaption, menuItemHandler = nil, &block)
-    _check_and_callback(:registerMenuItem, menuItemCaption, (block_given? ? &block : menuItemHandler))
+    ret = if block_given?
+      _check_and_callback(:registerMenuItem, menuItemCaption, &block)
+    else
+      _check_and_callback(:registerMenuItem, menuItemCaption, menuItemHandler)
+    end
     issueAlert("Handler #{menuItemHandler} registered for \"#{menuItemCaption}\"")
+    ret
   end
   alias register_menu_item registerMenuItem
 
@@ -623,7 +628,11 @@ class Buby
   #    (Isn't JRuby fun?)
   #
   def registerExtensionStateListener(listener = nil, &block)
-    _check_and_callback(:registerExtensionStateListener, (block_given? ? &block : listener))
+    if block_given?
+      _check_and_callback(:registerExtensionStateListener, &block)
+    else
+      _check_and_callback(:registerExtensionStateListener, listener)
+    end
   end
   alias register_extension_state_listener registerExtensionStateListener
 
@@ -639,7 +648,11 @@ class Buby
   #    (Isn't JRuby fun?)
   #
   def registerHttpListener(listener = nil, &block)
-    _check_and_callback(:registerHttpListener, (block_given? ? &block : listener))
+    if block_given?
+      _check_and_callback(:registerHttpListener, &block)
+    else
+      _check_and_callback(:registerHttpListener, listener)
+    end
   end
   alias register_http_listener registerHttpListener
 
@@ -655,7 +668,11 @@ class Buby
   #    (Isn't JRuby fun?)
   #
   def registerProxyListener(listener = nil, &block)
-    _check_and_callback(:registerProxyListener, (block_given? ? &block : listener))
+    if block_given?
+      _check_and_callback(:registerProxyListener, &block)
+    else
+      _check_and_callback(:registerProxyListener, listener)
+    end
   end
   alias register_proxy_listener registerProxyListener
 
@@ -671,7 +688,11 @@ class Buby
   #    (Isn't JRuby fun?)
   #
   def registerScannerListener(listener = nil, &block)
-    _check_and_callback(:registerScannerListener, (block_given? ? &block : listener))
+    if block_given?
+      _check_and_callback(:registerScannerListener, &block)
+    else
+      _check_and_callback(:registerScannerListener, listener)
+    end
   end
   alias register_scanner_listener registerScannerListener
 
@@ -685,7 +706,11 @@ class Buby
   #    (Isn't JRuby fun?)
   #
   def registerScopeChangeListener(listener = nil, &block)
-    _check_and_callback(:registerScopeChangeListener, (block_given? ? &block : listener))
+    if block_given?
+      _check_and_callback(:registerScopeChangeListener, &block)
+    else
+      _check_and_callback(:registerScopeChangeListener, listener)
+    end
   end
 
   # This method is used to register a factory for custom context menu items.
@@ -704,7 +729,11 @@ class Buby
   #     wrapped properly.
   #
   def registerContextMenuFactory(factory = nil, &block)
-    _check_and_callback(:registerContextMenuFactory, (block_given? ? &block : factory))
+    if block_given?
+      _check_and_callback(:registerContextMenuFactory, &block)
+    else
+      _check_and_callback(:registerContextMenuFactory, factory)
+    end
   end
   alias register_context_menu_factory registerContextMenuFactory
 
@@ -725,7 +754,11 @@ class Buby
   #     wrapped properly.
   #
   def registerMessageEditorTabFactory(factory = nil, &block)
-    _check_and_callback(:registerMessageEditorTabFactory, (block_given? ? &block : factory))
+    if block_given?
+      _check_and_callback(:registerMessageEditorTabFactory, &block)
+    else
+      _check_and_callback(:registerMessageEditorTabFactory, factory)
+    end
   end
   alias register_message_editor_tab_factory registerMessageEditorTabFactory
 
@@ -742,7 +775,11 @@ class Buby
   #     (Isn't JRuby fun?)
   #
   def registerScannerInsertionPointProvider(provider = nil, &block)
-    _check_and_callback(:registerScannerInsertionPointProvider, (block_given? ? &block : provider))
+    if block_given?
+      _check_and_callback(:registerScannerInsertionPointProvider, &block)
+    else
+      _check_and_callback(:registerScannerInsertionPointProvider, provider)
+    end
   end
   alias register_scanner_insertion_point_provider registerScannerInsertionPointProvider
 
@@ -753,7 +790,11 @@ class Buby
   # @param [IScannerCheck] check An object that performs a given check.
   #
   def registerScannerCheck(check = nil, &block)
-    _check_and_callback(:registerScannerCheck, (block_given? ? &block : check))
+    if block_given?
+      _check_and_callback(:registerScannerCheck, &block)
+    else
+      _check_and_callback(:registerScannerCheck, check)
+    end
   end
   alias register_scanner_check registerScannerCheck
 
@@ -769,7 +810,11 @@ class Buby
   #
   # @todo Test - block version may work here
   def registerIntruderPayloadGeneratorFactory(factory = nil, &block)
-    _check_and_callback(:registerIntruderPayloadGeneratorFactory, (block_given? ? &block : factory))
+    if block_given?
+      _check_and_callback(:registerIntruderPayloadGeneratorFactory, &block)
+    else
+      _check_and_callback(:registerIntruderPayloadGeneratorFactory, factory)
+    end
   end
   alias register_intruder_payload_generator_factory registerIntruderPayloadGeneratorFactory
 
@@ -782,7 +827,11 @@ class Buby
   #
   # @todo Test - block version may work here
   def registerIntruderPayloadProcessor(processor)
-    _check_and_callback(:registerIntruderPayloadProcessor, (block_given? ? &block : processor))
+    if block_given?
+      _check_and_callback(:registerIntruderPayloadProcessor, &block)
+    else
+      _check_and_callback(:registerIntruderPayloadProcessor, processor)
+    end
   end
   alias register_intruder_payload_processor registerIntruderPayloadProcessor
 
@@ -795,7 +844,11 @@ class Buby
   #
   # @todo Test - block version may work here
   def registerSessionHandlingAction(action)
-    _check_and_callback(:registerSessionHandlingAction, (block_given? ? &block : action))
+    if block_given?
+      _check_and_callback(:registerSessionHandlingAction, &block)
+    else
+      _check_and_callback(:registerSessionHandlingAction, action)
+    end
   end
   alias register_session_handling_action registerSessionHandlingAction
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buby
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre3
+  version: 1.5.0.pre4
   prerelease: 6
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler