cisco_nxapi 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63d9532b69dca7a3d89222ab55572a22cd3eabac
-  data.tar.gz: e16273c18cbb27992cde626b79d966395edc6f7d
+  metadata.gz: f43fda90d4e3356ec90ae3d58b3b5c42df1f5b81
+  data.tar.gz: 27411cb40812ff94649fc7fd60f77d9e3b0c2479
 SHA512:
-  metadata.gz: efceaaee7cca21224a8a105998b203f7c3f44a08decc02cca3f2b9bac0fafb3e7b2bec923b3e26b84561c53183803060275f72637a623685745310f5726aac41
-  data.tar.gz: 6bbde4135eba7ab19101df8d7c551925f99dfd539d4665ee42e7212de77f46a84c848c0a5185cbaac3281f6e2022406c5de533e775101b8b136d188571738d34
+  metadata.gz: ddff10307f0baafa3330c0b1944b81de4208e00a8e638e2be87786489cb45525a85ea14f8b118765fcd0947d8426853e855fadeebb499b894a501425a4eebf95
+  data.tar.gz: d0dc20a41170f446880f92329bc485a763e02f85004692189788df66381caf380d22c4bb1b8ae91c8b08447842c105281c6b20bfe3f3d36a61adfdb8b6b00d2c

data/lib/cisco_nxapi/cisco_nxapi.rb

@@ -210,11 +210,20 @@ module CiscoNxapi
       end
     end
 
+    # Sends a request to the NX API and returns the body of the request or
+    # handles errors that happen.
     # @raise CiscoNxapi::ConnectionRefused if NXAPI is disabled
     # @raise CiscoNxapi::HTTPUnauthorized if username/password are invalid
     # @raise CiscoNxapi::HTTPBadRequest (should never occur)
     # @raise CiscoNxapi::RequestNotSupported
     # @raise CiscoNxapi::CliError if any command is rejected as invalid
+    #
+    # @param type ["cli_show", "cli_show_ascii"] Specifies the type of command
+    #             to be executed.
+    # @param command_or_list [String, Array<String>] The command or array of
+    #                        commands which should be run.
+    # @return [Hash, Array<Hash>] output when type == "cli_show"
+    # @return [String, Array<String>] output when type == "cli_show_ascii"
     def req(type, command_or_list)
       if command_or_list.is_a?(Array)
         # NXAPI wants config lines to be separated by ' ; '
@@ -274,10 +283,20 @@ module CiscoNxapi
           handle_output(prev_cmds, cmd, o)
           prev_cmds << cmd
         end
-        output = output.each { |o| o['body'] }
+        output = output.collect do |o|
+          if type == 'cli_show_ascii' && o['body'].empty?
+            ''
+          else
+            o['body']
+          end
+        end
       else
         handle_output(prev_cmds, command, output)
-        output = output['body']
+        if type == 'cli_show_ascii' && output['body'].empty?
+          output = ''
+        else
+          output = output['body']
+        end
       end
 
       @cache_hash[type][command] = output if cache_enable?

data/lib/cisco_nxapi/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module CiscoNxapi
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/tests/test_nxapi.rb

@@ -105,6 +105,11 @@ class TestNxapi < TestCase
     assert_equal(result.strip, s.split("\n")[1].strip)
   end
 
+  def test_show_ascii_empty
+    result = client.show('show hostname | include foo | exclude foo', :ascii)
+    assert_equal('', result)
+  end
+
   def test_show_structured
     result = client.show('show hostname', :structured)
     s = @device.cmd('show hostname')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cisco_nxapi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alex Hunsberger
@@ -12,88 +12,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.32'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.32'
 - !ruby/object:Gem::Dependency
   name: net_http_unix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
 description: |
@@ -104,9 +104,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .rubocop_todo.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -133,17 +133,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Utilities for working with Cisco NX-OS NX-API