vnstat-ruby 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e3a8a3b67a8467f99b6574553ddedc1f8851fd0
-  data.tar.gz: 2bbb5f111df3f14cf9f1197ac1a9c5a40570f2e4
+  metadata.gz: 0b11dd1355f5618e134a3d186a1957b15790d237
+  data.tar.gz: 244a68723714c5ea3d432fd4dd65ba86f43a2d65
 SHA512:
-  metadata.gz: a3330ad0adc9d0ae2795edeee757c916e4e8b47aaeb90f3a8e25eeec1b56ae49a41163ac354b15fb19f467ce476a9d91cb979259baa758d4ab52510156f2c7ee
-  data.tar.gz: 0956f04732f976ee45cd0cd4e3762d44025e4487bcdda2a122b93270e53f753d2428fee92f9e67a04570b530537da53ef5f7cebb0a9353f63b2539ce2ea274f3
+  metadata.gz: 993ad13bda555602b454e5a713bf18fe661b66d27227dcc2a19c79e310309ca2b9d2c9c31bee4da335954e997f097452aa85ba9ce0e711f8007c2faf783b429e
+  data.tar.gz: 626885c81f31451e8699f8d985669de2dfb9feaa1e28314efc397d63c7bb6202089feb6338eba73f908555a5115250ada9e174bb0a97730d76d1677baf64e686

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
  - '2.0.0'
  - '2.1.7'
  - '2.2.3'
- - ruby-head
  - jruby
  - jruby-head
  - rbx-2

data/README.md

