lstash 0.2.0 → 1.0.0

data/spec/lstash/query_spec.rb

@@ -1,98 +1,96 @@
-require 'spec_helper'
-require 'lstash/query'
+require "spec_helper"
+require "lstash/query"
 
 describe Lstash::Query do
-
   context "running on 2014-08-03" do
-    let(:time)  { '2014-08-03 15:54:33' }
+    let(:time) { "2014-08-03 15:54:33" }
     let(:query_string) { nil }
     let(:options) { {} }
 
     subject { Lstash::Query.new(query_string, options) }
 
-    before { Timecop.freeze(Time.parse(time)) }
-    after  { Timecop.return }
+    before { Timecop.freeze(time) }
+    after { Timecop.return }
 
     it { should_not be nil }
     # it "should initialize properly" do
     #   expect(subject).not_to be nil
     # end
 
-    its('from') { should eq Time.parse('2014-08-03 00:00:00.000000000 +0200') }
-    its('to')   { should eq Time.parse('2014-08-03 15:54:33.000000000 +0200') }
+    its("from") { should eq Time.parse("2014-08-02 00:00:00 +0200") }
+    its("to") { should eq Time.parse("2014-08-03 00:00:00 +0200") }
 
     # its(:date_range) { should eq (Date.parse('2014-08-02')..Date.parse('2014-08-03')) }
 
     # its(:indices) { should eq [ "logstash-2014.08.02", "logstash-2014.08.03" ] }
 
     context "with specific query" do
-      let(:query_string) { 'program:haproxy' }
+      let(:query_string) { "program:haproxy" }
       its(:query_string) { should eq query_string }
     end
 
     context "without query" do
       let(:query_string) { nil }
-      its(:query_string) { should eql '*' }
+      its(:query_string) { should eql "*" }
     end
 
     context "from 'yesterday'" do
-      let(:options) { { from: 'yesterday' }}
-      its('from') { should eq Time.parse('2014-08-02 00:00:00.000000000 +0200') }
+      let(:options) { {from: "yesterday"} }
+      its("from") { should eq Time.parse("2014-08-02 00:00:00 +0200") }
     end
 
     context "from 'today'" do
-      let(:options) { { from: 'today' }}
-      its('from') { should eq Time.parse('2014-08-03 00:00:00.000000000 +0200') }
+      let(:options) { {from: "today"} }
+      its("from") { should eq Time.parse("2014-08-03 00:00:00 +0200") }
     end
 
     context "from 'now'" do
-      let(:options) { { from: 'now' }}
-      its('from') { should eq Time.parse('2014-08-03 15:54:33.000000000 +0200') }
+      let(:options) { {from: "now"} }
+      its("from") { should eq Time.parse("2014-08-03 15:54:33 +0200") }
     end
 
     context "to 'yesterday'" do
-      let(:options) { { to: 'yesterday' }}
-      its('to') { should eq Time.parse('2014-08-02 00:00:00.000000000 +0200') }
+      let(:options) { {to: "yesterday"} }
+      its("to") { should eq Time.parse("2014-08-02 00:00:00 +0200") }
     end
 
     context "to 'today'" do
-      let(:options) { { to: 'today' }}
-      its('to') { should eq Time.parse('2014-08-03 00:00:00.000000000 +0200') }
+      let(:options) { {to: "today"} }
+      its("to") { should eq Time.parse("2014-08-03 00:00:00 +0200") }
     end
 
     context "to 'now'" do
-      let(:options) { { to: 'now' }}
-      its('to') { should eq Time.parse('2014-08-03 15:54:33.000000000 +0200') }
+      let(:options) { {to: "now"} }
+      its("to") { should eq Time.parse("2014-08-03 15:54:33 +0200") }
     end
 
     context "from 'firstday'" do
-
-      let(:options) { { from: 'firstday' } }
-      its('from') { should eq Time.parse('2014-08-01 00:00:00.000000000 +0200') }
+      let(:options) { {from: "firstday"} }
+      its("from") { should eq Time.parse("2014-08-01 00:00:00 +0200") }
 
       context "anchor 'yesterday'" do
