utils 0.0.99 → 0.0.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67939ce99b900f52e390e0a417750092cc04877f
-  data.tar.gz: acfd86203297a5c4a7e2a216035d37c34c0b2457
+  metadata.gz: 480fb60da986380af2ebf724286e23f377893db2
+  data.tar.gz: b8094ae10a9b048bf1893e23c79f9556547de534
 SHA512:
-  metadata.gz: 76e4fa870b13bce0fe920dea5516c57ad42b1e9a8f5ac0e27e74193c6b269d9e7e62abf3091b925348bb940a65b88b41bb6ea29d13635358fa695c6951a78efe
-  data.tar.gz: 090fcc6f5f80202a1225abef6f87103a67acc17b9173742a72012403d975cc69a7f6735ac743e9b3368835d596c369000e304ce80465e37b0c5b5333ce58b1bf
+  metadata.gz: 41259059f1493fd2994f111dde35371edf43e3a2584766d04f150eaab1dce7fdb4677059b14c156cc3f8c410945dcc294ee57e0aa6afea3750485b44671332f2
+  data.tar.gz: ba71dc743cae3e3ba21fb1a3c32c384855a44006111edeb4c3a883e4391f6af314042822853ef25244e25d07a9c905a29f9b97c0692b979acb70eb502e2ae50b

data/.gitignore

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

data/Gemfile

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

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-0.0.99
+0.0.100

data/bin/chroot-libs

@@ -17,6 +17,10 @@ libs.concat ARGV
 cd dir do
   cp executable, File.basename(executable)
   for l in libs
-    cp l, File.basename(l)
+    begin
+      cp l, File.basename(l)
+    rescue Errno::ENOENT => e
+      warn "Caught #{e.class}: #{e}"
+    end
   end
 end

data/bin/ssh-tunnel

@@ -2,9 +2,13 @@
 
 require 'fileutils'
 include FileUtils::Verbose
-require 'tins/go'
+require 'tins/xt'
 include Tins::GO
 require 'utils'
+require 'pstree'
+require 'term/ansicolor'
+include Term::ANSIColor
+Term::ANSIColor.coloring = STDOUT.tty?
 
 SSH_CONFIG = <<SSH_CONFIG_END
 # ~/.ssh/config
@@ -20,31 +24,52 @@ def usage
 Usage: #{File.basename($0)} [OPTS] [user@]remote[:port]"
 
 OPTS is one of
-  -N                     list all session names on the specified remote
-  -n NAME                name of the multiplexer session to attach to (defaults to $USER)
-  -t [HOST[:PORT]]       host:port to tunnel if different from LOCALPORT
-  -m screen|tmux         use sshscreen or tmux as a terminal multiplexer
-  -l LOCALPORT           the localport to forward to
-  -C (ssh|rc)-default|rc output ssh or rc config file
-  -h                     to display this help
+  -N                                  list all session names on the specified remote
+  -n NAME                             name of the multiplexer session (default: $USER)
+  -T                                  list current tunnels
+  -e VARIABLE=VALUE [...]             set variables to values
+  -t [LHOST:][LPORT:][HOST:PORT|PORT] host:port to tunnel if different from LOCALPORT
+  -m screen|tmux                      use sshscreen or tmux as a terminal multiplexer
+  -C (ssh|rc)-default|rc              output ssh or rc config file
+  -d                                  enable debugging
+  -h                                  to display this help
 
 EOT
   exit 1
 end
 
+def cmd(string)
+  $DEBUG and warn "Executing: #{string.inspect}"
+  exec string
+end
+
 config = Utils::Config::ConfigFile.new
 
 arguments = ARGV
-opts = go 'l:t:n:C:m:hN', arguments
+opts = go 't:n:C:m:e:hNTd', arguments
+
+$DEBUG = opts['d']
+
+if opts['T']
+  tunnels = PSTree.new.select { |pt| pt.user == ENV['USER'] && pt.cmd =~ /ssh.*-L/ }
+  tunnels.map! do |pt|
+    cmd = pt.cmd
+    cmd.gsub!(/(?<=\s)[^\/\s]+@\S+/) { |t| red(t) }
+    cmd.gsub!(/-L\s+\S+/) { |t| green(t) }
+    "#{yellow(pt.pid.to_s)} #{cmd}"
+  end
+  STDOUT.puts tunnels
+  exit 0
+end
 
 case opts['C']
 when 'ssh-default'
-  puts SSH_CONFIG; exit
+  STDOUT.puts SSH_CONFIG; exit
 when 'rc-default'
-  puts config.to_ruby; exit
+  STDOUT.puts config.to_ruby; exit
 when 'rc'
   config.configure_from_paths
-  puts config.to_ruby; exit
+  STDOUT.puts config.to_ruby; exit
 end
 
 config.configure_from_paths
@@ -58,26 +83,13 @@ end
 user_remote = arguments.shift
 user, remote, rport =
   case user_remote
-  when /\A(?:([^@:]+)@)?([^@:]+)(?::(\d+))?\Z/
+  when /\A(?:([^@:]+)@)?([^@:]+)(?::(\d+))?\z/
     user = $1 || ENV['USER']
     user.to_s.empty? and fail "user required to login"
     [ user, $2, $3 || '22' ]
   else
     usage
   end
-lport = opts['l']
-tunnel, tport = nil, nil
-if tunnel_port = opts['t']
-  case tunnel_port
-  when /\A([^:]+)(?::(\d+))?\Z/
-    tunnel, tport = $1, $2 || '22'
-    lport ||= tport
-  else
-    usage
-  end
-else
-  tunnel, tport = 'localhost', lport
-end
 
 ssh_dir = File.expand_path('~/.ssh')
 mkdir_p ssh_dir
@@ -88,23 +100,30 @@ else
   opts['n'] ||= 'session'
 end
 if opts['N']
-  exec "ssh -p #{rport} -S #{sock_file} #{user}@#{remote} #{config.ssh_tunnel.multiplexer_list}"
+  cmd "ssh -p #{rport} -S #{sock_file} #{user}@#{remote} #{config.ssh_tunnel.multiplexer_list}"
 else
-  env = []
   File.exist? sock_file and rm_f sock_file
-  r = config.ssh_tunnel.copy_paste.full? do |t|
+  env, tunnels = [], []
+  config.ssh_tunnel.copy_paste.full? do |t|
     env << "COPY_REMOTE_HOST_PORT='#{t.bind_address}:#{t.port}'"
-    " -R #{t}"
+    tunnels << "-R #{t}"
   end
-  env *= ' '
-  if lport
-    exec "ssh -p #{rport} -Mt -L localhost:#{lport}:#{tunnel}:#{tport}#{r} "\
-      "-S #{sock_file} #{user}@#{remote} "\
-        "'env #{env} #{config.ssh_tunnel.multiplexer_new(opts['n'])} || "\
-        "#{config.ssh_tunnel.multiplexer_attach(opts['n'])}'"
-  else
-    exec "ssh -p #{rport} -Mt -S #{sock_file} #{user}@#{remote}#{r} "\
-      "'env #{env} #{config.ssh_tunnel.multiplexer_new(opts['n'])} || "\
-      "#{config.ssh_tunnel.multiplexer_attach(opts['n'])}'"
+  opts['t'].to_a.each do |tunnel_spec|
+    if arg = Utils::SshTunnelSpecification.new(tunnel_spec).valid?
+      tunnels << "-L #{arg}"
+    else
+      usage
+    end
+  end
+  config.ssh_tunnel.env.each do |var, val|
+    ENV[var.to_s] = val.to_s
   end
+  opts['e'].to_a.each do |setting|
+    var, val = setting.split('=', 2)
+    ENV[var] = val
+  end
+  cmd "ssh -p #{rport} -Mt  "\
+    "-S #{sock_file} #{user}@#{remote} #{tunnels * ' '} "\
+      "'env #{env * ' '} #{config.ssh_tunnel.multiplexer_new(opts['n'])} || "\
+      "#{config.ssh_tunnel.multiplexer_attach(opts['n'])}'"
 end

data/lib/utils.rb

@@ -9,4 +9,5 @@ module Utils
   require 'utils/finder'
   require 'utils/grepper'
   require 'utils/probe_server'
+  require 'utils/ssh_tunnel_specification'
 end

data/lib/utils/config/config_file.rb

@@ -156,6 +156,8 @@ class Utils::Config::ConfigFile
   class SshTunnel < BlockConfig
     config :terminal_multiplexer, 'screen'
 
+    config :env, {}
+
     def initialize
       super
       self.terminal_multiplexer = terminal_multiplexer

data/lib/utils/ssh_tunnel_specification.rb

