pstream 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f289cf0eedd318903ec265932fd3e3779e4745e
-  data.tar.gz: d4264b9311f20607bce36781efd16e39873ea934
+  metadata.gz: 317b451646cd84872f05c59d592c0ffb57cc2f9b
+  data.tar.gz: 4b65c4f947e2f27384383a5bfc54bcb718bd67bb
 SHA512:
-  metadata.gz: 6d6038f01b788a5fab2cde585580d4b17d4fc439ef9164ef4b8755559b555969adf0fd63f57f53cfc08beb1aab91180aedd768191c95093cfe5159208fa23f12
-  data.tar.gz: 5449e1fa140f5ee3942caf67c14aa7ab4d0814098f861b51ef17eb637c6865dbec4561fcb7ace8aba4003155c31818357455d94f006f7f6dd7617fc920462980
+  metadata.gz: c1718f9134683f46ae6167197b8d1cdfa87f45529b1378cbb8a2a3d3aa842eb9d1774e88360c7bcd5fad5e0dbdf5866c71cac061026a437c86cc8ae81a567060
+  data.tar.gz: 22bd61ba3713ba428992a0f0895845494a52d2a82b5b74cc801f79bc614e2371e995b69129c3df62bc0f5e54392c33732196d067db34ed4fc3511a5a0c2e54bd

data/lib/pstream.rb

@@ -63,8 +63,7 @@ class PStream
                     self,
                     ipv,
                     src,
-                    dst,
-                    @colorize
+                    dst
                 )
             end
         end
@@ -78,8 +77,13 @@ class PStream
         return negotiations.values
     end
 
+    def self.colorize?
+        @@colorize ||= false
+        return @@colorize
+    end
+
     def colorize_cipher_suite(suite)
-        return suite if (!@colorize)
+        return suite if (!@@colorize)
 
         case suite
         when /Unknown/
@@ -98,12 +102,12 @@ class PStream
     end
 
     def colorize_header(header)
-        return header if (!@colorize)
+        return header if (!@@colorize)
         return header.light_cyan
     end
 
     def colorize_stream(stream)
-        if (!@colorize)
+        if (!@@colorize)
             return "#{stream.id} | #{stream.desc} | #{stream.frames}"
         end
         return [
@@ -159,14 +163,7 @@ class PStream
         ).split("\n").each do |line|
             desc, frames = line.split(" | ")
             streams.push(
-                Stream.new(
-                    @pcap,
-                    prot,
-                    count,
-                    desc,
-                    frames,
-                    @colorize
-                )
+                Stream.new(@pcap, prot, count, desc, frames)
             )
             count += 1
         end
@@ -176,12 +173,11 @@ class PStream
     private :get_streams
 
     def initialize(pcap, colorize = false)
-        @colorize = colorize
-
         if (ScoobyDoo.where_are_you("tshark").nil?)
             raise PStream::Error::TsharkNotFound.new
         end
 
+        @@colorize = colorize
         @pcap = Pathname.new(pcap).expand_path
 
         if (!@pcap.exist?)

data/lib/pstream/cipher_negotiation.rb

@@ -9,12 +9,12 @@ class PStream::CipherNegotiation
     attr_reader :src
 
     def colorize_hosts(src, dst)
-        return "#{src} <-> #{dst}" if (!@colorize)
+        return "#{src} <-> #{dst}" if (!PStream.colorize?)
         return "#{src} <-> #{dst}".light_cyan
     end
 
     def colorize_ipv(ipv)
-        return "IPv#{ipv}" if (!@colorize)
+        return "IPv#{ipv}" if (!PStream.colorize?)
         return "IPv#{ipv}".light_cyan
     end
 
@@ -26,8 +26,7 @@ class PStream::CipherNegotiation
         ].join(" ")
     end
 
-    def initialize(pstream, ipv, src, dst, colorize)
-        @colorize = colorize
+    def initialize(pstream, ipv, src, dst)
         @dst = dst
         @ipv = ipv
         @length = nil

data/lib/pstream/stream.rb

@@ -4,17 +4,17 @@ class PStream::Stream
     attr_reader :id
 
     def colorize_address(address)
-        return address if (!@colorize)
+        return address if (!PStream.colorize?)
         return address.light_blue
     end
 
     def colorize_ascii(ascii)
-        return ascii if (!@colorize)
+        return ascii if (!PStream.colorize?)
         return ascii.light_white
     end
 
     def colorize_hex(hex)
-        return hex if (!@colorize)
+        return hex if (!PStream.colorize?)
         return hex.light_green
     end
 
@@ -46,8 +46,7 @@ class PStream::Stream
         return ret.join("\n")
     end
 
-    def initialize(pcap, prot, id, desc, frames, colorize = false)
-        @colorize = colorize
+    def initialize(pcap, prot, id, desc, frames)
         @desc = desc
         @frames = frames
         @id = id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pstream
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake