cosmos 5.0.2 → 5.0.3

data/lib/cosmos/utilities/logger.rb

@@ -23,6 +23,7 @@ require 'cosmos/utilities/store'
 require 'socket'
 require 'logger'
 require 'time'
+require 'json'
 
 module Cosmos
   # Supports different levels of logging and only writes if the level

data/lib/cosmos/utilities/s3.rb

@@ -22,6 +22,67 @@ require 'cosmos/models/reducer_model'
 
 module Cosmos
   class S3Utilities
+    def self.list_files_before_time(bucket, prefix, time)
+      rubys3_client = Aws::S3::Client.new
+      oldest_list = []
+      total_size = 0
+
+      # Return nothing if bucket doesn't exist (it won't at the very beginning)
+      begin
+        rubys3_client.head_bucket(bucket: bucket)
+      rescue Aws::S3::Errors::NotFound
+        return total_size, oldest_list
+      end
+
+      # Get List of Packet Names - Assumes prefix gets us to a folder of packet names
+      token = nil
+      folder_list = []
+      while true
+        resp = rubys3_client.list_objects_v2({
+          bucket: bucket,
+          max_keys: 1000,
+          prefix: prefix,
+          delimiter: '/',
+          continuation_token: token
+        })
+        
+        resp.common_prefixes.each do |item|
+          folder_list << item.prefix
+        end
+        break unless resp.is_truncated
+        token = resp.next_continuation_token
+      end
+
+      # Go through each folder and keep files that end before time
+      folder_list.each do |folder|
+        token = nil
+        next_folder = false
+        while true
+          resp = rubys3_client.list_objects_v2({
+                                                bucket: bucket,
+                                                max_keys: 1000,
+                                                prefix: folder,
+                                                continuation_token: token
+                                              })
+          resp.contents.each do |item|
+            t = item.key.split('__')[1]
+            file_end_time = Time.utc(t[0..3], t[4..5], t[6..7], t[8..9], t[10..11], t[12..13])
+            if file_end_time < time
+              oldest_list << item
+              total_size += item.size
+            else
+              next_folder = true
+              break
+            end
+          end
+          break if !resp.is_truncated or next_folder
+
+          token = resp.next_continuation_token
+        end
+      end
+      return total_size, oldest_list
+    end
+
     def self.get_total_size_and_oldest_list(bucket, prefix, max_list_length = 10000)
       rubys3_client = Aws::S3::Client.new
       oldest_list = []

data/lib/cosmos/utilities/store_autoload.rb

@@ -324,16 +324,6 @@ module Cosmos
         return redis.xtrim_minid(topic, minid, approximate: approximate, limit: limit)
       end
     end
-
-    # Execute any Redis command. Args must be an array (e.g. ["KEYS", "*"])
-    def self.execute_raw(args)
-      self.instance.execute_raw(args)
-    end
-
-    # Execute any Redis command. Args must be an array (e.g. ["KEYS", "*"])
-    def execute_raw(args)
-      synchronize { |client| client.call(args) }
-    end
   end
 end
 

data/lib/cosmos/version.rb

@@ -1,13 +1,14 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '5.0.2'
+COSMOS_VERSION = '5.0.3'
 module Cosmos
   module Version
     MAJOR = '5'
     MINOR = '0'
-    PATCH = '2'
+    PATCH = '3'
     OTHER = ''
-    BUILD = 'ce01db297de2695bdb78b542c428ca244144d59a'
+    BUILD = '715c106240ff43bb59be2d17d1f5aed50595fbc9'
   end
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
+  GEM_VERSION = '5.0.3'
 end

data/templates/plugin-template/plugin.gemspec

@@ -20,6 +20,4 @@ spec = Gem::Specification.new do |s|
     s.version = '0.0.0' + ".#{time}"
   end
   s.files = Dir.glob("{targets,lib,procedures,tools,microservices}/**/*") + %w(Rakefile README.md plugin.txt)
-
-  s.add_runtime_dependency 'cosmos', '~> 5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -837,7 +837,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: Ball Aerospace COSMOS