arista-eapi 0.10.3 → 0.11.0

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .env
 test.rb
+.rbenv-version

data/lib/arista/eapi.rb

@@ -12,47 +12,5 @@ require 'arista/eapi/version'
 
 module Arista
   module EAPI
-    JSON_COMMANDS = [
-      'show aliases',
-      'show interfaces',
-      'show interfaces counters',
-      'show interfaces counters discards',
-      'show interfaces status',
-      'show interfaces switchport vlan mapping',
-      'show ip interface',
-      'show ipv6 interface',
-      'show mac address-table',
-      'show mac address-table aging-time',
-      'show management api http-commands',
-      'show management api http-commands certificate',
-      'show monitor server-failure history',
-      'show monitor server-failure servers',
-      'show monitor session',
-      'show privilege',
-      'show sflow',
-      'show sflow interfaces',
-      'show spanning-tree topology status',
-      'show version',
-      'show version license',
-      'show vlan',
-      'show vlan trunk group',
-    ]
-
-
-    # Public: Determine the eAPI supported format based on the commands. 
-    #
-    # options - List of commands to check format options for.
-    #
-    # Examples
-    #
-    #   Arista::EAPI.format_for('show vlan') 
-    #   #=> 'json'
-    #   Arista::EAPI.format_for('show vlan', 'show lldp neighbors') 
-    #   #=> text
-    #
-    # Returns json if all commands support JSON output, otherwise returns text.
-    def self.format_for(*commands)
-      (commands.flatten - JSON_COMMANDS).size > 0 ? 'text' : 'json'
-    end
   end
 end

data/lib/arista/eapi/request.rb

@@ -1,11 +1,14 @@
 module Arista
   module EAPI
     class Request
-      attr_accessor :switch, :commands
+      attr_accessor :switch, :commands, :options
+
+      def initialize(switch, commands, options = {})
+        options[:format] ||= 'json'
 
-      def initialize(switch, *commands)
         self.switch = switch
         self.commands = commands
+        self.options = options
       end
 
       def payload
@@ -16,7 +19,7 @@ module Arista
           :params  => {
             :version => 1,
             :cmds    => commands,
-            :format  => Arista::EAPI.format_for(commands)
+            :format  => options[:format]
           },
         })
       end
@@ -24,11 +27,6 @@ module Arista
       def execute
         Arista::EAPI::Response.new(commands, RestClient.post(switch.url, payload))
       end
-
-      def self.execute!(switch, *commands)
-        req = self.new(switch, *commands)
-        req.execute
-      end
     end
   end
 end

data/lib/arista/eapi/response.rb

@@ -40,8 +40,7 @@ module Arista
       end
 
       def process_result(cmd, result)
-        case Arista::EAPI.format_for(cmd)
-        when 'json' then
+        if result.is_a? Hash then
           convert_hash_keys(result)
         else
           Arista::EAPI::Parser.parse(cmd, result['output'])

data/lib/arista/eapi/switch.rb

@@ -15,20 +15,41 @@ module Arista
       end
 
       def interfaces
-        run('show interfaces')
+        run!('show interfaces')
         attributes[:interfaces]
       end
 
       def version
-        run('show version').first
+        run!('show version')
       end
 
       def update_attributes!(results)
         results.each { |result| attributes.merge!(result) if result.is_a?(Hash) }
       end
 
-      def run(*commands)
-        request = Arista::EAPI::Request.new(self, *commands)
+      # Public: Runs a single command and returns the first result.
+      #
+      # options - Options to pass to the eAPI call.
+      #           :format - The format for the eAPI response. Accepts the strings
+      #                     "json" or "text". (Defaults to json)
+      #
+      # Examples
+      #
+      #   switch.run!('show version')
+      #   #=> {:model_name=>"DCS-7048T-A-R", :internal_version=>"4.12.0-1244071.EOS4120", :system_mac_address=>"00:1c:73:16:c2:c8", :serial_number=>"redacted", :mem_total=>4009152, :bootup_timestamp=>1368735672.690161, :mem_free=>1848284, :version=>"4.12.0", :architecture=>"i386", :internal_build_id=>"c25ec8ea-cb8f-40a8-af0b-d11eaa94d57c", :hardware_revision=>"01.04"}
+      #
+      def run!(command, options={})
+        run([command], options).first
+      end
+
+      # Public: Run the 
+      #
+      # options - Options to pass to the eAPI call.
+      #           :format - The format for the eAPI response. Accepts the strings
+      #                     "json" or "text". (Defaults to json)
+      #
+      def run(commands, options={})
+        request = Arista::EAPI::Request.new(self, commands, options)
         self.update_attributes!(request.execute.results)
       end
     end

data/lib/arista/eapi/version.rb

@@ -1,5 +1,5 @@
 module Arista
   module EAPI
-    VERSION = "0.10.3"
+    VERSION = "0.11.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arista-eapi
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 51
   prerelease: 
   segments: 
   - 0
-  - 10
-  - 3
-  version: 0.10.3
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Mark Imbriaco
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-19 00:00:00 -04:00
+date: 2013-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency