utils 0.6.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27961e1f6195cb69054f6b658820b1544d33ab46
-  data.tar.gz: e0a540a6f1cb21602322d8741a349212c9330882
+  metadata.gz: fd2e201421219d45b45d2fe83a850971c3b1f311
+  data.tar.gz: 5ba5419654b33453698c6c249749b132081b4555
 SHA512:
-  metadata.gz: f13ebaa7a97cc7a8067f63149a3ecccfedf237686cdd7864cddee1e8d52fba0e411a0329fb3eb8a764c593cfb49aed8943167c74bb0ed546802511b2b36acda5
-  data.tar.gz: 81efb168bb27cd2498147c6b48f18dad0714a575dd4d516d021acd57817a2b8072d1a297890cf172bf93efb807a4879542b8166dd28c5c12e7b9528d385ef1db
+  metadata.gz: 6553dda498be7fd555abacb3cd3ef8df38d7d0e408af0fddc76f856cd21ff93c73972fd1719c1cc68e1ddff346d774162b750c736faf4e4a10d6b7f5f3dfe4df
+  data.tar.gz: aced2f21c40473b7d006abe96be590a4095a86b32a1c62e2cc9b6eb0335a8630e09c545e13ace4941baec8bc5f86114f26f90b5244051826ea307c5a0bf3dd05

data/.gitignore

@@ -1,5 +1,6 @@
 .*.sw[pon]
 .AppleDouble
+.DS_Store
 .bundle
 .rvmrc
 Gemfile.lock

data/Rakefile

@@ -12,7 +12,8 @@ GemHadar do
   bindir      'bin'
   executables Dir['bin/*'].map(&File.method(:basename))
   test_dir    'tests'
-  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', '.AppleDouble', 'tags', '.bundle'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', '.AppleDouble',
+    'tags', '.bundle', '.DS_Store'
   readme      'README.md'
 
   dependency  'tins',           '~>1.8'

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.8.0

data/bin/blameline

@@ -22,8 +22,8 @@ end
 
 for line in lines
   blamer = Utils::LineBlamer.for_line(line) or next
-  blame = blamer.perform
-  blame.sub!(/^[0-9a-f]+/) { Term::ANSIColor.yellow($&) }
+  blame = blamer.perform or next
+  blame.sub!(/^[0-9a-f^]+/) { Term::ANSIColor.yellow($&) }
   blame.sub!(/\(([^)]+)\)/) { "(#{Term::ANSIColor.red($1)})" }
   puts blame
 end

data/bin/classify

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 
+require 'utils'
 require 'tins/go'
 include Tins::GO
 require 'tins/xt/string'
+require 'term/ansicolor'
 
-$opts = go 'bdtsn:'
-
-string  = ARGV.shift or fail "need a class/filepath/filename"
-
-def path_shifter(string, separator: ?/, n: 0)
+def path_shifter(string, separator: ?/, n: nil)
   n or return string
   n, path = n.to_i, string.split(separator)
   if n < 0
@@ -21,27 +19,65 @@ end
 
 def underscore(string)
   string = path_shifter(string, n: $opts['n'], separator: '::')
-  string = string.underscore
+  string = Tins::StringUnderscore.instance_method(:underscore).bind(string).()
   $opts['s'] and string << '.rb'
