datadog_backup 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dde2d1abab2ee528f325b7654246ac74e5af2237c2776d865cd5a937d15396e
-  data.tar.gz: 7a97f603ea64d4a5684c6c272f140c209e62d1c79e24eafd61b673b3829d6c1e
+  metadata.gz: 985fb90b7482b78cf13ce586048eba798002d79aa0a00aa1475f2c9030fe5585
+  data.tar.gz: 34e55a0a46912ac13a06cf022f63e97474d576b28377b38695bae14606871388
 SHA512:
-  metadata.gz: dc77dffd355537f3a88adf7c9a59cdb70fd3fc3ded6ee7c82c6d2db7055508da9f90a96ac8e8119126988708f81bdd54814656b38a20e9813016b2ffb0ea42ce
-  data.tar.gz: a8b36fdf7f5475421d19061b0d66ad21927d6c3a97ca690beaa08efd50d8598919871da46c0b1a4ba2209600e7a1174ecf069f35545c8b4f8b4b23a3c91b09ee
+  metadata.gz: 5783ab3fc1be9f27f99c9039f7ea3a1b0b3c5eae72278cdf99c2b954242c93dcf932bace845adaa825ed4481a4a6f39fe502ae2fedbb9a24973eed5b1b576f6c
+  data.tar.gz: 293c615e05587b9adf6af65e719e5ff3f8ab9f1441625904248c644a5b3ddaaad51cd5c265f8e99b784fbac6ba86fa41e71e5739a95049bedcc77d84dc575d53

