utils 0.6.4 → 0.8.0

data/lib/utils/grepper.rb

@@ -31,8 +31,8 @@ class Utils::Grepper
 
   def initialize(opts = {})
     @args  = opts[:args] || {}
-    @roots = opts[:roots] || []
-    @config = opts[:config] || Utils::Config::ConfigFile.new
+    @roots = discover_roots(opts[:roots])
+    @config = opts[:config] || Utils::ConfigFile.new
     if n = @args.values_at(*%w[A B C]).compact.first
       if n.to_s =~ /\A\d+\Z/ and (n = n.to_i) >= 1
         @queue = Queue.new n
@@ -94,6 +94,16 @@ class Utils::Grepper
     end
     unless @output.empty?
       case
+      when @args['b']
+        @output.uniq!
+        @output.each do |l|
+          blamer = LineBlamer.for_line(l)
+          if blame = blamer.perform
+            blame.sub!(/^[0-9a-f^]+/) { Term::ANSIColor.yellow($&) }
+            blame.sub!(/\(([^)]+)\)/) { "(#{Term::ANSIColor.red($1)})" }
+            puts "#{l} #{blame}"
+          end
+        end
       when @args['l'], @args['e'], @args['E'], @args['r']
         @output.uniq!
         @paths.concat @output
@@ -114,7 +124,7 @@ class Utils::Grepper
         case
         when @args['l']
           @output << @filename
-        when @args['L'], @args['r']
+        when @args['L'], @args['r'], @args['b']
           @output << "#{@filename}:#{file.lineno}"
         when @args['e'], @args['E']
           @output << "#{@filename}:#{file.lineno}"
@@ -153,4 +163,11 @@ class Utils::Grepper
     @paths = @paths.sort_by(&:source_location)
     self
   end
+
+  private
+
+  def discover_roots(roots)
+    roots ||= []
+    roots.inject([]) { |rs, r| rs.concat Dir[r] }
+  end
 end

data/lib/utils/line_blamer.rb

@@ -9,7 +9,7 @@ module Utils
     end
 
     def perform(options = '')
-      `git blame #{options} -L #@lineno,+1 "#@file"`
+      `git 2>/dev/null blame #{options} -L #@lineno,+1 "#@file"`.full?
     end
   end
 end

data/lib/utils/patterns.rb

@@ -19,7 +19,9 @@ module Utils
     class FuzzyPattern < Pattern
       def initialize(opts ={})
         super
