ipcad2squid 1.1.1 → 1.1.2

data/bin/ipcad2squid

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'ipcad2squid'
 require 'optparse'
 

data/ipcad2squid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ipcad2squid'
-  s.version     = '1.1.1'
+  s.version     = '1.1.2'
   s.date        = '2013-01-03'
   s.summary     = "Convert ipcad logs to squid logs"
   s.description = "Simple gem for converting and appending output from ipcad to squid logs formats"
@@ -15,4 +15,4 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/drakmail/ipcad2squid'
 
   s.add_development_dependency 'rspec'
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipcad2squid
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -33,7 +33,6 @@ description: Simple gem for converting and appending output from ipcad to squid
 email: drakmail@delta.pm
 executables:
 - ipcad2squid
-- ipcad2squid.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -41,7 +40,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - bin/ipcad2squid
-- bin/ipcad2squid.rb
 - ipcad2squid.gemspec
 - lib/ipcad2squid.rb
 - spec/input1.txt

data/bin/ipcad2squid.rb

@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-
-class Ipcad2squid
-  attr_reader :cmd1, :cmd2, :net, :ttime, :filename
-
-  def initialize(options={})
-    @cmd1     = options[:cmd1]     || 'netkit-rsh localhost sh ip accounting'
-    @cmd2     = options[:cmd2]     || 'netkit-rsh localhost show ip accounting checkpoint'
-    @net      = options[:net]      || '192.168.0'
-    @filename = options[:filename] || '/var/log/squid/access.log'
-    @ttime    = `#{@cmd1}`.split("\n").grep(/saved/) { |saved| saved.split.last }.first rescue '0'
-  end
-
-  def output
-    # get all data for subnet
-    accounting_data = `#{@cmd2}`.split("\n").grep(/#{@net}/)
-
-    # parse and output data
-    accounting_data.map do |raw_data|
-      data = raw_data.split
-      "#{@ttime}.000 1 #{data[1]} TCP_MISS/200 #{data[3]} CONNECT #{data[0]}:#{data[4]} - DIRECT/#{data[1]} -"
-    end.join("\n")
-  end
-
-  def write_to_file
-    File.open(@filename, "w") { |file| file.write(output) }
-  end
-end