data/.github/workflows/rspec_and_release.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.7, '3.0', '3.1']
+        ruby: [2.6, 2.7, '3.0', '3.1']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.0.2](https://github.com/scribd/datadog_backup/compare/v2.0.1...v2.0.2) (2022-08-11)
+
+
+### Bug Fixes
+
+* Deprecate Ruby 2.6 and Drop support for Ruby 2.5 ([#132](https://github.com/scribd/datadog_backup/issues/132)) ([432cb2c](https://github.com/scribd/datadog_backup/commit/432cb2c0d8b12d89aef81cf35597aa90f77407eb))
+
 ## [2.0.1](https://github.com/scribd/datadog_backup/compare/v2.0.0...v2.0.1) (2022-08-11)
 
 

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    datadog_backup (0.6.0)
-      amazing_print (= 1.4.0)
-      concurrent-ruby (= 1.1.10)
-      deepsort (= 0.4.5)
-      diffy (= 3.4.2)
-      dogapi (= 1.45.0)
+    datadog_backup (2.0.1)
+      amazing_print (~> 1.4.0)
+      concurrent-ruby (~> 1.1.10)
+      deepsort (~> 0.4.5)
+      diffy (~> 3.4.2)
+      dogapi (~> 1.45.0)
 
 GEM
   remote: https://rubygems.org/

data/bin/datadog_backup

@@ -5,13 +5,13 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
 
 require 'logger'
 require 'optparse'
+$stdout.sync = $stderr.sync = true
+LOGGER = Logger.new($stderr) unless defined?(LOGGER)
+LOGGER.level = Logger::INFO
 
 require 'datadog_backup'
 require 'dogapi'
 
-$stdout.sync = $stderr.sync = true
-LOGGER = Logger.new($stderr) unless defined?(LOGGER)
-LOGGER.level = Logger::INFO
 
 def fatal(message)
   LOGGER.fatal(message)
@@ -87,8 +87,7 @@ defaults = {
   diff_format: :color,
   resources: [DatadogBackup::Dashboards, DatadogBackup::Monitors],
   output_format: :yaml,
-  force_restore: false,
-  logger: LOGGER
+  force_restore: false
 }
 
 DatadogBackup::Cli.new(prereqs(defaults)).run!

data/datadog_backup.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ['>= 2.5']
+  spec.required_ruby_version = ['>= 2.6']
 
-  spec.add_dependency 'amazing_print', '1.4.0'
-  spec.add_dependency 'concurrent-ruby', '1.1.10'
-  spec.add_dependency 'deepsort', '0.4.5'
-  spec.add_dependency 'diffy', '3.4.2'
-  spec.add_dependency 'dogapi', '1.45.0'
+  spec.add_dependency 'amazing_print', '~> 1.4.0'
+  spec.add_dependency 'concurrent-ruby', '~> 1.1.10'
+  spec.add_dependency 'deepsort', '~> 0.4.5'
+  spec.add_dependency 'diffy', '~> 3.4.2'
+  spec.add_dependency 'dogapi', '~> 1.45.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'

data/lib/datadog_backup/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'optparse'
-require 'logger'
 require 'amazing_print'
 
 module DatadogBackup
@@ -9,7 +8,7 @@ module DatadogBackup
     include ::DatadogBackup::Options
 
     def all_diff_futures
-      logger.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
+      LOGGER.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
       any_resource_instance
         .all_file_ids_for_selected_resources
         .map do |id|
@@ -42,7 +41,7 @@ module DatadogBackup
 
     def diffs
       futures = all_diff_futures
-      ::DatadogBackup::ThreadPool.watcher(logger).join
+      ::DatadogBackup::ThreadPool.watcher.join
 
       format_diff_output(
         Concurrent::Promises
@@ -102,7 +101,7 @@ module DatadogBackup
 
     def restore
       futures = all_diff_futures
-      watcher = ::DatadogBackup::ThreadPool.watcher(logger)
+      watcher = ::DatadogBackup::ThreadPool.watcher
 
       futures.each do |future|
         id, diff = *future.value!
@@ -138,7 +137,7 @@ module DatadogBackup
     def run!
       puts(send(action.to_sym))
     rescue SystemExit, Interrupt
-      ::DatadogBackup::ThreadPool.shutdown(logger)
+      ::DatadogBackup::ThreadPool.shutdown
     end
   end
 end

data/lib/datadog_backup/core.rb

@@ -30,7 +30,7 @@ module DatadogBackup
       current = except(get_by_id(id)).deep_sort.to_yaml
       filesystem = except(load_from_file_by_id(id)).deep_sort.to_yaml
       result = ::Diffy::Diff.new(current, filesystem, include_plus_and_minus_in_html: true).to_s(diff_format)
-      logger.debug("Compared ID #{id} and found #{result}")
+      LOGGER.debug("Compared ID #{id} and found #{result}")
       result
     end
 
@@ -82,7 +82,7 @@ module DatadogBackup
       result = with_200 do
         api_service.request(Net::HTTP::Post, "/api/#{api_version}/#{api_resource_name}", nil, body, true)
       end
-      logger.warn 'Successfully created in datadog.'
+      LOGGER.warn 'Successfully created in datadog.'
       result
     end
 
@@ -91,7 +91,7 @@ module DatadogBackup
       result = with_200 do
         api_service.request(Net::HTTP::Put, "/api/#{api_version}/#{api_resource_name}/#{id}", nil, body, true)
       end
-      logger.warn 'Successfully restored to datadog.'
+      LOGGER.warn 'Successfully restored to datadog.'
       result
     end
 

data/lib/datadog_backup/dashboards.rb

@@ -20,7 +20,7 @@ module DatadogBackup
     end
 
     def backup
-      logger.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
+      LOGGER.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
 
       futures = all_boards.map do |board|
         Concurrent::Promises.future_on(::DatadogBackup::ThreadPool::TPOOL, board) do |board|
@@ -29,7 +29,7 @@ module DatadogBackup
         end
       end
 
-      watcher = ::DatadogBackup::ThreadPool.watcher(logger)
+      watcher = ::DatadogBackup::ThreadPool.watcher
       watcher.join if watcher.status
 
       Concurrent::Promises.zip(*futures).value!

data/lib/datadog_backup/deprecations.rb

@@ -0,0 +1,11 @@
+
+
+module DatadogBackup
+  module Deprecations
+    def self.check
+      if RUBY_VERSION < '2.7'
+        LOGGER.warn "ruby-#{RUBY_VERSION} is deprecated. Ruby 2.7 or higher will be required to use this gem after datadog_backup@v3"
+      end
+    end
+  end
+end

data/lib/datadog_backup/local_filesystem.rb

@@ -78,7 +78,7 @@ module DatadogBackup
     end
 
     def write_file(data, filename)
-      logger.info "Backing up #{filename}"
+      LOGGER.info "Backing up #{filename}"
       file = ::File.open(filename, 'w')
       file.write(data)
     ensure

data/lib/datadog_backup/options.rb

@@ -30,10 +30,6 @@ module DatadogBackup
       @options[:diff_format]
     end
 
-    def logger
-      @options[:logger]
-    end
-
     # Either :json or :yaml
     def output_format
       @options[:output_format]

data/lib/datadog_backup/thread_pool.rb

@@ -8,21 +8,21 @@ module DatadogBackup
       fallback_policy: :abort
     )
 
-    def self.watcher(logger)
+    def self.watcher
       Thread.new(TPOOL) do |pool|
         while pool.queue_length.positive?
           sleep 2
-          logger.info("#{pool.queue_length} tasks remaining for execution.")
+          LOGGER.info("#{pool.queue_length} tasks remaining for execution.")
         end
       end
     end
 
-    def self.shutdown(logger)
-      logger.fatal 'Shutdown signal caught. Performing orderly shut down of thread pool. Press Ctrl+C again to forcibly shut down, but be warned, DATA LOSS MAY OCCUR.'
+    def self.shutdown
+      LOGGER.fatal 'Shutdown signal caught. Performing orderly shut down of thread pool. Press Ctrl+C again to forcibly shut down, but be warned, DATA LOSS MAY OCCUR.'
       TPOOL.shutdown
       TPOOL.wait_for_termination
     rescue SystemExit, Interrupt
-      logger.fatal 'OK Nuking, DATA LOSS MAY OCCUR.'
+      LOGGER.fatal 'OK Nuking, DATA LOSS MAY OCCUR.'
       TPOOL.kill
     end
   end

data/lib/datadog_backup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatadogBackup
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/lib/datadog_backup.rb

@@ -6,13 +6,16 @@ require 'dogapi'
 
 require_relative 'datadog_backup/local_filesystem'
 require_relative 'datadog_backup/options'
-
 require_relative 'datadog_backup/cli'
 require_relative 'datadog_backup/core'
 require_relative 'datadog_backup/dashboards'
 require_relative 'datadog_backup/monitors'
 require_relative 'datadog_backup/thread_pool'
 require_relative 'datadog_backup/version'
+require_relative 'datadog_backup/deprecations'
+DatadogBackup::Deprecations.check
+
 
 module DatadogBackup
 end
+

data/spec/datadog_backup/cli_spec.rb

@@ -14,7 +14,6 @@ describe DatadogBackup::Cli do
       datadog_api_key: 1,
       datadog_app_key: 1,
       diff_format: nil,
-      logger: Logger.new('/dev/null'),
       output_format: :json,
       resources: [DatadogBackup::Dashboards]
     }

data/spec/datadog_backup/core_spec.rb

@@ -14,8 +14,7 @@ describe DatadogBackup::Core do
       backup_dir: tempdir,
       diff_format: nil,
       resources: [],
-      output_format: :json,
-      logger: Logger.new('/dev/null')
+      output_format: :json
     )
   end
 

data/spec/datadog_backup/dashboards_spec.rb

@@ -12,8 +12,7 @@ describe DatadogBackup::Dashboards do
       client: client_double,
       backup_dir: tempdir,
       output_format: :json,
-      resources: [],
-      logger: Logger.new('/dev/null')
+      resources: []
     )
   end
   let(:dashboard_description) do

