vnstat-ruby 3.0.0 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6862e06e3145d26d76461b2bb6df4840ff73d52
-  data.tar.gz: d704f075ed406527a5ebb5dad12572422dc7b5a7
+  metadata.gz: 7ff8f04378e0177c9d41f689ecb48c8f0c527f1b
+  data.tar.gz: 44a27aa9917f5a8f4a84839cb7c43ae676c25aa3
 SHA512:
-  metadata.gz: 59e46295ad1b32dbd8862421e484869f508ab67c75f205eb4e5a3f23a9ba534c24e2e431188415d354250f5263a58e3deb18acf5c9b040b48c6a9f9839e6f7f7
-  data.tar.gz: 56ad2d5a85a170c35544c83248b1b6a552d04c00544b9806039eb34e96753eebfe2b9b23d10cdd2c1ca9c77bf0e7478833c15ce4f8524f5c95a391b898402e55
+  metadata.gz: ee7a109601e998151efdad0594f73b810295b2ea146f7f5a30c8ec4eceb3983eb2c87bca2bd3d3f9ba953946eabca6f2df564e6d08cd51f24f6511b72780c5d9
+  data.tar.gz: 7e41dd6841e4b596bcc14f024a6bf094473129d0f34a8db25e65bad31e4b8f9b8ea1e014b141fda0ce891fe54668330d8621ce0ed639db2e2cb84dd3f1acf780

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -15,7 +15,7 @@ doc
 # jeweler generated
 pkg
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
 #
 # * Create a file at ~/.gitignore
 # * Include files you want ignored
@@ -47,3 +47,6 @@ pkg
 
 # For rubinius:
 #*.rbc
+
+/.vscode
+.DS_Store

data/.rubocop.yml

@@ -1,5 +1,3 @@
-require: rubocop-performance
-
 AllCops:
   Include:
     - '**/*.rb'

data/.travis.yml

@@ -5,8 +5,5 @@ rvm:
  - '2.4.5'
  - '2.5.3'
  - '2.6.1'
-before_install: gem install bundler -v 2.0.1
+before_install: gem install bundler -v 2.0.2
 script: bundle exec rspec
-addons:
-  code_climate:
-    repo_token: 06a44082b0f5a5114eec226952c45443a4ac8c86e59e098869b5c07e420505ab

data/Gemfile.lock

@@ -1,24 +1,32 @@
 PATH
   remote: .
   specs:
-    vnstat-ruby (3.0.0)
-      nokogiri (~> 1.8.5)
-      systemcall (~> 1.0.0)
+    vnstat-ruby (3.0.7)
+      nokogiri (~> 1.10, >= 1.10.4)
+      systemcall (~> 1.0, >= 1.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
     diff-lcs (1.2.5)
+    docile (1.3.2)
     jaro_winkler (1.5.2)
-    mini_portile2 (2.3.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    json (2.3.1)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -39,24 +47,31 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.1.0)
-      rubocop (>= 0.67.0)
     ruby-progressbar (1.10.0)
-    systemcall (1.0.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    systemcall (1.0.2)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (0.20.3)
+    tins (1.21.1)
     unicode-display_width (1.5.0)
-    yard (0.9.19)
+    yard (0.9.20)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
-  rake (~> 10.0)
+  coveralls (~> 0.8)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.68.0)
-  rubocop-performance (~> 1.1.0)
   vnstat-ruby!
-  yard (~> 0.9.19)
+  yard (~> 0.9.20)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.md

@@ -1,6 +1,7 @@
 # vnstat-ruby
 
 [![Build Status](https://travis-ci.org/tlux/vnstat-ruby.svg?branch=master)](https://travis-ci.org/tlux/vnstat-ruby)
+[![Coverage Status](https://coveralls.io/repos/github/tlux/vnstat-ruby/badge.svg?branch=master)](https://coveralls.io/github/tlux/vnstat-ruby?branch=master)
 [![Gem Version](https://badge.fury.io/rb/vnstat-ruby.svg)](https://badge.fury.io/rb/vnstat-ruby)
 
 Vnstat is a tool that tracks the traffic on your network interfaces.
@@ -172,4 +173,4 @@ interface.tops[1].bytes_received # => 1024000
 
 ### Copyright
 
-Copyright (c) 2015-2017 Tobias Casper. See LICENSE.txt for further details.
+Copyright (c) 2015-2020 Tobias Casper. See LICENSE.txt for further details.

data/lib/vnstat/document.rb

@@ -48,7 +48,10 @@ module Vnstat
     #
     # @return [String]
     def version
-      data.xpath('vnstat').attr('version').text
+      attr = data.xpath('vnstat').attr('version')
+      raise 'Unable to determine version' if attr.nil?
+
+      attr.text
     end
 
     ##
@@ -56,7 +59,10 @@ module Vnstat
     #
     # @return [String]
     def xml_version
-      data.xpath('vnstat').attr('xmlversion').text
+      attr = data.xpath('vnstat').attr('xmlversion')
+      raise 'Unable to determine XML version' if attr.nil?
+
+      attr.text
     end
   end
 end

data/lib/vnstat/interface_collection.rb

@@ -98,9 +98,10 @@ module Vnstat
 
     def interfaces_hash
       @interfaces_hash ||= begin
+        id_attr = xml_version == '2' ? :name : :id
         elements = data.xpath('//interface')
         elements.each_with_object({}) do |node, hash|
-          id = node[:id]
+          id = node[id_attr]
           hash[id] = Interface.new(id, data)
         end
       end

data/lib/vnstat/parser.rb

@@ -33,7 +33,7 @@ module Vnstat
     # Extracts the date and time from the given XML element.
     #
     # @param [Nokogiri::XML::Element] element The XML element.
-    # @return [DateTime]
+    # @return [Time]
     def extract_datetime_from_xml_element(element)
       date = extract_date_from_xml_element(element)
       hour = element.xpath('time/hour').text.to_i

data/lib/vnstat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vnstat
-  VERSION = '3.0.0'
+  VERSION = '3.0.7'
 end

data/vnstat-ruby.gemspec

@@ -24,13 +24,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_dependency 'nokogiri', '~> 1.8.5'
-  spec.add_dependency 'systemcall', '~> 1.0.0'
+  spec.add_dependency 'nokogiri', '~> 1.10', '>= 1.10.4'
+  spec.add_dependency 'systemcall', '~> 1.0', '>= 1.0.2'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.68.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.1.0'
-  spec.add_development_dependency 'yard', '~> 0.9.19'
+  spec.add_development_dependency 'yard', '~> 0.9.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vnstat-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.7
 platform: ruby
 authors:
 - Tobias Casper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,28 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: systemcall
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,75 +65,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.68.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.68.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 0.9.20
 description: Utilizes the the vnstat CLI to track your network traffic.
 email:
 - tobias.casper@gmail.com
@@ -129,6 +141,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".document"
 - ".gitignore"
 - ".rspec"