openflow-controller 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b55169812a488fa57a7c87739769f155f821614
-  data.tar.gz: 42f7ef4847a2f6858e5f486643accdc78bef68e9
+  metadata.gz: 5c4acadf7961136eb17add772ffdeefc969d4476
+  data.tar.gz: 9bd7eb4f73e9f23631f561eeb0947619bff9adcb
 SHA512:
-  metadata.gz: ae798f44ea134543fcfbf0239bc1c6a3b995830e70babe2b3718d77c2467a9a3c1cbe6de15aa12e66ab52fc90b049ce3ecc43df0844031558528927b6a5384b4
-  data.tar.gz: 37be1296345a3d69b6441bd3c704027ff282669cef09649212c944fbfd04646725a41fa5bd1a04b36c8d7f0f06e00728062d9189de050484a5eae0a4780e8128
+  metadata.gz: f68d7de83750edb01e19754f52a0f86125958b85d4c81f82acc0bafae6c260d9288416fad3c9406a5fe42e62739b93e01a7143162ad22ee247304731c418fb79
+  data.tar.gz: 3decb0031fe40e9d8e5b1a0010d1f09767639b28b9516ab30479eec65127f07bc77e91a70f922d21d9f37f3c7d4d21736ae49c7020dd936185ede3a7c0c40d9e

data/bin/ofctl

@@ -1,91 +1,62 @@
 #!/usr/bin/env ruby
-require 'gli'
+require 'cri'
 require 'readline'
 require_relative '../lib/controller'
 
 PROMPT = '> '
 
-def run_console(controller, ip, port, *args)
-  Thread.new { controller.run ip, port, args }
+command = Cri::Command.define do
+  name        'ofctl'
+  usage       'ofctl [options] [args]'
+  summary     'OpenFlow Controller command-line tool'
+  description 'OpenFlow Controller command-line tool'
 
-  loop do
-    begin
-      puts " => #{eval(Readline.readline(PROMPT, true)).inspect}"
-    rescue StandardError => e
-      puts "#{e.class}: #{e.message}"
-    end
+  flag :h, :help, 'show help for this command' do |value, cmd|
+    puts cmd.help
+    exit 0
   end
-end
+  flag :d, :debug, 'run controller in debug mode'
 
-module CommandLine
-  extend GLI::App
+  option :i, :ip,         'IP address of the controller',  argument: :optional
+  option :p, :port,       'port number of the controller', argument: :optional
+  option :c, :controller, 'custom controller file',        argument: :optional
 
-  program_desc 'OpenFlow Controller command-line tool'
+  run do |opts, args, _cmd|
+    load opts[:controller] unless opts[:controller].nil?
 
-  desc 'Runs an OpenFlow Controller'
-  arg_name 'controller', optional: false
-  command :run do |c|
-    c.flag :ip,
-      desc: 'IP Address',
-      must_match: /\d+\.\d+\.\d+\.\d+/,
-      required: false,
-      default_value: OFController::DEFAULT_IP_ADDRESS
-    c.flag :port,
-      desc: 'Port Number',
-      type: Integer,
-      required: false,
-      default_value: OFController::DEFAULT_TCP_PORT
-    c.switch :debug,
-      desc: 'Run in Debug Mode',
-      default_value: false
+    debug = opts[:debug] || false
 
-    c.action do |_global_options, options, args|
-      load args.first
-      controller = if options[:debug]
-                     OFController.create(Logger::DEBUG)
-                   else
-                     OFController.create
-                   end
-      controller.run options[:ip], options[:port], args[1..-1]
-    end
-  end
+    ctl = OFController.create(debug)
 
-  desc 'Runs a Simple OpenFlow Controller with REPL'
-  command :console do |c|
-    c.flag :ip,
-      desc: 'IP Address',
-      must_match: /\d+\.\d+\.\d+\.\d+/,
-      required: false,
-      default_value: OFController::DEFAULT_IP_ADDRESS
-    c.flag :port,
-      desc: 'Port Number',
-      type: Integer,
-      required: false,
-      default_value: OFController::DEFAULT_TCP_PORT
-    c.switch :debug,
-      desc: 'Run in Debug Mode',
-      default_value: false
+    init_form = ctl.logger.formatter
+    ctl.logger.formatter = proc do |severity, datetime, progname, msg|
+      buf = PROMPT + Readline::line_buffer
+      "\r" + ' ' * buf.length + "\r" +
+      init_form.call(severity, datetime, progname, msg).blue +
+      buf
+    end
 
-    c.action do |_global_options, options, args|
-      controller = if options[:debug]
-                     OFController.new(Logger::DEBUG)
-                   else
-                     OFController.new
-                   end
+    ip   = opts[:ip]   || OFController::DEFAULT_IP_ADDRESS
+    port = opts[:port] || OFController::DEFAULT_TCP_PORT
 
-      prompt = '> '
-      controller.logger.formatter = proc do |severity, datetime, _progname, msg|
-        buf = PROMPT + Readline::line_buffer
-        "\r" + ' ' * buf.length + "\r" +
-        "#{datetime} (#{severity}) -- #{msg}\n" +
-        buf
+    Thread.abort_on_exception = true
+    Thread.new do
+      begin
+        ctl.run ip, port, args
+      rescue StandardError => e
+        puts "#{e.class}: #{e.message}".red
+        exit 1
       end
+    end
 
-      run_console controller, options[:ip], options[:port], args
+    loop do
+      begin
+        puts " => #{eval(Readline.readline(PROMPT, true)).inspect}".green
+      rescue StandardError => e
+        puts "#{e.class}: #{e.message}".red
+      end
     end
   end
-
-  default_command :help
-
-  exit run(ARGV)
 end
+
+command.run(ARGV)

data/lib/controller.rb

@@ -15,7 +15,7 @@ class OFController
   end
 
   def self.create(*args)
-    @controller_class.new(*args)
+    (@controller_class || self).new(*args)
   end
 
   def self.timer_event(handler, options)
@@ -29,18 +29,18 @@ class OFController
 
   attr_reader :logger
 
-  def initialize(level = Logger::INFO)
+  def initialize(debug = false)
     @switches = {}
     @messages = {}
     @logger = Logger.new($stdout).tap do |logger|
       logger.formatter = proc do |severity, datetime, _progname, msg|
         "#{datetime} (#{severity}) -- #{msg}\n"
       end
-      logger.level = level
+      logger.level = debug ? Logger::DEBUG : Logger::INFO
     end
   end
 
-  def run(ip, port, *args)
+  def run(ip = DEFAULT_IP_ADDRESS, port = DEFAULT_TCP_PORT, *args)
     maybe_send_handler :start, *args
     socket = TCPServer.open(ip, port)
     socket.setsockopt(:SOCKET, :REUSEADDR, true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openflow-controller
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jérémy Pagé
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openflow-protocol
@@ -25,19 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: cri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement