myslog 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f02eb9634c5f3b4abe378b1358bd93dc1187caf
-  data.tar.gz: e672b7ffdc61f7c4b7f71ca92677ebc507dd8143
+  metadata.gz: 80788f037295ef11c3170012ebc5b2796190bb71
+  data.tar.gz: c89207a4068ada4490f8973ca7026d398b8bb9ec
 SHA512:
-  metadata.gz: 0f9be4886e77c116f1d8544ce66e54c7f8ed321db5522a440146117626365b9153d95917dfd669da08235bd86b612d1d9d316f407e0cf6dacada4f235f5593e1
-  data.tar.gz: b1274e4d02dc43d8c3efc69f50a4471211b991be947861afae5ea921de3ce52300f0adaaa0cc4843cfaa29020407558e2350cf99a4fdd5f1be4ccad8b05d591c
+  metadata.gz: 5c6800cf04a879821b1fcab7f2d0d244f2230fff976b599426734893c0f316c3d3c0fbe62bad227f8ede031736b74e99ee775dfa273371bd465f9db06a080dac
+  data.tar.gz: 91ada3731ba6290a078a1768c2127274f700681490030697b335228f2c13bfd83fef58f15206ffe9484052cc3db09205a36b1defa657c483f495fd0f0b31b086

data/.coverrails.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -1,18 +1,34 @@
 *.gem
 *.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
 
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
+.ruby-version
+.ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+- 1.9.3
+- 2.0.0

data/Gemfile

@@ -1,3 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'coveralls', require: false
+end

data/LICENSE

@@ -0,0 +1,13 @@
+Copyright (C) 2015 Yuku TAKAHASHI
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -1,6 +1,8 @@
 myslog
 ======
 
+[![Build Status](https://travis-ci.org/yuku-t/myslog.svg?branch=master)](https://travis-ci.org/yuku-t/myslog) [![Code Climate](https://codeclimate.com/github/yuku-t/myslog/badges/gpa.svg)](https://codeclimate.com/github/yuku-t/myslog) [![Coverage Status](https://coveralls.io/repos/yuku-t/myslog/badge.svg)](https://coveralls.io/r/yuku-t/myslog)
+
 MySQL slow query log parser
 
 Install

data/Rakefile

@@ -1,2 +1,5 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+task default: :spec

data/lib/myslog.rb

@@ -1,20 +1,3 @@
-#
-# MySlog
-#
-# Copyright (C) 2012 Yuku TAKAHASHI
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 require "time"
 
 class MySlog
@@ -36,7 +19,7 @@ class MySlog
       end
 
       sql = []
-      while line != nil && !line.start_with?("#")
+      while line != nil && !line.start_with?("# Time") && !line.start_with?("# User@Host") && !line.start_with?("# Query_time")
         sql << line.strip
         line = lines.shift
       end

data/myslog.gemspec

@@ -1,17 +1,16 @@
-# -*- coding:utf-8 -*-
+Gem::Specification.new do |spec|
+  spec.name          = "myslog"
+  spec.version       = "0.0.11"
+  spec.authors       = ["taka84u9"]
+  spec.email         = ["taka84u9@gmail.com"]
+  spec.summary       = "MySQL slow query parser."
+  spec.description   = "MySQL slow query parser."
+  spec.homepage      = "https://github.com/taka84u9/myslog"
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["taka84u9"]
-  gem.email         = ["taka84u9@gmail.com"]
-  gem.description   = %q{MySQL slow query parser.}
-  gem.summary       = %q{MySQL slow query parser.}
-  gem.homepage      = "https://github.com/taka84u9/myslog"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.require_paths = ["lib"]
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "myslog"
-  gem.require_paths = ["lib"]
-  gem.version       = "0.0.10"
-  gem.add_development_dependency "rspec"
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
 end

data/spec/{myslog.rb → myslog_spec.rb}

@@ -51,9 +51,9 @@ use webtie;
   describe "#parse" do
     it "should return Array of Hash" do
       results = @myslog.parse(@log)
-      results.should be_an_instance_of Array
+      expect(results).to be_an_instance_of Array
       results.each do |result|
-        results.should be_an_instance_of Array
+        expect(results).to be_an_instance_of Array
       end
     end
   end
@@ -65,9 +65,9 @@ use webtie;
 
     it "should return Array of Array" do
       results = @myslog.divide(@lines)
-      results.should be_an_instance_of Array
+      expect(results).to be_an_instance_of Array
       results.each do |result|
-        results.should be_an_instance_of Array
+        expect(results).to be_an_instance_of Array
       end
     end
 
@@ -75,24 +75,28 @@ use webtie;
       results = @myslog.divide(@lines)
 
       record = results[0]
-      record.size.should == 3
-      record[0].should ==
+      expect(record.size).to eq(3)
+      expect(record[0]).to eq(
           "# User@Host: gimp[drool] @ algernon.retards.org [10.10.10.7]"
+      )
 
       record = results[1]
-      record.size.should == 3
-      record[0].should ==
+      expect(record.size).to eq(3)
+      expect(record[0]).to eq(
           "# User@Host: gimp[drool] @ algernon.retards.org [10.10.10.7]"
+      )
 
       record = results[2]
-      record.size.should == 4
-      record[0].should ==
+      expect(record.size).to eq(4)
+      expect(record[0]).to eq(
           "# Time: 010626 10:44:50"
+      )
 
       record = results[3]
-      record.size.should == 4
-      record[0].should ==
+      expect(record.size).to eq(4)
+      expect(record[0]).to eq(
           "# Time: 010626 10:44:51"
+      )
     end
   end
 
@@ -106,10 +110,10 @@ use webtie;
       ]
       response = @myslog.parse_record(lines)
 
-      response.should be_an_instance_of Hash
+      expect(response).to be_an_instance_of Hash
       %w[
         date user host host_ip time lock_time rows_sent rows_examined sql
-      ].each { |k| response.should have_key k.to_sym}
+      ].each { |k| expect(response).to have_key k.to_sym}
     end
 
     context "given full log" do
