openvpn-status-web 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 211f9344884e61aefa346043a38689c30d74bc30f9fa7f3b1b580bbf5b0e3575
-  data.tar.gz: 11ad21226d37f88a427cf7571c2c98860cc3d6cc8daea3def18e2e603c10c298
+  metadata.gz: de8d358e0600c1f0843ff7bccc59bcc4a9ad685b70856509118d8ad6791bb870
+  data.tar.gz: d38bbd5238e321bdf5814a6c2e998f706e35897fa49f88180cdd4197852c1a42
 SHA512:
-  metadata.gz: a34579dcd1d6c7d1b84264d293342eb8cc813bb92d3aea556602f0f34ff485d7dab6e9442b522bc500780cf25478f2f143a3796212d03a770b825faaeaf44214
-  data.tar.gz: 3293608797c7a143bef0155818c765e92e53e16897f6855137d45ab368321528a83b52578f294ed97e44f1d0f49aec71832460adf8c1b96f77df6353c46b8904
+  metadata.gz: e4ce6ce068a55fe4ea2f9ee1815719033458307a476c9106c56fe22bcc65933d32e1b1c34ad42aa0981b6765a63a0842a2953d365554d044bb01734b3a9f04e9
+  data.tar.gz: b64467e939fde4ea6130d5f868351f9772da39440f1016c65adcaefd90904ba950d5ec16fa235f6343ebdf88260619b73785a4a0b037dcb49abd61c1f4078301

data/README.md

@@ -1,6 +1,6 @@
 # openvpn-status-web
 
