pstream 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c901e9969b36359875a7b0dc64ea1ac51e1d5e3c
-  data.tar.gz: 5014a39b62d7ed307e403ea0fab05127a5711d2b
+  metadata.gz: bcfeaaadeb0f4dd7c655faeb065192ab22cb7277
+  data.tar.gz: 226952ccd0e896ca98b039c2e397748c14989914
 SHA512:
-  metadata.gz: f5afc0e5b28202f406eff80925867ba629bba2ee81ebab39d1d406a7eb114fd15ab94094f8207bfd6905b7f3c124d3c86d283efd4a35e324778dfb264a476014
-  data.tar.gz: 7cb2801c693fac65a4c29af8145566f99fbbed1e7ed7a184f5078bcc69dc57f9c05290f00233b344c1e41a29ea1d2c8a7d1b6507bd8473015f2a86272dea34a1
+  metadata.gz: bb9d281c62201bff19cf97dd0c31a18302a77ef5541575953982f64150e9571fee5cfa7559b84fd31fb460dfa2ec770b3f35bfea0fe67d217444953542402f90
+  data.tar.gz: d9b70e10b47e98c444c77b43e9f1617244178f7b24aa31f290acac8379450ce71214132d61125f8c0d0a05c12f7173eb885571471dd7435d9ea9401000099dca

data/bin/pstream

@@ -4,7 +4,6 @@ require "colorize"
 require "io/wait"
 require "optparse"
 require "pstream"
-require "string"
 
 class PStreamExit
     GOOD = 0
@@ -27,8 +26,18 @@ def parse(args)
         "ciphersuites in use."
 
     parser = OptionParser.new do |opts|
+        opts.summary_width = 19
+
         opts.banner = "Usage: #{File.basename($0)} [OPTIONS] <pcap>"
 
+        opts.on("", "DESCRIPTION")
+
+        info.scan(/\S.{0,#{76}}\S(?=\s|$)|\S+/).each do |line|
+            opts.on("    #{line}")
+        end
+
+        opts.on("", "OPTIONS")
+
         opts.on(
             "-c",
             "--ciphersuites",
@@ -61,8 +70,6 @@ def parse(args)
         ) do
             options["verbose"] = true
         end
-
-        opts.on("", info.word_wrap)
     end
 
     begin
@@ -138,7 +145,8 @@ rescue Exception => e
     $stderr.puts "    https://gitlab.com/mjwhitta/pstream/issues"
     $stderr.puts
     $stderr.puts "Maybe the message below will help. If not, you " \
-        "can use the --verbose flag to get a backtrace.".word_wrap
+        "can use the --verbose flag to get"
+    $stderr.puts "a backtrace."
 
     $stderr.puts e.message.red
     if (options["verbose"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pstream
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,7 +59,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 description: This ruby gem will summarize or extract info from pcap files.
 email: mjwhitta@gmail.com
 executables:
@@ -87,7 +87,6 @@ files:
 - lib/pstream/error/stream_not_found.rb
 - lib/pstream/error/tshark_not_found.rb
 - lib/pstream/stream.rb
-- lib/string.rb
 homepage: https://mjwhitta.github.io/pstream
 licenses:
 - GPL-3.0

data/lib/string.rb

@@ -1,12 +0,0 @@
-# Modify String class to allow for rsplit and word wrap
-class String
-    def rsplit(pattern)
-        ret = rpartition(pattern)
-        ret.delete_at(1)
-        return ret
-    end
-
-    def word_wrap(width = 80)
-        return scan(/\S.{0,#{width}}\S(?=\s|$)|\S+/).join("\n")
-    end
-end