@@ -134,15 +138,15 @@ use webtie;
         end
 
         it "should have expected values" do
-          @response[:date].to_i.should     == @date.to_i
-          @response[:user].should          == @user
-          @response[:host].should          == @host
-          @response[:host_ip].should       == @host_ip
-          @response[:query_time].should    == @query_time
-          @response[:lock_time].should     == @lock_time
-          @response[:rows_sent].should     == @rows_sent
-          @response[:rows_examined].should == @rows_examined
-          @response[:sql].should           == @sql.strip
+          expect(@response[:date].to_i).to     eq(@date.to_i)
+          expect(@response[:user]).to          eq(@user)
+          expect(@response[:host]).to          eq(@host)
+          expect(@response[:host_ip]).to       eq(@host_ip)
+          expect(@response[:query_time]).to    eq(@query_time)
+          expect(@response[:lock_time]).to     eq(@lock_time)
+          expect(@response[:rows_sent]).to     eq(@rows_sent)
+          expect(@response[:rows_examined]).to eq(@rows_examined)
+          expect(@response[:sql]).to           eq(@sql.strip)
         end
       end
     end
@@ -167,15 +171,15 @@ use webtie;
         end
 
         it "should have expected values" do
-          @response[:date].to_s.should     == "2011-10-03 14:17:38 +0900"
-          @response[:user].should          == @user
-          @response[:host].should          == @host
-          @response[:host_ip].should       == @host_ip
-          @response[:query_time].should    == @query_time
-          @response[:lock_time].should     == @lock_time
-          @response[:rows_sent].should     == @rows_sent
-          @response[:rows_examined].should == @rows_examined
-          @response[:sql].should           == @sql.strip
+          expect(@response[:date].utc.to_s).to eq("2011-10-03 05:17:38 UTC")
+          expect(@response[:user]).to          eq(@user)
+          expect(@response[:host]).to          eq(@host)
+          expect(@response[:host_ip]).to       eq(@host_ip)
+          expect(@response[:query_time]).to    eq(@query_time)
+          expect(@response[:lock_time]).to     eq(@lock_time)
+          expect(@response[:rows_sent]).to     eq(@rows_sent)
+          expect(@response[:rows_examined]).to eq(@rows_examined)
+          expect(@response[:sql]).to           eq(@sql.strip)
         end
       end
 

data/spec/spec_helper.rb

@@ -1,4 +1,9 @@
-$LOAD_PATH.unshift File.expand_path("../", __FILE__)
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "coveralls"
+Coveralls.wear!
 
 require "myslog"
+
+RSpec.configure do |config|
+  config.color = true
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,27 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: myslog
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - taka84u9
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 description: MySQL slow query parser.
@@ -31,14 +59,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".coverrails.yml"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - lib/myslog.rb
 - myslog.gemspec
-- spec/myslog.rb
+- spec/myslog_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/taka84u9/myslog
 licenses: []
@@ -49,21 +79,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MySQL slow query parser.
-test_files:
-- spec/myslog.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: 

data/Gemfile.lock

@@ -1,24 +0,0 @@
-PATH
-  remote: .
-  specs:
-    myslog (0.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  myslog!
-  rspec