chronicle-shell 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f1e5fd44c4e21f27a1f0879096ebedc08dcb866ec62393b5935e348816c9a1
-  data.tar.gz: d1fee6983b672b691f19bf1efb6fa10629cbc3b112205761da35e7f82e5e59ec
+  metadata.gz: 2b88a844a7e429898c8cd9851e9326be1cb1a61cb7fb0598d44456519941d3b9
+  data.tar.gz: 51db09766b5dacf94e4cd92ea5531cdb6475e5afa4759d48acb7e3e8f224cc36
 SHA512:
-  metadata.gz: 15d51d049d46e24bed446cb8ea03cf2faed69f362a974e828336c5e3449d0037e221c15941cbc417c9585ff0e01160f6fcac5765a494f62f0e3d2d0b7934c0c3
-  data.tar.gz: ca9f88415679b7aa492a318e48885d1df401b98975c5f735bb36eb310494374d33b4e7cbdac06a06714c5161213ff5472796589bb225a96a40842d036f7dab9f
+  metadata.gz: 0a4f39726fe053ad6b5341cc5bece31eafb52bfde210fc7cb601cf388b4f7d131d0828d656946f436c455632d9c4f688e3c933f2069fcd55aef7c3204804d9f1
+  data.tar.gz: e4941551b42d16d90ac55345395d7b7bfbd73873a05dde157d129f4add9b0f839a4e55bf90705cd048e3a1c91e261f34aaf346933ebcc948630caf07df179c37

data/lib/chronicle/shell/shell_history_extractor.rb

@@ -6,10 +6,10 @@ module Chronicle
       register_connector do |r|
         r.provider = 'shell'
         r.description = 'shell command history'
-        r.identifier = 'shell-history'
+        r.identifier = 'history'
       end
 
-      setting :filename, default: ENV['HISTFILE']
+      setting :input
       setting :shell, default: 'bash'
 
       BASH_TIMESTAMP_REGEX = /^\#(?<timestamp>[0-9]{10})/
@@ -37,7 +37,8 @@ module Chronicle
 
       # TODO: modularize the shell-specific stuff
       def history_filename
-        @config.filename || __send__("history_filename_default_#{@config.shell}")
+        # Ideally we coudl just use ENV['HISTFILE] but it's not available outside of Bash
+        @config.input&.first || __send__("history_filename_default_#{@config.shell}")
       end
 
       def history_filename_default_bash
@@ -80,13 +81,15 @@ module Chronicle
       end
 
       def load_commands_from_bash
-        timestamp = nil
-        File.foreach(history_filename) do |line|
-          if match = line.scrub.match(BASH_TIMESTAMP_REGEX)
-            timestamp = Time.at(match[:timestamp].to_i)
-          elsif timestamp
-            command = { timestamp: timestamp, command: line.scrub.strip }
+        command = nil
+        File.readlines(history_filename).reverse_each do |line|
+          timestamp_line = line.scrub.match(BASH_TIMESTAMP_REGEX)
+          if timestamp_line && command
+            timestamp = Time.at(timestamp_line[:timestamp].to_i)
+            command = { timestamp: timestamp, command: command }
             yield command
+          else
+            command = line.scrub.strip
           end
         end
       end

data/lib/chronicle/shell/shell_history_transformer.rb

@@ -6,7 +6,7 @@ module Chronicle
       register_connector do |r|
         r.provider = 'shell'
         r.description = 'a shell command'
-        r.identifier = 'shell-history'
+        r.identifier = 'history'
       end
 
       def transform

data/lib/chronicle/shell/version.rb

@@ -2,6 +2,6 @@
 
 module Chronicle
   module Shell
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chronicle-shell
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Louis
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronicle-etl
@@ -49,7 +49,7 @@ metadata:
   homepage_uri: https://github.com/chronicle-app/chronicle-shell
   source_code_uri: https://github.com/chronicle-app/chronicle-shell
   changelog_uri: https://github.com/chronicle-app/chronicle-shell/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -64,8 +64,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Shell connectors for Chronicle-ETL
 test_files: []