-        let(:anchor) { 'yesterday' }
-        its('from') { should eq Time.parse('2014-08-01 00:00:00.000000000 +0200') }
+        let(:anchor) { "yesterday" }
+        its("from") { should eq Time.parse("2014-08-01 00:00:00 +0200") }
       end
 
       context "anchor 'today'" do
-        let(:anchor) { 'today' }
-        its('from') { should eq Time.parse('2014-08-01 00:00:00.000000000 +0200') }
+        let(:anchor) { "today" }
+        its("from") { should eq Time.parse("2014-08-01 00:00:00 +0200") }
       end
 
       context "anchor '2014-07-17'" do
-        let(:options) { { from: 'firstday', anchor: '2014-07-17' } }
-        its('from') { should eq Time.parse('2014-07-01 00:00:00.000000000 +0200') }
+        let(:options) { {from: "firstday", anchor: "2014-07-17"} }
+        its("from") { should eq Time.parse("2014-07-01 00:00:00 +0200") }
       end
 
       context "date range" do
-        let(:options) { { from: 'firstday', anchor: 'yesterday' } }
-        its('from') { should eq Time.parse('2014-08-01 00:00:00.000000000 +0200') }
-        its('to')   { should eq Time.parse('2014-08-03 15:54:33.000000000 +0200') }
+        let(:options) { {from: "firstday", anchor: "yesterday"} }
+        its("from") { should eq Time.parse("2014-08-01 00:00:00 +0200") }
+        its("to") { should eq Time.parse("2014-08-03 00:00:00 +0200") }
       end
 
       context "each_period" do
-        let(:options) { { from: 'firstday', anchor: 'yesterday', to: 'today' } }
+        let(:options) { {from: "firstday", anchor: "yesterday", to: "today"} }
         it "should iterate over range by hour" do
           indices = []
           queries = []
@@ -100,13 +98,13 @@ describe Lstash::Query do
             indices << index
             queries << query
           end
-          expect(indices.count).to eq ((subject.to - subject.from)/3600).round
-          expect(indices.uniq).to eq %w(
+          expect(indices.count).to eq ((subject.to - subject.from) / 3600).round
+          expect(indices.uniq).to eq %w[
             logstash-2014.07.31
             logstash-2014.08.01
             logstash-2014.08.02
-          )
-          expect(queries.map(&:from).map(&:to_s)).to eq ([
+          ]
+          expect(queries.map(&:from).map(&:to_s)).to eq([
             "2014-07-31 22:00:00 UTC",
             "2014-07-31 23:00:00 UTC",
             "2014-08-01 00:00:00 UTC",
@@ -158,50 +156,54 @@ describe Lstash::Query do
           ])
         end
       end
-
     end
 
     context "search" do
       it "should produce the correct elasticsearch search request attributes" do
-        expect(subject.search(0, 10)).to eq ({
-          :sort => [{"@timestamp"=>{:order=>"asc"}}],
-          :fields => %w(message),
-          :query => {:filtered=>{
-            :query => { :bool => { :should => [ { :query_string => { :query=>"*" }}]}},
-            :filter=> { :bool => { :must   => [ { :range => { "@timestamp" => { :gte => 1407016800000, :lt => 1407074073000}}}]}}}},
-          :from => 0,
-          :size => 10
+        expect(subject.search(0, 10)).to eq({
+          sort: [{"@timestamp" => {order: "asc"}}],
+          _source: %w[message],
+          query: {
+            bool: {
+              must: [
+                {
+                  query_string: {query: "*"}
+                }
+              ],
+              filter: {
+                range: {"@timestamp" => {gte: 1406930400000, lt: 1407016800000}}
+              }
+            }
+          },
+          from: 0,
+          size: 10
         })
       end
     end
-
   end
 
   context "running on 2014-08-01" do
-    let(:time)  { '2014-08-01 12:53:03' }
+    let(:time) { "2014-08-01 12:53:03" }
     let(:query_string) { nil }
     let(:options) { {} }
 
     subject { Lstash::Query.new(query_string, options) }
 
     before { Timecop.freeze(Time.parse(time)) }
-    after  { Timecop.return }
+    after { Timecop.return }
 
     context "from 'firstday' with 'yesterday' anchor" do
-      let(:options) { { anchor: 'yesterday', from: 'firstday' } }
+      let(:options) { {anchor: "yesterday", from: "firstday"} }
 
-        its('from') { should eq Time.parse('2014-07-01 00:00:00.000000000 +0200') }
-        its('to')   { should eq Time.parse('2014-08-01 12:53:03.000000000 +0200') }
+      its("from") { should eq Time.parse("2014-07-01 00:00:00 +0200") }
+      its("to") { should eq Time.parse("2014-08-01 00:00:00 +0200") }
     end
 
     context "from 'firstday' with default 'today' anchor" do
-      let(:options) { { from: 'firstday', to: 'now' } }
+      let(:options) { {from: "firstday", to: "now"} }
 
-        its('from') { should eq Time.parse('2014-08-01 00:00:00.000000000 +0200') }
-        its('to')   { should eq Time.parse('2014-08-01 12:53:03.000000000 +0200') }
+      its("from") { should eq Time.parse("2014-08-01 00:00:00 +0200") }
+      its("to") { should eq Time.parse("2014-08-01 12:53:03 +0200") }
     end
-
   end
-
 end
-

data/spec/lstash_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
-require 'lstash/cli'
+require "spec_helper"
+require "lstash/cli"
 
 describe Lstash do
-  it 'should have a version number' do
+  it "should have a version number" do
     expect(Lstash::VERSION).not_to be nil
   end
 end

data/spec/spec_helper.rb

@@ -1,33 +1,48 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'lstash'
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "lstash"
 
-require 'rspec/its'
+require "rspec/its"
 
-require 'timecop'
+require "timecop"
 
-ENV['ES_URL'] = nil
-ENV['TZ'] = 'Europe/Amsterdam' # Test in a specific timezone.
+ENV["ES_URL"] = nil
+ENV["TZ"] = "Europe/Amsterdam" # Test in a specific timezone.
 
 RSpec.configure do |config|
-  config.order = 'random'
+  config.order = "random"
+
+  # Suggestions taken from http://railscasts.com/episodes/413-fast-tests
+  #
+  # Focus on specific specs by tagging with `:focus`
+  # or use `fit` instead of `it`.
+  # ```ruby
+  # it "focus test", :focus do
+  # end
+  #
+  # fit "focus test" do
+  # end
+  # ```
+  config.alias_example_to :fit, focus: true
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
 end
 
-require 'stringio'
+require "stringio"
 
-def capture_stdout(&blk)
+def capture_stdout
   old = $stdout
   $stdout = fake = StringIO.new
-  blk.call
+  yield
   fake.string
 ensure
   $stdout = old
 end
 
-def capture_stderr(&blk)
+def capture_stderr
   old = $stderr
   $stderr = fake = StringIO.new
-  blk.call
+  yield
   fake.string
 ensure
   $stderr = old
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lstash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Klaas Jan Wierenga
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,48 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 7.17.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 7.17.7
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -136,24 +108,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.20.3
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.4
 description: Count or grep log messages in a specified time range from a Logstash
   Elasticsearch server.
 email:
-- k.j.wierenga@gmail.com
+- k.j.wierenga@kerkdienstgemist.nl
 executables:
 - lstash
 extensions: []
@@ -163,6 +121,10 @@ extra_rdoc_files:
 - CHANGELOG.md
 files:
 - ".autotest"
+- ".devcontainer/Aptfile"
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -174,6 +136,8 @@ files:
 - README.md
 - Rakefile
 - bin/lstash
+- dip.yml
+- docker-compose.yml
 - lib/lstash.rb
 - lib/lstash/cli.rb
 - lib/lstash/client.rb
@@ -185,11 +149,11 @@ files:
 - spec/lstash/query_spec.rb
 - spec/lstash_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/kjwierenga/lstash
+homepage: https://github.com/kdgm/lstash
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -204,14 +168,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: The lstash gem allows you to count or grep log messages in a specific time
   range from a Logstash Elasticsearch server.
-test_files:
-- spec/lstash/cli_spec.rb
-- spec/lstash/client_spec.rb
-- spec/lstash/query_spec.rb
-- spec/lstash_spec.rb
-- spec/spec_helper.rb
+test_files: []