trema 0.4.6 → 0.4.7

data/ruby/trema/dsl/stanza.rb

@@ -24,19 +24,19 @@ module Trema
       attr_reader :name
 
 
-      def initialize name = nil
+      def initialize(name = nil)
         @name = name
       end
 
 
-      def [] attribute
+      def [](attribute)
         instance_variable_get "@#{ attribute }".intern
       end
 
 
-      def fetch attribute
-        v = self[ attribute ]
-        raise "#{ attribute } is not set" if v.nil?
+      def fetch(attribute)
+        v = self[ attribute]
+        fail "#{ attribute } is not set" if v.nil?
         v
       end
     end

data/ruby/trema/dsl/switch.rb

@@ -18,33 +18,33 @@
 #
 
 
-require "trema/dsl/stanza"
+require 'trema/dsl/stanza'
 
 
 module Trema
   module DSL
     class Switch < Stanza
-      def dpid value
+      def dpid(value)
         case value
         when String
-          set_dpid value
+          self.dpid = value
         when Integer
-          set_dpid sprintf( "%#x", value )
+          self.dpid = sprintf('%#x', value)
         else
-          raise "Invalid datapath_id: #{ value }"
+          fail "Invalid datapath_id: #{ value }"
         end
       end
-      alias :datapath_id :dpid
+      alias_method :datapath_id, :dpid
 
 
-      def ports str
+      def ports(str)
         @ports = str
       end
 
 
       def validate
-        set_dpid name if /\A0x/=~ name
-        raise "Invalid dpid: #{ @name }" if @dpid_short.nil?
+        self.dpid = name if /\A0x/ =~ name
+        fail "Invalid dpid: #{ @name }" if @dpid_short.nil?
       end
 
 
@@ -53,16 +53,16 @@ module Trema
       ##########################################################################
 
 
-      def set_dpid string
-        @dpid_long = dpid_long_from( string )
+      def dpid=(string)
+        @dpid_long = dpid_long_from(string)
         @dpid_short = string
         @name = @dpid_short if @name.nil?
       end
 
 
-      def dpid_long_from string
-        no_0x = string.gsub( /^0x/, "" )
-        "0" * ( 16 - no_0x.length ) + no_0x
+      def dpid_long_from(string)
+        no_0x = string.gsub(/^0x/, '')
+        '0' * ( 16 - no_0x.length) + no_0x
       end
     end
   end

data/ruby/trema/dsl/syntax.rb

@@ -18,102 +18,102 @@
 #
 
 
-require "trema/app"
-require "trema/dsl/link"
-require "trema/dsl/netns"
-require "trema/dsl/rswitch"
-require "trema/dsl/run"
-require "trema/dsl/switch"
-require "trema/dsl/vhost"
-require "trema/dsl/vswitch"
-require "trema/dsl/custom-switch"
-require "trema/hardware-switch"
-require "trema/host"
-require "trema/link"
-require "trema/monkey-patch/module"
-require "trema/netns"
-require "trema/open-vswitch"
-require "trema/packetin-filter"
-require "trema/ruby-switch"
-require "trema/switch-manager"
-require "trema/custom-switch"
+require 'trema/app'
+require 'trema/dsl/link'
+require 'trema/dsl/netns'
+require 'trema/dsl/rswitch'
+require 'trema/dsl/run'
+require 'trema/dsl/switch'
+require 'trema/dsl/vhost'
+require 'trema/dsl/vswitch'
+require 'trema/dsl/custom-switch'
+require 'trema/hardware-switch'
+require 'trema/host'
+require 'trema/link'
+require 'trema/monkey-patch/module'
+require 'trema/netns'
+require 'trema/open-vswitch'
+require 'trema/packetin-filter'
+require 'trema/ruby-switch'
+require 'trema/switch-manager'
+require 'trema/custom-switch'
 
 
 module Trema
   module DSL
     class Syntax
-      def initialize config
+      def initialize(config)
         @config = config
       end
 
 
-      def port number
+      def port(number)
         @config.port = number
       end
 
 
-      def link peer0, peer1
-        stanza = Trema::DSL::Link.new( peer0, peer1 )
-        Trema::Link.new( stanza )
+      def link(peer0, peer1)
+        stanza = Trema::DSL::Link.new(peer0, peer1)
+        Trema::Link.new(stanza)
       end
 
 
-      def switch name = nil, &block
-        stanza = Trema::DSL::Switch.new( name )
-        stanza.instance_eval( &block )
-        Trema::HardwareSwitch.new( stanza )
+      def switch(name = nil, &block)
+        stanza = Trema::DSL::Switch.new(name)
+        stanza.instance_eval(&block)
+        Trema::HardwareSwitch.new(stanza)
       end
 
 
-      def vswitch name = nil, &block
-        stanza = Trema::DSL::Vswitch.new( name )
-        stanza.instance_eval( &block )
+      def vswitch(name = nil, &block)
+        stanza = Trema::DSL::Vswitch.new(name)
+        stanza.instance_eval(&block)
         Trema::OpenVswitch.new stanza, @config.port
       end
 
 
-      def rswitch name = nil, &block
-        stanza = Trema::DSL::Rswitch.new( name )
-        stanza.instance_eval( &block )
-        Trema::RubySwitch.new( stanza )
+      def rswitch(name = nil, &block)
+        stanza = Trema::DSL::Rswitch.new(name)
+        stanza.instance_eval(&block)
+        Trema::RubySwitch.new(stanza)
       end
 
 
-      def custom_switch name = nil, &block
-        stanza = Trema::DSL::CustomSwitch.new( name )
-        stanza.instance_eval( &block )
+      def custom_switch(name = nil, &block)
+        stanza = Trema::DSL::CustomSwitch.new(name)
+        stanza.instance_eval(&block)
         Trema::CustomSwitch.new stanza
       end
 
 
-      def vhost name = nil, &block
-        stanza = Trema::DSL::Vhost.new( name )
-        stanza.instance_eval( &block ) if block
-        Trema::Host.new( stanza )
+      def vhost(name = nil, &block)
+        stanza = Trema::DSL::Vhost.new(name)
+        stanza.instance_eval(&block) if block
+        Trema::Host.new(stanza)
       end
 
 
-      def netns name, &block
-        stanza = Trema::DSL::Netns.new( name )
-        stanza.instance_eval( &block ) if block
-        Trema::Netns.new( stanza )
+      def netns(name, &block)
+        stanza = Trema::DSL::Netns.new(name)
+        stanza.instance_eval(&block) if block
+        Trema::Netns.new(stanza)
       end
 
 
-      def filter rule
-        Trema::PacketinFilter.new( rule )
+      def filter(rule)
+        Trema::PacketinFilter.new(rule)
       end
 
 
-      def event rule
-        Trema::SwitchManager.new( rule, @config.port )
+      def event(rule)
+        Trema::SwitchManager.new(rule, @config.port)
       end
 
 
-      def run name = nil, &block
-        stanza = Trema::DSL::Run.new( name )
-        stanza.instance_eval( &block )
-        Trema::App.new( stanza )
+      def run(name = nil, &block)
+        stanza = Trema::DSL::Run.new(name)
+        stanza.instance_eval(&block)
+        Trema::App.new(stanza)
       end
       deprecate :app => :run
     end

data/ruby/trema/dsl/vhost.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/dsl/stanza"
-require "trema/dsl/syntax-error"
+require 'trema/dsl/stanza'
+require 'trema/dsl/syntax-error'
 
 
 module Trema
@@ -36,14 +36,14 @@ module Trema
       #
       # @api public
       #
-      def promisc on_off
+      def promisc(on_off)
         case on_off.to_s.downcase
-        when "on", "yes"
+        when 'on', 'yes'
           @promisc = true
-        when "off", "no"
+        when 'off', 'no'
           @promisc = false
         else
-          raise SyntaxError, "Unknown option: promisc #{ on_off }"
+          fail SyntaxError, "Unknown option: promisc #{ on_off }"
         end
       end
 
@@ -58,7 +58,7 @@ module Trema
       #
       # @api public
       #
-      def ip str
+      def ip(str)
         @ip = str
         if @name.nil?
           @name = @ip
@@ -76,7 +76,7 @@ module Trema
       #
       # @api public
       #
-      def netmask str
+      def netmask(str)
         @netmask = str
       end
 
@@ -91,7 +91,7 @@ module Trema
       #
       # @api public
       #
-      def mac str
+      def mac(str)
         @mac = str
       end
     end

data/ruby/trema/dsl/vswitch.rb

@@ -18,19 +18,19 @@
 #
 
 
-require "trema/dsl/switch"
+require 'trema/dsl/switch'
 
 
 module Trema
   module DSL
     class Vswitch < Switch
-      def initialize name = nil
+      def initialize(name = nil)
         super name
-        @ip = "127.0.0.1"
+        @ip = '127.0.0.1'
       end
 
 
-      def ip str
+      def ip(str)
         @ip = str
       end
     end

data/ruby/trema/enqueue.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/action"
-require "trema/monkey-patch/integer"
+require 'trema/action'
+require 'trema/monkey-patch/integer'
 
 
 module Trema
@@ -53,24 +53,24 @@ module Trema
     # @raise [ArgumentError] if port_number is not an unsigned 16-bit integer.
     # @raise [ArgumentError] if queue id is not an unsigned 32-bit integer.
     #
-    def initialize options
-      if options.is_a?( Hash )
-        @port_number = options[ :port_number ]
-        @queue_id = options[ :queue_id ]
+    def initialize(options)
+      if options.is_a?(Hash)
+        @port_number = options[ :port_number]
+        @queue_id = options[ :queue_id]
         if @port_number.nil?
-          raise ArgumentError, "Port number is a mandatory option"
+          fail ArgumentError, 'Port number is a mandatory option'
         end
         unless @port_number.unsigned_16bit?
-          raise ArgumentError, "Port number must be an unsigned 16-bit integer"
+          fail ArgumentError, 'Port number must be an unsigned 16-bit integer'
         end
         if @queue_id.nil?
-          raise ArgumentError, "Queue ID is a mandatory option"
+          fail ArgumentError, 'Queue ID is a mandatory option'
         end
         unless @queue_id.unsigned_32bit?
-          raise ArgumentError, "Queue ID must be an unsigned 32-bit integer"
+          fail ArgumentError, 'Queue ID must be an unsigned 32-bit integer'
         end
       else
-        raise "Invalid option"
+        fail 'Invalid option'
       end
     end
   end

data/ruby/trema/exact-match.rb

@@ -20,7 +20,7 @@
 
 module Trema
   class ExactMatch
-    def self.from message
+    def self.from(message)
       Match.from message
     end
   end

data/ruby/trema/executables.rb

@@ -16,9 +16,9 @@
 #
 
 
-require "trema/monkey-patch/module"
-require "trema/monkey-patch/string"
-require "trema/path"
+require 'trema/monkey-patch/module'
+require 'trema/monkey-patch/string'
+require 'trema/path'
 
 
 #
@@ -36,7 +36,7 @@ class Trema::Executables
     #
     def compiled?
       @list.each do | each |
-        return false unless FileTest.executable?( __send__ each )
+        return false unless FileTest.executable?(__send__ each)
       end
     end
 
@@ -49,7 +49,7 @@ class Trema::Executables
     #
     # Adds the name to a list.
     #
-    def add name
+    def add(name)
       @list ||= []
       @list << name
     end
@@ -68,9 +68,9 @@ class Trema::Executables
     #
     # @return [Array] a list of a class method to access each executable program.
     #
-    def path path
-      name = File.basename( path ).underscore
-      define_class_method( name ) do
+    def path(path)
+      name = File.basename(path).underscore
+      define_class_method(name) do
         File.join Trema.objects, path
       end
       add name
@@ -78,17 +78,17 @@ class Trema::Executables
   end
 
 
-  path "openvswitch/bin/ovs-ofctl"
-  path "openvswitch/bin/ovs-openflowd"
-  path "packetin_filter/packetin_filter"
-  path "phost/cli"
-  path "phost/phost"
-  path "switch_manager/switch"
-  path "switch_manager/switch_manager"
-  path "tremashark/packet_capture"
-  path "tremashark/stdin_relay"
-  path "tremashark/syslog_relay"
-  path "tremashark/tremashark"
+  path 'openvswitch/bin/ovs-ofctl'
+  path 'openvswitch/bin/ovs-openflowd'
+  path 'packetin_filter/packetin_filter'
+  path 'phost/cli'
+  path 'phost/phost'
+  path 'switch_manager/switch'
+  path 'switch_manager/switch_manager'
+  path 'tremashark/packet_capture'
+  path 'tremashark/stdin_relay'
+  path 'tremashark/syslog_relay'
+  path 'tremashark/tremashark'
 end