logstash-codec-rubydebug 3.0.6 → 3.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8a159dfbee71aa926219ef18cfd0c500344f96088b614547c4d1f13215876326
4
- data.tar.gz: b722151b16f30e3969ab80db50b9368d00ed43ae6fa3d922c9fd872ff2bc55ec
3
+ metadata.gz: 62712db87122265158cba756df8ebf8528172f23c7596674cbe0b73c40262877
4
+ data.tar.gz: 9c37215a3f28a7350daea93d82ae0793a42bd45c9d6a5c7bdedfbb11f334df7c
5
5
  SHA512:
6
- metadata.gz: df1c1b9d58469133d6620388cd5214f510145b1ec2f7b858168d7e624e0c3713407748ac5ed2d447abe08294517fa6b3b22c3a15da4f02211e032820c7c2cb1e
7
- data.tar.gz: 688fbf9d7dfdcda5ef9504ac33ec82244e7b4a9f775207f274ffb8a2fcdc1848e5e30b3fa790a0d7a83d5bdf78082464fcedd1b7564ff46a54a52db2d0c5f7c6
6
+ metadata.gz: 400088251841a032a8835e19f2228c1d4075fafaa245fdf10dac16f14a8b5f1497107f3edb4de1bc61c33b5a770dc6185535608f5da1c88f935edcdf60ae9390
7
+ data.tar.gz: d8c25711101964ec9300fc9e3c3bf6b0ccf4bd59f31e0aac2a0d51b45a13029f90b5e3802350df683e20207016d9103831914dafb20610ff153fe769b9c36133
@@ -1,3 +1,6 @@
1
+ ## 3.1.0
2
+ - Replace stale awesome_print library with maintained fork called amazing_print.
3
+
1
4
  ## 3.0.6
2
5
  - Fixes crash that could occur on startup if `$HOME` was unset or if `${HOME}/.aprc` was unreadable by pinning `awesome_print` dependency to a release before the bug was introduced.
3
6
 
data/LICENSE CHANGED
@@ -1,13 +1,202 @@
1
- Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
2
1
 
3
- Licensed under the Apache License, Version 2.0 (the "License");
4
- you may not use this file except in compliance with the License.
5
- You may obtain a copy of the License at
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
6
5
 
7
- http://www.apache.org/licenses/LICENSE-2.0
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
8
7
 
9
- Unless required by applicable law or agreed to in writing, software
10
- distributed under the License is distributed on an "AS IS" BASIS,
11
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
- See the License for the specific language governing permissions and
13
- limitations under the License.
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright 2020 Elastic and contributors
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
@@ -21,7 +21,7 @@ include::{include_path}/plugin_header.asciidoc[]
21
21
  ==== Description
22
22
 
23
23
  The rubydebug codec will output your Logstash event data using
24
- the Ruby Awesome Print library.
24
+ the Ruby Amazing Print library.
25
25
 
26
26
 
27
27
  [id="plugins-{type}s-{plugin}-options"]
@@ -2,7 +2,7 @@
2
2
  require "logstash/codecs/base"
3
3
 
4
4
  # The rubydebug codec will output your Logstash event data using
5
- # the Ruby Awesome Print library.
5
+ # the Ruby Amazing Print library.
6
6
  #
7
7
  class LogStash::Codecs::RubyDebug < LogStash::Codecs::Base
8
8
  config_name "rubydebug"
@@ -10,13 +10,12 @@ class LogStash::Codecs::RubyDebug < LogStash::Codecs::Base
10
10
  # Should the event's metadata be included?
11
11
  config :metadata, :validate => :boolean, :default => false
12
12
 
13
- # AWESOME_OPTIONS = {:color => {:logstash_timestamp => :green}}
14
- # disabled options, awesome_print coloring option is buggy and only occurs once and it cannot be tested.
15
- AWESOME_OPTIONS = {}
13
+ # AMAZING_OPTIONS = {:color => {:logstash_timestamp => :green}}
14
+ AMAZING_OPTIONS = {}
16
15
 
17
16
  def register
18
- require "awesome_print"
19
- AwesomePrint.defaults = AWESOME_OPTIONS
17
+ require "amazing_print"
18
+ AmazingPrint.defaults = AMAZING_OPTIONS
20
19
 
21
20
  if @metadata
22
21
  @encoder = method(:encode_with_metadata)
@@ -36,11 +35,11 @@ class LogStash::Codecs::RubyDebug < LogStash::Codecs::Base
36
35
  end
37
36
 
38
37
  def encode_default(event)
39
- @on_event.call(event, event.to_hash.awesome_inspect + NL)
38
+ @on_event.call(event, event.to_hash.ai + NL)
40
39
  end # def encode_default
41
40
 