data/spec/datadog_backup/deprecations_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe DatadogBackup::Deprecations do
+  let(:logger) { double }
+
+  before do
+    stub_const('LOGGER', logger)
+    allow(logger).to receive(:warn)
+  end
+
+  %w[2.4.10 2.5.9 2.6.8].each do |ruby_version|
+    describe "#check#{ruby_version}" do
+      subject { described_class.check }
+
+      it 'does warn' do
+        stub_const('RUBY_VERSION', ruby_version)
+        expect(logger).to receive(:warn).with(/ruby-#{ruby_version} is deprecated./)
+        subject
+      end
+    end
+  end
+
+  %w[2.7.4 3.0.4 3.1.2 3.2.0-preview1].each do |ruby_version|
+    describe "#check#{ruby_version}" do
+      subject { described_class.check }
+
+      it 'does not warn' do
+        stub_const('RUBY_VERSION', ruby_version)
+        expect(logger).to_not receive(:warn).with(/ruby-#{ruby_version} is deprecated./)
+        subject
+      end
+    end
+  end
+end

data/spec/datadog_backup/local_filesystem_spec.rb

@@ -11,8 +11,7 @@ describe DatadogBackup::LocalFilesystem do
       client: client_double,
       backup_dir: tempdir,
       resources: [DatadogBackup::Dashboards],
-      output_format: :json,
-      logger: Logger.new('/dev/null')
+      output_format: :json
     )
   end
   let(:core_yaml) do
@@ -21,8 +20,7 @@ describe DatadogBackup::LocalFilesystem do
       client: client_double,
       backup_dir: tempdir,
       resources: [],
-      output_format: :yaml,
-      logger: Logger.new('/dev/null')
+      output_format: :yaml
     )
   end
 

