utils 0.0.70 → 0.0.71

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1a815a0f9d45e2069c0d682b0efde84c9a6419be
+  data.tar.gz: b6dd523fc01a1ce8102707f7ba7d1c8f27eb6eac
+SHA512:
+  metadata.gz: efb4c4876cb7ffc886ca1fe9d80a1cf00adfc65ad0871f746875785ee77f25078e593b9ea1ee38aa0dba056e65edd621bc538c51773436a9fbc464f437841815
+  data.tar.gz: f9c1a77b6b875dccdccd353644094323bfaa0e064d01c328acd2406fa94e620692a6dd31929c653b6fcdb96e07956b3e47883dfb72af1f54d2da2071f06b0eb5

data/VERSION

@@ -1 +1 @@
-0.0.70
+0.0.71

data/bin/ssh-tunnel

@@ -77,7 +77,11 @@ 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 env_user = ENV['USER']
+  opts['n'] ||= env_user
+else
+  opts['n'] ||= 'session'
+end
 if opts['N']
   exec "ssh -p #{rport} -S #{sock_file} #{user}@#{remote} #{config.ssh_tunnel.multiplexer_list}"
 elsif lport
@@ -86,5 +90,7 @@ elsif lport
     " -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']}"
+  exec "ssh -p #{rport} -Mt -S #{sock_file} #{user}@#{remote} "\
+    "'#{config.ssh_tunnel.multiplexer_new(opts['n'])} || "\
+    "#{config.ssh_tunnel.multiplexer_attach(opts['n'])}'"
 end

data/lib/utils/config/config_file.rb

@@ -153,22 +153,37 @@ class Utils::Config::ConfigFile
 
     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
+      @multiplexer = terminal_multiplexer.to_s
+      @multiplexer =~ /\A(sshscreen|tmux)\z/ or
+        fail "invalid terminal_multiplexer #{terminal_multiplexer.inspect} was configured"
+    end
+
+    def multiplexer_list
+      case @multiplexer
+      when 'sshscreen'
+        'screen -ls'
+      when 'tmux'
+        'tmux ls'
+      end
+    end
+
+    def multiplexer_new(session)
+      case @multiplexer
+      when 'sshscreen'
+        'false'
+      when 'tmux'
+        'tmux new -s "%s"' % session
+      end
+    end
+
+    def multiplexer_attach(session)
+      case @multiplexer
+      when 'sshscreen'
+        'screen -DUR "%s"' % session
+      when 'tmux'
+        'tmux attach -t "%s"' % session
+      end
+    end
   end
 
   def ssh_tunnel(&block)

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.70'
+  VERSION         = '0.0.71'
   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,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.70"
+  s.version = "0.0.71"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2013-02-26"
+  s.date = "2013-02-28"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
   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"]
@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   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.25"
+  s.rubygems_version = "2.0.0"
   s.summary = "Some useful command line utilities"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    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"])

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.70
-  prerelease: 
+  version: 0.0.71
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dslkit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,17 +69,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-editline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This ruby gem provides some useful command line utilities
@@ -192,6 +181,7 @@ files:
 - utils.gemspec
 homepage: http://github.com/flori/utils
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -201,24 +191,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3707239069864148424
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Some useful command line utilities
 test_files: []