pipe2me-client 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f325ba9aa41bbe17611895ce65eff4279fe21fa
-  data.tar.gz: 330125913e082e80df6e67fde935b41d810b738f
+  metadata.gz: da14193618947d8349f1570d2aca3314181b2f27
+  data.tar.gz: 374de70c21cfa735fdaf7955d5c7899f2d14fab4
 SHA512:
-  metadata.gz: d517e7c6df0d6f76e430d342adfb1931f53fbf585b4b86087a7bee9b9575972180337849813c7d08ca84cdd44e2e17a91ac1a16ab7ba5017022faa7c3467b552
-  data.tar.gz: 24b3a761dee28119080f12d6aec46a5a05c52a58d5809cf710bb075f1f74eeb89ac93f6bb50d3aedd3e561b17beb47ca52cad82868cfe881f7d4d2b8289abe00
+  metadata.gz: c4209b4b7667b38c07ff30e9b7d18916ce6f6ccaaeed2e62262074b379d3b5c1d2aaf32aa3ab557228a44000f9a8cee5845b4c6266d02c4e18f4c0186fab6eac
+  data.tar.gz: 1af495821d30bdfd36c5142ca9821710fae53dcc979b18533197d141dd76631015fbb15a36b1dfd2031835f558a683b913ec9d601f63cb7689a5389bb01b6563

data/lib/pipe2me.rb

@@ -1,9 +1,10 @@
 module Pipe2me
+  def self.server;          @server; end
+  def self.server=(server); @server = server; end
 end
 
 require "simple/ui"
 
 require_relative "pipe2me/version"
-require_relative "pipe2me/config"
 require_relative "pipe2me/tunnel"
 

data/lib/pipe2me/cli.rb

@@ -24,7 +24,7 @@ class Pipe2me::CLI < Thor
       Dir.chdir options[:dir]
       UI.info "Changed into", options[:dir]
     end
-    
+
     if options[:insecure]
       Pipe2me::HTTP.enable_insecure_mode
     end
@@ -49,7 +49,7 @@ class Pipe2me::CLI < Thor
   def setup
     handle_global_options
 
-    Pipe2me::Config.server = options[:server]
+    Pipe2me.server = options[:server]
     server_info = Pipe2me::Tunnel.setup options
 
     update
@@ -84,4 +84,27 @@ class Pipe2me::CLI < Thor
 
     Pipe2me::Tunnel.check
   end
+
+  desc "start", "start tunnels"
+  def start
+    handle_global_options
+
+    Pipe2me::Tunnel.tunnels.each do |tunnel|
+      UI.info "Setting up", tunnel
+    end
+
+    cmd = Pipe2me::Tunnel.command
+    UI.info cmd
+    Kernel.exec cmd
+  end
+
+  desc "clear", "clear configuration"
+  def clear
+    handle_global_options
+
+    UI.error "This will remove the configuration in #{Dir.getwd}. Continue? (^C to cancel)"
+    STDIN.gets
+
+    Pipe2me::Tunnel.clear
+  end
 end

data/lib/pipe2me/tunnel.rb

@@ -10,8 +10,20 @@ module Pipe2me::Tunnel
 
   SSH_PUBKEY  = "pipe2me.id_rsa.pub"
   SSH_PRIVKEY = "pipe2me.id_rsa"
-  
+
   SSH_CONFIG  = "pipe2me.ssh_config"
+  
+  def clear
+    [ 
+      SSL_KEY, SSL_CERT, SSL_CACERT, SSH_PUBKEY, SSH_PRIVKEY, SSH_CONFIG,
+      "pipe2me.info.inc", "pipe2me.local.inc",
+      "pipe2me.openssl.priv.csr", "pipe2me.openssl.rnd"
+    ].each do |base|
+        next unless File.exist?(base)
+        UI.info "Deleting #{base}" 
+        FileUtils.rm base
+    end
+  end
 end
 
 require_relative "tunnel/openssl"
@@ -34,7 +46,7 @@ module Pipe2me::Tunnel
     end
 
     # [todo] escape auth option
-    response = HTTP.post! "#{Pipe2me::Config.server}/tunnels/#{options[:token]}",
+    response = HTTP.post! "#{Pipe2me.server}/tunnels/#{options[:token]}",
       "protocols" => options[:protocols]
 
     server_info = ShellFormat.parse(response)
@@ -43,7 +55,7 @@ module Pipe2me::Tunnel
 
     ShellFormat.write "pipe2me.info.inc", server_info
     ShellFormat.write "pipe2me.local.inc",
-                        :server => Pipe2me::Config.server,
+                        :server => Pipe2me.server,
                         :ports => options[:ports]
 
     server_info

