phut 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3b681d2cbe588388b838a3b6d9d888242a319a
-  data.tar.gz: 2b8602c3b6d63299c5f648256cffa40c201684c6
+  metadata.gz: 78fcf6f28c8a7ca7d4b96577e741a040d36a6b6b
+  data.tar.gz: 50eee5d6d1cc66c2c18039bf2270bc80379a6886
 SHA512:
-  metadata.gz: 6f5bca013e25718e9e209dd90e9597ea62373e914af63c5a81bd286f8aa917e7f2de6dd8cd755664cc3593545c47fd532d1e8fc844f06ad641cd97167702d8e6
-  data.tar.gz: 3b31460f0b73ca4ee302b4664504e78c359549213bc92900dc887e2c93766c73849faa2cccf80e14137cb467fb955191f1f6ed929754fda7faae19b7c48f40dc
+  metadata.gz: ebbd2a412dfd6effeff88e914fcaafbe6312506de0f899437454f963f8fbbb7e0c2a18c59de3a1058b7865a4dd161deeb630756a7b5564e03ef630a784ce7498
+  data.tar.gz: bbdb92a486e99b2c41a0540e0f3cf291b9fd77d369c51dc81b9987976fa9ebf0a38ee28e9e4a348d0772e828492be789e4825413f07e2f756ddc4129c0e59cab

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.7.6 (2/10/2016)
+### Changes
+* Drop the first line (NXST_FLOW...) of dump-flows output.
+
+
 ## 0.7.5 (12/17/2015)
 ### Bugs fixed
 * [#33](https://github.com/trema/phut/pull/33): Fix dump_flows in OpenFlow 1.3.

data/features/shell.feature

@@ -17,14 +17,6 @@ Feature: Shell
     And sleep 1
     Then a vswitch named "0xabc" should be running
 
-  @shell
-  Scenario: dump_flows
-    Given I type "vswitch '0xabc'"
-    When I type "dump_flows 0xabc"
-    And I type "quit"
-    And sleep 1
-    Then the output should contain "NXST_FLOW reply"
-
   @shell
   Scenario: vswitch twice and fail
     And I type "vswitch 0xabc"

data/lib/phut/open_vswitch.rb

@@ -109,7 +109,11 @@ module Phut
     end
 
     def dump_flows
-      `sudo ovs-ofctl dump-flows #{bridge_name} -O #{Pio::OpenFlow.version}`
+      output =
+        `sudo ovs-ofctl dump-flows #{bridge_name} -O #{Pio::OpenFlow.version}`
+      output.split("\n").inject('') do |memo, each|
+        memo + ((/^(NXST|OFPST)_FLOW reply/=~ each) ? '' : each.lstrip + "\n")
+      end
     end
 
     def running?

data/lib/phut/version.rb

@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -412,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Virtual network in seconds.