sms-logparser 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac7a2c7bd9b90b797a3ee9a0200117c47139f54b
-  data.tar.gz: 88b67958f0fd4b641414a028b329be5bbd50e0da
+  metadata.gz: 763fefca222c68deeee291c3afefc4b86a9b5291
+  data.tar.gz: 6b369ebcb0beda9c45045118c3891d69f4930a71
 SHA512:
-  metadata.gz: 8e2fca495d375a1edf97a182552bdb38b15001929dacc3ae777c70a8a33ec377ced9c481d6b636acdb75aab90e6fe3384ee981b92841835fc2c78ad9b369b665
-  data.tar.gz: 40f73533a55aa2deb3e2f76a1fda30037e375e179cee86401df26b7551c0027b12c289dae30043419b691e117b507eaab8464dd44f33061b601b1e0be1721522
+  metadata.gz: 06b1e2e3b4e55770625e8af0053243d1b48eda441432b3e8eb5d397d9b39dab759f53a9d66d32248be16b817da5d97d8550e46126fd0c3bc73570c964ad2f0d1
+  data.tar.gz: 659e7def844b3b476acaa607469c76e3f3d4c7ca2157b05c44e68c847088e7affb945aef3e9737bb538100b7e16ff24a90ad552035c350e26d6f9ba6d37858fb

data/lib/sms-logparser/cli.rb

@@ -2,10 +2,7 @@ module SmsLogparser
   class Cli < Thor
     require 'yaml'
 
-    STATUS = {
-      :ok => 0,
-      :api_error => 1
-    }
+    STATUS = {ok: 0, api_error: 1}
 
     class_option :config, 
       default: File.join(Dir.home, '.sms-logparser.yml'),
@@ -56,51 +53,37 @@ module SmsLogparser
       default: false
     def parse
       say "Starting the parser...", :green
-      start_time = Time.now
-      count = 0
-      begin
-        mysql = Mysql.new(options)
-        api = Api.new(options)
-        last_id = mysql.get_last_parse_id
-        status = STATUS[:ok]
-        begin
-          mysql.get_entries(last_id: last_id, limit: options[:limit]) do |entries|
-            entries.each do |entry| 
-              if data = Parser.extract_data_from_msg(entry['Message'])
-                uris = api.send(data)
-                last_id = entry['ID']
-                count += 1
-                if options[:verbose]
-                  verbose_parser_output(data, uris, entry)
-                end
-              end
-            end
+      mysql = Mysql.new(options)
+      state = {
+        last_event_id: mysql.get_last_parse_id, 
+        match_count: 0,
+        status: STATUS[:ok],
+        run_at: Time.now,
+        run_time: 0.0
+      }
+      api = Api.new(options)
+      mysql.get_entries(last_id: state[:last_event_id], limit: options[:limit]) do |entries|
+        entries.each do |entry| 
+          if data = Parser.extract_data_from_msg(entry['Message'])
+            uris = api.send(data)
+            state[:last_event_id] = entry['ID']
+            state[:match_count] += 1
+            verbose_parser_output(data, uris, entry) if options[:verbose]
           end
-        rescue => e
-          say "Error: #{e.message}", :red
-          say "Aborting parser run...", :red
-          status = STATUS[:api_error]
-        ensure
-          mysql.write_parse_result(
-            last_event_id: last_id, 
-            match_count: count,
-            status: status,
-            run_at: start_time,
-            run_time: (Time.now - start_time).round(2)
-          ) unless options[:simulate]
         end
-        say "Started:\t", :cyan
-        say start_time.strftime('%d.%d.%Y %T')
-        say "Runtime:\t", :cyan
-        say "#{(Time.now - start_time).round(2)}s"
-        say "Status:\t\t", :cyan
-        say STATUS.key(status).upcase
-        action = options[:simulate] ? "found" : "sent"
-        say("Events #{action}:\t", :cyan)
-        say count
+      end
+    rescue => e
+      say "Error: #{e.message}", :red
+      say "Aborting parser run...", :red
+      state[:status] = STATUS[:api_error]
+    ensure
+      begin
+        state[:run_time] = (Time.now - state[:run_at]).round(2)
+        mysql.write_parse_result(state) unless options[:simulate]
+        print_parse_results(state)
       rescue => e
         say "Error: #{e.message}", :red
-        say e.backtrace; :yellow
+        say(e.backtrace.join("\n"), :yellow) if options[:debug]
       end
     end
 
@@ -111,26 +94,25 @@ module SmsLogparser
       aliases: %w(-n),
       desc: "Number of results to display"
     def history
-      begin
-        runs = Mysql.new(options).last_runs(options[:results])
-        if runs.size > 0
-          table = [%w(run_at run_time match_count last_event_id status)]
-          runs.to_a.reverse.each do |run|
-            table << [
-              run['run_at'],
-              "#{run['run_time']}s",
-              run['match_count'],
-              run['last_event_id'],
-              STATUS.key(run['status']).upcase
-            ]
-          end
-          print_table table
-        else
-          say "No parser runs found in the database."
+      runs = Mysql.new(options).last_runs(options[:results])
+      if runs && runs.size > 0
+        table = [%w(run_at count last_id status run_time)]
+        runs.to_a.reverse.each do |run|
+          table << [
+            run['run_at'].strftime('%d.%d.%Y %T'),
+            run['match_count'],
+            run['last_event_id'],
+            STATUS.key(run['status']).upcase,
+            "#{run['run_time']}s"
+          ]
         end
-      rescue => e
-        say "Error: #{e.message}", :red
+        print_table table
+      else
+        say "No parser runs found in the database."
       end
+    rescue => e
+      say "Error: #{e.message}", :red
+      exit 1
     end
 
     desc "setup", "Create the parser table to track the last logs parsed"
@@ -140,16 +122,15 @@ module SmsLogparser
       aliases: %w(-f),
       desc: "Drop an existing table if it exists"
     def setup
-      begin
-        case Mysql.new(options).create_parser_table(options[:force])
-        when 0
-          say "OK, table created.", :green
-        when 1
-          say "Table already exists.", :yellow
-        end
-      rescue => e
-        say "Error: #{e.message}", :red
+      case Mysql.new(options).create_parser_table(options[:force])
+      when 0
+        say "OK, table created.", :green
+      when 1
+        say "Table already exists.", :yellow
       end
+    rescue => e
+      say "Error: #{e.message}", :red
+      exit 1
     end
 
     no_commands do
@@ -165,6 +146,18 @@ module SmsLogparser
         puts
       end
 
+      def print_parse_results(res)
+        say "Started:\t", :cyan
+        say res[:run_at].strftime('%d.%d.%Y %T')
+        say "Runtime:\t", :cyan
+        say "#{res[:run_time]}s"
+        say "Status:\t\t", :cyan
+        say STATUS.key(res[:status]).upcase
+        action = options[:simulate] ? "found" : "sent"
+        say("Events #{action}:\t", :cyan)
+        say res[:match_count]
+      end
+
       def options
         original_options = super
         filename = original_options[:config] || File.join(Dir.home, '.sms-logparser.yml')

data/lib/sms-logparser/mysql.rb

@@ -19,7 +19,7 @@ module SmsLogparser
 
     def last_runs(results = 10)
       runs = client.query(
-        "SELECT * FROM sms_logparser_runs ORDER BY id DESC LIMIT #{results}"
+        "SELECT * FROM sms_logparser_runs ORDER BY id DESC LIMIT #{results || 10}"
       )
     end
 

data/lib/sms-logparser/version.rb

@@ -1,3 +1,3 @@
 module SmsLogparser
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/sms-logparser.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'webmock'
 
   spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'mysql2'

data/spec/api_spec.rb

@@ -5,7 +5,7 @@ describe SmsLogparser::Api do
   before do
     @api = SmsLogparser::Api.new(
       simulate: true,
-      api_base_path: "http://myapi.com/rest/"
+      api_base_url: "http://localhost/creator/rest/"
     )
   end
 

data/spec/cli_spec.rb

@@ -4,6 +4,9 @@ describe SmsLogparser::Cli do
   before do
     TestHelper.create_test_db
     TestHelper.create_sylog_db_table
+    stub_request(:post, /.*locahost.*/).
+      with(headers: {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+      to_return(status: 200, body: "stubbed response", headers: {})
   end
 
   after do
@@ -11,8 +14,10 @@ describe SmsLogparser::Cli do
   end
 
   it "can create the parser_runs database table" do
+    parser = TestHelper.sms_logparser
+    parser.options[:force] = true
     out, err = capture_io do
-      TestHelper.sms_logparser.setup
+      parser.setup
     end
     out.must_match /OK.*/
   end
@@ -21,8 +26,9 @@ describe SmsLogparser::Cli do
     TestHelper.seed_db(10)
     parser = TestHelper.sms_logparser
     parser.options[:simulate] = true
+    #parser.options[:api_base_url] = "http://localhost/creator/rest/"
     out, err = capture_io do
-      TestHelper.sms_logparser.setup
+      parser.setup
       parser.parse  
     end
     out.must_match /\s+10$/
@@ -44,8 +50,10 @@ describe SmsLogparser::Cli do
     TestHelper.seed_db(1)
     parser = TestHelper.sms_logparser
     parser.options[:simulate] = true
+    parser.options[:force] = true
+
     out, err = capture_io do
-      TestHelper.sms_logparser.setup
+      parser.setup
       parser.parse
       parser.history 
     end

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ require 'minitest/spec'
 require 'minitest/autorun'
 require 'minitest/pride'
 
+require 'webmock/minitest'
+WebMock.disable_net_connect!(allow_localhost: true)
+
 require 'sms-logparser'
 
 module TestHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sms-logparser
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - niwo
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement