pipe2me-client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9f132b1573f1f4fb103d1862ef4a0f4c8bc70f3
-  data.tar.gz: 680041d4879c6b15e81e6e68c8b57d6a76ab702e
+  metadata.gz: 42624605ab61b1e56bf53471eebe5d321699f5bb
+  data.tar.gz: 7624869dc720e1ecc272f86c67d1be7d66ec06a8
 SHA512:
-  metadata.gz: 06cb41c0cfb69a9e275d798d0938e220092a7c8cc45eb36ac75557777598f8a825f2377d36a5162cc490e36816281f736d0c772b7de38649d97b2a01f7b6425e
-  data.tar.gz: d77b13376efe3a4b6bc34431b3d82d8b72190f5d1c1712b2b63fe37f792c03e38924ded69cd0274c001224ac21b52a6b08a6e29d7ee3bd13a2fba46f5a9de81a
+  metadata.gz: 156fa716529c419b83c0fe2859758ef291991b37966dfe1c0455a3b2b9d5d7aad8fd8dcbe55224c1f18235d65d788e4600f02ee4f2765118810463497ca92fea
+  data.tar.gz: 2d053da9bc4a94e57b2fcfa4f1eb35fc43b33eb329ce0b7f9a170ed86eb6e8ce7df7dd881508817678d54c5a0b35a3d6f2fd9b9c584a027c30d8237c2a4dac5b

data/README.mdown

@@ -9,7 +9,7 @@ see [pipe2me](https://github.com/kinko/pipe2me)
 
     gem install pipe2me-client
     # optional: install man page
-    sudo rake install
+    sudo cp doc/pipe2me.1 /usr/local/share/man/man1
 
 ## Usage
 

data/bin/pipe2me

@@ -6,16 +6,21 @@ require "pipe2me/cli"
 require "pipe2me/cli-foreman"
 require "pipe2me/cli-monit"
 
+if ENV["BACKTRACE"].to_i == 1
+  Pipe2me::CLI.start ARGV
+  exit 0
+end
+
 begin
   Pipe2me::CLI.start ARGV
 rescue
   if UI.verbosity >= 2
-    UI.error $!
+    UI.error $!.message
     raise
   elsif UI.verbosity >= 0
-    UI.error $!
+    UI.error $!.message
   else
-    STDERR.puts $!
+    STDERR.puts $!.message
   end
   exit 1
 end

data/bin/pipe2med

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV["BACKTRACE"] = "1"
+Kernel.exec File.dirname(__FILE__) + "/pipe2me", *ARGV

data/lib/pipe2me/cli-foreman.rb

@@ -16,6 +16,13 @@ class Pipe2me::CLI < Thor
       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.rb

@@ -12,7 +12,7 @@ class Pipe2me::CLI < Thor
   option :server, :default => "http://test.pipe2.me:8080"
   option :auth, :required => true                     # "auth token"
   option :protocols, :default => "https"              # "protocol names, e.g. 'http,https,imap'"
-  option :ports                                       # "local ports, one per protocol"
+  option :ports, :type => :string                     # "local ports, one per protocol"
   def setup
     Pipe2me::Config.server = options[:server]
     server_info = Pipe2me::Tunnel.setup options
@@ -27,6 +27,11 @@ class Pipe2me::CLI < Thor
     puts File.read("pipe2me.info.inc")
   end
 
+  desc "verify", "Verify the tunnel"
+  def verify
+    Pipe2me::Tunnel.verify
+  end
+
   desc "update", "Updates configuration"
   def update
     Pipe2me::Tunnel.update

data/lib/pipe2me/ext/http.rb

@@ -1,5 +1,6 @@
 require "net/http"
 require "ostruct"
+require "forwardable"
 
 # The HTTP module implements a simple wrapper around Net::HTTP, intended to
 # ease the pain of dealing with HTTP requests.
@@ -19,12 +20,11 @@ module Pipe2me::HTTP
       @response = response
     end
 
-    def code
-      response.code
-    end
+    extend Forwardable
+    delegate [ :code, :url ] => :@response 
 
     def message #:nodoc:
-      "#{@response.response.class}: #{@response[0..120]}"
+      "#{url}: #{code} #{@response[0..120]} (#{@response.response.class})" 
     end
   end
 
@@ -82,7 +82,8 @@ module Pipe2me::HTTP
       (200..299).include? status
     end
 
-    # returns the response object itself, if it is valid (i.e. has a ), or raise
+    # returns the response object itself, if it is valid (i.e. has a 2XX status),
+    # or raise an Error.
     def validate!
       return self if valid?
 

data/lib/pipe2me/tunnel/commands.rb

@@ -3,12 +3,10 @@ module Pipe2me::Tunnel::Commands
 
   T = Pipe2me::Tunnel
 
-  private
-  
   # returns an array of [ protocol, remote_port, local_port ] entries
   def tunnels
     @tunnels ||= begin
-      urls, ports = config.urls, config.ports
+      urls, ports = config.urls, config.ports.to_s.split(",")
     
       urls.zip(ports).map do |url, local_port|
         uri = URI.parse(url)
@@ -32,7 +30,7 @@ module Pipe2me::Tunnel::Commands
   def echo_commands
     tunnels.map do |protocol, remote_port, local_port|
       next unless cmd = echo_server_command(protocol, local_port)
-      [ "echo_#{remote_port}", cmd ]
+      [ "echo_#{local_port}", cmd ]
     end.compact
   end
 

data/lib/pipe2me/tunnel.rb

@@ -50,7 +50,7 @@ module Pipe2me::Tunnel
 
   # The base URL for this tunnels' configuration
   def url
-    "#{config.server}/tunnels/#{config.token}"
+    "#{config.server}/tunnels/#{config.id}"
   end
 
   def config
@@ -64,6 +64,11 @@ module Pipe2me::Tunnel
 
   public
 
+  def verify
+    HTTP.get! "#{url}/verify"
+    puts config.fqdn
+  end
+  
   def update
     unless File.exists?(SSH_PRIVKEY)
       ssh_keygen

data/lib/pipe2me/version.rb

@@ -1,4 +1,4 @@
 module Pipe2me
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
   BANNER = "pipe2.me command line client V#{Pipe2me::VERSION}; (c) The kink team, 2013, 2014."
 end

data/test/env-test.sh

@@ -11,7 +11,7 @@ it_start_a_tunnel() {
   echo "== env done ============="
   
   cat env | grep PIPE2ME_SERVER
-  cat env | grep PIPE2ME_TOKEN
+  cat env | grep PIPE2ME_ID
   cat env | grep PIPE2ME_FQDN
   cat env | grep PIPE2ME_URLS_0
   cat env | grep PIPE2ME_TUNNEL

data/test/setup-test.sh

@@ -5,7 +5,7 @@ describe "tunnel setup"
 
 # setup a tunnel
 it_sets_up_tunnels() {
-  fqdn=$($pipe2me setup --server $pipe2me_server --auth $pipe2me_token)
+  fqdn=$($pipe2me setup --server $pipe2me_server --auth $pipe2me_token --ports 8100,8101 --protocols http,https)
   
   # pipe2me setup --server $pipe2me_server returns the fqdn of the subdomain and nothing else
   test 1 -eq $(echo $fqdn | wc -l)  

data/test/verify-test.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env roundup
+describe "verify subcommand"
+
+. $(dirname $1)/testhelper.inc
+
+# setup a tunnel
+it_sets_up_tunnels_and_verifies() {
+  fqdn=$($pipe2me setup --server $pipe2me_server --auth short@test.kinko.me)
+
+  # pipe2me setup --server $pipe2me_server returns the fqdn of the subdomain and nothing else
+  test 1 -eq $(echo $fqdn | wc -l)  
+
+  verified=$($pipe2me verify)
+  test "$fqdn" == "$verified"
+  
+  # sleep 4 seconds. The tunnel lives for 3 seconds
+  sleep 4
+  ! $pipe2me verify
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe2me-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,7 +66,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: pipe2.me command line client V0.2.1; (c) The kink team, 2013, 2014.
+description: pipe2.me command line client V0.2.2; (c) The kink team, 2013, 2014.
 email: contact@kinko.me
 executables:
 - pipe2me
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - README.mdown
 - bin/pipe2me
+- bin/pipe2med
 - lib/pipe2me.rb
 - lib/pipe2me/cli-foreman.rb
 - lib/pipe2me/cli-monit.rb
@@ -106,6 +107,7 @@ files:
 - test/testhelper.debug
 - test/testhelper.inc
 - test/testhelper.release
+- test/verify-test.sh
 - test/version-test.sh
 homepage: https://github.com/kinko/pipe2me-client
 licenses: []
@@ -129,5 +131,5 @@ rubyforge_project:
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
-summary: pipe2.me command line client V0.2.1; (c) The kink team, 2013, 2014.
+summary: pipe2.me command line client V0.2.2; (c) The kink team, 2013, 2014.
 test_files: []