vnstat-ruby 1.0.5 → 1.1.0

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 rvm:
- - '1.9.3'
  - '2.0.0'
  - '2.1.7'
  - '2.2.3'
- - jruby
- - jruby-head
- - rbx-2
+ - '2.3.1'
+ - '2.4.1'
 script: bundle exec rspec
 addons:
   code_climate:

data/Gemfile

@@ -3,9 +3,10 @@ source 'http://rubygems.org'
 gem 'nokogiri', '~> 1.6'
 
 group :development do
-  gem 'rspec', '~> 3.0'
-  gem 'yard', '~> 0'
   gem 'bundler', '~> 1.0'
+  gem 'codeclimate-test-reporter', '0.6.0', require: false
   gem 'jeweler', '~> 2.0', '>= 2.0.1'
-  gem 'codeclimate-test-reporter', '~> 0', require: false
+  gem 'rspec', '~> 3.0'
+  gem 'rubocop', '~> 0'
+  gem 'yard', '~> 0'
 end

data/Gemfile.lock

@@ -1,9 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
-    builder (3.2.2)
-    codeclimate-test-reporter (0.4.8)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    ast (2.3.0)
+    builder (3.2.3)
+    codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -11,43 +13,50 @@ GEM
     docile (1.1.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
-    github_api (0.12.4)
+    git (1.3.0)
+    github_api (0.11.3)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.4)
+      descendants_tracker (~> 0.0.1)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
+      hashie (>= 1.2)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.6)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (3.4.2)
+    hashie (3.5.5)
     highline (1.7.8)
-    jeweler (2.0.1)
+    jeweler (2.1.2)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.3)
-    jwt (1.5.1)
-    mini_portile (0.6.2)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
+      semver
+    json (2.1.0)
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.4)
-    rake (10.4.2)
-    rdoc (4.2.0)
+      rack (>= 1.2, < 3)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    public_suffix (2.0.5)
+    rack (1.6.5)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
+    rdoc (5.1.0)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -61,24 +70,34 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    simplecov (0.10.0)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    semver (1.0.1)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    thread_safe (0.3.5)
-    yard (0.8.7.6)
+    thread_safe (0.3.6)
+    unicode-display_width (1.2.1)
+    yard (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0)
-  codeclimate-test-reporter (~> 0)
+  codeclimate-test-reporter (= 0.6.0)
   jeweler (~> 2.0, >= 2.0.1)
   nokogiri (~> 1.6)
   rspec (~> 3.0)
+  rubocop (~> 0)
   yard (~> 0)
 
 BUNDLED WITH
-   1.10.6
+   1.14.6

data/README.md

@@ -1,6 +1,9 @@
 # vnstat-ruby
 
