em-wssh 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5594f5ba9ee7af40c50e16a6495afe8567c1ae8e
-  data.tar.gz: 5d311ce91fcd6c547070ce9dfd805c44dbc8b204
+  metadata.gz: 60abc80ee170a46ba2b1b2e70166eeb4a5f5718e
+  data.tar.gz: be2a072ef48e86d235c1a88781f9855f482ee416
 SHA512:
-  metadata.gz: bf4bc293ae6fda9f53b3183566fb9a644146e9e70022cbd11273ea76274a8fbda896a367ff0219b3a6ac8e338ef49e23474b1703965ee427897776c4aa2f3fd1
-  data.tar.gz: cfd455480307b436d080bd803ac188dd90c615b7b270b04cfdfbe83bc07f6b8f8d501aeff8c45503fc7aa946bfe17a89d441f8ce19eb6227f7c31b6346c87acb
+  metadata.gz: eb11f5728fc982b93a87fb395e98eed141e45cac2993e37e0d080c250fbed1c84f211b47fe7bdcd2f267a0397c22c5d5ffc29cf0c4f12591882ab265a26d5888
+  data.tar.gz: d69126590e4af9e4337769032a31e8dc461ad019b9c84ef04ed3fcb3e8b1bdd514edb9f2aebc839fb8a837c3d5f796459254624a6dfb0474644df81eb09df40f

data/em-wssh.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["ukoloff@gmail.com"]
   spec.description   = 'Proxy SSH connection through Websocket (nginx)'
   spec.summary       = ''
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/ukoloff/em-wssh"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/em/wssh/client.rb

@@ -2,13 +2,17 @@ require_relative '../wssh'
 
 module EventMachine::Wssh
 module Client
+
+  Title='Connect to WSSH server'
+
   Need=%w(faye/websocket)
 
   def self.help
+    require_relative 'exe'
     puts <<-EOT
 WSSH client
 
-Usage: ruby #{File.basename __FILE__} ws[s]://host[:port]/uri
+Usage: #{Exe.biname} ws[s]://host[:port]/uri
     EOT
     exit 1
   end

data/lib/em/wssh/connect.rb

@@ -4,6 +4,8 @@ module EventMachine::Wssh
 module Connect
   extend Service
 
+  Title='HTTP Connect proxy to WSSH server'
+
   Need=%w(faye/websocket)
 
   @options={
@@ -16,10 +18,11 @@ module Connect
   }
 
   def self.help
+    require_relative 'exe'
     puts <<-EOF
 Simple HTTP CONNECT proxy to WSSH daemon
 
-Usage: ruby #{File.basename __FILE__} [options...] ws[s]://host[:port]/uri
+Usage: #{Exe.biname} [options...] ws[s]://host[:port]/uri
     EOF
     helptions
   end
@@ -157,7 +160,8 @@ Usage: ruby #{File.basename __FILE__} [options...] ws[s]://host[:port]/uri
   end
 
   def self.listen!
-    EM.start_server options[:host], options[:port], Http
+    conn=EM.start_server options[:host], options[:port], Http
+    options[:onport].call Socket.unpack_sockaddr_in(EM.get_sockname conn)[0] if options[:onport]
   end
 end
 end

data/lib/em/wssh/exe.rb

@@ -2,18 +2,35 @@ require_relative '../wssh'
 
 module EventMachine::Wssh
 module Exe
-  def self.do!
-    cmd = ARGV.shift
-    help unless /\A\w+\Z/.match cmd
+  def self.command? cmd
+    return unless /\A\w+\Z/.match cmd
     cmd=cmd.downcase
     begin
       require_relative cmd
     rescue LoadError
-      help
+      return
     end
