trema 0.4.6 → 0.4.7

data/spec/trema/dsl/link_spec.rb

@@ -16,26 +16,26 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
-require "trema/dsl/link"
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require 'trema/dsl/link'
 
 
 module Trema
   module DSL
     describe Link do
-      context %[when parsing "link peerA peerB"] do
-        it %[recognizes "link peerA peerB" directive] do
-          expect { Link.new "Host", "Switch" }.not_to raise_error
+      context 'when parsing "link peerA peerB"' do
+        it 'recognizes "link peerA peerB" directive' do
+          expect { Link.new 'Host', 'Switch' }.not_to raise_error
         end
       end
 
 
-      context "when getting attributes of a link" do
-        it "remembers peers" do
-          link = Link.new( "Host", "Switch" )
-          expect( link.peers.size ).to eq( 2 )
-          expect( link.peers ).to include( "Host" )
-          expect( link.peers ).to include( "Switch" )
+      context 'when getting attributes of a link' do
+        it 'remembers peers' do
+          link = Link.new('Host', 'Switch')
+          expect(link.peers.size).to eq(2)
+          expect(link.peers).to include('Host')
+          expect(link.peers).to include('Switch')
         end
       end
     end

data/spec/trema/dsl/run_spec.rb

@@ -16,8 +16,8 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
-require "trema/dsl/run"
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require 'trema/dsl/run'
 
 
 module Trema
@@ -28,36 +28,36 @@ module Trema
       end
 
 
-      context %[when parsing "run { ... }"] do
-        it %[recognizes "path COMMAND_PATH" directive] do
-          expect { @run.path "/usr/bin/tremario" }.not_to raise_error
+      context 'when parsing "run { ... }"' do
+        it 'recognizes "path COMMAND_PATH" directive' do
+          expect { @run.path '/usr/bin/tremario' }.not_to raise_error
         end
 
 
-        it %[recognizes "options OPTIONS..." directive] do
-          expect { @run.options "--verbose", "--color" }.not_to raise_error
+        it 'recognizes "options OPTIONS..." directive' do
+          expect { @run.options '--verbose', '--color' }.not_to raise_error
         end
       end
 
 
-      context "when getting the attributes of an run" do
-        it "returns its name" do
-          @run.path "/usr/bin/tremario"
-          expect( @run[ :name ] ).to eq( "tremario" )
+      context 'when getting the attributes of an run' do
+        it 'returns its name' do
+          @run.path '/usr/bin/tremario'
+          expect(@run[ :name]).to eq('tremario')
         end
 
 
-        it "returns its path" do
-          @run.path "/usr/bin/tremario"
-          expect( @run[ :path ] ).to eq( "/usr/bin/tremario" )
+        it 'returns its path' do
+          @run.path '/usr/bin/tremario'
+          expect(@run[ :path]).to eq('/usr/bin/tremario')
         end
 
 
-        it "returns its options" do
-          @run.options "--verbose", "--color"
-          expect( @run[ :options ].size ).to eq( 2 )
-          expect( @run[ :options ] ).to include( "--verbose" )
-          expect( @run[ :options ] ).to include( "--color" )
+        it 'returns its options' do
+          @run.options '--verbose', '--color'
+          expect(@run[ :options].size).to eq(2)
+          expect(@run[ :options]).to include('--verbose')
+          expect(@run[ :options]).to include('--color')
         end
       end
     end

data/spec/trema/dsl/runner_spec.rb

@@ -16,28 +16,28 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
-require "trema/dsl/runner"
-require "trema/ordered-hash"
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require 'trema/dsl/runner'
+require 'trema/ordered-hash'
 
 
 module Trema
   module DSL
     describe Runner do
       before :each do
-        ::Process.stub!( :fork ).and_yield
-        ::Process.stub!( :waitpid )
-        @switch_manager = mock( "switch manager", :run! => nil )
-        SwitchManager.stub!( :new ).and_return( @switch_manager )
+        ::Process.stub!(:fork).and_yield
+        ::Process.stub!(:waitpid)
+        @switch_manager = mock('switch manager', :run! => nil)
+        SwitchManager.stub!(:new).and_return(@switch_manager)
       end
 
 
-      context "when running" do
-        it "should run switch_manager" do
-          @switch_manager.should_receive( :run! ).once
+      context 'when running' do
+        it 'should run switch_manager' do
+          @switch_manager.should_receive(:run!).once
 
           context = mock(
-            "context",
+            'context',
             :port => 6653,
             :tremashark => nil,
             :switch_manager => nil,
@@ -49,18 +49,18 @@ module Trema
             :netnss => {}
           )
 
-          Runner.new( context ).run
+          Runner.new(context).run
         end
 
 
-        it "should run packetin_filter" do
+        it 'should run packetin_filter' do
           packetin_filter = mock
-          packetin_filter.should_receive( :run! ).once
+          packetin_filter.should_receive(:run!).once
 
           context = mock(
-            "context",
+            'context',
             :tremashark => nil,
-            :switch_manager => mock( "switch_manager", :run! => nil ),
+            :switch_manager => mock('switch_manager', :run! => nil),
             :packetin_filter => packetin_filter,
             :links => {},
             :hosts => {},
@@ -70,29 +70,29 @@ module Trema
             :port => 6633
           )
 
-          Runner.new( context ).run
+          Runner.new(context).run
         end
 
 
-        it "should create links" do
-          link0 = mock( "link0" )
-          link0.should_receive( :delete! ).once
-          link0.should_receive( :enable! ).once
+        it 'should create links' do
+          link0 = mock('link0')
+          link0.should_receive(:delete!).once
+          link0.should_receive(:enable!).once
 
-          link1 = mock( "link1" )
-          link1.should_receive( :delete! ).once
-          link1.should_receive( :enable! ).once
+          link1 = mock('link1')
+          link1.should_receive(:delete!).once
+          link1.should_receive(:enable!).once
 
-          link2 = mock( "link2" )
-          link2.should_receive( :delete! ).once
-          link2.should_receive( :enable! ).once
+          link2 = mock('link2')
+          link2.should_receive(:delete!).once
+          link2.should_receive(:enable!).once
 
           context = mock(
-            "context",
+            'context',
             :tremashark => nil,
-            :switch_manager => mock( "switch manager", :run! => nil ),
+            :switch_manager => mock('switch manager', :run! => nil),
             :packetin_filter => nil,
-            :links => { "link0" => link0, "link1" => link1, "link2" => link2 },
+            :links => { 'link0' => link0, 'link1' => link1, 'link2' => link2 },
             :hosts => {},
             :switches => {},
             :apps => {},
@@ -100,99 +100,99 @@ module Trema
             :port => 6633
           )
 
-          Runner.new( context ).run
+          Runner.new(context).run
         end
 
 
-        it "should run vhosts" do
-          host0 = mock( "host0" )
-          host1 = mock( "host1" )
-          host2 = mock( "host2" )
+        it 'should run vhosts' do
+          host0 = mock('host0')
+          host1 = mock('host1')
+          host2 = mock('host2')
 
-          host0.should_receive( :run! ).once
-          host0.should_receive( :add_arp_entry ).with do | arg |
-            expect( arg.size ).to eq( 2 )
-            expect( arg ).to include( host1 )
-            expect( arg ).to include( host2 )
+          host0.should_receive(:run!).once
+          host0.should_receive(:add_arp_entry).with do | arg |
+            expect(arg.size).to eq(2)
+            expect(arg).to include(host1)
+            expect(arg).to include(host2)
           end
 
-          host1.should_receive( :run! ).once
-          host1.should_receive( :add_arp_entry ).with do | arg |
-            expect( arg.size ).to eq( 2 )
-            expect( arg ).to include( host0 )
-            expect( arg ).to include( host2 )
+          host1.should_receive(:run!).once
+          host1.should_receive(:add_arp_entry).with do | arg |
+            expect(arg.size).to eq(2)
+            expect(arg).to include(host0)
+            expect(arg).to include(host2)
           end
 
-          host2.should_receive( :run! ).once
-          host2.should_receive( :add_arp_entry ).with do | arg |
-            expect( arg.size ).to eq( 2 )
-            expect( arg ).to include( host0 )
-            expect( arg ).to include( host1 )
+          host2.should_receive(:run!).once
+          host2.should_receive(:add_arp_entry).with do | arg |
+            expect(arg.size).to eq(2)
+            expect(arg).to include(host0)
+            expect(arg).to include(host1)
           end
 
           context = mock(
-            "context",
+            'context',
             :tremashark => nil,
-            :switch_manager => mock( "switch manager", :run! => nil ),
+            :switch_manager => mock('switch manager', :run! => nil),
             :packetin_filter => nil,
             :links => {},
-            :hosts => { "host0" => host0, "host1" => host1, "host2" => host2 },
+            :hosts => { 'host0' => host0, 'host1' => host1, 'host2' => host2 },
             :switches => {},
             :apps => {},
             :netnss => {},
             :port => 6633
           )
 
-          Runner.new( context ).run
+          Runner.new(context).run
         end
 
 
-        it "should run switches" do
-          switch0 = mock( "switch0" )
-          switch0.should_receive( :run! ).once
+        it 'should run switches' do
+          switch0 = mock('switch0')
+          switch0.should_receive(:run!).once
 
-          switch1 = mock( "switch1" )
-          switch1.should_receive( :run! ).once
+          switch1 = mock('switch1')
+          switch1.should_receive(:run!).once
 
-          switch2 = mock( "switch2" )
-          switch2.should_receive( :run! ).once
+          switch2 = mock('switch2')
+          switch2.should_receive(:run!).once
 
           context = mock(
-            "context",
+            'context',
             :tremashark => nil,
-            :switch_manager => mock( "switch manager", :run! => nil ),
+            :switch_manager => mock('switch manager', :run! => nil),
             :packetin_filter => nil,
             :links => {},
             :hosts => {},
-            :switches => { "switch0" => switch0, "switch1" => switch1, "switch 2" => switch2 },
+            :switches => { 'switch0' => switch0, 'switch1' => switch1, 'switch 2' => switch2 },
             :apps => {},
             :netnss => {},
             :port => 6633
           )
 
-          Runner.new( context ).run
+          Runner.new(context).run
         end
 
 
-        it "should run apps" do
+        it 'should run apps' do
           apps = OrderedHash.new
 
-          app0 = mock( "app0", :name => "app0" )
-          app0.should_receive( :daemonize! ).once.ordered
-          apps[ "app0" ] = app0
+          app0 = mock('app0', :name => 'app0')
+          app0.should_receive(:daemonize!).once.ordered
+          apps[ 'app0'] = app0
 
-          app1 = mock( "app1", :name => "app1" )
-          app1.should_receive( :daemonize! ).once.ordered
-          apps[ "app1" ] = app1
+          app1 = mock('app1', :name => 'app1')
+          app1.should_receive(:daemonize!).once.ordered
+          apps[ 'app1'] = app1
 
-          app2 = mock( "app2", :name => "app2" )
-          app2.should_receive( :run! ).once.ordered
-          apps[ "app2" ] = app2
+          app2 = mock('app2', :name => 'app2')
+          app2.should_receive(:run!).once.ordered
+          apps[ 'app2'] = app2
 
           context = mock(
-            "context",
+            'context',
             :tremashark => nil,
-            :switch_manager => mock( "switch manager", :run! => nil, :rule => {} ),
+            :switch_manager => mock('switch manager', :run! => nil, :rule => {}),
             :packetin_filter => nil,
             :links => {},
             :hosts => {},
@@ -201,29 +201,29 @@ module Trema
             :apps => apps
           )
 
-          Runner.new( context ).run
+          Runner.new(context).run
         end
 
 
-        it "should daemonize apps" do
+        it 'should daemonize apps' do
           apps = OrderedHash.new
 
-          app0 = mock( "app0" )
-          app0.should_receive( :daemonize! ).once.ordered
-          apps[ "app0" ] = app0
+          app0 = mock('app0')
+          app0.should_receive(:daemonize!).once.ordered
+          apps[ 'app0'] = app0
 
-          app1 = mock( "app1" )
-          app1.should_receive( :daemonize! ).once.ordered
-          apps[ "app1" ] = app1
+          app1 = mock('app1')
+          app1.should_receive(:daemonize!).once.ordered
+          apps[ 'app1'] = app1
 
-          app2 = mock( "app2", :name => "App2" )
-          app2.should_receive( :daemonize! ).once.ordered
-          apps[ "app2" ] = app2
+          app2 = mock('app2', :name => 'App2')
+          app2.should_receive(:daemonize!).once.ordered
+          apps[ 'app2'] = app2
 
           context = mock(
-            "context",
+            'context',
             :tremashark => nil,
-            :switch_manager => mock( "switch manager", :run! => nil, :rule => {} ),
+            :switch_manager => mock('switch manager', :run! => nil, :rule => {}),
             :packetin_filter => nil,
             :links => {},
             :hosts => {},
@@ -232,7 +232,7 @@ module Trema
             :apps => apps
           )
 
-          Runner.new( context ).daemonize
+          Runner.new(context).daemonize
         end
       end
     end

data/spec/trema/dsl/switch_spec.rb

@@ -16,8 +16,8 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
-require "trema/dsl/switch"
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require 'trema/dsl/switch'
 
 
 module Trema
@@ -28,33 +28,33 @@ module Trema
       end
 
 
-      context %[when parsing "switch { ... }"] do
-        it %[recognizes "dpid DATAPATH_ID" directive] do
-          expect { @switch.dpid "0xabc" }.not_to raise_error
+      context 'when parsing "switch { ... }"' do
+        it 'recognizes "dpid DATAPATH_ID" directive' do
+          expect { @switch.dpid '0xabc' }.not_to raise_error
         end
 
 
-        it %[recognizes "datapath_id DATAPATH_ID" directive] do
-          expect { @switch.datapath_id "0xabc" }.not_to raise_error
+        it 'recognizes "datapath_id DATAPATH_ID" directive' do
+          expect { @switch.datapath_id '0xabc' }.not_to raise_error
         end
 
 
-        it %[recognizes "ports PORT_NUMBERS" directive] do
-          expect { @switch.ports "0-4" }.not_to raise_error
+        it 'recognizes "ports PORT_NUMBERS" directive' do
+          expect { @switch.ports '0-4' }.not_to raise_error
         end
       end
 
 
-      context "when getting the attributes of a switch" do
-        it "returns its dpid in long format" do
-          @switch.dpid "0xabc"
-          expect( @switch[ :dpid_long ] ).to eq( "0000000000000abc" )
+      context 'when getting the attributes of a switch' do
+        it 'returns its dpid in long format' do
+          @switch.dpid '0xabc'
+          expect(@switch[ :dpid_long]).to eq('0000000000000abc')
         end
 
 
-        it "returns its dpid in short format" do
-          @switch.dpid "0xabc"
-          expect( @switch[ :dpid_short ] ).to eq( "0xabc" )
+        it 'returns its dpid in short format' do
+          @switch.dpid '0xabc'
+          expect(@switch[ :dpid_short]).to eq('0xabc')
         end
       end
     end