logstash-cli 0.0.7 → 0.0.8

data/Gemfile

@@ -4,6 +4,7 @@ gem "logstash-cli", :path => "."
 
 group :test do
   gem "rake"
+  gem "rspec"
 end
 
 gemspec

data/lib/logstash-cli/command/grep.rb

@@ -1,34 +1,37 @@
-require 'date'
-
+require 'time'
 require 'yajl/json_gem'
 
 module Grep
 
   def self.indexes_from_interval(from, to)
-    (from.to_date..to.to_date).sort.map do |date|
-      date.to_s.gsub('-', '.')
+    ret = []
+    while from <= to
+      ret << from.strftime("%F").gsub('-', '.')
+      from += 86400
     end
+    ret
   end
 
   # Very naive time range description parsing.
   def self.parse_time_range(desc)
-    /(?<value>\d+)\s*(?<units>\w*)/ =~ desc
+    /(\d+)\s*(\w*)/ =~ desc
+    value, units = $1, $2
     value = value.to_i
     start = case units.to_s.downcase
             when 'm', 'min', 'mins', 'minute', 'minutes'
-              DateTime.now - (value/(60*24.0))
+              Time.now - value*60
             when 'h', 'hr', 'hrs', 'hour', 'hours'
-              DateTime.now - (value/24.0)
+              Time.now - value*3600
             when 'd', 'day', 'days'
-              DateTime.now - value
+              Time.now - value*86400
             when 'w', 'wk', 'wks', 'week', 'weeks'
-              DateTime.now - (7.0*value)
+              Time.now - 7.0*value*86400
             when 'y', 'yr', 'yrs', 'year', 'years'
-              DateTime.now - (365.0*value)
+              Time.now - 365.0*value*86400
             else
               raise ArgumentError
             end
-    [start, DateTime.now]
+    [start, Time.now]
   end
 
   def _grep(pattern,options)
@@ -38,12 +41,14 @@ module Grep
     fields = options[:fields].split(',')
 
     begin
-      if options[:last].nil?
-        from_time = DateTime.parse(options[:from])
-        to_time = DateTime.parse(options[:to])
-      else
-        from_time, to_time = Grep.parse_time_range(options[:last])
-      end
+      from_time, to_time = if options[:from] && options[:to]
+                             [ Time.parse(options[:from]),
+                               Time.parse(options[:to]) ]
+                           elsif options[:from] && ! options[:to]
+                             [Time.parse(options[:from]), Time.now]
+                           elsif options[:last]
+                             Grep.parse_time_range(options[:last])
+                           end
     rescue ArgumentError
       $stderr.puts "Something went wrong while parsing the date range."
       exit -1
@@ -56,8 +61,8 @@ module Grep
     $stderr.puts "Searching #{es_url}[#{index_range.first}..#{index_range.last}] - #{pattern}"
 
     # Reformat time interval to match logstash's internal timestamp'
-    from = from_time.to_time.utc.strftime('%FT%T')
-    to = to_time.to_time.utc.strftime('%FT%T')
+    from = from_time.strftime('%FT%T')
+    to = to_time.strftime('%FT%T')
 
     # Total of results to show
     total_result_size = options[:size]

data/lib/logstash-cli/version.rb

@@ -1,3 +1,3 @@
 module LogstashCli
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/logstash-cli/command/grep_spec.rb

@@ -1,53 +1,55 @@
-require_relative '../../spec_helper.rb'
-require_relative '../../../lib/logstash-cli/command/grep.rb'
+require 'spec_helper'
+require 'logstash-cli/command/grep'
 
 describe Grep do
   it "determines index range needed for a given date range" do
-    Grep.indexes_from_interval(DateTime.now, DateTime.now).should == [DateTime.now.to_date.to_s.gsub('-', '.')]
+    from = 1358832972
+    to = 1359005772
+    Grep.indexes_from_interval(Time.at(from), Time.at(to)).should == ["2013.01.21", "2013.01.22", "2013.01.23"]
   end
 
   it "calculates time range required to search last X minutes" do
     # The to_i removes fractions seconds.  Unsure on the best way to test this.
-    diff = 10*(1/60.0*24.0)
-    Grep.parse_time_range("10m").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10mins").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 min").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 minute").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 minutes").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
+    diff = 10*60
+    Grep.parse_time_range("10m").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10mins").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 min").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 minute").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 minutes").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
   end
 
   it "calculates time range required to search last X hours" do
-    diff = 10*(1/24.0)
-    Grep.parse_time_range("10h").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10hr").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10hrs").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 hour").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 hours").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
+    diff = 10*60*60
+    Grep.parse_time_range("10h").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10hr").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10hrs").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 hour").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 hours").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
   end
 
   it "calculates time range required to search last X days" do
-    diff = 10
-    Grep.parse_time_range("10d").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10days").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 day").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
+    diff = 10*86400
+    Grep.parse_time_range("10d").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10days").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 day").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
   end
 
   it "calculates time range required to search last X weeks" do
-    diff = 10*7
-    Grep.parse_time_range("10w").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10wk").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 wks").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 week").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 weeks").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
+    diff = 10*7*86400
+    Grep.parse_time_range("10w").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10wk").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 wks").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 week").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 weeks").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
   end
 
   it "calculates time range required to search last X years" do
-    diff = 10*365
-    Grep.parse_time_range("10y").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 yr").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 yrs").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 year").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
-    Grep.parse_time_range("10 years").map{|t| t.to_time.to_i}.should == [DateTime.now - diff, DateTime.now].map{|t| t.to_time.to_i}
+    diff = 10*365*86400
+    Grep.parse_time_range("10y").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 yr").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 yrs").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 year").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
+    Grep.parse_time_range("10 years").map{|t| t.to_i}.should == [Time.now - diff, Time.now].map{|t| t.to_i}
   end
 
   it "raises an ArgumentError if it can't cacluate the time range" do

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.expand_path("../lib", __FILE__))
+$:.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3090991630995914937
+      hash: -800876866884960970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: