trema 0.3.10 → 0.3.11

data/Gemfile

@@ -15,17 +15,14 @@ gemspec
 group :development do
   gem "aruba", "~> 0.5.1"
   gem "cucumber", "~> 1.2.1"
-  gem "flay", "~> 1.4.3"
-  gem "flog", "~> 2.5.3"
-  gem "rake", "~> 10.0.2"
+  gem "flay", "~> 2.0.1"
+  gem "flog", "~> 3.2.2"
   gem "rcov", "~> 1.0.0"
-  gem "rdoc", "~> 3.12"
   gem "redcarpet", "~> 2.2.2"
-  gem "reek", "~> 1.2.13"
+  gem "reek", "~> 1.3.1"
   gem "relish", "~> 0.6"
-  gem "roodi", "~> 2.1.0"
   gem "rspec", "~> 2.12.0"
-  gem "yard", "~> 0.8.3"
+  gem "yard", "~> 0.8.4.1"
 end
 
 

data/README.md

@@ -256,7 +256,7 @@ Project Status
 
 * Build Status [![Build Status](https://secure.travis-ci.org/trema/trema.png?branch=develop)](http://travis-ci.org/trema/trema)
 * Dependency Status [![Dependency Status](https://gemnasium.com/trema/trema.png)](https://gemnasium.com/trema/trema)
-* Code Quality [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/trema/trema)
+* Code Quality [![Code Climate](https://codeclimate.com/github/trema/trema.png)](https://codeclimate.com/github/trema/trema)
 
 
 License

data/Rakefile

@@ -114,7 +114,7 @@ $quality_targets = if ENV[ "QUALITY_TARGETS" ]
 
 
 desc "Enforce Ruby code quality with static analysis of code"
-task :quality => [ :reek, :roodi, :flog, :flay ]
+task :quality => [ :reek, :flog, :flay ]
 
 
 begin
@@ -131,20 +131,6 @@ rescue LoadError
   $stderr.puts $!.to_s
 end
 
-
-begin
-  require "roodi"
-  require "roodi_task"
-
-  RoodiTask.new do | t |
-    t.verbose = false
-    t.patterns = $quality_targets
-  end
-rescue LoadError
-  $stderr.puts $!.to_s
-end
-
-
 begin
   require "flog"
 

data/features/support/hooks.rb

@@ -17,7 +17,7 @@
 
 
 Before do
-  @aruba_timeout_seconds = 5
+  @aruba_timeout_seconds = 10
   run "trema killall"
   sleep 5
 end

data/ruby/trema/command/run.rb

@@ -73,7 +73,7 @@ module Trema
         if ruby_controller?
           require "trema"
           include Trema
-          ARGV.replace ARGV[ 0 ].split
+          ARGV.replace ARGV[ 0 ].split[ 1..-1 ]
           $LOAD_PATH << File.dirname( controller_file )
           load controller_file
         else

data/ruby/trema/packet-in.c

@@ -1087,8 +1087,6 @@ Init_packet_in() {
   rb_define_const( cPacketIn, "OFPR_NO_MATCH", INT2NUM( OFPR_NO_MATCH ) );
   rb_define_const( cPacketIn, "OFPR_ACTION", INT2NUM( OFPR_ACTION ) );
 
-  rb_define_method( cPacketIn, "initialize_copy", packet_in_init_copy, 1 );
-
   rb_define_method( cPacketIn, "datapath_id", packet_in_datapath_id, 0 );
   rb_define_method( cPacketIn, "transaction_id", packet_in_transaction_id, 0 );
   rb_define_method( cPacketIn, "buffer_id", packet_in_buffer_id, 0 );
@@ -1171,6 +1169,8 @@ Init_packet_in() {
   rb_define_method( cPacketIn, "udp_dst_port", packet_in_udp_dst_port, 0 );
   rb_define_method( cPacketIn, "udp_checksum", packet_in_udp_checksum, 0 );
   rb_define_method( cPacketIn, "udp_len", packet_in_udp_len, 0 );
+
+  rb_define_private_method( cPacketIn, "initialize_copy", packet_in_init_copy, 1 );
 }
 
 

data/ruby/trema/stats-reply.c

@@ -118,12 +118,14 @@ stats_reply_flags( VALUE self ) {
 /*
  * A list of reply type objects for this message.
  *
+ * @return [Array<DescStatsReply>]
+ *   an array of {DescStatsReply} objects if type is +OFPST_DESC+.
  * @return [Array<FlowStatsReply>]
  *   an array of {FlowStatsReply} objects if type is +OFPST_FLOW+.
- * @return [Array<TableStatsReply>]
- *   an array of {TableStatsReply} objects if type is +OFPST_TABLE+.
  * @return [AggregateStatsReply]
  *   a {AggregateStatsReply} object if type is +OFPST_AGGREGATE+.
+ * @return [Array<TableStatsReply>]
+ *   an array of {TableStatsReply} objects if type is +OFPST_TABLE+.
  * @return [Array<PortStatsReply>]
  *   an array of {PortStatsReply} objects if type is +OFPST_PORT+.
  * @return [Array<QueueStatsReply>]

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end
 
 

data/src/examples/openflow_message/example.rb

@@ -20,11 +20,10 @@
 
 module Example
   class << self
-    attr_accessor :exec_name, :count, :datapath_id
+    attr_accessor :count, :datapath_id
 
 
     def options_parse args
-      @exec_name = args.shift
       case args.length
       when 2
         @datapath_id = args[ 0 ] =~ /^0x/ ? args[ 0 ].hex : args[ 0 ].to_i
@@ -36,7 +35,7 @@ module Example
 
 
     def cmd_usage
-      "Usage: #{ @exec_name } datapath_id, count"
+      "Usage: #{ File.basename __FILE__ } datapath_id, count"
     end
   end
 

data/src/examples/openflow_message/hello.rb

@@ -20,11 +20,11 @@
 
 class HelloController < Controller
   def start
-    if ARGV.size < 2
-      STDERR.puts "Usage: #{ File.basename ARGV[ 0 ] } COUNT"
+    if ARGV.size != 1
+      STDERR.puts "Usage: #{ File.basename __FILE__ } COUNT"
       shutdown!
     end
-    @count = ARGV[ 1 ].to_i
+    @count = ARGV[ 0 ].to_i
   end
 
 

data/trema.gemspec

@@ -1,34 +1,35 @@
 $:.push File.expand_path( "../ruby", __FILE__ )
 require "trema/version"
 
+
 Gem::Specification.new do | gem |
   gem.name = "trema"
   gem.version = Trema::VERSION
+  gem.summary = "Full-stack OpenFlow framework."
+  gem.description = "Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C."
+
+  gem.required_ruby_version = "~> 1.8.7"
+
+  gem.license = "GPL2"
+
   gem.authors = [ "Yasuhito Takamiya" ]
   gem.email = [ "yasuhito@gmail.com" ]
   gem.homepage = "http://github.com/trema/trema"
-  gem.summary = %q{Full-Stack OpenFlow Framework for Ruby and C}
-  gem.description = %q{Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C}
-  gem.license = "GPL2"
-  gem.required_ruby_version = "~> 1.8.7"
 
-  gem.files = `git ls-files`.split( "\n" )
-  gem.test_files = `git ls-files -- {spec,features}/*`.split( "\n" )
   gem.bindir = "."
   gem.executables = [ "trema", "trema-config" ]
+  gem.files = `git ls-files`.split( "\n" )
+
   gem.require_path = "ruby"
   gem.extensions = [ "Rakefile" ]
-  gem.extra_rdoc_files = [ "README.md" ]
 
-  # specify any dependencies here; for example:
-  # gem.add_development_dependency "rspec"
-  gem.add_runtime_dependency "rake"
-  gem.add_runtime_dependency "gli", "~> 2.5.4"
-  gem.add_runtime_dependency "rdoc", "~> 3.12"
+  gem.extra_rdoc_files = [ "README.md" ]
+  gem.test_files = `git ls-files -- {spec,features}/*`.split( "\n" )
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rdoc"
-  gem.add_development_dependency "aruba"
+  gem.add_dependency "bundler", "~> 1.2.3"
+  gem.add_dependency "gli", "~> 2.5.4"
+  gem.add_dependency "rake", "~> 10.0.3"
+  gem.add_dependency "rdoc", "~> 3.12.1"
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,20 +15,22 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-02-08 00:00:00 Z
+date: 2013-02-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+  name: bundler
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
   requirement: *id001
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -49,62 +51,37 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rdoc
+  name: rake
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 73
         segments: 
+        - 10
+        - 0
         - 3
-        - 12
-        version: "3.12"
+        version: 10.0.3
   requirement: *id003
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+  name: rdoc
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 53
         segments: 
-        - 0
-        version: "0"
+        - 3
+        - 12
+        - 1
+        version: 3.12.1
   requirement: *id004
-  type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rdoc
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-  type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: aruba
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-  type: :development
-description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C
+  type: :runtime
+description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C.
 email: 
 - yasuhito@gmail.com
 executables: 
@@ -813,7 +790,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Full-Stack OpenFlow Framework for Ruby and C
+summary: Full-stack OpenFlow framework.
 test_files: []
 
 has_rdoc: