cowl 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436d01bac929781a14589af2137d683976216efd
-  data.tar.gz: 21b34be19ede64bfea48b8c1318d3ce644de4212
+  metadata.gz: ec29b6542eb34b987d246605d65bbb055569cf15
+  data.tar.gz: 526d928d71c5f86fbecd4f771933f42ea73a148d
 SHA512:
-  metadata.gz: 543230d30dff94fe4b73c722786835d2d426f225010f651eeec5afb4a49e452f6670587b2a041342db5a532a124917fccdd619262359cfa8ba749fe912992bac
-  data.tar.gz: 44ab04bc4bf5782135459ea0ba832de48081d03724f9f2cc0260991c840737aa2a709679e499c465db835e203070f377f478ddcbb6aafb3a7c83e410f9aa6c85
+  metadata.gz: 1ffda0a7455741198c8889ca278c7399711ae1412181b2c0f1e0f67a13b5eebd859d8c9bc79c7df3e617e457f7e72050eee51825c5015490cc4a7b3d125bc2d2
+  data.tar.gz: 198cc9de7b84a6e70940f562578170fd01b458a4faa8a7d86da045a706d8c40c9bb56139d27b9af55e31d9e95fd9a8f6abb809966181d2516086b039ca87ec9c

data/README.md

@@ -25,6 +25,9 @@ cowl is a shell wrapper around the traditional GNU [grep](http://www.gnu.org/sof
 $ cowl examples/
 examples/hello.bf:3:++++++++[>++++[>++>+++>+++>+<<<<-]>+>+>->>+[<]<-]>>.>---.+++++++..+++.>>.<-.<.+++.------.--------.>>+.>++.
 
+$ cat examples/hello.bf | cowl
+stdin:3:++++++++[>++++[>++>+++>+++>+<<<<-]>+>+>->>+[<]<-]>>.>---.+++++++..+++.>>.<-.<.+++.------.--------.>>+.>++.
+
 $ wc -L examples/hello.bf
 106 examples/hello.bf
 
@@ -33,6 +36,13 @@ $
 
 $ cowl -i .bf examples/
 $
+
+$ cowl -h
+Usage: cowl [options] [<files>|-]
+    -i, --ignore pattern             Ignore file names matching Ruby regex pattern
+    -w, --max-width=                 Maximum column width, either an integer or "unlimited". Default: 80
+    -h, --help                       Print usage info
+    -v, --version                    Print version info
 ```
 
 # REQUIREMENTS

data/bin/cowl

@@ -12,12 +12,12 @@ CONFIGURATION_FILENAME = '.cowlrc.yml'
 def main
   ignores = DEFAULT_IGNORES
 
-  filenames = ['.']
+  filenames = ['-']
 
   configuration_flags = {}
 
   option = OptionParser.new do |option|
-    option.banner = "Usage: cowl [options] [<files>]"
+    option.banner = "Usage: cowl [options] [<files>|-]"
 
     option.on('-i', '--ignore pattern', 'Ignore file names matching Ruby regex pattern') do |pattern|
       ignores << pattern
@@ -42,20 +42,12 @@ def main
 
   filenames = ARGV unless ARGV.empty?
 
-  recursive_filenames = []
+  if filenames.empty? || filenames == ['-'] then
+    configuration_dotfile = DEFAULT_CONFIGURATION
 
-  filenames.each do |f|
-    if File.directory? f
-      recursive_filenames = recursive_filenames.concat(recursive_list(f, ignores))
-    else
-      recursive_filenames << f
-    end
-  end
+    pwd = Dir.pwd
 
-  configuration_dotfile = DEFAULT_CONFIGURATION
-
-  recursive_filenames.each do |f|
-    dir = File.expand_path("..", f)
+    dir = pwd
 
     parent_of_home = File.expand_path("..", ENV["HOME"])
 
@@ -69,8 +61,8 @@ def main
       dir = File.expand_path("..", dir)
     end
 
-    if ignores.none? { |ignore| f =~ %r(#{ignore}) } then
-      dir = File.expand_path("..", f)
+    if ignores.none? { |ignore| pwd =~ %r(#{ignore}) } then
+      dir = Dir.pwd
 
       parent_of_home = File.expand_path("..", ENV["HOME"])
 
@@ -88,7 +80,57 @@ def main
       # Command line flags override dotfile settings
       configuration = configuration_dotfile.merge(configuration_flags)
 
-      check(f, configuration)
+      check_stdin(configuration)
+    end
+  else
+    recursive_filenames = []
+
+    filenames.each do |f|
+      if File.directory? f
+        recursive_filenames = recursive_filenames.concat(recursive_list(f, ignores))
+      else
+        recursive_filenames << f
+      end
+    end
+
+    configuration_dotfile = DEFAULT_CONFIGURATION
+
+    recursive_filenames.each do |f|
+      dir = File.expand_path("..", f)
+
+      parent_of_home = File.expand_path("..", ENV["HOME"])
+
+      while dir != parent_of_home
+        ignore_file = dir + File::SEPARATOR + IGNORE_FILENAME
+
+        if File.exist?(ignore_file) then
+          ignores.concat(open(ignore_file).read.split("\n"))
+        end
+
+        dir = File.expand_path("..", dir)
+      end
+
+      if ignores.none? { |ignore| f =~ %r(#{ignore}) } then
+        dir = File.expand_path("..", f)
+
+        parent_of_home = File.expand_path("..", ENV["HOME"])
+
+        while dir != parent_of_home
+          config_file = dir + File::SEPARATOR + CONFIGURATION_FILENAME
+
+          if File.exist?(config_file) then
+            configuration_dotfile = YAML.load_file(config_file)
+            break
+          else
+            dir = File.expand_path("..", dir)
+          end
+        end
+
+        # Command line flags override dotfile settings
+        configuration = configuration_dotfile.merge(configuration_flags)
+
+        check(f, configuration)
+      end
     end
   end
 end

data/lib/cowl.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
 require 'ptools'
+require 'tempfile'
+
+$stdout.sync = true
 
 require 'version'
 
@@ -69,6 +72,28 @@ def self.recursive_list(directory, ignores = DEFAULT_IGNORES)
   end
 end
 
+def self.check_stdin(configuration = DEFAULT_CONFIGURATION)
+  max_width = configuration["max_width"]
+
+  contents = $stdin.read
+
+  t = Tempfile.new('aspelllint')
+  t.write(contents)
+  t.close
+
+  filename = t.path
+
+  if max_width != UNLIMITED
+    output = `grep -n \'^.\\{#{max_width.to_i + 1},\\}$\' \"#{filename}\"`
+
+    lines = output.split("\n")
+
+    widenings = lines.map { |line| Widening.parse('stdin', line) }
+
+    widenings.each { |m| puts m }
+  end
+end
+
 def self.check(filename, configuration = DEFAULT_CONFIGURATION)
   max_width = configuration["max_width"]
 

data/lib/version.rb

@@ -2,5 +2,5 @@
 # Cowl
 #
 module Cowl
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowl
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Andrew Pennebaker
@@ -227,12 +227,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cowl.rb
-- lib/version.rb
 - CONFIGURE.md
 - LICENSE.md
 - README.md
 - bin/cowl
+- lib/cowl.rb
+- lib/version.rb
 homepage: https://github.com/mcandre/cowl
 licenses:
 - FreeBSD
@@ -253,9 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: column width linter
 test_files: []
-has_rdoc: