pipe2me-client 0.2.15 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d71c8d4790ffb256420754f6da2f3883d640b4
-  data.tar.gz: d9cf6ae6b8c13975fa9e70cff666bcd0af35fd3b
+  metadata.gz: 6f325ba9aa41bbe17611895ce65eff4279fe21fa
+  data.tar.gz: 330125913e082e80df6e67fde935b41d810b738f
 SHA512:
-  metadata.gz: dcab1a08ad5d8900dd697f2ddd0a421c3e76b814cbb1c2b9789e7f97d6d87852d20ef0a6d3f3bd9c3f6cdd22ab7834a51403dbe1ffd375e22c8a1ea340eae966
-  data.tar.gz: ec2c3cecba6b539aef79e71710cc5d7e235740aa738b738788b50d90cca8ea6ddbdfa884a12484aef7b73970ca15f0b89cbdca72d1a17862bd1803afad91bd3c
+  metadata.gz: d517e7c6df0d6f76e430d342adfb1931f53fbf585b4b86087a7bee9b9575972180337849813c7d08ca84cdd44e2e17a91ac1a16ab7ba5017022faa7c3467b552
+  data.tar.gz: 24b3a761dee28119080f12d6aec46a5a05c52a58d5809cf710bb075f1f74eeb89ac93f6bb50d3aedd3e561b17beb47ca52cad82868cfe881f7d4d2b8289abe00

data/README.md

@@ -40,7 +40,7 @@ pretty-ivory-horse.test.pipe2.me
 PIPE2ME_URLS_0=http://pretty-ivory-horse.test.pipe2.me:10003
 PIPE2ME_URLS_1=https://pretty-ivory-horse.test.pipe2.me:10004
 
-# Start the tunnels via foreman (but please review on using foreman)
+# Start the tunnels
 &gt; <b>pipe2me start</b>
 </pre>
 
@@ -107,4 +107,4 @@ under the terms of the MIT License (MIT), see COPYING.MIT for details.
 The subdirectory lib/vendor contains third-party code, which is subject to its own copyrights.
 Please see the respective source files for copyright information.
 
-(c) The kinko team, 2014
+(c) The kinko.me team, 2014

data/bin/pipe2me

@@ -3,8 +3,6 @@ $:.unshift "#{File.dirname(__FILE__)}/../lib"
 
 require "pipe2me"
 require "pipe2me/cli"
-require "pipe2me/cli-foreman"
-require "pipe2me/cli-monit"
 
 if ENV["BACKTRACE"].to_i == 1
   Pipe2me::CLI.start ARGV

data/lib/pipe2me/tunnel/commands.rb

@@ -15,36 +15,25 @@ module Pipe2me::Tunnel::Commands
     end
   end
 
-  public
-
   # return an arry [ [name, command ], [name, command ], .. ]
-  def tunnel_commands
+  def tunnel_command
     tunnel_uri = URI.parse config.tunnel
 
-    tunnels.map do |protocol, remote_port, local_port|
-      next unless cmd = port_tunnel_command(tunnel_uri, protocol, remote_port, local_port)
-      [ "#{protocol}_#{remote_port}", cmd ]
-    end.compact
-  end
-
-  # def mapping_commands
-  #   natpmpc = File.expand_path "#{File.dirname(__FILE__)}/../bin/natpmpc"
-  #   mappings = tunnels.map do |_, remote_port, local_port|
-  #     "tcp:#{remote_port}:#{local_port}"
-  #   end
-  #   [ [ "natpmpc", "#{natpmpc} #{mappings.join(" ")} && sleep 10000" ] ]
-  # end
+    port_mappings = tunnels.map do |protocol, remote_port, local_port|
+      [ remote_port, local_port ]
+    end
 
-  def echo_commands
-    tunnels.map do |protocol, remote_port, local_port|
-      next unless cmd = echo_server_command(protocol, local_port)
-      [ "echo_#{local_port}", cmd ]
-    end.compact
+    cmd = port_tunnel_command(tunnel_uri, port_mappings)
+    [ "tunnel", cmd ]
   end
 
   private
 
-  def port_tunnel_command(tunnel_uri, protocol, remote_port, local_port)
+  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(" ")
+
     cmd = <<-SHELL
       env AUTOSSH_GATETIME=0                                # comments work here..
       #{Which::AUTOSSH}
@@ -52,23 +41,16 @@ module Pipe2me::Tunnel::Commands
       -F #{T::SSH_CONFIG}
       #{tunnel_uri.user}@#{tunnel_uri.host}
       -p #{tunnel_uri.port}
-      -R 0.0.0.0:#{remote_port}:localhost:#{local_port}
+      #{port_mappings}
       -i #{T::SSH_PRIVKEY}
       -o StrictHostKeyChecking=no
       -o UserKnownHostsFile=pipe2me.known_hosts
       -o PasswordAuthentication=no
