utils 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8514a94586fa480b82deb20918d1d40ac89d284d
-  data.tar.gz: e53cac57b84397754de9291f73076d498b50c408
+  metadata.gz: f22ef57d6940146fca1afe065d634f6ab354dd60
+  data.tar.gz: 5b865d549b37f5dc5c8f24c29461330eaa2aea20
 SHA512:
-  metadata.gz: 3ed309d7fe82e8145414f1af30ef2b516d0742af071ec638a70fb21d83a0db1f04cac671da74b651cf17a14cb121e37f873ce85adbb9d02e96f2e27d34ec75c6
-  data.tar.gz: f59099c146fba8e204f6ba185dfceea62ddd4018d4f12a3027b38b75d4888af1e17ad9a03c08e1ca9f7f95bb31487f053df71ec0c60c737230e7e5e43265e699
+  metadata.gz: 6b0c419748b621417ac3f6708de4b0642a715162f917c7303942ba3da71f0b3b0735fd4039692a75c12a7edc3f3fed1fbb63a0c92792062001de396965296ef5
+  data.tar.gz: 1a3fe64cbf9086650c6436a5496dab2a05cc06c240eba10709e5d1a8c20a74bc767d195b5c74fa0e2fe516f5ade9fce92614381a4b1522358aaaa61263827c1b

data/.ruby-version

@@ -0,0 +1 @@
+2.1.4

data/Gemfile

@@ -3,7 +3,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :developer do
-  gem 'byebug', :platform => :ruby
-end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/blameline

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require 'tins/go'
+include Tins::GO
+require 'utils'
+require 'term/ansicolor'
+
+$opts = go 'sh'
+
+if $opts[?h]
+  puts <<USAGE
+#{File.basename($0)} [OPTIONS] [LINES|FILES]
+USAGE
+  exit
+end
+
+if $opts[?s]
+  lines = ARGF
+else
+  lines = ARGV
+end
+
+for line in lines
+  (file, line = line.source_location) or next
+  blame = `git blame -L #{line},+1 "#{file}"`
+  blame.sub!(/^[0-9a-f]+/) { Term::ANSIColor.yellow($&) }
+  blame.sub!(/\(([^)]+)\)/) { "(#{Term::ANSIColor.red($1)})" }
+  puts blame
+end

data/lib/utils.rb

@@ -11,4 +11,9 @@ module Utils
   require 'utils/probe_server'
   require 'utils/ssh_tunnel_specification'
   require 'utils/line_formatter'
+
+  require 'utils/xt/source_location_extension'
+  class ::Object
+    include Utils::Xt::SourceLocationExtension
+  end
 end

data/lib/utils/editor.rb

@@ -1,53 +1,10 @@
 require 'tins/xt/full'
-require 'tins/deep_const_get'
 require 'fileutils'
 require 'rbconfig'
 require 'pstree'
 
 module Utils
   class Editor
-    FILE_LINENUMBER_REGEXP = /\A\s*([^:]+):(\d+)/
-    CLASS_METHOD_REGEXP    = /\A([A-Z][\w:]+)([#.])([\w!?]+)/
-
-    module SourceLocationExtension
-      include Tins::DeepConstGet
-
-      def source_location
-        filename   = nil
-        linenumber = nil
-        if respond_to?(:to_str)
-          string = to_str
-          case
-          when string =~ FILE_LINENUMBER_REGEXP && File.exist?($1)
-            filename = $1
-            linenumber = $2.to_i
-          when string =~ CLASS_METHOD_REGEXP && !File.exist?(string)
-            klassname   = $1
-            method_kind = $2 == '#' ? :instance_method : :method
-            methodname  = $3
-            filename, linenumber =
-              deep_const_get(klassname).__send__(method_kind, methodname).source_location
-          else
-            filename = string
-          end
-        else
-          filename = to_s
-        end
-        array = linenumber ? [ filename, linenumber ] : [ filename, 1 ]
-        array_singleton_class = class << array; self; end
-        array_singleton_class.instance_eval do
-          define_method(:filename) { filename }
-          define_method(:linenumber) { linenumber }
-          define_method(:to_s) { [ filename, linenumber ].compact * ':' }
-        end
-        array
-      end
-    end
-
-    class ::Object
-      include SourceLocationExtension
-    end
-
     def initialize
       self.wait           = false
       self.pause_duration = 1
@@ -108,7 +65,7 @@ module Utils
     end
 
     def file_linenumber?(filename)
-      filename.match(FILE_LINENUMBER_REGEXP)
+      filename.match(Utils::Xt::SourceLocationExtension::FILE_LINENUMBER_REGEXP)
     end
 
     def expand_globs(filenames)

data/lib/utils/line_formatter.rb

@@ -1,12 +1,16 @@
 require 'tins/terminal'
 require 'term/ansicolor'
+
 begin
-  require 'rpsec'
+  begin
+    require 'rspec'
+  rescue LoadError
+  end
   require 'rspec/core/formatters/base_text_formatter'
 rescue LoadError
 end
 
-if defined? RSpec
+if defined?(RSpec) && defined?(RSpec::Core::Formatters::BaseTextFormatter)
   module Utils
     class LineFormatter < RSpec::Core::Formatters::BaseTextFormatter
       def start(example_count)

data/lib/utils/version.rb

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

data/lib/utils/xt/source_location_extension.rb

@@ -0,0 +1,44 @@
+require 'tins/deep_const_get'
+
+module Utils
+  module Xt
+    module SourceLocationExtension
+      include Tins::DeepConstGet
+
+      CLASS_METHOD_REGEXP    = /\A([A-Z][\w:]+)([#.])([\w!?]+)/
+
+      FILE_LINENUMBER_REGEXP = /\A\s*([^:]+):(\d+)/
+
+      def source_location
+        filename   = nil
+        linenumber = nil
+        if respond_to?(:to_str)
+          string = to_str
+          case
+          when string =~ FILE_LINENUMBER_REGEXP && File.exist?($1)
+            filename = $1
+            linenumber = $2.to_i
+          when string =~ CLASS_METHOD_REGEXP && !File.exist?(string)
+            klassname   = $1
+            method_kind = $2 == '#' ? :instance_method : :method
+            methodname  = $3
+            filename, linenumber =
+              deep_const_get(klassname).__send__(method_kind, methodname).source_location
+          else
+            filename = string
+          end
+        else
+          filename = to_s
+        end
+        array = linenumber ? [ filename, linenumber ] : [ filename, 1 ]
+        array_singleton_class = class << array; self; end
+        array_singleton_class.instance_eval do
+          define_method(:filename) { filename }
+          define_method(:linenumber) { linenumber }
+          define_method(:to_s) { [ filename, linenumber ].compact * ':' }
+        end
+        array
+      end
+    end
+  end
+end

data/utils.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.2.2 ruby lib
+# stub: utils 0.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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 = "2014-08-25"
+  s.date = "2015-01-14"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
-  s.executables = ["brakeman2err", "chroot-exec", "chroot-libs", "classify", "create_tags", "discover", "edit", "edit_wait", "enum", "errf", "git-empty", "irb_connect", "json_check", "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/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"]
-  s.files = [".gitignore", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "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/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/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", "utils.gemspec"]
+  s.executables = ["blameline", "brakeman2err", "chroot-exec", "chroot-libs", "classify", "create_tags", "discover", "edit", "edit_wait", "enum", "errf", "git-empty", "irb_connect", "json_check", "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/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", ".ruby-version", "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/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/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"]
   s.homepage = "http://github.com/flori/utils"
   s.rdoc_options = ["--title", "Utils - Some useful command line utilities", "--main", "README.md"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Some useful command line utilities"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,88 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pstree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pry-editline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
+- blameline
 - brakeman2err
 - chroot-exec
 - chroot-libs
@@ -130,13 +131,16 @@ extra_rdoc_files:
 - lib/utils/probe_server.rb
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
+- lib/utils/xt/source_location_extension.rb
 files:
-- .gitignore
+- ".gitignore"
+- ".ruby-version"
 - COPYING
 - Gemfile
 - README.md
 - Rakefile
 - VERSION
+- bin/blameline
 - bin/brakeman2err
 - bin/chroot-exec
 - bin/chroot-libs
@@ -189,31 +193,32 @@ files:
 - lib/utils/probe_server.rb
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
+- lib/utils/xt/source_location_extension.rb
 - utils.gemspec
 homepage: http://github.com/flori/utils
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Utils - Some useful command line utilities
-- --main
+- "--main"
 - README.md
 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Some useful command line utilities