utils 0.0.69 → 0.0.70

data/Gemfile

@@ -1,6 +1,6 @@
 # vim: set filetype=ruby et sw=2 ts=2:
 
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/VERSION

@@ -1 +1 @@
-0.0.69
+0.0.70

data/bin/ssh-tunnel

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+include FileUtils::Verbose
+require 'tins/go'
+include Tins::GO
+require 'utils'
+
+SSH_CONFIG = <<SSH_CONFIG_END
+# ~/.ssh/config
+
+Host *
+  ForwardX11 = yes
+  ControlMaster auto
+  ControlPath ~/.ssh/%r@%h:%p.sock
+SSH_CONFIG_END
+
+def usage
+  puts <<EOT
+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 multplexer session to attach to (defaults to $USER)
+  -t [HOST[:PORT]]       host:port to tunnel if different from LOCALPORT
+  -l LOCALPORT           the localport to forward to
+  -C (ssh|rc)-default|rc output ssh or rc config file
+  -h                     to display this help
+
+EOT
+  exit 1
+end
+
+config = Utils::Config::ConfigFile.new
+
+arguments = ARGV
+opts = go 'l:t:n:C:hN', arguments
+
+case opts['C']
+when 'ssh-default'
+  puts SSH_CONFIG; exit
+when 'rc-default'
+  puts config.to_ruby; exit
+when 'rc'
+  config.configure_from_paths
+  puts config.to_ruby; exit
+end
+
+config.configure_from_paths
+
+usage if opts['h'] or arguments.size != 1
+
+user_remote = arguments.shift
+user, remote, rport =
+  case user_remote
+  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
+sock_file = "#{ssh_dir}/#{user}@#{remote}:#{rport}.sock"
+env_user = ENV['USER'] and opts['n'] ||= env_user
+if opts['N']
+  exec "ssh -p #{rport} -S #{sock_file} #{user}@#{remote} #{config.ssh_tunnel.multiplexer_list}"
+elsif lport
+  rm_f sock_file
+  exec "ssh -p #{rport} -Mt -L localhost:#{lport}:#{tunnel}:#{tport}"\
+    " -S #{sock_file} #{user}@#{remote} #{config.ssh_tunnel.multiplexer_attach} #{opts['n']}"
+else
+  File.exist? sock_file and rm_f sock_file
+  exec "ssh -p #{rport} -Mt -S #{sock_file} #{user}@#{remote} #{config.ssh_tunnel.multiplexer_attach} #{opts['n']}"
+end

data/lib/utils/config/config_file.rb

@@ -148,9 +148,39 @@ class Utils::Config::ConfigFile
     @strip_spaces ||= StripSpaces.new
   end
 
+  class SshTunnel < BlockConfig
+    config :terminal_multiplexer, 'sshscreen'
+
+    def initialize
+      super
+      @multiplexer =
+        case terminal_multiplexer.to_s
+        when 'sshscreen'
+          @multiplexer_list   = 'screen -ls'
+          @multiplexer_attach = 'screen -DUR'
+        when 'tmux'
+          @multiplexer_list   = 'tmux ls'
+          @multiplexer_attach = 'tmux attach'
+        else
+          fail "invalid terminal_multiplexer #{terminal_multiplexer.inspect} was configured"
+        end
+    end
+
+    attr_reader :multiplexer_list
+
+    attr_reader :multiplexer_attach
+  end
+
+  def ssh_tunnel(&block)
+    if block
+      @ssh_tunnel = SshTunnel.new(&block)
+    end
+    @ssh_tunnel ||= SshTunnel.new
+  end
+
   def to_ruby
     result = "# vim: set ft=ruby:\n"
-    for bc in %w[search discover strip_spaces probe]
+    for bc in %w[search discover strip_spaces probe ssh_tunnel]
       result << "\n" << __send__(bc).to_ruby
     end
     result

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.69'
+  VERSION         = '0.0.70'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.69"
+  s.version = "0.0.70"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-12-14"
+  s.date = "2013-02-26"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
-  s.executables = ["chroot-exec", "chroot-libs", "classify", "create_tags", "discover", "edit", "edit_wait", "enum", "errf", "git-empty", "irb_connect", "myex", "number_files", "on_change", "path", "probe", "same_files", "search", "sedit", "sshscreen", "strip_spaces", "unquarantine_apps", "untest", "utils-install-config", "utils-utilsrc", "vacuum_firefox_sqlite", "xmp"]
+  s.executables = ["create_tags", "untest", "chroot-libs", "edit_wait", "chroot-exec", "irb_connect", "number_files", "search", "strip_spaces", "path", "enum", "edit", "git-empty", "classify", "utils-install-config", "xmp", "discover", "ssh-tunnel", "myex", "probe", "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/version.rb"]
-  s.files = [".gitignore", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "TODO", "VERSION", "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/same_files", "bin/search", "bin/sedit", "bin/sshscreen", "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/version.rb", "utils.gemspec"]
+  s.files = [".gitignore", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "TODO", "VERSION", "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/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/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 = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Some useful command line utilities"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.70
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -94,33 +94,33 @@ dependencies:
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
-- 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
-- path
-- probe
-- same_files
 - search
-- sedit
-- sshscreen
 - strip_spaces
-- unquarantine_apps
-- untest
+- path
+- enum
+- edit
+- git-empty
+- classify
 - utils-install-config
+- xmp
+- discover
+- ssh-tunnel
+- myex
+- probe
+- errf
+- same_files
 - utils-utilsrc
+- unquarantine_apps
 - vacuum_firefox_sqlite
-- xmp
+- on_change
+- sedit
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -162,7 +162,7 @@ files:
 - bin/same_files
 - bin/search
 - bin/sedit
-- bin/sshscreen
+- bin/ssh-tunnel
 - bin/strip_spaces
 - bin/unquarantine_apps
 - bin/untest
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1440742416268417193
+      hash: -3707239069864148424
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Some useful command line utilities

data/bin/sshscreen

@@ -1,71 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-include FileUtils::Verbose
-require 'tins/go'
-include Tins::GO
-
-=begin
-~/.ssh/config:
-
-Host *
-  ForwardX11 = yes
-  ControlMaster auto
-  ControlPath ~/.ssh/%r@%h:%p.sock
-=end
-
-def usage
-  puts <<EOT
-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 screen session to attach to (defaults to $USER)
-  -t [TUNNEL_HOST[:TUNNEL_PORT]]    host:port to tunnel if different from LOCALPORT
-  -l LOCALPORT                      the localport to forward to if different from TUNNEL_PORT
-  -h                                to display this help
-
-EOT
-  exit 1
-end
-
-arguments = ARGV.dup
-opts = go 'l:t:n:hN', arguments
-usage if opts['h'] || arguments.size != 1
-user_remote = arguments.shift
-user, remote, rport =
-  case user_remote
-  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
-sock_file = "#{ssh_dir}/#{user}@#{remote}:#{rport}.sock"
-env_user = ENV['USER'] and opts['n'] ||= env_user
-if opts['N']
-  exec "ssh -p #{rport} -S #{sock_file} #{user}@#{remote} screen -ls"
-elsif lport
-  rm_f sock_file
-  exec "ssh -p #{rport} -Mt -L localhost:#{lport}:#{tunnel}:#{tport}"\
-    " -S #{sock_file} #{user}@#{remote} screen -DUR #{opts['n']}"
-else
-  rm_f sock_file
-  exec "ssh -p #{rport} -Mt -S #{sock_file} #{user}@#{remote} screen -DUR #{opts['n']}"
-end