@@ -3,8 +3,12 @@
 [![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)
 
 Vnstat is a tool that tracks the traffic on your network interfaces.
-This tiny library dependends on the `vnstat` command line utility to provide
-network traffic information through an easy-to-use API.
+This tiny library is intended to provide network traffic information
+through an easy-to-use API.
+
+It depends on the
+[vnstat command line utility](http://humdi.net/vnstat/) which is
+maintained by Teemu Toivola.
 
 
 ### Prerequisites

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/vnstat/interface.rb

@@ -61,8 +61,8 @@ module Vnstat
     #
     # @return [Interface]
     def reset
-      Utils.call_executable_returning_status('--reset', '-i', id)
-      reload
+      reload if Utils.call_executable_returning_status('--reset', '-i', id)
+      self
     end
 
     ##

data/lib/vnstat/traffic/base.rb

@@ -36,11 +36,6 @@ module Vnstat
       def traffic_data
         interface.data.xpath('//traffic')
       end
-
-      def entries_hash
-        fail NotImplementedError,
-             "Please override #{self.class.name}##{__method__}"
-      end
     end
   end
 end

data/spec/lib/vnstat/interface_collection_spec.rb

@@ -28,6 +28,21 @@ describe Vnstat::InterfaceCollection do
     end
   end
 
+  describe '.load_data' do
+    it 'calls Vnstat::Utils.call_executable' do
+      expect(Vnstat::Utils).to receive(:call_executable).with('--xml')
+
+      described_class.load_data
+    end
+
+    it 'returns result of Vnstat::Utils.call_executable' do
+      allow(Vnstat::Utils).to receive(:call_executable).with(any_args)
+        .and_return('test')
+
+      expect(described_class.load_data).to eq 'test'
+    end
+  end
+
   describe '#ids' do
     it 'returns interface names from the data' do
       expect(subject.ids).to eq %w(eth0 wlan0)
@@ -64,6 +79,59 @@ describe Vnstat::InterfaceCollection do
     end
   end
 
+  describe '#create' do
+    it 'calls Vnstat::Utils.call_executable_returning_status' do
+      expect(Vnstat::Utils).to receive(:call_executable_returning_status)
+        .with('--create', '-i', 'test').and_return(false)
+
+      subject.create('test')
+    end
+
+    context 'when Vnstat::Utils.call_executable_returning_status ' \
+            'returns true' do
+      before :each do
+        allow(Vnstat::Utils).to receive(:call_executable_returning_status)
+          .and_return(true)
+      end
+
+      it 'calls #[] with first arg' do
+        allow(subject).to receive(:reload)
+
+        expect(subject).to receive(:[]).with('test')
+
+        subject.create('test')
+      end
+
+      it 'returns result of #[] with first arg' do
+        allow(subject).to receive(:reload)
+
+        allow(subject).to receive(:[]).and_return('test')
+
+        expect(subject.create('eth1')).to eq 'test'
+      end
+
+      it 'calls #reload' do
+        allow(subject).to receive(:[]).with('test')
+
+        expect(subject).to receive(:reload)
+
+        subject.create('test')
+      end
+    end
+
+    context 'when Vnstat::Utils.call_executable_returning_status ' \
+            'returns false' do
+      before :each do
+        allow(Vnstat::Utils).to receive(:call_executable_returning_status)
+          .and_return(false)
+      end
+
+      it 'returns nil' do
+        expect(subject.create('test')).to be nil
+      end
+    end
+  end
+
   describe '#reload' do
     before :each do
       allow(described_class).to receive(:load_data).and_return('<test />')

data/spec/lib/vnstat/interface_spec.rb

@@ -84,48 +84,19 @@ describe Vnstat::Interface do
     end
   end
 
-  describe '#reload' do
-    let :reloaded_data do
-      <<-XML
-        <vnstat version="1.12" xmlversion="1">
-          <interface id="eth0">
-            <id>eth0</id>
-            <nick>New Ethernet</nick>
-          </interface>
-        </vnstat>
-      XML
-    end
-
-    before :each do
-      allow(described_class).to receive(:load_data).and_return('<test />')
-    end
-
-    it 'returns self' do
-      expect(subject.reload).to eq subject
-    end
-
-    it 'calls .load_data with #id as argument' do
-      expect(described_class).to receive(:load_data).with('eth0')
-        .and_return(reloaded_data)
-
-      subject.reload
-    end
-
-    it 'calls #data= with the result from .load_data' do
-      allow(described_class).to receive(:load_data).and_return('<vnstat />')
-
-      expect(subject).to receive(:data=).with('<vnstat />')
+  describe '.load_data' do
+    it 'calls Vnstat::Utils.call_executable' do
+      expect(Vnstat::Utils).to receive(:call_executable)
+        .with('-i', 'test', '--xml')
 
-      subject.reload
+      described_class.load_data('test')
     end
 
-    it 'resets #nick from reloaded data' do
-      allow(described_class).to receive(:load_data).with('eth0')
-        .and_return(reloaded_data)
+    it 'returns result of Vnstat::Utils.call_executable' do
+      allow(Vnstat::Utils).to receive(:call_executable).with(any_args)
+        .and_return('test')
 
-      expect { subject.reload }
-        .to change { subject.nick }
-        .from('Ethernet').to('New Ethernet')
+      expect(described_class.load_data('eth0')).to eq 'test'
     end
   end
 
@@ -239,4 +210,118 @@ describe Vnstat::Interface do
       expect(subject.tops.interface).to eq subject
     end
   end
+
+  describe '#reload' do
+    let :reloaded_data do
+      <<-XML
+        <vnstat version="1.12" xmlversion="1">
+          <interface id="eth0">
+            <id>eth0</id>
+            <nick>New Ethernet</nick>
+          </interface>
+        </vnstat>
+      XML
+    end
+
+    before :each do
+      allow(described_class).to receive(:load_data).and_return('<test />')
+    end
+
+    it 'returns self' do
+      expect(subject.reload).to eq subject
+    end
+
+    it 'calls .load_data with #id as argument' do
+      expect(described_class).to receive(:load_data).with('eth0')
+        .and_return(reloaded_data)
+
+      subject.reload
+    end
+
+    it 'calls #data= with the result from .load_data' do
+      allow(described_class).to receive(:load_data).and_return('<vnstat />')
+
+      expect(subject).to receive(:data=).with('<vnstat />')
+
+      subject.reload
+    end
+
+    it 'resets #nick from reloaded data' do
+      allow(described_class).to receive(:load_data).with('eth0')
+        .and_return(reloaded_data)
+
+      expect { subject.reload }
+        .to change { subject.nick }.from('Ethernet').to('New Ethernet')
+    end
+  end
+
+  describe '#delete' do
+    it 'calls Vnstat::Utils.call_executable_returning_status' do
+      expect(Vnstat::Utils).to receive(:call_executable_returning_status)
+        .with('--delete', '-i', subject.id)
+
+      subject.delete
+    end
+
+    [true, false].each do |expected|
+      context "when Vnstat::Utils.call_executable_returning_status " \
+              "returns #{expected}" do
+        before :each do
+          allow(Vnstat::Utils).to receive(:call_executable_returning_status)
+            .with(any_args).and_return(expected)
+        end
+
+        it 'returns true' do
+          expect(subject.delete).to be expected
+        end
+      end
+    end
+  end
+
+  describe '#reset' do
+    it 'calls Vnstat::Utils.call_executable_returning_status' do
+      expect(Vnstat::Utils).to receive(:call_executable_returning_status)
+        .with('--reset', '-i', subject.id)
+
+      subject.reset
+    end
+
+    context 'when Vnstat::Utils.call_executable_returning_status ' \
+            'returns true' do
+      before :each do
+        allow(Vnstat::Utils).to receive(:call_executable_returning_status)
+          .with(any_args).and_return(true)
+      end
+
+      it 'returns self' do
+        allow(subject).to receive(:reload)
+
+        expect(subject.reset).to eq subject
+      end
+
+      it 'calls #reload' do
+        expect(subject).to receive(:reload)
+
+        subject.reset
+      end
+    end
+
+    context 'when Vnstat::Utils.call_executable_returning_status ' \
+            'returns false' do
+      before :each do
+        allow(Vnstat::Utils).to receive(:call_executable_returning_status)
+          .with(any_args).and_return(false)
+      end
+
+      it 'returns self' do
+        expect(subject.reset).to eq subject
+      end
+
+      it 'does not call #reload' do
+        expect(subject).not_to receive(:reload)
+
+        subject.reset
+      end
+    end
+  end
 end

data/vnstat-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vnstat-ruby 1.0.4 ruby lib
+# stub: vnstat-ruby 1.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vnstat-ruby"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   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-25"
+  s.date = "2015-11-28"
   s.description = "Uses the the vnstat CLI to track your network traffic."
   s.email = "tobias.casper@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vnstat-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Tobias Casper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri