s3_rotate 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0a47b24554da5a2107fbb2c2ac19957f2053916c8d1202e6c1dac94358bfa2d
-  data.tar.gz: 50c281cd8b4453e2075570a8e6a1f1a905e865c5d253215fb193b0769b780650
+  metadata.gz: 16f04d3b048eedc89e3a4efaacdb46009bda296f842ace1d1a0c56f87bb88158
+  data.tar.gz: df1fd512ebb22a0800ea822364e76f69c0a5409d89e90b95ee7731dcd81f0bed
 SHA512:
-  metadata.gz: 9995b0a95d18a51414526b46c3670bac87a53c6355c25e50f6785787a198b3f61aa72547b68fceaaa650cbf822a75cf2dbf8b17f7d1f0fddf75ed50e1ef0785c
-  data.tar.gz: 725bfa0b4974e2ffca31775954c0c505ec87a2f8ad1560f4e6f045a11d67bab6261d5158e9ea9de3a66d2d8ff4b93663628509a2cee3233d1ee20f5ed30fe688
+  metadata.gz: 89caf936d757c6d2afd3bc2eba65361e9d79ed1547b1fed1f51317925af7ddd458dce94cdd6a4402cf07d35889bb3be105c047dbdc6c690bf9f3c71fb715a26e
+  data.tar.gz: 30e6a7117c71466ff2bc99dafe37d97edfc574d945c30c6b4886d06f2644a2dae68db59f23d1f6dc11c3e7f32928927ad11182a24e69f1e0749203aee090cc62

data/.gitignore

@@ -1,5 +1,6 @@
 # gems
 *.gem
+Gemfile.lock
 
 # tmp
 tmp

data/README.md

@@ -8,6 +8,10 @@
 
 
 
+## Requirements
+- Ruby >= 2.0.0
+
+
 ## Installation
 In your `Gemfile`:
 ```bash

data/lib/s3_rotate/core/backup_rotator.rb

@@ -63,13 +63,13 @@ module S3Rotate
       weekly_backups = @s3_client.remote_backups(backup_name, "weekly").files
 
       # get most recent weekly file
-      recent_weekly_file = weekly_backups.last
+      recent_weekly_file = weekly_backups.last ? weekly_backups.last.key : nil
 
       # look through daily backups to find which oness should be promoted
       daily_backups.each do |backup|
         # promote to weekly if applicable
-        if should_promote_daily_to_weekly?(backup.key, recent_weekly_file&.key)
-          recent_weekly_file = promote(backup_name, backup.key, backup.body, "weekly")
+        if should_promote_daily_to_weekly?(backup.key, recent_weekly_file)
+          recent_weekly_file = promote(backup_name, backup.key, backup.body, "weekly").key
         end
       end
 
@@ -100,13 +100,13 @@ module S3Rotate
       monthly_backups = @s3_client.remote_backups(backup_name, "monthly").files
 
       # get most recent monthly file
-      recent_monthly_file = monthly_backups.last
+      recent_monthly_file = monthly_backups.last ? monthly_backups.last.key : nil
 
       # look through weekly backups to find which oness should be promoted
       weekly_backups.each do |backup|
         # promote to monthly if applicable
-        if should_promote_weekly_to_monthly?(backup.key, recent_monthly_file&.key)
-          recent_monthly_file = promote(backup_name, backup.key, backup.body, "monthly")
+        if should_promote_weekly_to_monthly?(backup.key, recent_monthly_file)
+          recent_monthly_file = promote(backup_name, backup.key, backup.body, "monthly").key
         end
       end
 

data/lib/s3_rotate/utils/file_utils.rb

@@ -15,8 +15,15 @@ module S3Rotate
     #
     def FileUtils.date_from_filename(filename, date_regex=/\d{4}-\d{2}-\d{2}/)
       # match the date in the filename
-      match    = filename.match(date_regex)
-      date_str = match&.captures&.first || match&.to_s
+      match = filename.match(date_regex)
+
+      if not match
+        date_str = nil
+      elsif not match.captures
+        date_str = match.to_s
+      else
+        date_str = match.captures.first || match.to_s
+      end
 
       # if nothing could be match, immediately fail
       raise "Invalid date_regex or filename format" if not date_str

data/s3_rotate.gemspec

@@ -2,14 +2,21 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 's3_rotate'
-  s.version     = '1.0.0'
-  s.homepage    = 'https://github.com/Whova/s3_rotate'
-  s.date        = Date.today.to_s
   s.summary     = "AWS S3 upload with rotation mechanism"
   s.description = s.summary
+  s.homepage    = 'https://github.com/Whova/s3_rotate'
+  s.license     = 'MIT'
+
+  s.version     = '1.0.1'
+  s.date        = Date.today.to_s
+
   s.authors     = ["Simon Ninon"]
   s.email       = 'simon.ninon@gmail.com'
+
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.license     = 'MIT'
+
+  s.required_ruby_version = '>= 2.0.0'
+
+  s.add_dependency 'fog-aws', '~> 3.5.2'
 end

data/spec/s3_rotate/core/backup_rotator_spec.rb

@@ -147,6 +147,48 @@ describe S3Rotate::BackupRotator do
       expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[0].body).to eq 'some data'
     end
 
+    it 'rotates multiples when relevant' do
+      # mock
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-12.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-13.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-14.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-16.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-20.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-21.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-24.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-27.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-29.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/weekly/2020-01-06.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/monthly/2020-01-06.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/other_backup_name/daily/2020-01-07.tgz', body: 'some data')
+
+      # perform test
+      @rotator.rotate_daily('backup_name', 3)
+
+      # verify result
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files.length).to eq 3
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[0].key).to eq '/backup_name/daily/2020-01-24.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[0].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[1].key).to eq '/backup_name/daily/2020-01-27.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[1].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[2].key).to eq '/backup_name/daily/2020-01-29.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[2].body).to eq 'some data'
+
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files.length).to eq 4
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[0].key).to eq '/backup_name/weekly/2020-01-06.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[0].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[1].key).to eq '/backup_name/weekly/2020-01-13.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[1].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[2].key).to eq '/backup_name/weekly/2020-01-20.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[2].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[3].key).to eq '/backup_name/weekly/2020-01-27.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[3].body).to eq 'some data'
+
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files.length).to eq 1
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[0].key).to eq '/backup_name/monthly/2020-01-06.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[0].body).to eq 'some data'
+    end
+
     it 'always promote when there is no weekly backup' do
       # mock
       @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-12.tgz', body: 'some data')
@@ -338,6 +380,56 @@ describe S3Rotate::BackupRotator do
       expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[1].body).to eq 'some data'
     end
 
+    it 'rotates multiple when relevant' do
+      # mock
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-12.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-13.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-14.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-15.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-16.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-17.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/weekly/2020-02-07.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/weekly/2020-02-14.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/weekly/2020-03-06.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/weekly/2020-03-13.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/weekly/2020-04-05.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/weekly/2020-04-12.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/backup_name/monthly/2020-01-12.tgz', body: 'some data')
+      @client.connection.directories.get('bucket').files.create(key: '/other_backup_name/daily/2020-01-07.tgz', body: 'some data')
+
+      # perform test
+      @rotator.rotate_weekly('backup_name', 2)
+
+      # verify result
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files.length).to eq 6
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[0].key).to eq '/backup_name/daily/2020-01-12.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[0].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[1].key).to eq '/backup_name/daily/2020-01-13.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[1].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[2].key).to eq '/backup_name/daily/2020-01-14.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[2].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[3].key).to eq '/backup_name/daily/2020-01-15.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[3].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[4].key).to eq '/backup_name/daily/2020-01-16.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[4].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[5].key).to eq '/backup_name/daily/2020-01-17.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/daily').files[5].body).to eq 'some data'
+
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files.length).to eq 2
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[0].key).to eq '/backup_name/weekly/2020-04-05.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[0].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[1].key).to eq '/backup_name/weekly/2020-04-12.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/weekly').files[1].body).to eq 'some data'
+
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files.length).to eq 3
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[0].key).to eq '/backup_name/monthly/2020-01-12.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[0].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[1].key).to eq '/backup_name/monthly/2020-02-14.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[1].body).to eq 'some data'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[2].key).to eq '/backup_name/monthly/2020-04-05.tgz'
+      expect(@client.connection.directories.get('bucket', prefix: '/backup_name/monthly').files[2].body).to eq 'some data'
+    end
+
     it 'always promote when there is no monthly backup' do
       # mock
       @client.connection.directories.get('bucket').files.create(key: '/backup_name/daily/2020-01-12.tgz', body: 'some data')

metadata

@@ -1,25 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: s3_rotate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Simon Ninon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
-dependencies: []
+date: 2020-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: fog-aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.2
 description: AWS S3 upload with rotation mechanism
 email: simon.ninon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - examples/example.rb
@@ -50,16 +63,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: AWS S3 upload with rotation mechanism

data/Gemfile.lock

@@ -1,55 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.4)
-    diff-lcs (1.3)
-    excon (0.71.1)
-    fog-aws (3.5.2)
-      fog-core (~> 2.1)
-      fog-json (~> 1.1)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (2.2.0)
-      builder
-      excon (~> 0.71)
-      formatador (~> 0.2)
-      mime-types
-    fog-json (1.2.0)
-      fog-core
-      multi_json (~> 1.10)
-    fog-xml (0.1.3)
-      fog-core
-      nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.2.5)
-    ipaddress (0.8.3)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_portile2 (2.4.0)
-    multi_json (1.14.1)
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fog-aws (~> 3.5.2)
-  rspec
-  rspec-mocks
-
-BUNDLED WITH
-   1.17.2