log_simulator 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0491b2c446f53382f87c7025c3cc219bcb2cd9ed
-  data.tar.gz: 8381502fd38df4bcec428de0a012b83aa01cd46c
+  metadata.gz: 2e46a3e2ce97f595adbb932c47fb2911bcafa353
+  data.tar.gz: ebe48704df22d97935621be3ece3225406a0e32e
 SHA512:
-  metadata.gz: 50908b42324c1b66d862023d6d76a9615c02bf8124caeac0b950898ea0550446bf03381c7515bd8d3503b8a6d21881395fe9689cf1764e44642d2d9f7b6355a2
-  data.tar.gz: b56af2ae432c0bb13777b25eda6c511b1f32557b850d09880724d05f9d16a921c7328e4765229fc690da67c19195595fdad081286755885edaad9e8c9190bcbd
+  metadata.gz: 1da4b658e560f0405f385ec021ac3b82e874f75c1cde22c2e508aca9447c59a7adc888b28738a51a9248c289d8b8a8be6d3d2c30791d0a9757b0139de4abf3e9
+  data.tar.gz: 705d4c696d1330b8f2f2017df05dcf53d0e923c69f9de49ed76594e2e919e00a99f17d7e25c2f0343e04bc6452ff1f1ae3f926f170f193343a39d9dd5a402664

data/bin/simulate

@@ -6,7 +6,7 @@ require 'peak_log_simulator'
 require 'resolve'
 require 'socket_connetion'
 
-options={:filepath => nil ,:timescale => 1.0}
+options={:filepath => nil ,:timescale => 1.0, :pretty => false}
 
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: simulate [logfile path] [options]"
@@ -15,6 +15,10 @@ opts = OptionParser.new do |opts|
     options[:timescale] = time
   end
 
+  opts.on('-p','--pretty','Pretty Log Messages') do
+    options[:pretty] = true
+  end
+
   opts.on('-v','--version','Version') {puts LogSimulator::VERSION; exit}
 
   opts.on_tail('-h', '--help', 'Show this message') { puts opts; exit }
@@ -37,7 +41,7 @@ LogSimulator::Resolver.select_target(2.0) do |target|
   socket_connection = LogSimulator::SocketConnetion.new(target.target_name,target.port)
 
   unless options[:filepath].nil?
-    LogSimulator::PeakLogSimulator.start(socket_connection.socket,options[:filepath],options[:timescale]) do |success|
+    LogSimulator::PeakLogSimulator.start(socket_connection.socket,options[:filepath],options[:timescale],options[:pretty]) do |success|
       while true #TODO: make it DRY
         print '>'
         message = gets.chomp

data/lib/log_simulator/version.rb

@@ -1,3 +1,3 @@
 module LogSimulator
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/peak_log_simulator.rb

@@ -1,9 +1,11 @@
 require 'socket'
+require 'date'
+require 'json-prettyprint'
 
 module LogSimulator
   class PeakLogSimulator
 
-    def self.start(socket,filepath,timescale)
+    def self.start(socket,filepath,timescale,pretty)
       path = File.expand_path(filepath)
       puts 'Opening log file at path: ' + path
 
@@ -23,7 +25,7 @@ module LogSimulator
             if socket != nil
               socket.puts message
             end
-            puts '<' + message
+            puts '<' + (pretty ? (JSON::PrettyPrint.prettify(message)) : message)
             time = _time
           end
         end
@@ -33,8 +35,13 @@ module LogSimulator
     end
 
     def self.timestamp_parse (line)
-      line.scan(/N\|(\d+)\|RECEIVE << (.*)/) do |timeStr,message|
-        yield timeStr.to_i,message
+      line.scan(/N\|(.+)\|RECEIVE << (.*)/) do |timestamp,message|
+        begin
+          date = DateTime.parse(timestamp)
+          yield date.to_time.utc.to_i,message
+        rescue
+          yield timestamp.to_i,message
+        end
       end
     end
 

data/log_simulator.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "dnssd", "~>2.0"
+  spec.add_runtime_dependency "json-prettyprint"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_simulator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ogan Topkaya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json-prettyprint
+  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: bundler
   requirement: !ruby/object:Gem::Requirement