-[![Code Climate](https://codeclimate.com/github/tlux/vnstat-ruby/badges/gpa.svg)](https://codeclimate.com/github/tlux/vnstat-ruby) [![Test Coverage](https://codeclimate.com/github/tlux/vnstat-ruby/badges/coverage.svg)](https://codeclimate.com/github/tlux/vnstat-ruby/coverage) [![Build Status](https://travis-ci.org/tlux/vnstat-ruby.svg?branch=master)](https://travis-ci.org/tlux/vnstat-ruby)
+[![Code Climate](https://codeclimate.com/github/tlux/vnstat-ruby/badges/gpa.svg)](https://codeclimate.com/github/tlux/vnstat-ruby)
+[![Test Coverage](https://codeclimate.com/github/tlux/vnstat-ruby/badges/coverage.svg)](https://codeclimate.com/github/tlux/vnstat-ruby/coverage)
+[![Build Status](https://travis-ci.org/tlux/vnstat-ruby.svg?branch=master)](https://travis-ci.org/tlux/vnstat-ruby)
+[![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.
 This tiny library is intended to provide network traffic information
@@ -10,24 +13,12 @@ It depends on the
 [vnstat command line utility](http://humdi.net/vnstat/) which is
 maintained by Teemu Toivola.
 
-
 ### Prerequisites
 
-You need one of the following Ruby versions installed to run the gem:
-
-* Ruby >= 1.9.3
-* JRuby
-* Rubinius >= 2
-
-Also make sure you have the vnstat CLI installed by running `which vnstat`.
-
-If the executable was not found, you are able to obtain the vnstat package
-via aptitude (or a similar package manager):
-
-```bash
-apt-get install vnstat
-```
+* Ruby 2.0.0 or greater
+* Make sure you have `vnstat` CLI installed by running `which vnstat`.
 
+On Ubuntu you can get the vnstat package via `apt-get install vnstat`.
 
 ### Getting Started
 
@@ -183,5 +174,4 @@ interface.tops[1].bytes_received # => 1024000
 
 ### Copyright
 
-Copyright (c) 2015 Tobias Casper. See LICENSE.txt for
-further details.
+Copyright (c) 2015-2017 Tobias Casper. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.1.0

data/lib/vnstat/configuration.rb

@@ -26,7 +26,7 @@ module Vnstat
     # @return [String]
     def executable_path
       @executable_path ||= Utils.system_call('which', 'vnstat') do
-        fail ExecutableNotFound, 'Unable to locate vnstat executable'
+        raise ExecutableNotFound, 'Unable to locate vnstat executable'
       end
     end
 

data/lib/vnstat/document.rb

@@ -21,8 +21,8 @@ module Vnstat
     # A hook used by {.open} that is intended to be overridden by subclasses.
     #
     # @raise [NotImplementedError]
-    def self.load_data(*args)
-      fail NotImplementedError, "Please override #{name}.#{__method__}"
+    def self.load_data(*_args)
+      raise NotImplementedError, "Please override #{name}.#{__method__}"
     end
 
     attr_reader :data
@@ -33,7 +33,7 @@ module Vnstat
     # @param [String] data A string representing the document.
     # @raise [ArgumentError] Raised if the specified data was nil.
     def data=(data)
-      fail ArgumentError, 'No document data specified' if data.nil?
+      raise ArgumentError, 'No document data specified' if data.nil?
       @data = Nokogiri::XML.parse(data.to_s)
     end
 

data/lib/vnstat/interface.rb

@@ -82,14 +82,16 @@ module Vnstat
       success = Utils.call_executable_returning_status(
         '-i', id, '--nick', nick, '--update'
       )
-      fail Error, "Unable to set nickname for interface (#{id}). " \
-                  'Please make sure the vnstat daemon is not running while ' \
-                  'performing this operation.' unless success
+      unless success
+        raise Error, "Unable to set nickname for interface (#{id}). " \
+                    'Please make sure the vnstat daemon is not running while ' \
+                    'performing this operation.'
+      end
       @nick = nick
     end
 
-    alias_method :name, :nick
-    alias_method :name=, :nick=
+    alias name nick
+    alias name= nick=
 
     ##
     # The date on which tracking of the interface began.

data/lib/vnstat/interface_collection.rb

@@ -47,8 +47,8 @@ module Vnstat
     # @return [Interface]
     def [](id)
       interfaces_hash.fetch(id.to_s) do
-        fail UnknownInterface.new(id.to_s),
-             "Unknown interface: #{id}"
+        raise UnknownInterface.new(id.to_s),
+              "Unknown interface: #{id}"
       end
     end
 

data/lib/vnstat/result/hour.rb

@@ -33,7 +33,11 @@ module Vnstat
       def self.extract_from_xml_element(element)
         date = Parser.extract_date_from_xml_element(element)
         hour = Integer(element.attr('id').to_s)
-        new(date, hour, *Parser.extract_transmitted_bytes_from_xml_element(element))
+        new(
+          date,
+          hour,
+          *Parser.extract_transmitted_bytes_from_xml_element(element)
+        )
       end
 
       ##

data/lib/vnstat/system_call.rb

@@ -68,7 +68,7 @@ module Vnstat
     # @raise [RuntimeError] Raises when the command has not yet been called.
     # @return [true, false]
     def success?
-      fail 'Command not invoked' unless called?
+      raise 'Command not invoked' unless called?
       exit_status.success?
     end
 

data/lib/vnstat/traffic/daily.rb

@@ -20,7 +20,7 @@ module Vnstat
                when 1 then args.first
                when 3 then Date.new(*args)
                else
-                 fail ArgumentError, 'wrong number of arguments ' \
+                 raise ArgumentError, 'wrong number of arguments ' \
                                      "(#{args.count} for 1 or 3)"
                end
         entries_hash[date]

data/lib/vnstat/traffic/hourly.rb

@@ -24,7 +24,7 @@ module Vnstat
                when 2 then args.first
                when 4 then Date.new(*args)
                else
-                 fail ArgumentError, 'wrong number of arguments ' \
+                 raise ArgumentError, 'wrong number of arguments ' \
                                      "(#{args_count} for 2 or 4)"
                end
         entries_hash[[date, hour]]

data/spec/lib/vnstat/document_spec.rb

@@ -29,7 +29,7 @@ describe Vnstat::Document do
       end
 
       it 'changes #data' do
-        expect { subject.data = '<vnstat />' }.to change { subject.data }
+        expect { subject.data = '<vnstat />' }.to(change { subject.data })
       end
 
       it 'stores the XML fragment in #data' do

data/spec/lib/vnstat/interface_collection_spec.rb

@@ -45,7 +45,7 @@ describe Vnstat::InterfaceCollection do
 
   describe '#ids' do
     it 'returns interface names from the data' do
-      expect(subject.ids).to eq %w(eth0 wlan0)
+      expect(subject.ids).to eq %w[eth0 wlan0]
     end
   end
 
@@ -153,7 +153,8 @@ describe Vnstat::InterfaceCollection do
       allow(described_class).to receive(:load_data).and_return('<test />')
     end
 
-    context 'when Vnstat::Utils.call_executable_returning_status returns true' do
+    context 'when Vnstat::Utils.call_executable_returning_status ' \
+            'returns true' do
       before :each do
         allow(Vnstat::Utils)
           .to receive(:call_executable_returning_status)
@@ -171,7 +172,8 @@ describe Vnstat::InterfaceCollection do
       end
     end
 
-    context 'when Vnstat::Utils.call_executable_returning_status returns false' do
+    context 'when Vnstat::Utils.call_executable_returning_status ' \
+            'returns false' do
       before :each do
         allow(Vnstat::Utils)
           .to receive(:call_executable_returning_status)

data/spec/lib/vnstat/interface_spec.rb

@@ -106,7 +106,7 @@ describe Vnstat::Interface do
     end
   end
 
-  %w(nick name).each do |method_name|
+  %w[nick name].each do |method_name|
     describe "##{method_name}" do
       it 'returns value from the nick node' do
         expect(subject.public_send(method_name)).to eq 'Ethernet'
@@ -151,7 +151,7 @@ describe Vnstat::Interface do
 
   describe '#updated_at' do
     it 'returns the DateTime from the updated node in the correct time zone' do
-      time = DateTime.new(2015, 10, 21, 22, 58, 00, DateTime.now.offset)
+      time = DateTime.new(2015, 10, 21, 22, 58, 0o0, DateTime.now.offset)
 
       expect(subject.updated_at).to eq time
     end
@@ -264,7 +264,7 @@ describe Vnstat::Interface do
     end
 
     [true, false].each do |expected|
-      context "when Vnstat::Utils.call_executable_returning_status " \
+      context 'when Vnstat::Utils.call_executable_returning_status ' \
               "returns #{expected}" do
         before :each do
           allow(Vnstat::Utils).to receive(:call_executable_returning_status)

data/spec/lib/vnstat/result/minute_spec.rb

@@ -22,7 +22,7 @@ describe Vnstat::Result::Minute do
     it { is_expected.to be_a described_class }
 
     it 'initializes with the correct #time with the system time zone' do
-      time = DateTime.new(2015, 2, 3, 12, 34, 00, DateTime.now.offset)
+      time = DateTime.new(2015, 2, 3, 12, 34, 0o0, DateTime.now.offset)
 
       expect(subject.time).to eq time
     end

data/spec/lib/vnstat/result_spec.rb

@@ -62,7 +62,7 @@ describe Vnstat::Result do
         let(:other) { double(bytes_transmitted: 4000) }
 
         it 'returns -1' do
-          expect(subject <=> other).to eq -1
+          expect(subject <=> other).to eq(-1)
         end
       end
 

data/spec/lib/vnstat/system_call_spec.rb

@@ -1,5 +1,5 @@
 describe Vnstat::SystemCall do
-  let(:args) { ['test', 'test2', 'test3'] }
+  let(:args) { %w[test test2 test3] }
 
   describe '#initialize' do
     context 'when arguments are anything' do
@@ -32,7 +32,7 @@ describe Vnstat::SystemCall do
       described_class.call('test')
     end
 
-    it "returns result of #call" do
+    it 'returns result of #call' do
       allow_any_instance_of(described_class)
         .to receive(:call).and_return('test')
 

data/spec/lib/vnstat/utils_spec.rb

@@ -2,7 +2,9 @@ describe Vnstat::Utils do
   let(:executable_path) { '/any/path' }
 
   before :each do
-    allow(Vnstat.config).to receive(:executable_path).and_return(executable_path)
+    allow(Vnstat.config)
+      .to receive(:executable_path)
+      .and_return(executable_path)
   end
 
   describe '.system_call' do
@@ -93,7 +95,7 @@ describe Vnstat::Utils do
   end
 
   describe '.call_executable' do
-    let(:block) { Proc.new {} }
+    let(:block) { proc {} }
 
     it 'calls .system_call using vnstat executable' do
       expect(described_class).to receive(:system_call)

data/vnstat-ruby.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vnstat-ruby 1.0.5 ruby lib
+# stub: vnstat-ruby 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "vnstat-ruby"
-  s.version = "1.0.5"
+  s.name = "vnstat-ruby".freeze
+  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Tobias Casper"]
-  s.date = "2015-11-28"
-  s.description = "Uses the the vnstat CLI to track your network traffic."
-  s.email = "tobias.casper@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Tobias Casper".freeze]
+  s.date = "2017-04-27"
+  s.description = "Uses the the vnstat CLI to track your network traffic.".freeze
+  s.email = "tobias.casper@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -78,36 +78,39 @@ Gem::Specification.new do |s|
     "spec/support/shared_examples/shared_examples_for_traffic_collection.rb",
     "vnstat-ruby.gemspec"
   ]
-  s.homepage = "http://github.com/tlux/vnstat-ruby"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5.1"
-  s.summary = "A Ruby wrapper for vnstat."
+  s.homepage = "http://github.com/tlux/vnstat-ruby".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "A Ruby wrapper for vnstat.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6"])
-      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
-      s.add_development_dependency(%q<codeclimate-test-reporter>, ["~> 0"])
+      s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.6"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_development_dependency(%q<codeclimate-test-reporter>.freeze, ["= 0.6.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.0.1", "~> 2.0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
+      s.add_development_dependency(%q<rubocop>.freeze, ["~> 0"])
+      s.add_development_dependency(%q<yard>.freeze, ["~> 0"])
     else
-      s.add_dependency(%q<nokogiri>, ["~> 1.6"])
-      s.add_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_dependency(%q<yard>, ["~> 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
-      s.add_dependency(%q<codeclimate-test-reporter>, ["~> 0"])
+      s.add_dependency(%q<nokogiri>.freeze, ["~> 1.6"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<codeclimate-test-reporter>.freeze, ["= 0.6.0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 2.0.1", "~> 2.0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
+      s.add_dependency(%q<rubocop>.freeze, ["~> 0"])
+      s.add_dependency(%q<yard>.freeze, ["~> 0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, ["~> 1.6"])
-    s.add_dependency(%q<rspec>, ["~> 3.0"])
-    s.add_dependency(%q<yard>, ["~> 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
-    s.add_dependency(%q<codeclimate-test-reporter>, ["~> 0"])
+    s.add_dependency(%q<nokogiri>.freeze, ["~> 1.6"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<codeclimate-test-reporter>.freeze, ["= 0.6.0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 2.0.1", "~> 2.0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
+    s.add_dependency(%q<rubocop>.freeze, ["~> 0"])
+    s.add_dependency(%q<yard>.freeze, ["~> 0"])
   end
 end