pipe2me-client 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eceaa5c69187b15f7b43b0fe2cdbe1dd9b7281f
-  data.tar.gz: ca812510cb4937691876f1fc8b5642b50cea853d
+  metadata.gz: aea15364dda99c7a242eb34318206a44b3565213
+  data.tar.gz: 33527a1e0d1817ddcc04ba0a798bd573e1def867
 SHA512:
-  metadata.gz: ee65b0e72ff5c66bb7bca14a7c2724a0e7f1717b33696d0b9aaf1aa1f7a87b1a8ea78cffab3f4d08df416a6dcf17c1f72d13db195a3be7037da69194193dedfe
-  data.tar.gz: 7fa92f1490c22365e4a8ca87f0ed4480429923694ba24d6c2ac897db6f37162ca64b1fc7493b67698342951d881364386aa6761d67afcc97cd958f127247dd90
+  metadata.gz: cb06a677dc3bc15419751ff34234a2ede56b82830ca87cca72665deb17a5b1041b008f5016657cc72d5b02eae563641d955a8e4d80f654cc5f03cfde4da0d795
+  data.tar.gz: f71501c3301136a3cdccbd14501b88ba60836fbc9fd5c9a8344c81fac792588e033344ab675f31b190073f4987d6dabd7710dd4bf2776b0a810eaf4b7f378744

data/lib/pipe2me/cli-monit.rb

@@ -23,17 +23,11 @@ class Pipe2me::CLI < Thor
 
   private
 
-  def which!(cmd)
-    path = `which #{cmd}`.chomp
-    raise "Cannot find #{cmd} in your $PATH. Is it installed?" if path == ""
-    path
-  end
-
   def create_monitrc
     path = options[:echo] ? "pipe2me.monitrc.echo" : "pipe2me.monitrc"
 
     # The daemon binary
-    daemon = "#{which! :daemon} -D #{File.expand_path(Dir.getwd)}"
+    daemon = "#{Which.DAEMON} -D #{File.expand_path(Dir.getwd)}"
 
     port = options[:port]
 

data/lib/pipe2me/cli.rb

@@ -1,4 +1,5 @@
 require "thor"
+require_relative "which"
 
 class Pipe2me::CLI < Thor
   class_option :dir, :type => :string

data/lib/pipe2me/tunnel.rb

@@ -9,6 +9,8 @@ module Pipe2me::Tunnel
 
   SSH_PUBKEY  = "pipe2me.id_rsa.pub"
   SSH_PRIVKEY = "pipe2me.id_rsa"
+  
+  SSH_CONFIG  = "pipe2me.ssh_config"
 end
 
 require_relative "tunnel/openssl"
@@ -84,5 +86,8 @@ module Pipe2me::Tunnel
     unless File.exists?(SSL_CERT)
       ssl_certsign
     end
+    unless File.exists?(SSH_CONFIG)
+      FileUtils.cp "#{File.dirname(__FILE__)}/tunnel/ssh_config", SSH_CONFIG
+    end
   end
 end

data/lib/pipe2me/tunnel/commands.rb

@@ -44,19 +44,12 @@ module Pipe2me::Tunnel::Commands
 
   private
 
-  def which!(cmd)
-    path = `which #{cmd}`.chomp
-    raise "Cannot find #{cmd} in your $PATH. Is it installed?" if path == ""
-    path
-  end
-
   def port_tunnel_command(tunnel_uri, protocol, remote_port, local_port)
-    autossh = which! :autossh
-
     cmd = <<-SHELL
       env AUTOSSH_GATETIME=0                                # comments work here..
-      #{autossh}
+      #{Which.AUTOSSH}
       -M 0
+      -F #{T::SSH_CONFIG}
       #{tunnel_uri.user}@#{tunnel_uri.host}
       -p #{tunnel_uri.port}
       -R 0.0.0.0:#{remote_port}:localhost:#{local_port}

data/lib/pipe2me/tunnel/ssh_config