data/lib/pipe2me/tunnel/commands.rb

@@ -3,45 +3,38 @@ module Pipe2me::Tunnel::Commands
 
   T = Pipe2me::Tunnel
 
-  # returns an array of [ protocol, remote_port, local_port ] entries
-  def tunnels
-    @tunnels ||= begin
-      urls, ports = config.urls, config.ports.to_s.split(",")
+  def tunnel_uri
+    URI.parse config.tunnel
+  end
 
-      urls.zip(ports).map do |url, local_port|
-        uri = URI.parse(url)
-        [ uri.scheme, uri.port, local_port || uri.port ]
-      end
+  class Spec < Struct.new(:protocol, :host, :remote_port, :local_port)
+    def inspect
+      "#{protocol}: #{host}:#{remote_port} <= localhost:#{local_port}"
     end
   end
 
-  # return an arry [ [name, command ], [name, command ], .. ]
-  def tunnel_command
-    tunnel_uri = URI.parse config.tunnel
-
-    port_mappings = tunnels.map do |protocol, remote_port, local_port|
-      [ remote_port, local_port ]
+  def tunnels
+    urls, ports = config.urls, config.ports.split(",") 
+    urls.zip(ports).map do |url, local_port|
+      uri = URI.parse(url)
+      Spec.new uri.scheme, tunnel_uri.host, uri.port, local_port || uri.port
     end
-
-    cmd = port_tunnel_command(tunnel_uri, port_mappings)
-    [ "tunnel", cmd ]
   end
 
-  private
-
-  def port_tunnel_command(tunnel_uri, port_mappings)
-    port_mappings = port_mappings.map do |remote_port, local_port|
-      "-R 0.0.0.0:#{remote_port}:localhost:#{local_port}"
-    end.join(" ")
+  # return an arry [ [name, command ], [name, command ], .. ]
+  def command
+    port_mappings = tunnels.map do |tunnel|
+      "-R 0.0.0.0:#{tunnel.remote_port}:localhost:#{tunnel.local_port}"
+    end
 
     cmd = <<-SHELL
-      env AUTOSSH_GATETIME=0                                # comments work here..
+      env AUTOSSH_GATETIME=0
       #{Which::AUTOSSH}
       -M 0
       -F #{T::SSH_CONFIG}
       #{tunnel_uri.user}@#{tunnel_uri.host}
       -p #{tunnel_uri.port}
-      #{port_mappings}
+      #{port_mappings.join(" ")}
       -i #{T::SSH_PRIVKEY}
       -o StrictHostKeyChecking=no
       -o UserKnownHostsFile=pipe2me.known_hosts
@@ -49,8 +42,7 @@ module Pipe2me::Tunnel::Commands
       -o ExitOnForwardFailure=yes 
       -N
     SHELL
-
-    # remove comments and newlines from commands
-    cmd.gsub(/( *#.*|\s+)/, " ").gsub(/(^ )|( $)/, "")
+    
+    cmd.gsub(/\s+/, " ")
   end
 end

data/lib/pipe2me/tunnel/openssl.rb

@@ -27,8 +27,8 @@ module Pipe2me::Tunnel::OpenSSL
 
     File.write SSL_CERT, cert
 
-    cacert = HTTP.get! "#{Pipe2me::Config.server}/cacert"
-    UI.error "Got #{cacert.length} byte from #{Pipe2me::Config.server}/cacert"
+    cacert = HTTP.get! "#{Pipe2me.server}/cacert"
+    UI.success "Got #{cacert.length} byte from #{Pipe2me.server}/cacert"
     File.write SSL_CACERT, cacert
   end
 end

data/lib/pipe2me/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipe2me-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - radiospiel
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: pipe2me command line client V0.3.0; (c) The kinko.me team, 2013, 2014.
+description: pipe2me command line client V0.3.1; (c) The kinko.me team, 2013, 2014.
 email: contact@kinko.me
 executables:
 - pipe2me
@@ -65,7 +65,6 @@ files:
 - lib/pipe2me.rb
 - lib/pipe2me/bin/natpmpc
 - lib/pipe2me/cli.rb
-- lib/pipe2me/config.rb
 - lib/pipe2me/ext/file_ext.rb
 - lib/pipe2me/ext/http.rb
 - lib/pipe2me/ext/shell_format.rb
@@ -115,5 +114,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: pipe2me command line client V0.3.0; (c) The kinko.me team, 2013, 2014.
+summary: pipe2me command line client V0.3.1; (c) The kinko.me team, 2013, 2014.
 test_files: []

data/lib/pipe2me/config.rb

@@ -1,7 +0,0 @@
-require "tmpdir"
-
-module Pipe2me::Config
-  extend self
-
-  attr :server, true
-end