logstash-filter-fix_protocol 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d64ca3007060cbec2236752969bc46c77b81b011
-  data.tar.gz: f03c1e3cd153ddf7dbae4705d3e894cc1cf5fdbb
+  metadata.gz: d2ab5f7e044aaeec1772eac93f6cdcc0a7b3b244
+  data.tar.gz: 64d0fb4501b0f248a6c6c27b209a1233974a9810
 SHA512:
-  metadata.gz: aee628efe7b15084e5e9c1043246b9e7199ed984226df25ddbb8d8a61e4bc261a91a5c2017d31c67709c9db7d8af817d868af00e9e1fdb479b1af2b4ed812ae2
-  data.tar.gz: 37e8bba116e19bd4a7a507cdebb194ef85cace4b4d0f0abba396f1ac4d902828fd5c3e2ea291fea0c418347efbe05d8635a617fc2057564ffefbddd0179b5467
+  metadata.gz: 964dd92d25e2e7705a6e4e3ebebd069dd146c7094d94396ac860bcf584c38511e1d33a78b6f6e6b29abb1776f31630c382b134c440351ed2a09def9606605981
+  data.tar.gz: 9f8aa82f8e7f7a4735a1f5d3b6668a6e90f227a779c70f1c2a0610cc7bf069b92bce8eb00a7488f70fee06023f6257a6a5d896c0f7f4988ef197983f37e0e62e

data/README.md

@@ -108,6 +108,36 @@ To release a new version, update the **version number** in `logstash-filter-fix_
 $ ./bin/rspec rspec
 ```
 
+### Logstash 2x vs 5x
+
+Remove any installed versions of logstash and install your desired version.
+
+After you've completed the 'Manual change' or 'Ansible provisioning change' below, follow instructions for 'Development Logstash Installation'
+
+#### Manual change:
+
+Change the version number in `lib/logstash/filters/version.rb` 
+
+```ruby
+module Logstash
+  VERSION = '2.x'
+end
+```
+
+#### Ansible provisioning change:
+
+Change the version number in `provision/group_vars/all.yml`
+
+```yml
+logstash_version: 5.x # -> 2.x
+```
+
+Run vagrant provision:
+
+```
+vagrant provision
+```
+
 ### Development Logstash Installation
 
 1. Add the filter to your installation of LogStash

data/lib/logstash/filters/extensions/event.rb

@@ -0,0 +1,11 @@
+
+# monkey-patch deprecated breaking change from 5x
+class LogStash::Event
+  def [](key)
+    respond_to?(:get) ? get(key) : super(key)
+  end
+
+  def []=(key, val)
+    respond_to?(:set) ? set(key, val) : super(key, val)
+  end
+end

data/lib/logstash/filters/fix_protocol.rb

@@ -5,11 +5,12 @@ require "logstash/filters/data_dictionary"
 require "logstash/filters/fix_message"
 require 'active_support'
 require 'active_support/core_ext'
+# monkey-patching breaking 5x behavior
+require 'logstash/filters/extensions/event'
 
 module LogStash
   module  Filters
     class FixProtocol < LogStash::Filters::Base
-
       attr_reader :data_dictionary, :session_dictionary
 
       config_name "fix_protocol"

data/lib/logstash/filters/version.rb

@@ -0,0 +1,3 @@
+module Logstash
+  VERSION = '5.x'
+end

data/logstash-filter-fix_protocol.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'logstash/filters/version'
 
 Gem::Specification.new do |s|
   s.name          = "logstash-filter-fix_protocol"
-  s.version       = "0.2.1"
+  s.version       = "0.3.0"
   s.authors       = ["Connamara Systems"]
   s.email         = ["info@connamara.com"]
 
@@ -21,7 +22,13 @@ Gem::Specification.new do |s|
 
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  if Logstash::VERSION == '5.x'
+    s.add_runtime_dependency 'logstash-core', '>= 5.0.0'
+  elsif Logstash::VERSION == '2.x'
+    s.add_runtime_dependency 'logstash-core', '>= 2.0.0.beta2', '< 3.0.0'
+  else
+    raise "Invalid Logstash::VERSION - should be 2x or 5x located in `/lib/logstash/filters/version`"
+  end
   s.add_runtime_dependency "logstash-input-generator"
   s.add_runtime_dependency "activesupport"
   s.add_runtime_dependency "quickfix-jruby"

data/spec/support/logstash_helper.rb

@@ -1,3 +1,3 @@
-require 'logstash/filters/fix_protocol'
 require "logstash/devutils/rspec/spec_helper"
+require 'logstash/filters/fix_protocol'
 

metadata

@@ -1,24 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-fix_protocol
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Connamara Systems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
@@ -26,10 +23,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -156,8 +150,10 @@ files:
 - QUICKFIX_LICENSE.txt
 - README.md
 - lib/logstash/filters/data_dictionary.rb
+- lib/logstash/filters/extensions/event.rb
 - lib/logstash/filters/fix_message.rb
 - lib/logstash/filters/fix_protocol.rb
+- lib/logstash/filters/version.rb
 - logstash-filter-fix_protocol.gemspec
 - spec/filters/fix_message_spec.rb
 - spec/filters/fix_protocol_spec.rb