-  print string
+  string
+end
+
+def parameterize(string, separator)
+  underscore(string).gsub(?/, separator) # quick and dirty
 end
 
 def camelize(string)
   string = path_shifter(string, n: $opts['n'])
   string = string.gsub(/#{Regexp.quote(File.extname(string))}\Z/, '')
-  print string.camelize
+  string.camelize
+end
+
+def camelcase?(string)
+  string[0, 1] =~ /[A-Z]/
+end
+
+def compute_shift(config, string)
+  string = underscore(string)
+  result = config.classify.shift_path_by_default
+  for prefix in config.classify.shift_path_for_prefix
+    if string.start_with? prefix
+      return prefix.count(?/) + 1
+    end
+  end
+  result
 end
 
+$opts = go 'bdtsp:n:'
+
+
+string = ARGV.shift or fail "need a class/filepath/filename"
+string = Term::ANSIColor.uncolor string
+
+config = Utils::ConfigFile.new
+config.configure_from_paths
+
+$opts['n'] ||= compute_shift(config, string)
+
 $opts['b'] and $opts['n'] = '-1'
-case
+print case
 when $opts['t']
-  if string[0, 1] =~ /[A-Z]/
-    underscore string
+  if camelcase?(string)
+    if separator = $opts['p']
+      parameterize string, separator
+    else
+      underscore string
+    end
   else
     camelize string
   end
 when $opts['d']
-  underscore string
+  if separator = $opts['p']
+    parameterize string, separator
+  else
+    underscore string
+  end
 else
   camelize string
 end

data/bin/dialog-pick

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+text=${1:-Pick}
+tags=`cat`
+lines=$(tput lines)
+columns=$(tput cols)
+
+result=$(dialog --no-items --menu "$text" $((lines - 5)) $((columns - 5)) $((lines - 10)) $tags 2>&1 1>/dev/tty)
+exitcode=$?
+echo $result
+exit $exitcode

data/bin/discover

@@ -32,10 +32,7 @@ directory and file paths that are searched.
 Options are
 
   -r          interpret PATTERN argument as regex not fuzzy
-  -d          discover directories as well
-  -D          discover only directories
   -c          disable color output
-  -i          use case insensitive matches
   -e          open the matching files with edit command
   -E          pick one file to edit
   -a CSET     use only character set CSET from PATTERN
@@ -49,14 +46,14 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:a:rdDcieEbvh'
+args = go 'I:a:rceEbvh'
 args['h'] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
 
 Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args['c']
 STDOUT.sync = true
-config = Utils::Config::ConfigFile.new
+config = Utils::ConfigFile.new
 config.configure_from_paths
 args['b'] ||= config.discover.binary
 finder = Finder.new(

data/bin/edit

@@ -32,7 +32,7 @@ end
 $opt = go 'p:S:c:g:wsmh'
 $opt['h'] and usage
 
-config = Utils::Config::ConfigFile.new
+config = Utils::ConfigFile.new
 config.configure_from_paths
 
 editor = Editor.new do |c|

data/bin/probe

@@ -92,7 +92,7 @@ def connect_server
   end
 end
 
-$config = Utils::Config::ConfigFile.new
+$config = Utils::ConfigFile.new
 $config.configure_from_paths
 testrunner_args = []
 if i = ARGV.index('--')

data/bin/rssr

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+require 'rss'
+require 'tins'
+require 'open-uri'
+require 'term/ansicolor'
+
+
+class String
+  include Term::ANSIColor
+
+  def wrap(cols: Tins::Terminal.cols)
+    split(?\n).each do |line|
+      line.size > cols and line.gsub!(/(.{1,#{cols}})(\s+|$)/, "\\1\n")
+      line.strip!
+    end * ?\n
+  end
+end
+
+IO.popen(ENV.fetch('PAGER', `which less`.chomp << ' -r'), 'w') do |pager|
+  url = ARGV.shift
+  open(url) do |rss|
+    feed = RSS::Parser.parse(rss)
+    pager.puts "Feed: #{feed.channel.title}",
+      ?– * Tins::Terminal.cols
+    feed.items.sort_by { |item| -item.date.to_f }.each do |item|
+      pager.puts(
+        "Title: #{item.title.bright_blue}",
+        "Link: #{item.link.red}",
+        "Date: #{item.date.strftime('%FT%T%z')}",
+        "",
+        item.description.wrap.chomp.white,
+        ?– * Tins::Terminal.cols
+      )
+    end
+  end
+end

data/bin/search

@@ -125,6 +125,7 @@ Options are
   -e          open the matching files with edit command
   -E          pick one file to edit
   -r REPLACE  replace the searched match with REPLACE
+  -b
   -a CSET     use only character set CSET from PATTERN
   -v          be verbose
   -h          display this help
@@ -134,14 +135,14 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'r:I:A:B:C:s:S:n:N:a:RciflLeEvh'
+args = go 'r:I:A:B:C:s:S:n:N:a:RciflLeEvbh'
 args['h'] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
 
 Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args['c']
 STDOUT.sync = true
-config = Utils::Config::ConfigFile.new
+config = Utils::ConfigFile.new
 config.configure_from_paths
 grepper = Grepper.new(
   :pattern => pattern,

data/bin/serve

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require 'tins/go'
+include Tins::GO
+require 'webrick'
+
+$opts = go 'p:h'
+
+if $opts[?h]
+  puts <<USAGE
+#{File.basename($0)} [OPTIONS] [DIR]
+USAGE
+  exit
+end
+
+port = ($opts[?p] || 8888).to_i
+s = WEBrick::HTTPServer.new(
+  Port:         port,
+  DocumentRoot: ARGV.shift || Dir.pwd
+)
+trap('INT') { s.shutdown }
+puts "You have been served: http://localhost:#{port}/"
+s.start
+

data/bin/ssh-tunnel

@@ -44,7 +44,7 @@ def cmd(string)
   exec string
 end
 
-config = Utils::Config::ConfigFile.new
+config = Utils::ConfigFile.new
 
 arguments = ARGV
 opts = go 't:n:C:m:e:hNTd', arguments

data/bin/strip_spaces

@@ -38,7 +38,7 @@ end
 
 suffix = args['I'].ask_and_send(:split, /[\s,]+/).to_a
 
-config = Utils::Config::ConfigFile.new
+config = Utils::ConfigFile.new
 config.configure_from_paths
 
 if paths

data/bin/utils-utilsrc

@@ -4,7 +4,7 @@ require 'tempfile'
 require 'utils'
 include Utils
 
-$config = Utils::Config::ConfigFile.new
+$config = Utils::ConfigFile.new
 $utilsrc = File.expand_path('~/.utilsrc')
 
 def create_default_utilsrc

data/lib/utils.rb

@@ -3,8 +3,7 @@ module Utils
   require 'utils/file_xt'
   require 'utils/md5'
   require 'utils/patterns'
-  require 'utils/config'
-  require 'utils/config/config_file'
+  require 'utils/config_file'
   require 'utils/editor'
   require 'utils/finder'
   require 'utils/grepper'

data/lib/utils/{config/config_file.rb → config_file.rb}

@@ -1,7 +1,7 @@
 require 'tins'
 require 'tins/xt/string'
 
-class Utils::Config::ConfigFile
+class Utils::ConfigFile
   class << self
     attr_accessor :config_file_paths
   end
@@ -64,13 +64,15 @@ class Utils::Config::ConfigFile
 
     def to_ruby(depth = 0)
       result = ''
-      result << ' ' * 2 * depth << "#{self.class.name[/::([^:]+)\z/, 1].underscore} do\n"
+      result << ' ' * 2 * depth <<
+        "#{self.class.name[/::([^:]+)\z/, 1].underscore} do\n"
       for name in self.class.config_settings
         value = __send__(name)
         if value.respond_to?(:to_ruby)
           result << ' ' * 2 * (depth + 1) << value.to_ruby(depth + 1)
         else
-          result << ' ' * 2 * (depth + 1) << "#{name} #{Array(value).map(&:inspect) * ', '}\n"
+          result << ' ' * 2 * (depth + 1) <<
+            "#{name} #{Array(value).map(&:inspect) * ', '}\n"
         end
       end
       result << ' ' * 2 * depth << "end\n"
@@ -244,9 +246,22 @@ class Utils::Config::ConfigFile
     @edit ||= Edit.new
   end
 
+  class Classify < BlockConfig
+    config :shift_path_by_default, 0
+
+    config :shift_path_for_prefix, []
+  end
+
+  def classify(&block)
+    if block
+      @classify = Classify.new(&block)
+    end
+    @classify ||= Classify.new
+  end
+
   def to_ruby
     result = "# vim: set ft=ruby:\n"
-    for bc in %w[search discover strip_spaces probe ssh_tunnel]
+    for bc in %w[search discover strip_spaces probe ssh_tunnel edit classify]
       result << "\n" << __send__(bc).to_ruby
     end
     result

data/lib/utils/editor.rb

@@ -9,7 +9,7 @@ module Utils
       self.wait           = false
       self.pause_duration = 1
       self.servername     = derive_server_name
-      config              = Utils::Config::ConfigFile.new
+      config              = Utils::ConfigFile.new
       config.configure_from_paths
       self.config = config.edit
       yield self if block_given?

data/lib/utils/finder.rb

@@ -11,19 +11,17 @@ class Utils::Finder
   include Term::ANSIColor
 
   def initialize(opts = {})
-    @args    = opts[:args] || {}
-    @roots   = opts[:roots] || []
-    @config = opts[:config] || Utils::Config::ConfigFile.new
+    @args  = opts[:args] || {}
+    @roots = discover_roots(opts[:roots])
+    @config = opts[:config] || Utils::ConfigFile.new
     pattern_opts = opts.subhash(:pattern) | {
       :cset  => @args['a'],
-      :icase => @args['i'],
+      :icase => @args.fetch('i', true),
     }
     @binary = @args['b']
     @pattern = @args['r'] ?
       RegexpPattern.new(pattern_opts) :
       FuzzyPattern.new(pattern_opts)
-    @directory = @args['d']
-    @only_directory = @args['D']
     @paths  = []
   end
 
@@ -38,13 +36,7 @@ class Utils::Finder
   def attempt_match?(path)
     stat = path.stat
     stat.symlink? and stat = path.lstat
-    if @only_directory
-      stat.directory?
-    elsif @directory
-      stat.directory? || ascii_file?(stat, path)
-    else
-      ascii_file?(stat, path)
-    end
+    stat.directory? || ascii_file?(stat, path)
   rescue SystemCallError => e
     warn "Caught #{e.class}: #{e}"
     nil
@@ -73,7 +65,7 @@ class Utils::Finder
       if do_match = attempt_match?(path) and @args['v']
         warn "Attempt match of #{path.inspect}"
       end
-      if do_match and match = @pattern.match(file)
+      if do_match and match = @pattern.match(path)
         if FuzzyPattern === @pattern
           current = 0
           marked_file = ''
@@ -81,8 +73,8 @@ class Utils::Finder
           for i in 1...(match.size)
             match[i] or next
             b = match.begin(i)
-            marked_file << file[current...b]
-            marked_file << red(file[b, 1])
+            marked_file << path[current...b]
+            marked_file << red(path[b, 1])
             score += (b - e)
             e = match.end(i)
             current = b + 1
@@ -90,9 +82,9 @@ class Utils::Finder
           marked_file << match.post_match
           [ score, file.size, path, File.join(dir, marked_file) ]
         else
-          marked_file = file[0...match.begin(0)] <<
-            red(file[match.begin(0)...match.end(0)]) <<
-            file[match.end(0)..-1]
+          marked_file = path[0...match.begin(0)] <<
+            red(path[match.begin(0)...match.end(0)]) <<
+            path[match.end(0)..-1]
           [ 0, file.size, path, File.join(dir, marked_file) ]
         end
       end
@@ -101,4 +93,11 @@ class Utils::Finder
     @paths, @output = paths.sort.transpose.values_at(-2, -1)
     self
   end
+
+  private
+
+  def discover_roots(roots)
+    roots ||= []
+    roots.inject([]) { |rs, r| rs.concat Dir[r] }
+  end
 end