@@ -0,0 +1,99 @@
+#	$OpenBSD: ssh_config,v 1.26 2010/01/11 01:39:46 dtucker Exp $
+
+# This is the ssh client system-wide configuration file.  See
+# ssh_config(5) for more information.  This file provides defaults for
+# users, and the values can be changed in per-user configuration files
+# or on the command line.
+
+# Configuration data is parsed as follows:
+#  1. command line options
+#  2. user-specific file
+#  3. system-wide file
+# Any configuration value is only changed the first time it is set.
+# Thus, host-specific definitions should be at the beginning of the
+# configuration file, and defaults at the end.
+
+# Site-wide defaults for some commonly used options.  For a comprehensive
+# list of available options, their meanings and defaults, please see the
+# ssh_config(5) man page.
+
+ Host *
+   SendEnv LANG LC_*
+
+# Configuration options and default values (see ssh_config(5) for their meaning):
+#
+#   Host # (no default)
+#   AddressFamily any
+#   AskPassGUI yes # (Apple only)
+#   BatchMode no
+#   BindAddress # (no default)
+#   ChallengeResponseAuthentication yes
+#   CheckHostIP yes
+#   Cipher 3des
+#   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,aes256-cbc,arcfour
+#   ClearAllForwardings no
+#   Compression no
+#   CompressionLevel 6
+#   ConnectionAttempts 1
+#   ConnectTimeout # (no default)
+#   ControlMaster no
+#   ControlPath  # (no default)
+#   ControlPersist no
+#   DynamicForward
+#   EnableSSHKeysign no
+#   EscapeChar ~
+#   ExitOnForwardFailure no
+#   ForwardAgent no
+#   ForwardX11 no
+#   ForwardX11Timeout 1200
+#   ForwardX11Trusted no
+#   XauthLocation xauth # Default is to search $PATH.  It is recommended that a full path be provided.
+#   GatewayPorts no
+#   GlobalKnownHostsFile /etc/ssh/ssh_known_hosts,/etc/ssh/ssh_known_hosts2
+#   GSSAPIAuthentication no
+#   GSSAPIDelegateCredentials no
+#   GSSAPIKeyExchange no
+#   GSSAPITrustDNS no
+#   HashKnownHosts no
+#   HostbasedAuthentication no
+#   HostKeyAlgorithms ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-dss-cert-v01@openssh.com,ssh-rsa-cert-v00@openssh.com,ssh-dss-cert-v00@openssh.com,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,ssh-rsa,ssh-dss
+#   HostKeyAlias # (no default)
+#   HostName # (set by command at run-time)
+#   IdentitiesOnly no
+#   IdentityFile .ssh/id_rsa,.ssh/id_dsa
+#   IPQoS lowdelay
+#   KbdInteractiveAuthentication yes
+#   KbdInteractiveDevices # (no default)
+#   KexAlgorithms ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1
+#   LocalCommand  # (no default)
+#   LocalForward  # (no default)
+#   LogLevel INFO
+#   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160,hmac-sha1-96,hmac-md5-96,hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,hmac-sha2-512-96
+#   NoHostAuthenticationForLocalhost no
+#   NumberOfPasswordPrompts 3
+#   PasswordAuthentication yes
+#   PermitLocalCommand no
+#   PKCS11Provider # (no default)
+#   Port 22
+#   PreferredAuthentications gssapi-with-mic,hostbased,publickey,keyboard-interactive,password  # (set by ssh at run-time)
+#   Protocol 2
+#   ProxyCommand # (no default)
+#   PubkeyAuthentication yes
+#   RekeyLimit 0
+#   RemoteForward # (no default)
+#   RequestTTY auto
+#   RhostsRSAAuthentication no
+#   RSAAuthentication yes
+#   SendEnv # (no default)
+#   ServerAliveCountMax 3
+#   ServerAliveInterval 0
+#   StrictHostKeyChecking ask
+#   TCPKeepAlive yes
+#   Tunnel no
+#   TunnelDevice any:any
+#   UsePrivilegedPort no
+#   User # (set by command at run-time)
+#   UserKnownHostsFile ~/.ssh/known_hosts,~/.ssh/known_hosts2
+#   VerifyHostKeyDNS no
+#   VisualHostKey no
+#   XAuthLocationi xauth

data/lib/pipe2me/version.rb

@@ -1,4 +1,4 @@
 module Pipe2me
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
   BANNER = "pipe2me command line client V#{Pipe2me::VERSION}; (c) The kinko team, 2013, 2014."
 end

data/lib/pipe2me/which.rb

@@ -0,0 +1,11 @@
+module Which
+  def self.which!(cmd)
+    path = `which #{cmd}`.chomp
+    raise "Cannot find #{cmd} in your $PATH. Is it installed?" if path == ""
+    path
+  end
+
+  DAEMON = which!(:daemon)
+  AUTOSSH = which!(:autossh)
+  MONIT = which!(:monit)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe2me-client
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,17 +66,15 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: pipe2me command line client V0.2.9; (c) The kinko team, 2013, 2014.
+description: pipe2me command line client V0.2.10; (c) The kinko team, 2013, 2014.
 email: contact@kinko.me
 executables:
 - pipe2me
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - bin/pipe2me
 - bin/pipe2med
-- lib/pipe2me.rb
 - lib/pipe2me/bin/natpmpc
 - lib/pipe2me/cli-foreman.rb
 - lib/pipe2me/cli-monit.rb
@@ -86,16 +84,20 @@ files:
 - lib/pipe2me/ext/http.rb
 - lib/pipe2me/ext/shell_format.rb
 - lib/pipe2me/ext/sys.rb
-- lib/pipe2me/tunnel.rb
 - lib/pipe2me/tunnel/commands.rb
 - lib/pipe2me/tunnel/echo/http
 - lib/pipe2me/tunnel/echo/https
 - lib/pipe2me/tunnel/openssl.conf
 - lib/pipe2me/tunnel/openssl.rb
 - lib/pipe2me/tunnel/ssh.rb
+- lib/pipe2me/tunnel/ssh_config
+- lib/pipe2me/tunnel.rb
 - lib/pipe2me/version.rb
+- lib/pipe2me/which.rb
+- lib/pipe2me.rb
 - rakelib/gem.rake
 - rakelib/test.rake
+- README.md
 - test/000-roundup-test.sh
 - test/auth-token-test.sh
 - test/env-test.sh
@@ -129,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: pipe2me command line client V0.2.9; (c) The kinko team, 2013, 2014.
+summary: pipe2me command line client V0.2.10; (c) The kinko team, 2013, 2014.
 test_files: []