+      -o ExitOnForwardFailure=yes 
       -N
     SHELL
 
     # remove comments and newlines from commands
     cmd.gsub(/( *#.*|\s+)/, " ").gsub(/(^ )|( $)/, "")
   end
-
-  def echo_server_command(protocol, port)
-    binary = File.dirname(__FILE__) + "/echo/#{protocol}"
-    return unless File.executable?(binary)
-
-    UI.info "Starting #{protocol} echo server on port #{port}"
-    "env PORT=#{port} #{binary}"
-  end
 end

data/lib/pipe2me/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe2me-client
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.3.0
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: foreman
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple-ui
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: pipe2me command line client V0.2.15; (c) The kinko team, 2013, 2014.
+description: pipe2me command line client V0.3.0; (c) The kinko.me team, 2013, 2014.
 email: contact@kinko.me
 executables:
 - pipe2me
@@ -78,8 +64,6 @@ files:
 - bin/pipe2med
 - lib/pipe2me.rb
 - lib/pipe2me/bin/natpmpc
-- lib/pipe2me/cli-foreman.rb
-- lib/pipe2me/cli-monit.rb
 - lib/pipe2me/cli.rb
 - lib/pipe2me/config.rb
 - lib/pipe2me/ext/file_ext.rb
@@ -100,8 +84,6 @@ files:
 - rakelib/test.rake
 - test/auth-token-test.sh
 - test/env-test.sh
-- test/foreman-test.sh
-- test/monitrc-test.sh
 - test/redirection-test.sh
 - test/setup-test.sh
 - test/sshkey-test.sh
@@ -133,5 +115,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: pipe2me command line client V0.2.15; (c) The kinko team, 2013, 2014.
+summary: pipe2me command line client V0.3.0; (c) The kinko.me team, 2013, 2014.
 test_files: []

data/lib/pipe2me/cli-foreman.rb

@@ -1,34 +0,0 @@
-class Pipe2me::CLI < Thor
-  desc "start", "Start tunnels"
-  option :echo, :type => :boolean, :banner => "Also run echo servers"
-  def start
-    handle_global_options
-
-    procfile = options[:echo] ? "pipe2me.procfile.echo" : "pipe2me.procfile"
-
-    File.open procfile, "w" do |io|
-      Pipe2me::Tunnel.tunnel_commands.each do |name, cmd|
-        io.write "#{name}: #{cmd}\n"
-      end
-
-      # Pipe2me::Tunnel.mapping_commands.each do |name, cmd|
-      #   io.write "#{name}: #{cmd}\n"
-      # end
-
-      next unless options[:echo]
-
-      Pipe2me::Tunnel.echo_commands.each do |name, cmd|
-        io.write "#{name}: #{cmd}\n"
-      end
-    end
-
-    config = Pipe2me::Tunnel.send(:config)
-    fqdn = config.fqdn
-
-    Pipe2me::Tunnel.tunnels.each do |protocol, remote_port, local_port|
-      UI.success "Tunneling #{protocol}://localhost:#{local_port} <=> #{protocol}://#{fqdn}:#{remote_port}"
-    end
-
-    Kernel.exec "foreman start -f #{procfile}"
-  end
-end

data/lib/pipe2me/cli-monit.rb

@@ -1,66 +0,0 @@
-class Pipe2me::CLI < Thor
-  desc "monit", "Create monitrc file and run monit"
-  option :port, :default => 5555, :banner => "control port"
-  option :echo, :type => :boolean, :banner => "Also run echo servers"
-  def monit(*args)
-    handle_global_options
-
-    monitrc_file = create_monitrc
-
-    UI.warn "Running: monit -c #{monitrc_file} #{args.join(" ")}"
-    Kernel.exec "monit", "-c", monitrc_file, *args
-  end
-
-  desc "monitrc", "Create monitrc file"
-  option :port, :default => 5555, :banner => "control port"
-  option :echo, :type => :boolean, :banner => "Also run echo servers"
-  def monitrc
-    handle_global_options
-
-    monitrc_file = create_monitrc
-    Kernel.exec "monit", "-c", monitrc_file, "-t"
-  end
-
-  private
-
-  def create_monitrc
-    path = options[:echo] ? "pipe2me.monitrc.echo" : "pipe2me.monitrc"
-
-    # The daemon binary
-    daemon = "#{Which::DAEMON} -D #{File.expand_path(Dir.getwd)}"
-
-    port = options[:port]
-
-    logfile = File.expand_path "pipe2me.monit.log"
-    piddir = File.expand_path "pipe2me.monit.pids"
-    FileUtils.mkdir_p piddir
-
-    commands = Pipe2me::Tunnel.tunnel_commands
-    # commands += Pipe2me::Tunnel.mapping_commands
-    commands += Pipe2me::Tunnel.echo_commands if options[:echo]
-
-    File.open path, "w", 0600 do |io|
-      require "erb"
-
-      erb = ERB.new MONITRC_ERB
-      io.write erb.result(self.send(:binding))
-    end
-
-    UI.success "Created #{path}"
-
-    path
-  end
-
-MONITRC_ERB =  %q{
-set daemon 10
-set httpd port <%= port %> and use address localhost allow localhost
-
-<% commands.each do |name, cmd| %>
-check process <%= name %> with pidfile <%= piddir %>/<%= name %>.pid
-  <% daemon = "#{daemon} -N --name #{name} --pidfiles #{piddir} --output #{logfile}" %>
-  start program = "<%= daemon %> -- <%= cmd %>" with timeout 60 seconds
-  stop program = "<%= daemon %> --stop"
-<% end %>
-}
-
-end

data/test/foreman-test.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env roundup
-describe "setup and starts tunnels in foreman mode"
-
-. $(dirname $1)/testhelper.inc
-
-it_works_with_foreman() {
-  later It setup and starts tunnels in foreman mode
-  # i.e.  pipe2me setup
-  #       pipe2me echo
-  #       ...
-}

data/test/monitrc-test.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env roundup
-describe "setup and starts tunnels in foreman mode"
-
-. $(dirname $1)/testhelper.inc
-
-it_works_with_monitrc() {
-  later It setup and starts tunnels in monitrc mode
-  # i.e.  pipe2me setup
-  #       pipe2me monitrc
-  #       pipe2me monit start all
-  #       ...
-}
-
-it_creates_a_monitrc_file() {
-  ! [ -e pipe2me.monitrc ]
-  fqdn=$($pipe2me setup --server $pipe2me_server --token $pipe2me_token)
-
-  $pipe2me monitrc
-  [ -e pipe2me.monitrc ]
-
-  # The file is 0600
-  ls -l pipe2me.monitrc | grep -e "-rw-------"
-}