natpmp 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504f5dbfbf0b924f579d4cc21c3329c415bb0d66
-  data.tar.gz: 2d29eb61c29f70a0876c5592781518c3514064e3
+  metadata.gz: 5bc342344a2e984433de34dc071d77204fc8db69
+  data.tar.gz: 9ad73d6773aefc8f9d4efc287dd4f46928cdc0cb
 SHA512:
-  metadata.gz: 933f2b1277663de3fe5ac5c7110c53ab4ae65161ff1459ad1a1fe4e684c109719540c537647a822e2ffb11de01bde089d49ccadba8f165caefa602a29153e5f2
-  data.tar.gz: d776e773dc7c29c404d896a040120efa19634ba0e88b8d8250e57c94d0f1cfa825539226c1d5ef054fc406751d9f23ee1dbc038e50a67b567b0443ce94cf99be
+  metadata.gz: a3861511a4c3176715aa8cba2884f93fb92a2e2a134fe72451a911aee39d82177d08320a5e83fd8022c9de97bcc52a6f8357447f7f86efa609e2734a3235556f
+  data.tar.gz: e7dc90a16aa49b2db6758857cdcf283e53072f45e15297de7548507491a386628b12c76eecf576c789aae4d1cad077997230d304fb0c9138fa9aeec1ef8fbcb8

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Nick Townsend
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,11 @@
+require 'rake/extensiontask'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+      t.pattern = 'test/**/test_*.rb'
+end
+
+Gem::PackageTask.new(NATPMP::GemSpec) do |pkg|
+end
+
+task :default => :test

data/bin/natpmp

@@ -10,13 +10,9 @@ types = [:tcp, :udp]
 opts = OpenStruct.new(port: nil, type: :tcp, verbose: false, public: 0, ttl: 7200)
 
 OptionParser.new do |o|
-    o.banner = "usage: #{o.program_name} [options] [command]"
-    o.separator "Open a port on a NAT-PMP gateway. Options:"
+    o.banner = "usage: #{o.program_name} [options] [--] [command]"
+    o.separator "Open a port on a NAT-PMP gateway (v#{NATPMP::Version}). Options:"
 
-    o.on_tail( '-?', '--help', 'Display this screen' ) do
-        puts o
-        exit
-    end
     o.on('-t', '--type TYPE', types, "Type: #{types.join(', ')} (default: #{opts.type})") do |t|
         opts.type = t
     end
@@ -32,17 +28,17 @@ OptionParser.new do |o|
     o.on('-v', '--verbose', "Verbose") do
         opts.verbose = true
     end
-    o.on('--version', "Version") do
-        STDERR.puts "#{o.program_name}: Version #{NATPMP::VERSION}"
-        exit;
+    o.on( '-?', '--help', 'Display this screen' ) do
+        puts o
+        exit
     end
-    o.separator "In the command string the following substitutions will be made:"
+    o.separator "If a command string is used the following substitutions will be made:"
     o.separator "  %p the local port"
     o.separator "  %h the local IP address"
     o.separator "  %P the gateway port"
     o.separator "  %H the gateway IP address"
-    o.separator "(Use %% to avoid this)"
-    o.separator "The mapping will be closed on completion of the command"
+    o.separator "  %% to % (to avoid this)"
+    o.separator "When the command terminates the mapping will be removed"
     o.parse! rescue (STDERR.puts "#{o.program_name}: #{$!}\n#{o.to_s}"; exit)
 end
 

data/lib/natpmp.rb

@@ -107,7 +107,7 @@ class NATPMP
     rsp = NATPMP.send [0, OPCODE[@type], 0, @priv, @pub, @maxlife||DEFAULT_LIFETIME].pack("CCnnnN")
     (sssoe, priv, @mapped, @life) = rsp.unpack("x4NnnN")
     raise "Port mismatch: requested #{@priv} received #{priv}" if @priv != priv
-    STDERR.puts "Mapped (at #{sssoe}) #{inspect}" if NATPMP.verbose?
+    STDERR.puts "Mapped (at #{sssoe}) #{inspect}"
     schedule_renew! if @maxlife.nil?
   end
 

data/lib/natpmp/version.rb

@@ -1,3 +1,3 @@
 class NATPMP
-  VERSION='0.9'
+  Version='0.9.1'
 end

metadata

@@ -1,16 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: natpmp
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
 platform: ruby
 authors:
 - Nick Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
-dependencies: []
-description: Interface to NAT-PMP. Portable between Mac OS X and CentOS 5+.
+date: 2014-03-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.2
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+description: Client Interface to NAT Port Mapping Protocol
 email:
 - nick.townsend@mac.com
 executables:
@@ -18,12 +58,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gemtest"
+- Gemfile
+- LICENSE
 - README.md
-- lib/natpmp.rb
+- Rakefile
 - bin/natpmp
+- lib/natpmp.rb
 - lib/natpmp/version.rb
 - test/test_natpmp.rb
-homepage: https://github.com/townsen/c-pod/
+homepage: https://github.com/townsen/natpmp
 licenses:
 - MIT
 metadata: {}
@@ -33,19 +77,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Encapsulate NAT-PMP protocol
-test_files:
-- test/test_natpmp.rb
+summary: Client NAT-PMP protocol
+test_files: []