utils 0.0.72 → 0.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 272f15d17775ad53ee538f56dcbd7155f01b4475
-  data.tar.gz: cc71c73c94a73b7fde073866b1ac01e2057ae5be
+  metadata.gz: 3f84a7cb62fc30ec50975afed3993c85e1e75f85
+  data.tar.gz: 05bd623454afa06895fe78afe24a887dce12aec4
 SHA512:
-  metadata.gz: 3c9045a504b98e3641216eee232589b2b35872f6c32eacafeb81f62c5265714c20589eef1de2ea9b36ae422b1b020607c48b062c997960d6ce58bcaf37e8f086
-  data.tar.gz: 14b6b06dea7616ba5afa3c78b1151665abf46986800a7c36485b41721d77361d9b52325d23dee541aedd3fcdfa8a7fb559fd0a91fd2aa0e7b563d39d5921a6d3
+  metadata.gz: 51e718468925a4976022cf87a58ec13db90fce4b7ce241d024e0110fabf939010b0724fe449159ebd6514e21906136d9c65d074f174e9642b4dd02642cc64916
+  data.tar.gz: a99d6d83f9bcac7ae21b74818d4f6b6b9d85544b092221d470a49f86b4e7a72d13b032ef9d3ccbc5ea35df1264e2fe528eefff995f2ab4130974cabd16f2f2ec

data/VERSION

@@ -1 +1 @@
-0.0.72
+0.0.73

data/bin/remote_copy

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'socket'
+
+copy_remote_host_port = ENV['COPY_REMOTE_HOST_PORT'] and
+  copy_remote_host_port =~ /\A([^:]+):([^:]+)\z/ or
+  fail "environment variable COPY_REMOTE_HOST_PORT of form host:port required"
+copy_remote_host, copy_remote_port = $1, $2
+
+clipboard = TCPSocket.new(copy_remote_host, copy_remote_port)
+until STDIN.eof?
+  clipboard.write STDIN.read(1 << 16)
+end

data/bin/ssh-tunnel

@@ -21,8 +21,9 @@ 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)
+  -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
@@ -34,7 +35,7 @@ end
 config = Utils::Config::ConfigFile.new
 
 arguments = ARGV
-opts = go 'l:t:n:C:hN', arguments
+opts = go 'l:t:n:C:m:hN', arguments
 
 case opts['C']
 when 'ssh-default'
@@ -50,6 +51,10 @@ config.configure_from_paths
 
 usage if opts['h'] or arguments.size != 1
 
+if multiplexer = opts['m']
+  config.ssh_tunnel.terminal_multiplexer = multiplexer
+end
+
 user_remote = arguments.shift
 user, remote, rport =
   case user_remote
@@ -84,13 +89,22 @@ else
 end
 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
+  env = []
   File.exist? sock_file and rm_f sock_file
-  exec "ssh -p #{rport} -Mt -S #{sock_file} #{user}@#{remote} "\
-    "'#{config.ssh_tunnel.multiplexer_new(opts['n'])} || "\
-    "#{config.ssh_tunnel.multiplexer_attach(opts['n'])}'"
+  r = config.ssh_tunnel.copy_paste.full? do |t|
+    env << "COPY_REMOTE_HOST_PORT='#{t.bind_address}:#{t.port}'"
+    " -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'])}'"
+  end
 end

data/lib/utils/config/config_file.rb

@@ -49,26 +49,31 @@ class Utils::Config::ConfigFile
       end
 
       def config(name, *r, &block)
-        self.dsl_attributes ||= []
-        dsl_attributes << name.to_sym
+        self.config_settings ||= []
+        config_settings << name.to_sym
         dsl_accessor name, *r, &block
         self
       end
 
-      attr_accessor :dsl_attributes
+      attr_accessor :config_settings
     end
 
     def initialize(&block)
       block and instance_eval(&block)
     end
 
-    def to_ruby
+    def to_ruby(depth = 0)
       result = ''
-      result << "#{self.class.name[/::([^:]+)\z/, 1].underscore} do\n"
-      for da in self.class.dsl_attributes
-        result << "  #{da} #{Array(__send__(da)).map(&:inspect) * ', '}\n"
+      result << ' ' * 2 * depth << "#{self.class.name[/::([^:]+)\z/, 1].underscore} do\n"
+      for name in self.class.config_settings
+        value = __send__(name)
+        if value.respond_to?(:to_ruby)
+          result << ' ' * 2 * (depth + 1) << value.to_ruby(depth + 1)
+        else
+          result << ' ' * 2 * (depth + 1) << "#{name} #{Array(value).map(&:inspect) * ', '}\n"
+        end
       end
-      result << "end\n"
+      result << ' ' * 2 * depth << "end\n"
     end
   end
 
@@ -149,18 +154,22 @@ class Utils::Config::ConfigFile
   end
 
   class SshTunnel < BlockConfig
-    config :terminal_multiplexer, 'sshscreen'
+    config :terminal_multiplexer, 'screen'
 
     def initialize
       super
+      self.terminal_multiplexer = terminal_multiplexer
+    end
+
+    def terminal_multiplexer=(terminal_multiplexer)
       @multiplexer = terminal_multiplexer.to_s
-      @multiplexer =~ /\A(sshscreen|tmux)\z/ or
+      @multiplexer =~ /\A(screen|tmux)\z/ or
         fail "invalid terminal_multiplexer #{terminal_multiplexer.inspect} was configured"
     end
 
     def multiplexer_list
       case @multiplexer
-      when 'sshscreen'
+      when 'screen'
         'screen -ls'
       when 'tmux'
         'tmux ls'
@@ -169,7 +178,7 @@ class Utils::Config::ConfigFile
 
     def multiplexer_new(session)
       case @multiplexer
-      when 'sshscreen'
+      when 'screen'
         'false'
       when 'tmux'
         'tmux -u new -s "%s"' % session
@@ -178,12 +187,39 @@ class Utils::Config::ConfigFile
 
     def multiplexer_attach(session)
       case @multiplexer
-      when 'sshscreen'
+      when 'screen'
         'screen -DUR "%s"' % session
       when 'tmux'
         'tmux -u attach -t "%s"' % session
       end
     end
+
+    class CopyPaste < BlockConfig
+      config :bind_address, 'localhost'
+
+      config :port, 6166
+
+      config :host, 'localhost'
+
+      config :host_port, 6166
+
+      def to_s
+        [ bind_address, port, host, host_port ] * ':'
+      end
+    end
+
+    def copy_paste(enable = false, &block)
+      if @copy_paste
+        @copy_paste
+      else
+        if block
+          @copy_paste = CopyPaste.new(&block)
+        elsif enable
+          @copy_paste = CopyPaste.new {}
+        end
+      end
+    end
+    self.config_settings << :copy_paste
   end
 
   def ssh_tunnel(&block)

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.72'
+  VERSION         = '0.0.73'
   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,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.72"
+  s.version = "0.0.73"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2013-02-28"
+  s.date = "2013-03-08"
   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"]
+  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", "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/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/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.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/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/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"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.72
+  version: 0.0.73
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -103,6 +103,7 @@ executables:
 - ssh-tunnel
 - myex
 - probe
+- remote_copy
 - errf
 - same_files
 - utils-utilsrc
@@ -148,6 +149,7 @@ files:
 - bin/on_change
 - bin/path
 - bin/probe
+- bin/remote_copy
 - bin/same_files
 - bin/search
 - bin/sedit