-[![Build Status](https://travis-ci.org/cmur2/openvpn-status-web.png)](https://travis-ci.org/cmur2/openvpn-status-web)
+[![Build Status](https://travis-ci.org/cmur2/openvpn-status-web.svg)](https://travis-ci.org/cmur2/openvpn-status-web) [![Depfu](https://badges.depfu.com/badges/c264e2f70f2a19c43f880ddcb4a12ba8/overview.svg)](https://depfu.com/github/cmur2/openvpn-status-web?project_id=6194)
 
 ## Description
 

data/{bin → exe}/openvpn-status-web

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'openvpn-status-web'
 

data/lib/openvpn-status-web.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'date'
 require 'etc'
@@ -8,7 +9,7 @@ require 'yaml'
 require 'rack'
 require 'erb'
 require 'metriks'
-require 'better_errors' if ENV['RACK_ENV'] == "development"
+require 'better_errors' if ENV['RACK_ENV'] == 'development'
 
 require 'openvpn-status-web/status'
 require 'openvpn-status-web/parser/v1'
@@ -18,17 +19,25 @@ require 'openvpn-status-web/int_patch'
 require 'openvpn-status-web/version'
 
 module OpenVPNStatusWeb
+  # @return [Logger]
   def self.logger
     @logger
   end
 
+  # @param logger [Logger]
+  # @return [Logger]
   def self.logger=(logger)
     @logger = logger
   end
 
   class LogFormatter
-    def call(lvl, time, progname, msg)
-      "[%s] %-5s %s\n" % [Time.now.strftime('%Y-%m-%d %H:%M:%S'), lvl, msg.to_s]
+    # @param lvl [Object]
+    # @param _time [DateTime]
+    # @param _progname [String]
+    # @param msg [Object]
+    # @return [String]
+    def call(lvl, _time, _progname, msg)
+      format("[%s] %-5s %s\n", Time.now.strftime('%Y-%m-%d %H:%M:%S'), lvl, msg.to_s)
     end
   end
 
@@ -40,29 +49,29 @@ module OpenVPNStatusWeb
     end
 
     def call(env)
-      return [405, {"Content-Type" => "text/plain"}, ["Method Not Allowed"]] if env["REQUEST_METHOD"] != "GET"
-      return [404, {"Content-Type" => "text/plain"}, ["Not Found"]] if env["PATH_INFO"] != "/"
+      return [405, {'Content-Type' => 'text/plain'}, ['Method Not Allowed']] if env['REQUEST_METHOD'] != 'GET'
+      return [404, {'Content-Type' => 'text/plain'}, ['Not Found']] if env['PATH_INFO'] != '/'
 
       # variables for template
       vpns = @vpns
       stati = {}
-      @vpns.each do |name,config|
+      @vpns.each do |name, config|
         stati[name] = parse_status_log(config)
       end
       # eval
       html = @main_tmpl.result(binding)
 
-      [200, {"Content-Type" => "text/html"}, [html]]
+      [200, {'Content-Type' => 'text/html'}, [html]]
     end
 
     def read_template(file)
-      text = File.open(file, 'rb') do |f| f.read end
-    
+      text = File.read(file, mode: 'rb')
+
       ERB.new(text)
     end
-  
+
     def parse_status_log(vpn)
-      text = File.open(vpn['status_file'], 'rb') do |f| f.read end
+      text = File.read(vpn['status_file'], mode: 'rb')
 
       case vpn['version']
       when 1
@@ -76,23 +85,24 @@ module OpenVPNStatusWeb
       end
     end
 
+    # @return [void]
     def self.run!
       if ARGV.length != 1
-        puts "Usage: openvpn-status-web config_file"
+        puts 'Usage: openvpn-status-web config_file'
         exit 1
       end
 
       config_file = ARGV[0]
 
-      if not File.file?(config_file)
-        puts "Config file not found!"
+      if !File.file?(config_file)
+        puts 'Config file not found!'
         exit 1
       end
-      
+
       puts "openvpn-status-web version #{OpenVPNStatusWeb::VERSION}"
       puts "Using config file #{config_file}"
 
-      config = YAML::load(File.open(config_file, 'r') { |f| f.read })
+      config = YAML.safe_load(File.read(config_file, mode: 'r'))
 
       if config['logfile']
         OpenVPNStatusWeb.logger = Logger.new(config['logfile'])
@@ -100,32 +110,39 @@ module OpenVPNStatusWeb
         OpenVPNStatusWeb.logger = Logger.new(STDOUT)
       end
 
-      OpenVPNStatusWeb.logger.progname = "openvpn-status-web"
+      OpenVPNStatusWeb.logger.progname = 'openvpn-status-web'
       OpenVPNStatusWeb.logger.formatter = LogFormatter.new
 
-      OpenVPNStatusWeb.logger.info "Starting..."
+      OpenVPNStatusWeb.logger.info 'Starting...'
 
-      # drop privs (first change group than user)
-      Process::Sys.setgid(Etc.getgrnam(config['group']).gid) if config['group']
-      Process::Sys.setuid(Etc.getpwnam(config['user']).uid) if config['user']
+      # drop priviliges as soon as possible
+      # NOTE: first change group than user
+      if config['group']
+        group = Etc.getgrnam(config['group'])
+        Process::Sys.setgid(group.gid) if group
+      end
+      if config['user']
+        user = Etc.getpwnam(config['user'])
+        Process::Sys.setuid(user.uid) if user
+      end
 
       # configure rack
       app = Daemon.new(config['vpns'])
-      if ENV['RACK_ENV'] == "development"
+      if ENV['RACK_ENV'] == 'development'
         app = BetterErrors::Middleware.new(app)
-        BetterErrors.application_root = File.expand_path("..", __FILE__)
+        BetterErrors.application_root = File.expand_path(__dir__)
       end
 
       Signal.trap('INT') do
-        OpenVPNStatusWeb.logger.info "Quitting..."
+        OpenVPNStatusWeb.logger.info 'Quitting...'
         Rack::Handler::WEBrick.shutdown
       end
       Signal.trap('TERM') do
-        OpenVPNStatusWeb.logger.info "Quitting..."
+        OpenVPNStatusWeb.logger.info 'Quitting...'
         Rack::Handler::WEBrick.shutdown
       end
-      
-      Rack::Handler::WEBrick.run app, :Host => config['host'], :Port => config['port']
+
+      Rack::Handler::WEBrick.run app, Host: config['host'], Port: config['port']
     end
   end
 end

data/lib/openvpn-status-web/int_patch.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
 
 class Integer
   def as_bytes
-    return "1 Byte" if self == 1
-    
-    label = ["Bytes", "KiB", "MiB", "GiB", "TiB"]
+    return '1 Byte' if self == 1
+
+    label = %w[Bytes KiB MiB GiB TiB]
     i = 0
-    num = self.to_f
-    while num >= 1024 do
-      num = num / 1024
+    num = to_f
+    while num >= 1024
+      num /= 1024
       i += 1
     end
-    
+
     "#{format('%.2f', num)} #{label[i]}"
   end
 end

data/lib/openvpn-status-web/parser/modern_stateless.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module OpenVPNStatusWeb
   module Parser
@@ -10,29 +11,27 @@ module OpenVPNStatusWeb
 
         text.lines.each do |line|
           parts = line.strip.split(sep)
-          status.client_list << parse_client(parts[1..5]) if parts[0] == "CLIENT_LIST"
-          status.routing_table << parse_route(parts[1..4]) if parts[0] == "ROUTING_TABLE"
-          status.global_stats << parse_global(parts[1..2]) if parts[0] == "GLOBAL_STATS"
+          status.client_list << parse_client(parts[1..5]) if parts[0] == 'CLIENT_LIST'
+          status.routing_table << parse_route(parts[1..4]) if parts[0] == 'ROUTING_TABLE'
+          status.global_stats << parse_global(parts[1..2]) if parts[0] == 'GLOBAL_STATS'
         end
 
         status
       end
 
-      private
-
-      def self.parse_client(client)
+      private_class_method def self.parse_client(client)
         client[2] = client[2].to_i
         client[3] = client[3].to_i
         client[4] = DateTime.strptime(client[4], '%a %b %d %k:%M:%S %Y')
         client
       end
 
-      def self.parse_route(route)
+      private_class_method def self.parse_route(route)
         route[3] = DateTime.strptime(route[3], '%a %b %d %k:%M:%S %Y')
         route
       end
 
-      def self.parse_global(global)
+      private_class_method def self.parse_global(global)
         global[1] = global[1].to_i
         global
       end

data/lib/openvpn-status-web/parser/v1.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module OpenVPNStatusWeb
   module Parser
@@ -13,7 +14,7 @@ module OpenVPNStatusWeb
           (current_section = :rt; next) if line == "ROUTING TABLE\n"
           (current_section = :gs; next) if line == "GLOBAL STATS\n"
           (current_section = :end; next) if line == "END\n"
-      
+
           case current_section
           when :cl
             client_list << line.strip.split(',')

data/lib/openvpn-status-web/parser/v2.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-require 'openvpn-status-web/parser/modern_stateless'
+require_relative 'modern_stateless'
 
 module OpenVPNStatusWeb
   module Parser

data/lib/openvpn-status-web/parser/v3.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-require 'openvpn-status-web/parser/modern_stateless'
+require_relative 'modern_stateless'
 
 module OpenVPNStatusWeb
   module Parser

data/lib/openvpn-status-web/status.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module OpenVPNStatusWeb
   class Status

data/lib/openvpn-status-web/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 
 module OpenVPNStatusWeb
-  VERSION = "2.0.0"
+  VERSION = '2.1.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: openvpn-status-web
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Christian Nicolai
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2020-03-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: metriks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -25,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: metriks
+  name: better_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: better_errors
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.0
+- !ruby/object:Gem::Dependency
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,22 +165,17 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Small Rack (Ruby) application serving OpenVPN status file.
-email: chrnicolai@gmail.com
+email: 
 executables:
 - openvpn-status-web
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- LICENSE
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/openvpn-status-web
-- examples/status.v1
-- examples/status.v2
-- examples/status.v3
+- exe/openvpn-status-web
 - init.d/debian-6-openvpn-status-web
 - lib/openvpn-status-web.rb
 - lib/openvpn-status-web/int_patch.rb
@@ -149,14 +186,12 @@ files:
 - lib/openvpn-status-web/parser/v3.rb
 - lib/openvpn-status-web/status.rb
 - lib/openvpn-status-web/version.rb
-- openvpn-status-web.gemspec
-- spec/parser/modern_stateless_spec.rb
-- spec/parser/v1_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/cmur2/dyndnsd
+homepage: https://github.com/cmur2/openvpn-status-web
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/cmur2/openvpn-status-web/issues
+  source_code_uri: https://github.com/cmur2/openvpn-status-web
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -172,12 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: openvpn-status-web
-test_files:
-- spec/parser/modern_stateless_spec.rb
-- spec/parser/v1_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,3 +0,0 @@
-.DS_Store
-*.lock
-pkg/*

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-rvm:
-  - 2.5
-  - 2.4
-  - 2.3

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/examples/status.v1

@@ -1,14 +0,0 @@
-OpenVPN CLIENT LIST
-Updated,Sun Jan 1 23:42:00 2012
-Common Name,Real Address,Bytes Received,Bytes Sent,Connected Since
-foo,1.2.3.4:1234,11811160064,4194304,Sun Jan 1 23:42:00 2012
-bar,1.2.3.5:1235,512,2048,Sun Jan 1 23:42:00 2012
-ROUTING TABLE
-Virtual Address,Common Name,Real Address,Last Ref
-192.168.0.0/24,foo,1.2.3.4:1234,Sun Jan 1 23:42:00 2012
-192.168.66.2,bar,1.2.3.5:1235,Sun Jan 1 23:42:00 2012
-192.168.66.3,foo,1.2.3.4:1234,Sun Jan 1 23:42:00 2012
-2001:db8:0:0::1000,bar,1.2.3.5:1235,Sun Jan 1 23:42:00 2012
-GLOBAL STATS
-Max bcast/mcast queue length,42
-END

data/examples/status.v2

@@ -1,12 +0,0 @@
-TITLE,OpenVPN 2.1_rc15 mipsel-unknown-linux-gnu [SSL] [LZO1] [EPOLL] built on Mar 27 2009
-TIME,Sun Jan 1 23:42:00 2012,1238702330
-HEADER,CLIENT_LIST,Common Name,Real Address,Virtual Address,Bytes Received,Bytes Sent,Connected Since,Connected Since (time_t)
-CLIENT_LIST,foo,1.2.3.4:1234,11811160064,4194304,Sun Jan 1 23:42:00 2012,1238702330
-CLIENT_LIST,bar,1.2.3.5:1235,512,2048,Sun Jan 1 23:42:00 2012,1238702330
-HEADER,ROUTING_TABLE,Virtual Address,Common Name,Real Address,Last Ref,Last Ref (time_t)
-ROUTING_TABLE,192.168.0.0/24,foo,1.2.3.4:1234,Sun Jan 1 23:42:00 2012,1238702330
-ROUTING_TABLE,192.168.66.2,bar,1.2.3.5:1235,Sun Jan 1 23:42:00 2012,1238702330
-ROUTING_TABLE,192.168.66.3,foo,1.2.3.4:1234,Sun Jan 1 23:42:00 2012,1238702330
-ROUTING_TABLE,2001:db8:0:0::1000,bar,1.2.3.5:1235,Sun Jan 1 23:42:00 2012,1238702330
-GLOBAL_STATS,Max bcast/mcast queue length,42
-END

data/examples/status.v3

@@ -1,12 +0,0 @@
-TITLE	OpenVPN 2.1_rc15 mipsel-unknown-linux-gnu [SSL] [LZO1] [EPOLL] built on Mar 27 2009
-TIME	Sun Jan 1 23:42:00 2012	1238702330
-HEADER	CLIENT_LIST	Common Name	Real Address	Virtual Address	Bytes Received	Bytes Sent	Connected Since	Connected Since (time_t)
-CLIENT_LIST	foo	1.2.3.4:1234	11811160064	4194304	Sun Jan 1 23:42:00 2012	1238702330
-CLIENT_LIST	bar	1.2.3.5:1235	512	2048	Sun Jan 1 23:42:00 2012	1238702330
-HEADER	ROUTING_TABLE	Virtual Address	Common Name	Real Address	Last Ref	Last Ref (time_t)
-ROUTING_TABLE	192.168.0.0/24	foo	1.2.3.4:1234	Sun Jan 1 23:42:00 2012	1238702330
-ROUTING_TABLE	192.168.66.2	bar	1.2.3.5:1235	Sun Jan 1 23:42:00 2012	1238702330
-ROUTING_TABLE	192.168.66.3	foo	1.2.3.4:1234	Sun Jan 1 23:42:00 2012	1238702330
-ROUTING_TABLE	2001:db8:0:0::1000	bar	1.2.3.5:1235	Sun Jan 1 23:42:00 2012	1238702330
-GLOBAL_STATS	Max bcast/mcast queue length	42
-END

data/openvpn-status-web.gemspec

@@ -1,32 +0,0 @@
-
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-
-require 'openvpn-status-web/version'
-
-Gem::Specification.new do |s|
-  s.name  = 'openvpn-status-web'
-  s.version = OpenVPNStatusWeb::VERSION
-  s.summary = 'openvpn-status-web'
-  s.description = 'Small Rack (Ruby) application serving OpenVPN status file.'
-  s.author = 'Christian Nicolai'
-  s.email = 'chrnicolai@gmail.com'
-  s.homepage = 'https://github.com/cmur2/dyndnsd'
-  s.license = 'Apache-2.0'
-
-  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ['lib']
-  s.executables = ['openvpn-status-web']
-
-  s.required_ruby_version = '>= 2.3'
-
-  s.add_runtime_dependency 'rack', '~> 2.0'
-  s.add_runtime_dependency 'metriks'
-
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'better_errors'
-  s.add_development_dependency 'binding_of_caller'
-end

data/spec/parser/modern_stateless_spec.rb

@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe OpenVPNStatusWeb::Parser::ModernStateless do
-  {
-    2 => status_v2,
-    3 => status_v3
-  }.each do |version, status|
-    context "for status-version #{version}" do
-      context 'for client list' do
-        it 'parses common names' do
-          expect(status.client_list.map { |client| client[0] }).to eq(["foo", "bar"])
-        end
-
-        it 'parses real addresses' do
-          expect(status.client_list.map { |client| client[1] }).to eq(["1.2.3.4:1234", "1.2.3.5:1235"])
-        end
-
-        it 'parses received bytes' do
-          expect(status.client_list.map { |client| client[2] }).to eq([11811160064, 512])
-        end
-
-        it 'parses sent bytes' do
-          expect(status.client_list.map { |client| client[3] }).to eq([4194304, 2048])
-        end
-
-        it 'parses connected since date' do
-          expect(status.client_list.map { |client| client[4] }).to eq([DateTime.new(2012,1,1,23,42,0), DateTime.new(2012,1,1,23,42,0)])
-        end
-      end
-
-      context 'for routing table' do
-        it 'parses virtual addresses' do
-          expect(status.routing_table.map { |route| route[0] }).to eq(["192.168.0.0/24", "192.168.66.2", "192.168.66.3", "2001:db8:0:0::1000"])
-        end
-
-        it 'parses common names' do
-          expect(status.routing_table.map { |route| route[1] }).to eq(["foo", "bar", "foo", "bar"])
-        end
-
-        it 'parses real addresses' do
-          expect(status.routing_table.map { |route| route[2] }).to eq(["1.2.3.4:1234", "1.2.3.5:1235", "1.2.3.4:1234", "1.2.3.5:1235"])
-        end
-
-        it 'parses last ref date' do
-          expect(status.routing_table.map { |route| route[3] }).to eq([DateTime.new(2012,1,1,23,42,0), DateTime.new(2012,1,1,23,42,0), DateTime.new(2012,1,1,23,42,0), DateTime.new(2012,1,1,23,42,0)])
-        end
-      end
-
-      it 'parses global stats' do
-        expect(status.global_stats.size).to eq(1)
-        expect(status.global_stats.first).to eq(["Max bcast/mcast queue length", 42])
-      end
-    end
-  end
-end

data/spec/parser/v1_spec.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-describe OpenVPNStatusWeb::Parser::V1 do
-  def status; status_v1; end
-
-  context 'for client list' do
-    it 'parses common names' do
-      expect(status.client_list.map { |client| client[0] }).to eq(["foo", "bar"])
-    end
-
-    it 'parses real addresses' do
-      expect(status.client_list.map { |client| client[1] }).to eq(["1.2.3.4:1234", "1.2.3.5:1235"])
-    end
-
-    it 'parses received bytes' do
-      expect(status.client_list.map { |client| client[2] }).to eq([11811160064, 512])
-    end
-
-    it 'parses sent bytes' do
-      expect(status.client_list.map { |client| client[3] }).to eq([4194304, 2048])
-    end
-
-    it 'parses connected since date' do
-      expect(status.client_list.map { |client| client[4] }).to eq([DateTime.new(2012,1,1,23,42,0), DateTime.new(2012,1,1,23,42,0)])
-    end
-  end
-
-  context 'for routing table' do
-    it 'parses virtual addresses' do
-      expect(status.routing_table.map { |route| route[0] }).to eq(["192.168.0.0/24", "192.168.66.2", "192.168.66.3", "2001:db8:0:0::1000"])
-    end
-
-    it 'parses common names' do
-      expect(status.routing_table.map { |route| route[1] }).to eq(["foo", "bar", "foo", "bar"])
-    end
-
-    it 'parses real addresses' do
-      expect(status.routing_table.map { |route| route[2] }).to eq(["1.2.3.4:1234", "1.2.3.5:1235", "1.2.3.4:1234", "1.2.3.5:1235"])
-    end
-
-    it 'parses last ref date' do
-      expect(status.routing_table.map { |route| route[3] }).to eq([DateTime.new(2012,1,1,23,42,0), DateTime.new(2012,1,1,23,42,0), DateTime.new(2012,1,1,23,42,0), DateTime.new(2012,1,1,23,42,0)])
-    end
-  end
-
-  it 'parses global stats' do
-    expect(status.global_stats.size).to eq(1)
-    expect(status.global_stats.first).to eq(["Max bcast/mcast queue length", 42])
-  end
-end

data/spec/spec_helper.rb

@@ -1,21 +0,0 @@
-
-require 'rubygems'
-require 'bundler/setup'
-require 'rack/test'
-
-require 'openvpn-status-web'
-
-def status_v1
-  text = File.open('examples/status.v1', 'rb') do |f| f.read end
-  OpenVPNStatusWeb::Parser::V1.new.parse_status_log text
-end
-
-def status_v2
-  text = File.open('examples/status.v2', 'rb') do |f| f.read end
-  OpenVPNStatusWeb::Parser::V2.new.parse_status_log text
-end
-
-def status_v3
-  text = File.open('examples/status.v3', 'rb') do |f| f.read end
-  OpenVPNStatusWeb::Parser::V3.new.parse_status_log text
-end