-    m=Module.nesting[1].const_get cmd.sub(/^./){|s|s.upcase}
-    help unless Module===m and m.respond_to? :go!
-    m.go!
+    m=Module.nesting[1].const_get cmd.sub(/^./){|s|s.upcase} rescue nil
+    return unless Module===m and m.respond_to? :go!
+    m
+  end
+
+  def self.commands
+    m=Module.nesting[1]
+    Hash[
+      m.constants
+      .map{|n|m.const_get n}
+      .grep(Module)
+      .select{|m| m.respond_to? :go!}
+      .map{|m| [m.name.split(/\W+/).last.downcase, m]}
+      .sort_by{|x| x[0]}
+    ]
+  end
+
+  def self.do!
+    mod = command? ARGV.shift
+    help unless mod
+    mod.go!
   end
 
   def self.help
@@ -21,5 +38,9 @@ module Exe
     Help.go!
     exit
   end
+
+  def self.biname
+    "wssh "+File.basename(caller_locations.first.path).sub(/[.][^.]*\Z/, '')
+  end
 end
 end

data/lib/em/wssh/help.rb

@@ -1,19 +1,45 @@
-require_relative 'all'
+require_relative 'exe'
 
 module EventMachine::Wssh
 module Help
+
+  Title='Show this help'
+
   def self.go!
-    m=Module.nesting[1]
-    list=m.constants
-    .map{|n|m.const_get n}
-    .grep(Module)
-    .select{|m| m.respond_to? :go!}
-    .map{|m| m.name.split(/\W+/).last.downcase}
-    .sort
+    if mod = Exe.command?(ARGV.shift)
+      command mod
+    else
+      top
+    end
+  end
+
+  def self.top
+    require_relative 'all'
+
+    puts <<-EOT
+WSSH suite v#{VERSION}
+
+Usage: wssh command [parameters...]
+
+Available commands:
+
+    EOT
+    Exe.commands.each{|cmd, mod| puts "  wssh #{cmd}\t#{mod::Title rescue nil}"}
+  end
+
+  def self.command mod
+    if mod.respond_to? :help
+      mod.help
+    else
+      puts mod::Title
+    end
+  end
+
+  def self.help
     puts <<-EOT
-WSSH v#{VERSION}
+Shows help for WSSH suite or individual commands
 
-Available commands: #{list*', '}
+Usage: #{Exe.biname} [command]
     EOT
   end
 end

data/lib/em/wssh/server.rb

@@ -4,6 +4,8 @@ module EventMachine::Wssh
 module Server
   extend Service
 
+  Title='WSSH daemon redirects Websocket to sshd'
+
   Need=%w(yaml em-websocket)
 
   @options={
@@ -16,10 +18,11 @@ module Server
   }
 
   def self.help
+    require_relative 'exe'
     puts <<-EOF
 Proxy ssh connection through websocket
 
-Usage: ruby #{File.basename __FILE__} [options...]
+Usage: #{Exe.biname} [options...]
 EOF
     helptions
   end
@@ -68,8 +71,7 @@ EOF
 
       @count=self.class.count
 
-      port, ip=Socket.unpack_sockaddr_in ws.get_peername
-      log "Connect from", ip
+      log "Connect from", Socket.unpack_sockaddr_in(ws.get_peername)[1]
 
       ws.onopen{|handshake| onopen handshake}
       ws.onbinary{|msg| ondata msg}

data/lib/em/wssh/service.rb

@@ -6,7 +6,7 @@ module Service
 
   def log *msg
     msg.unshift "[#{Time.now}]"
-    puts msg*' '
+    (options[:logger]||=STDOUT).puts msg*' '
   end
 
   def helptions

data/lib/em/wssh/version.rb

@@ -0,0 +1,12 @@
+require_relative '../wssh'
+
+module EventMachine::Wssh
+module Version
+
+  Title = 'Show WSSH version'
+
+  def self.go!
+    puts VERSION
+  end
+end
+end

data/lib/em/wssh.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Wssh
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-wssh
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Stas Ukolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -91,8 +91,9 @@ files:
 - lib/em/wssh/help.rb
 - lib/em/wssh/server.rb
 - lib/em/wssh/service.rb
+- lib/em/wssh/version.rb
 - nginx/ssh
-homepage: ''
+homepage: https://github.com/ukoloff/em-wssh
 licenses:
 - MIT
 metadata: {}