packetgen 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f4985dff6a759aee18e0ca94ec364686d58304
-  data.tar.gz: 5aed1f1d1075e6c00ccac6f76191fcbf537f0005
+  metadata.gz: e814826688f3a780a9c222dcc6fd5a2a3ae7daf0
+  data.tar.gz: ccb268a111976248f6dd932c3556874c0f639938
 SHA512:
-  metadata.gz: ccc6f02e411f0f2632bb21b49859bb4efa4a7cf76c71a32e035796589dd4acddee1508ef47ed26afb426b6e1060b694a88d6872a4f019863274b4bf9573c2dcc
-  data.tar.gz: ea8b5f8819097303c3134b168fa4eaaa4de4fe00d23d7eb5631f1d1279a0b9bbbf0159c3e1fb6dfc71846ecbe1fc0929c4da010710dcb790ce1e5bdceb365d27
+  metadata.gz: 7d2b48c08caafa50c4ee4ce3812bc3e7122ca69ccc00a91dc2c75b448dd78fb85cd18c8e352773b81e27e6f7b69b05417a3b953e131a2bd5b775c924b3da1ef3
+  data.tar.gz: e1c2317f4d950c8b78bec81dd4944af29f0faa5ee21a949dd32422827689e752c43acbde5c12784ddd82fa56bfdf99f60449ed90faba2c530f2daadf3658c9a3

data/README.md

@@ -132,7 +132,7 @@ pkt.myheader.field2.read 0x01
 ```
 
 ## Interactive console
-PacketGen provides an interactive console, based on `pry`: `pgconsole`.
+PacketGen provides an interactive console: `pgconsole`.
 
 In this console, context includes PacketGen module to give direct access to PacketGen
 classes. A special `config` object gives local network configuration:
@@ -146,6 +146,8 @@ classes. A special `config` object gives local network configuration:
     pg(main)> packets = capture(max: 5)
     pg(main)> exit
 
+If `pry` gem is installed, it is used as backend for `pgconsole`, else IRB is used.
+
 ## Pull requests?
 
 yes

data/bin/pgconsole

@@ -1,9 +1,17 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
 require 'packetgen'
 require 'packetgen/config'
-require 'pry'
+
+use_pry = false
+begin
+  require 'pry'
+  use_pry = true
+  puts "use Pry!"
+rescue LoadError
+  require 'irb'
+  require 'irb/completion'
+end
 
 include PacketGen
 
@@ -23,19 +31,48 @@ def write(filename, packets)
   Packet.write filename, packets
 end
 
-@config = Config.new
+@config = PacketGen::Config.new
 
 def config
   @config
 end
 
-Pry.config.prompt = [
-  proc { |target_self, nest_level, pry|
-    "#{pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}> "
-     },
-  proc { |target_self, nest_level, pry|
-    "#{pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}* "
-  }
-]
-Pry.config.prompt_name = 'pg'
-Pry.start
+def start_message(use_pry)
+  print "\npgconsole uses #{use_pry ? 'Pry' : 'IRB'}\n\n"
+end
+
+start_message use_pry
+
+if use_pry
+  Pry.config.prompt = [
+    proc { |target_self, nest_level, pry|
+      "#{pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}> "
+    },                                                                           
+    proc { |target_self, nest_level, pry|                                           
+      "#{pry.config.prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}* "       
+    }
+  ]
+  Pry.config.prompt_name = 'pg'
+  Pry.start
+else
+  IRB.setup nil
+  irb = IRB::Irb.new(IRB::WorkSpace.new(binding))
+  IRB.conf[:MAIN_CONTEXT] = irb.context
+  irb.context.auto_indent_mode = true
+  irb.context.prompt_i = "pg(%m)>"
+  irb.context.prompt_s = "pg(%m)*"
+  irb.context.prompt_c = "pg(%m)*"
+
+  trap("SIGINT") do
+    irb.signal_handle
+  end
+
+  begin
+    catch(:IRB_EXIT) do
+      irb.eval_input
+    end
+  ensure
+    IRB.irb_at_exit
+  end
+end
+   

data/lib/packetgen/version.rb

@@ -8,5 +8,5 @@
 # @author Sylvain Daubert
 module PacketGen
   # PacketGen version
-  VERSION = "2.1.0"
+  VERSION = '2.1.1'
 end

data/packetgen.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_dependency 'pcaprub', '~>0.12.4'
-  spec.add_dependency 'pry', '~>0.10'
   spec.add_dependency 'network_interface'
   spec.add_dependency 'net-proto', '~>1.2'
   spec.add_dependency 'rasn1', '~>0.3', '>= 0.3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packetgen
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pcaprub
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.4
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: network_interface
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Network packet generator and analyzor