trema 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 281c9abb37b075014c1ffa114fe1e690c6fd0746
4
+ data.tar.gz: a26c7d9a54f2f6227908f274201378dab82e8116
5
+ SHA512:
6
+ metadata.gz: dc0908793e0d3d726737149c733b184c5e1f5e3505b26e66ef56d2044fd62c693719e973c18618da8d3531109dffca63aa24ef07df46755e820349be29edf6a1
7
+ data.tar.gz: 5d8f2e991f868011274e0735400e86be8be3b3eeda0820a9090ccbdef2edae4a2e30b045839e4eb5e9c6d154a173fec9cee9b11be1bf6c3562e9f2bc389d7e7f
data/cruise.rb CHANGED
@@ -303,7 +303,7 @@ end
303
303
  def test message
304
304
  puts message
305
305
  cd Trema.home do
306
- sh "rake clean"
306
+ sh "bundle exec rake clean"
307
307
  begin
308
308
  yield
309
309
  ensure
@@ -315,8 +315,8 @@ end
315
315
 
316
316
  def run_unit_test
317
317
  test "Running unit tests ..." do
318
- sh "rake unittests"
319
- sh "rake spec"
318
+ sh "bundle exec rake unittests"
319
+ sh "bundle exec rake spec"
320
320
  end
321
321
  measure_coverage
322
322
  end
@@ -324,7 +324,7 @@ end
324
324
 
325
325
  def run_acceptance_test
326
326
  test "Running acceptance tests ..." do
327
- sh "rake features"
327
+ sh "bundle exec rake features"
328
328
  end
329
329
  end
330
330
 
@@ -358,8 +358,9 @@ $options.parse! ARGV
358
358
 
359
359
 
360
360
  def init_cruise
361
- sh "bundle"
362
- sh "rake clobber"
361
+ sh "bundle install"
362
+ sh "bundle update"
363
+ sh "bundle exec rake clobber"
363
364
  end
364
365
 
365
366
 
data/ruby/trema/match.c CHANGED
@@ -569,6 +569,8 @@ match_init( int argc, VALUE *argv, VALUE self ) {
569
569
  */
570
570
  void
571
571
  Init_match() {
572
+ rb_require( "rubygems" );
573
+ rb_require( "pio" );
572
574
  mTrema = rb_eval_string( "Trema" );
573
575
  cMatch = rb_define_class_under( mTrema, "Match", rb_cObject );
574
576
  rb_define_alloc_func( cMatch, match_alloc );
@@ -144,6 +144,8 @@ stats_reply_stats( VALUE self ) {
144
144
  */
145
145
  void
146
146
  Init_stats_reply() {
147
+ rb_require( "rubygems" );
148
+ rb_require( "pio" );
147
149
  rb_require( "trema/desc-stats-reply" );
148
150
  rb_require( "trema/flow-stats-reply" );
149
151
  rb_require( "trema/aggregate-stats-reply" );
@@ -17,7 +17,7 @@
17
17
 
18
18
 
19
19
  module Trema
20
- VERSION = "0.4.1"
20
+ VERSION = "0.4.2"
21
21
  end
22
22
 
23
23
 
@@ -17,7 +17,6 @@
17
17
 
18
18
 
19
19
  require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
20
- require "pio"
21
20
  require "trema"
22
21
 
23
22
 
metadata CHANGED
@@ -1,127 +1,111 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: trema
3
- version: !ruby/object:Gem::Version
4
- hash: 13
5
- prerelease:
6
- segments:
7
- - 0
8
- - 4
9
- - 1
10
- version: 0.4.1
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.4.2
11
5
  platform: ruby
12
- authors:
6
+ authors:
13
7
  - Yasuhito Takamiya
14
8
  autorequire:
15
9
  bindir: .
16
10
  cert_chain: []
17
-
18
- date: 2013-09-27 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
21
- version_requirements: &id001 !ruby/object:Gem::Requirement
22
- none: false
23
- requirements:
24
- - - ">="
25
- - !ruby/object:Gem::Version
26
- hash: 3
27
- segments:
28
- - 0
29
- version: "0"
11
+ date: 2013-09-30 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
30
14
  name: bundler
31
- prerelease: false
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - '>='
18
+ - !ruby/object:Gem::Version
19
+ version: '0'
32
20
  type: :runtime
33
- requirement: *id001
34
- - !ruby/object:Gem::Dependency
35
- version_requirements: &id002 !ruby/object:Gem::Requirement
36
- none: false
37
- requirements:
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - '>='
25
+ - !ruby/object:Gem::Version
26
+ version: '0'
27
+ - !ruby/object:Gem::Dependency
28
+ name: gli
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
38
31
  - - ~>
39
- - !ruby/object:Gem::Version
40
- hash: 47
41
- segments:
42
- - 2
43
- - 8
44
- - 0
32
+ - !ruby/object:Gem::Version
45
33
  version: 2.8.0
46
- name: gli
47
- prerelease: false
48
34
  type: :runtime
49
- requirement: *id002
50
- - !ruby/object:Gem::Dependency
51
- version_requirements: &id003 !ruby/object:Gem::Requirement
52
- none: false
53
- requirements:
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
54
38
  - - ~>
55
- - !ruby/object:Gem::Version
56
- hash: 15
57
- segments:
58
- - 0
59
- - 4
60
- - 0
61
- version: 0.4.0
39
+ - !ruby/object:Gem::Version
40
+ version: 2.8.0
41
+ - !ruby/object:Gem::Dependency
62
42
  name: paper_house
63
- prerelease: false
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ~>
46
+ - !ruby/object:Gem::Version
47
+ version: 0.4.0
64
48
  type: :runtime
65
- requirement: *id003
66
- - !ruby/object:Gem::Dependency
67
- version_requirements: &id004 !ruby/object:Gem::Requirement
68
- none: false
69
- requirements:
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
70
52
  - - ~>
71
- - !ruby/object:Gem::Version
72
- hash: 31
73
- segments:
74
- - 0
75
- - 2
76
- - 4
77
- version: 0.2.4
53
+ - !ruby/object:Gem::Version
54
+ version: 0.4.0
55
+ - !ruby/object:Gem::Dependency
78
56
  name: pio
79
- prerelease: false
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: 0.2.4
80
62
  type: :runtime
81
- requirement: *id004
82
- - !ruby/object:Gem::Dependency
83
- version_requirements: &id005 !ruby/object:Gem::Requirement
84
- none: false
85
- requirements:
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
86
66
  - - ~>
87
- - !ruby/object:Gem::Version
88
- hash: 75
89
- segments:
90
- - 10
91
- - 1
92
- - 0
93
- version: 10.1.0
67
+ - !ruby/object:Gem::Version
68
+ version: 0.2.4
69
+ - !ruby/object:Gem::Dependency
94
70
  name: rake
95
- prerelease: false
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - ~>
74
+ - !ruby/object:Gem::Version
75
+ version: 10.1.0
96
76
  type: :runtime
97
- requirement: *id005
98
- - !ruby/object:Gem::Dependency
99
- version_requirements: &id006 !ruby/object:Gem::Requirement
100
- none: false
101
- requirements:
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
102
80
  - - ~>
103
- - !ruby/object:Gem::Version
104
- hash: 61
105
- segments:
106
- - 4
107
- - 0
108
- - 1
109
- version: 4.0.1
81
+ - !ruby/object:Gem::Version
82
+ version: 10.1.0
83
+ - !ruby/object:Gem::Dependency
110
84
  name: rdoc
111
- prerelease: false
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ~>
88
+ - !ruby/object:Gem::Version
89
+ version: 4.0.1
112
90
  type: :runtime
113
- requirement: *id006
114
- description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C.
115
- email:
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ~>
95
+ - !ruby/object:Gem::Version
96
+ version: 4.0.1
97
+ description: Trema is a full-stack, easy-to-use framework for developing OpenFlow
98
+ controllers in Ruby and C.
99
+ email:
116
100
  - yasuhito@gmail.com
117
- executables:
101
+ executables:
118
102
  - trema
119
103
  - trema-config
120
- extensions:
104
+ extensions:
121
105
  - Rakefile
122
- extra_rdoc_files:
106
+ extra_rdoc_files:
123
107
  - README.md
124
- files:
108
+ files:
125
109
  - .gitignore
126
110
  - .ruby-version
127
111
  - .travis.yml
@@ -813,40 +797,28 @@ files:
813
797
  - ./trema
814
798
  - ./trema-config
815
799
  homepage: http://github.com/trema/trema
816
- licenses:
800
+ licenses:
817
801
  - GPL2
802
+ metadata: {}
818
803
  post_install_message:
819
804
  rdoc_options: []
820
-
821
- require_paths:
805
+ require_paths:
822
806
  - ruby
823
- required_ruby_version: !ruby/object:Gem::Requirement
824
- none: false
825
- requirements:
826
- - - ">="
827
- - !ruby/object:Gem::Version
828
- hash: 57
829
- segments:
830
- - 1
831
- - 8
832
- - 7
807
+ required_ruby_version: !ruby/object:Gem::Requirement
808
+ requirements:
809
+ - - '>='
810
+ - !ruby/object:Gem::Version
833
811
  version: 1.8.7
834
- required_rubygems_version: !ruby/object:Gem::Requirement
835
- none: false
836
- requirements:
837
- - - ">="
838
- - !ruby/object:Gem::Version
839
- hash: 3
840
- segments:
841
- - 0
842
- version: "0"
812
+ required_rubygems_version: !ruby/object:Gem::Requirement
813
+ requirements:
814
+ - - '>='
815
+ - !ruby/object:Gem::Version
816
+ version: '0'
843
817
  requirements: []
844
-
845
818
  rubyforge_project:
846
- rubygems_version: 1.8.25
819
+ rubygems_version: 2.0.3
847
820
  signing_key:
848
- specification_version: 3
821
+ specification_version: 4
849
822
  summary: Full-stack OpenFlow framework.
850
823
  test_files: []
851
-
852
824
  has_rdoc: