sqlint 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a659c0622ca330e784dfecef69f5c0545f79836
-  data.tar.gz: 14ad1e500274a2b00a98cb20ea3f58fe2eb2c5a4
+  metadata.gz: b14888e061953471546b3c17225b83b056b2d738
+  data.tar.gz: 3d760e0838c3a4ca4caa03e397d443c52b1cf131
 SHA512:
-  metadata.gz: 52bfbfbfc45980d7398932b0098f152bd1e8ffa0a55e0acfa09480634553b58c0d63cbdd3490883b48ba4aa7202bee65252e0ff6cb7121e951d92183b3f8fb03
-  data.tar.gz: 8f30c0e45b775eafd0e062e655d2d8bfba4fe2002049c7c6e7ced55da7581a8adf63cc58801eab91f7a97083299bb00e30b78ab32649574a808abc272cd1f501
+  metadata.gz: 19bcbb3e7c9532b315a3c55f6624f89eb9fd449b8bdd65b13b4bcf15ed1585d5ab1dfa88588814bf52bea190663519b9c1df9affb53f8e9d6ea70881e614bcde
+  data.tar.gz: e7640ef540312e72b0f1a68d3664ec29b0f7accd83d38e122bf79bcbb2a5af8966a0399e158a51c1d1499b1539f5736d8d45c139bd36366bdd442ac9ab9be20e

data/README.md

@@ -35,7 +35,7 @@ Support for `sqlint` is provided for the following editors:
 
 - Emacs, via [Flycheck](https://github.com/flycheck/flycheck)
 - VIM, via [Syntastic](https://github.com/scrooloose/syntastic)
-- SublimeText, via the SublimeLinter package ([submission pending](https://github.com/SublimeLinter/SublimeLinter3/issues/297))
+- SublimeText, via [SublimeLinter](https://github.com/SublimeLinter/SublimeLinter3/)
 
 ### Authors
 

data/bin/sqlint

@@ -5,14 +5,12 @@ require 'pg_query'
 require 'sqlint'
 require 'optparse'
 
-LIMIT = 1000
-
 options = { limit: 1000 }
 optparse = OptionParser.new do |opts|
-  opts.banner = "Usage: #{File.basename($0)} [options] file.sql ..."
+  opts.banner = "Usage: #{File.basename($0)} [options] [file.sql ...]"
   opts.separator ""
   opts.separator "Options:"
-  opts.on("--limit=N", Integer, "Limit checking to N errors") do |n|
+  opts.on("--limit=N", Integer, "Limit checking to N errors (default: #{options[:limit]})") do |n|
     options[:limit] = n
   end
   opts.on_tail("-h", "--help", "Print this help") do
@@ -25,10 +23,6 @@ optparse = OptionParser.new do |opts|
   end
 end
 optparse.parse!(ARGV)
-if ARGV.empty?
-  puts optparse
-  exit 1
-end
 
 ERROR_TYPES = {error: "ERROR", warning: "WARNING"}
 
@@ -40,25 +34,38 @@ class String
   end
 end
 
-saw_errors = false
-ARGV.each do |filename|
-  File.open(filename, 'r') do |file|
-    results = SQLint::Linter.new(filename, file).run.first(options[:limit])
-    results.each do |lint|
-      message_lines = lint.message.split("\n")
-      puts [
-        lint.filename,
-        lint.line,
-        lint.column,
-        ERROR_TYPES[lint.type] + " " + message_lines.shift.sanitise
-      ].join(":")
-      message_lines.each do |line|
-        puts "  " + line.sanitise
-      end
+def display_lint(lint)
+  message_lines = lint.message.split("\n")
+  puts [
+    lint.filename,
+    lint.line,
+    lint.column,
+    ERROR_TYPES[lint.type] + " " + message_lines.shift.sanitise
+  ].join(":")
+  message_lines.each do |line|
+    puts "  " + line.sanitise
+  end
+end
 
-      saw_errors ||= (lint.type == :error)
+def each_input_file(&block)
+  if ARGV.empty?
+    yield [STDIN, "stdin"]
+  else
+    ARGV.each do |filename|
+      File.open(filename, 'r') do |file|
+        yield [file, filename]
+      end
     end
   end
 end
 
+saw_errors = false
+each_input_file do |file, filename|
+  results = SQLint::Linter.new(filename, file).run.first(options[:limit])
+  results.each do |lint|
+    display_lint(lint)
+  end
+  saw_errors ||= results.any? { |lint| lint.type == :error }
+end
+
 exit 1 if saw_errors

data/lib/sqlint/version.rb

@@ -1,3 +1,3 @@
 module SQLint
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlint
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Steve Purcell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_query
@@ -67,8 +67,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: |2
-      Simple SQL linter.
+description: "    Simple SQL linter.\n"
 email: steve@sanityinc.com
 executables:
 - sqlint