@@ -0,0 +1,47 @@
+module Utils
+  class SshTunnelSpecification
+    def initialize(spec_string)
+      interpret_spec(spec_string)
+    end
+
+    attr_reader :local_addr
+
+    attr_reader :local_port
+
+    attr_reader :remote_addr
+
+    attr_reader :remote_port
+
+    def to_a
+      [ local_addr, local_port, remote_addr, remote_port ]
+    end
+
+    def valid?
+      if to_a.all?
+        to_s
+      end
+    end
+
+    def to_s
+      to_a * ':'
+    end
+
+    private
+
+    def interpret_spec(spec_string)
+      @local_addr, @local_port, @remote_addr, @remote_port =
+        case spec_string
+        when /\A(\d+)\z/
+          [ 'localhost', $1.to_i, 'localhost', $1.to_i ]
+        when /\A(\[[^\]]+\]|[^:]+):(\d+)\z/
+          [ 'localhost', $2.to_i, $1, $2.to_i ]
+        when /\A(\d+):(\[[^\]]+\]|[^:]+):(\d+)\z/
+          [ 'localhost', $1.to_i, $2, $3.to_i ]
+        when /\A(\[[^\]]+\]|[^:]+):(\[[^\]]+\]|[^:]+):(\d+)\z/
+          [ $1, $3.to_i, $2, $3.to_i ]
+        when /\A(\[[^\]]+\]|[^:]+):(\d+):(\[[^\]]+\]|[^:]+):(\d+)\z/
+          [ $1, $2.to_i, $3, $4.to_i ]
+        end
+    end
+  end
+end

data/lib/utils/version.rb

@@ -1,7 +1,7 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.99'
-  VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
+  VERSION         = '0.0.100'
+  VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
   VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:

data/utils.gemspec

@@ -1,36 +1,36 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.0.99 ruby lib
+# stub: utils 0.0.100 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.99"
+  s.version = "0.0.100"
 
   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 = "2013-10-09"
+  s.date = "2014-01-30"
   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", "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.rdoc", "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/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/version.rb"]
-  s.files = [".gitignore", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "TODO", "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/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/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/version.rb", "utils.gemspec"]
+  s.executables = ["create_tags", "untest", "chroot-libs", "edit_wait", "chroot-exec", "irb_connect", "number_files", "search", "strip_spaces", "path", "enum", "brakeman2err", "edit", "git-empty", "classify", "utils-install-config", "xmp", "discover", "ssh-tunnel", "myex", "probe", "remote_copy", "errf", "same_files", "utils-utilsrc", "unquarantine_apps", "vacuum_firefox_sqlite", "on_change", "sedit"]
+  s.extra_rdoc_files = ["README.rdoc", "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/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.rdoc", "Rakefile", "TODO", "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/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/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/ssh_tunnel_specification.rb", "lib/utils/version.rb", "utils.gemspec"]
   s.homepage = "http://github.com/flori/utils"
   s.rdoc_options = ["--title", "Utils - Some useful command line utilities", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.5"
+  s.rubygems_version = "2.2.1"
   s.summary = "Some useful command line utilities"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.3.2"])
       s.add_runtime_dependency(%q<tins>, [">= 0.8.3", "~> 0.8"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.2.2", "~> 1.2"])
       s.add_runtime_dependency(%q<dslkit>, ["~> 0.2.10"])
       s.add_runtime_dependency(%q<pstree>, [">= 0"])
       s.add_runtime_dependency(%q<pry-editline>, [">= 0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.3.2"])
       s.add_dependency(%q<tins>, [">= 0.8.3", "~> 0.8"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.2.2", "~> 1.2"])
       s.add_dependency(%q<dslkit>, ["~> 0.2.10"])
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry-editline>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.3.2"])
     s.add_dependency(%q<tins>, [">= 0.8.3", "~> 0.8"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.2.2", "~> 1.2"])
     s.add_dependency(%q<dslkit>, ["~> 0.2.10"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.99
+  version: 0.0.100
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2014-01-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: 0.1.8
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -109,35 +109,35 @@ dependencies:
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
-- brakeman2err
-- chroot-exec
-- chroot-libs
-- classify
 - create_tags
-- discover
-- edit
+- untest
+- chroot-libs
 - edit_wait
-- enum
-- errf
-- git-empty
+- chroot-exec
 - irb_connect
-- myex
 - number_files
-- on_change
+- search
+- strip_spaces
 - path
+- enum
+- brakeman2err
+- edit
+- git-empty
+- classify
+- utils-install-config
+- xmp
+- discover
+- ssh-tunnel
+- myex
 - probe
 - remote_copy
+- errf
 - same_files
-- search
-- sedit
-- ssh-tunnel
-- strip_spaces
-- unquarantine_apps
-- untest
-- utils-install-config
 - utils-utilsrc
+- unquarantine_apps
 - vacuum_firefox_sqlite
-- xmp
+- on_change
+- sedit
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -152,6 +152,7 @@ extra_rdoc_files:
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
 - lib/utils/probe_server.rb
+- lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
 files:
 - .gitignore
@@ -209,6 +210,7 @@ files:
 - 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
 homepage: http://github.com/flori/utils
@@ -234,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Some useful command line utilities