-        r        = @pattern.split(//).map { |x| "(#{Regexp.quote(x)})" } * '.*?'
+        r = @pattern.split(//).grep(/[0-9a-z]/).map { |x|
+          "(#{Regexp.quote(x)})"
+        } * '.*?'
         @matcher = Regexp.new(
           "\\A(?:.*/.*?#{r}|.*#{r})",
           @icase ? Regexp::IGNORECASE : 0)

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.6.4'
+  VERSION         = '0.8.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.6.4 ruby lib
+# stub: utils 0.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.6.4"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2016-04-11"
+  s.date = "2016-09-30"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
-  s.executables = ["blameline", "brakeman2err", "chroot-exec", "chroot-libs", "classify", "create_tags", "discover", "edit", "edit_wait", "enum", "errf", "git-empty", "irb_connect", "json_check", "long_lines", "myex", "number_files", "on_change", "path", "probe", "remote_copy", "same_files", "search", "sedit", "ssh-tunnel", "strip_spaces", "unquarantine_apps", "untest", "utils-install-config", "utils-utilsrc", "vacuum_firefox_sqlite", "xmp"]
-  s.extra_rdoc_files = ["README.md", "lib/utils.rb", "lib/utils/config.rb", "lib/utils/config/config_file.rb", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/irb.rb", "lib/utils/irb/service.rb", "lib/utils/line_blamer.rb", "lib/utils/line_formatter.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/ssh_tunnel_specification.rb", "lib/utils/version.rb", "lib/utils/xt/source_location_extension.rb"]
-  s.files = [".gitignore", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "bin/blameline", "bin/brakeman2err", "bin/chroot-exec", "bin/chroot-libs", "bin/classify", "bin/create_tags", "bin/discover", "bin/edit", "bin/edit_wait", "bin/enum", "bin/errf", "bin/git-empty", "bin/irb_connect", "bin/json_check", "bin/long_lines", "bin/myex", "bin/number_files", "bin/on_change", "bin/path", "bin/probe", "bin/remote_copy", "bin/same_files", "bin/search", "bin/sedit", "bin/ssh-tunnel", "bin/strip_spaces", "bin/unquarantine_apps", "bin/untest", "bin/utils-install-config", "bin/utils-utilsrc", "bin/vacuum_firefox_sqlite", "bin/xmp", "lib/utils.rb", "lib/utils/config.rb", "lib/utils/config/config_file.rb", "lib/utils/config/gdb/asm", "lib/utils/config/gdb/ruby", "lib/utils/config/gdbinit", "lib/utils/config/irbrc", "lib/utils/config/rdebugrc", "lib/utils/config/rvmrc", "lib/utils/config/screenrc", "lib/utils/config/utilsrc", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/irb.rb", "lib/utils/irb/service.rb", "lib/utils/line_blamer.rb", "lib/utils/line_formatter.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/ssh_tunnel_specification.rb", "lib/utils/version.rb", "lib/utils/xt/source_location_extension.rb", "utils.gemspec", "utils.gemspec "]
+  s.executables = ["blameline", "brakeman2err", "chroot-exec", "chroot-libs", "classify", "create_tags", "dialog-pick", "discover", "edit", "edit_wait", "enum", "errf", "git-empty", "irb_connect", "json_check", "long_lines", "myex", "number_files", "on_change", "path", "probe", "remote_copy", "rssr", "same_files", "search", "sedit", "serve", "ssh-tunnel", "strip_spaces", "unquarantine_apps", "untest", "utils-utilsrc", "vacuum_firefox_sqlite", "xmp"]
+  s.extra_rdoc_files = ["README.md", "lib/utils.rb", "lib/utils/config_file.rb", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/irb.rb", "lib/utils/irb/service.rb", "lib/utils/line_blamer.rb", "lib/utils/line_formatter.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/ssh_tunnel_specification.rb", "lib/utils/version.rb", "lib/utils/xt/source_location_extension.rb"]
+  s.files = [".gitignore", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "bin/blameline", "bin/brakeman2err", "bin/chroot-exec", "bin/chroot-libs", "bin/classify", "bin/create_tags", "bin/dialog-pick", "bin/discover", "bin/edit", "bin/edit_wait", "bin/enum", "bin/errf", "bin/git-empty", "bin/irb_connect", "bin/json_check", "bin/long_lines", "bin/myex", "bin/number_files", "bin/on_change", "bin/path", "bin/probe", "bin/remote_copy", "bin/rssr", "bin/same_files", "bin/search", "bin/sedit", "bin/serve", "bin/ssh-tunnel", "bin/strip_spaces", "bin/unquarantine_apps", "bin/untest", "bin/utils-utilsrc", "bin/vacuum_firefox_sqlite", "bin/xmp", "lib/utils.rb", "lib/utils/config_file.rb", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/irb.rb", "lib/utils/irb/service.rb", "lib/utils/line_blamer.rb", "lib/utils/line_formatter.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/ssh_tunnel_specification.rb", "lib/utils/version.rb", "lib/utils/xt/source_location_extension.rb", "utils.gemspec", "utils.gemspec "]
   s.homepage = "http://github.com/flori/utils"
   s.rdoc_options = ["--title", "Utils - Some useful command line utilities", "--main", "README.md"]
   s.rubygems_version = "2.5.1"
@@ -23,20 +23,20 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 1.7.0"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 1.8.0"])
       s.add_runtime_dependency(%q<tins>, ["~> 1.8"])
       s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.3"])
       s.add_runtime_dependency(%q<pstree>, ["~> 0.1"])
       s.add_runtime_dependency(%q<pry-editline>, [">= 0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 1.7.0"])
+      s.add_dependency(%q<gem_hadar>, ["~> 1.8.0"])
       s.add_dependency(%q<tins>, ["~> 1.8"])
       s.add_dependency(%q<term-ansicolor>, ["~> 1.3"])
       s.add_dependency(%q<pstree>, ["~> 0.1"])
       s.add_dependency(%q<pry-editline>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 1.7.0"])
+    s.add_dependency(%q<gem_hadar>, ["~> 1.8.0"])
     s.add_dependency(%q<tins>, ["~> 1.8"])
     s.add_dependency(%q<term-ansicolor>, ["~> 1.3"])
     s.add_dependency(%q<pstree>, ["~> 0.1"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ executables:
 - chroot-libs
 - classify
 - create_tags
+- dialog-pick
 - discover
 - edit
 - edit_wait
@@ -104,14 +105,15 @@ executables:
 - path
 - probe
 - remote_copy
+- rssr
 - same_files
 - search
 - sedit
+- serve
 - ssh-tunnel
 - strip_spaces
 - unquarantine_apps
 - untest
-- utils-install-config
 - utils-utilsrc
 - vacuum_firefox_sqlite
 - xmp
@@ -119,8 +121,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - lib/utils.rb
-- lib/utils/config.rb
-- lib/utils/config/config_file.rb
+- lib/utils/config_file.rb
 - lib/utils/editor.rb
 - lib/utils/file_xt.rb
 - lib/utils/finder.rb
@@ -148,6 +149,7 @@ files:
 - bin/chroot-libs
 - bin/classify
 - bin/create_tags
+- bin/dialog-pick
 - bin/discover
 - bin/edit
 - bin/edit_wait
@@ -163,28 +165,20 @@ files:
 - bin/path
 - bin/probe
 - bin/remote_copy
+- bin/rssr
 - bin/same_files
 - bin/search
 - bin/sedit
+- bin/serve
 - bin/ssh-tunnel
 - bin/strip_spaces
 - bin/unquarantine_apps
 - bin/untest
-- bin/utils-install-config
 - bin/utils-utilsrc
 - bin/vacuum_firefox_sqlite
 - bin/xmp
 - lib/utils.rb
-- lib/utils/config.rb
-- lib/utils/config/config_file.rb
-- lib/utils/config/gdb/asm
-- lib/utils/config/gdb/ruby
-- lib/utils/config/gdbinit
-- lib/utils/config/irbrc
-- lib/utils/config/rdebugrc
-- lib/utils/config/rvmrc
-- lib/utils/config/screenrc
-- lib/utils/config/utilsrc
+- lib/utils/config_file.rb
 - lib/utils/editor.rb
 - lib/utils/file_xt.rb
 - lib/utils/finder.rb

data/bin/utils-install-config

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'utils'
-
-puts 'Install config into home directory? (yes/NO)'
-if gets =~ /^yes$/i
-  Utils::Config.install_config
-else
-  exit 1
-end

data/lib/utils/config.rb

@@ -1,23 +0,0 @@
-require 'fileutils'
-
-module Utils
-  module Config
-    extend FileUtils::Verbose
-
-    CONFIG_DIR = File.expand_path(__FILE__).sub(/#{Regexp.quote(File.extname(__FILE__))}\Z/, '')
-
-    def self.install_config
-      srcs = Dir[File.join(CONFIG_DIR, '*')]
-      dst_prefix = ENV['HOME'] or fail 'environment variable $HOME is required'
-      for src in srcs
-        dst = File.join(dst_prefix, ".#{File.basename(src)}")
-        if File.exist?(dst)
-          rm_rf "#{dst}.bak"
-          mv dst, "#{dst}.bak/", :force => true
-        end
-        cp_r src, dst
-      end
-      self
-    end
-  end
-end

data/lib/utils/config/gdb/asm

@@ -1,179 +0,0 @@
-
-# ASM DEBUGGING
-# define special help command "h" that shows asm related commands only
-#
-define h
-echo -------\n
-echo asm debugging commands, see "help" for other gdb comands\n
-echo \ \n
-echo g <adr>  exec & set temp break <adr>     u <n> disassemble from pc n times\n
-echo c  run program (continue)                uu <adr> <n> disassemble from adr n times\n
-echo n  step one instruction                  ss <n> show stack n locations\n
-echo nn  step but do not enter calls          r  show registers\n
-echo until  step or run to end of loop        db <adr> <n> display bytes\n
-echo \                                         dw <adr> <n> display words\n
-echo q  quit gdb                              dd <adr> <n> display dword\n
-echo \                                         ds <adr> <n> display string\n
-echo bs  show breaks                                                      \n
-echo bc  clear breaks                                                     \n
-echo                                                                     \n
-echo modifying the code within gdb requires reload, recompile easier? \n
-echo to change register -> set $eax = 0x123456 \n
-echo ------\n
-end
-#
-# set gdb initialization flags - change these as needed
-#
-# eliminate the pesky exit message that says program is running
-set confirm off
-set language asm
-# set disassembly-flavor intel
-# enable the following to work in hex, the default is decimal
-set output-radix 16
-set input-radix 16
-#
-# disable pesky hook messages?? this may not be necessary in other versions of gdb
-#
-define hook-stop
-end
-define hook-continue
-end
-#------------- define special commands for assembler -------------------
-#
-# go (run) to temporary break location "g <label>"
-#
-define g
-tbreak $arg0
-continue
-x/1i $pc
-echo ----------\n
-end
-#
-# show stack  "ss <n>" where n is number of entries to show
-#
-define ss
-x/$arg0xh $esp-(4 * $arg0)
-end
-#
-# define nn to single step over calls
-#
-define nn
-echo --------------
-nexti
-printf "eax=%x ebx=%x ecx=%x edx=%x esi=%x edi=%x ebp=%x esp=%x\n",$eax,$ebx,$ecx,$edx,$esi,$edi,$ebp,$esp
-x /4i $pc
-end
-#
-# define n to single step one instruction
-#
-define n
-echo line-
-si
-printf "eax=%x ebx=%x ecx=%x edx=%x esi=%x edi=%x ebp=%x esp=%x eflags=%x\n",$eax,$ebx,$ecx,$edx,$esi,$edi,$ebp,$esp,$eflags
-#disassemble $pc $pc+14
-x /4i $pc
-end
-#
-# define "u <n>"  to disassemble n locations from $pc
-#
-define u
-# x/$arg0i $eip
- disassemble $eip $eip+$arg0
-#disassemble $arg0
- end
-#
-# define "uu <label> <n>"  to disassemble n locations from given label
-#
-define uu
-x/$arg1i $arg0
-# disassemble $arg0 $arg0+$arg1
- end
-#
-# define "bs" show breaks
-#
-define bs
-info break
-end
-#
-# define "bc" clear all breakpoints
-#
-define bc
-delete
-end
-#
-# define "r" show  registers
-#
-define r
-echo -----\n
-printf "eax=%x ebx=%x ecx=%x edx=%x esi=%x edi=%x ebp=%x\n",$eax,$ebx,$ecx,$edx,$esi,$edi,$ebp
-printf "esp=%x   eip=%x   flag=%x -->     O D I T   S Z - AC  - P - C\n",$esp,$eip,$eflags
-echo flags= Overflow, Direction, Interrupt, Trap, Sign, Zero, AuxCarry, Parity, Carry\n
-x/i $pc
-echo -----\n
-end
-#
-# define "db <adr> <n>"  display <n> bytes at <adr>
-#
-define db
-x/$arg1xb $arg0
-end
-#
-# define "dw <adr> <n>"  display <n> words at <adr>
-#
-define dw
-x/$arg1xh $arg0
-end
-#
-# define "dd <adr> <n>"  display <n> dwords at <adr>
-#
-define dd
-x/$arg1xw $arg0
-end
-#
-# define "ds <adr> <n>"  display <n> char(ascii) at <adr>
-#
-define ds
-x/$arg1cb $arg0
-end
-
-# attempt a string display...
-define dstr
-x /1sb &$arg0
-end
-
-
-set $asm_instruction_counter = 0
-define icount
-  print "stepi instructions: %d\n", $asm_instruction_counter
-end
-
-define hook-n
-  set $asm_instruction_counter = $asm_instruction_counter + 1
-end
-
-define icountreset
-  set $asm_instruction_counter = 0
-end
-
-#
-# start of code initialization ----------------------
-#
-# to initialize gdb we need to use the "run" command once, first
-# we display the current instruction, then set a break at next location.
-# Warning - the first instruction must be one byte long.
-# Next, we start the program executing (run) then clear all breakpoints.
-#
-
-# x /1i *_start
-# echo ---------------
-# break *_start+1
-# run
-# delete
-# x /1i *_start+1
-
-echo \n---------\n
-echo for some reason nasm symbols appear as functions?  ignore\n
-echo symbol related warnings.\n
-echo \n
-echo -------- type <h> for asm cmds  <help> for gdb commands\n
-