42
41
  def encode_with_metadata(event)
43
- @on_event.call(event, event.to_hash_with_metadata.awesome_inspect + NL)
42
+ @on_event.call(event, event.to_hash_with_metadata.ai + NL)
44
43
  end # def encode_with_metadata
45
44
 
46
45
  end # class LogStash::Codecs::Dots
@@ -1,9 +1,9 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-codec-rubydebug'
4
- s.version = '3.0.6'
4
+ s.version = '3.1.0'
5
5
  s.licenses = ['Apache License (2.0)']
6
- s.summary = "Applies the Ruby Awesome Print library to Logstash events"
6
+ s.summary = "Applies the Ruby Amazing Print library to Logstash events"
7
7
  s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
8
8
  s.authors = ["Elastic"]
9
9
  s.email = 'info@elastic.co'
@@ -22,13 +22,7 @@ Gem::Specification.new do |s|
22
22
  # Gem dependencies
23
23
  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
24
24
 
25
- # 2018-06-04: as of this writing, the latest release of awesome_print (v1.8.0) contains a bug that causes the Logstash
26
- # process to crash while loading this dependency if an exception is raised attempting to load defaults (e.g., when
27
- # `ENV['HOME']` is unset or the JVM doesn't have permission to read the `.aprc` file at that address).
28
- #
29
- # Pin to 1.7.0 until the already-fixed code on awesome_print's master branch finds its way to a release.
30
- # SEE: https://github.com/awesome-print/awesome_print/issues/338
31
- s.add_runtime_dependency 'awesome_print', '1.7.0'
25
+ s.add_runtime_dependency 'amazing_print', '~> 1'
32
26
 
33
27
  s.add_development_dependency 'logstash-devutils'
34
28
  end
@@ -4,30 +4,15 @@ require "logstash/event"
4
4
 
5
5
  describe LogStash::Codecs::RubyDebug do
6
6
 
7
- # This is a necessary monkey patch that ensures that if ActiveSupport
8
- # is defined, then the on_load method exists.
9
- # The awesome_print gem uses this method to hook extra funcionality if
10
- # ActiveSupport is loaded. Since some versions of ActiveSupport don't
11
- # have the on_load method we must ensure this method exists.
12
- # More information:
13
- # * https://github.com/logstash-plugins/logstash-codec-rubydebug/issues/8
14
- # * https://github.com/michaeldv/awesome_print/pull/206
15
- before(:all) do
16
- if defined?(ActiveSupport) && !ActiveSupport.respond_to?(:on_load)
17
- module ActiveSupport
18
- def self.on_load(*params); end
19
- end
20
- end
21
- end
22
-
23
7
  subject { LogStash::Codecs::RubyDebug.new }
24
8
 
25
9
  context "#encode" do
26
- it "should print beautiful hashes" do
27
- subject.register
10
+ let(:event) { LogStash::Event.new({"what" => "ok", "who" => 2}) }
11
+
12
+ before(:each) { subject.register }
28
13
 
29
- event = LogStash::Event.new({"what" => "ok", "who" => 2})
30
- on_event = lambda { |e, d| expect(d.chomp).to eq(event.to_hash.awesome_inspect) }
14
+ it "should print beautiful hashes" do
15
+ on_event = lambda { |e, d| expect(d.chomp).to eq(event.to_hash.ai) }
31
16
 
32
17
  subject.on_event(&on_event)
33
18
  expect(on_event).to receive(:call).once.and_call_original
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-codec-rubydebug
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.6
4
+ version: 3.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-07-27 00:00:00.000000000 Z
11
+ date: 2020-07-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -33,17 +33,17 @@ dependencies:
33
33
  - !ruby/object:Gem::Dependency
34
34
  requirement: !ruby/object:Gem::Requirement
35
35
  requirements:
36
- - - '='
36
+ - - "~>"
37
37
  - !ruby/object:Gem::Version
38
- version: 1.7.0
39
- name: awesome_print
38
+ version: '1'
39
+ name: amazing_print
40
40
  prerelease: false
41
41
  type: :runtime
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
- - - '='
44
+ - - "~>"
45
45
  - !ruby/object:Gem::Version
46
- version: 1.7.0
46
+ version: '1'
47
47
  - !ruby/object:Gem::Dependency
48
48
  requirement: !ruby/object:Gem::Requirement
49
49
  requirements:
@@ -101,6 +101,6 @@ rubyforge_project:
101
101
  rubygems_version: 2.6.13
102
102
  signing_key:
103
103
  specification_version: 4
104
- summary: Applies the Ruby Awesome Print library to Logstash events
104
+ summary: Applies the Ruby Amazing Print library to Logstash events
105
105
  test_files:
106
106
  - spec/codecs/rubydebug_spec.rb