data/spec/datadog_backup/monitors_spec.rb

@@ -12,8 +12,7 @@ describe DatadogBackup::Monitors do
       client: client_double,
       backup_dir: tempdir,
       output_format: :json,
-      resources: [],
-      logger: Logger.new('/dev/null')
+      resources: []
     )
   end
   let(:monitor_description) do

data/spec/spec_helper.rb

@@ -2,16 +2,18 @@
 
 $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 
-require 'datadog_backup'
 require 'logger'
-require 'tmpdir'
-require 'dogapi'
-
 $stdout.sync = $stderr.sync = true
-LOGGER = Logger.new($stderr) unless defined?(LOGGER)
+LOGGER = Logger.new('/dev/null')
 LOGGER.level = Logger::INFO
 $stdout = File.new('/dev/null', 'w+')
 
+require 'tmpdir'
+require 'dogapi'
+require 'datadog_backup'
+
+
+
 SPEC_ROOT = __dir__
 WORK_ROOT = File.expand_path(File.join(SPEC_ROOT, '..'))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog_backup
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Kamran Farhadi
@@ -15,70 +15,70 @@ dependencies:
   name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: deepsort
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: dogapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.45.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.45.0
 - !ruby/object:Gem::Dependency
@@ -198,6 +198,7 @@ files:
 - lib/datadog_backup/cli.rb
 - lib/datadog_backup/core.rb
 - lib/datadog_backup/dashboards.rb
+- lib/datadog_backup/deprecations.rb
 - lib/datadog_backup/local_filesystem.rb
 - lib/datadog_backup/monitors.rb
 - lib/datadog_backup/options.rb
@@ -207,6 +208,7 @@ files:
 - spec/datadog_backup/cli_spec.rb
 - spec/datadog_backup/core_spec.rb
 - spec/datadog_backup/dashboards_spec.rb
+- spec/datadog_backup/deprecations_spec.rb
 - spec/datadog_backup/local_filesystem_spec.rb
 - spec/datadog_backup/monitors_spec.rb
 - spec/datadog_backup_bin_spec.rb
@@ -224,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -239,6 +241,7 @@ test_files:
 - spec/datadog_backup/cli_spec.rb
 - spec/datadog_backup/core_spec.rb
 - spec/datadog_backup/dashboards_spec.rb
+- spec/datadog_backup/deprecations_spec.rb
 - spec/datadog_backup/local_filesystem_spec.rb
 - spec/datadog_backup/monitors_spec.rb
 - spec/datadog_backup_bin_spec.rb