chef_backup 0.1.1 → 0.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd9e42aaddb3298dee25b5dff5ff972f92ed2b9554fac1cfdbd487edd3c9bc9
-  data.tar.gz: 3b53768ed83f86bcf25259e65a8b710198d3b97b9fdc7e5ca52446e7511e69d6
+  metadata.gz: 51de6280ecd6ede16153afcfb70d6fcfa508e76dfa48dea7858d5d5fcc4be278
+  data.tar.gz: a358070ef671054bda4e8b21bc6e6bb51fb915b31bded0567d4c717731fff0c5
 SHA512:
-  metadata.gz: 3f9a37b97ab0553644d533a63d49b42fa68a28eef2f821da971f78341c5d1d4324f219ac9996ab8abb59f47d707e05e71fccbbee2003b9b0725260758ddb3d00
-  data.tar.gz: 8ad641f82c2e0592dd29eff51e8ebd155980bdd27730718f23cb798008c5ba226eadaeaba0764bf5e5305f614660885bc8605891629fbe72169aaf8bf718b18d
+  metadata.gz: cbc70201b088ac22f49d34cfb6114eebfe62f8b2f8cca7fd3beb5255b54df77dddcdc76287f3474f284532b387a9297c8659c4eaf5c5a50444536579c7e98354
+  data.tar.gz: 96e4e39b9d0083c81a0ba2dbf009f32545e027aa5a5a5f0f3beb91eb34f7fae0a17f9493e1c766979ec73719ee5104c28aae8fa59d739141ba9d49a64d6aa805

data/lib/chef_backup/config.rb

@@ -1,6 +1,6 @@
-require "fileutils"
-require "json"
-require "forwardable"
+require "fileutils" unless defined?(FileUtils)
+require "json" unless defined?(JSON)
+require "forwardable" unless defined?(Forwardable)
 
 module ChefBackup
   # ChefBackup Global Config

data/lib/chef_backup/data_map.rb

@@ -1,4 +1,4 @@
-require "time"
+require "time" unless defined?(Time.zone_offset)
 
 module ChefBackup
   # DataMap class to store data about the data we're backing up

data/lib/chef_backup/logger.rb

@@ -1,5 +1,3 @@
-require "highline"
-
 module ChefBackup
   # Basic Logging Class
   class Logger
@@ -16,17 +14,24 @@ module ChefBackup
 
     def initialize(logfile = nil)
       $stdout = logfile ? File.open(logfile, "ab") : $stdout
-      @highline = HighLine.new($stdin, $stdout)
+    end
+
+    # pastel.decorate is a lightweight replacement for highline.color
+    def pastel
+      @pastel ||= begin
+        require "pastel" unless defined?(Pastel)
+        Pastel.new
+      end
     end
 
     def log(msg, level = :info)
       case level
       when :warn
         msg = "WARNING: #{msg}"
-        $stdout.puts(color? ? @highline.color(msg, :yellow) : msg)
+        $stdout.puts(color? ? pastel.decorate(msg, :yellow) : msg)
       when :error
         msg = "ERROR: #{msg}"
-        $stdout.puts(color? ? @highline.color(msg, :red) : msg)
+        $stdout.puts(color? ? pastel.decorate(msg, :red) : msg)
       else
         $stdout.puts(msg)
       end

data/lib/chef_backup/runner.rb

@@ -1,5 +1,5 @@
-require "fileutils"
-require "pathname"
+require "fileutils" unless defined?(FileUtils)
+require "pathname" unless defined?(Pathname)
 
 module ChefBackup
   # ChefBackup::Runner class initializes the strategy and runs the action
@@ -60,16 +60,14 @@ module ChefBackup
     # @return [String] A path to backup tarball or EBS snapshot ID
     #
     def restore_strategy
-      @restore_strategy ||= begin
-        if tarball?
-          unpack_tarball
-          manifest["strategy"]
-        elsif ebs_snapshot?
-          "ebs"
-        else
-          raise InvalidStrategy, "#{restore_param} is not a valid backup"
-        end
-      end
+      @restore_strategy ||= if tarball?
+                              unpack_tarball
+                              manifest["strategy"]
+                            elsif ebs_snapshot?
+                              "ebs"
+                            else
+                              raise InvalidStrategy, "#{restore_param} is not a valid backup"
+                            end
     end
 
     #

data/lib/chef_backup/strategy/backup/tar.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'json'
 require 'time'
-require 'highline/import'
 
 # rubocop:disable IndentationWidth
 module ChefBackup
@@ -244,7 +243,8 @@ class TarBackup
     msg << 'continuing.  You can skip this message by passing a "--yes" '
     msg << 'argument. Do you wish to proceed? (y/N):'
 
-    exit(1) unless ask(msg) =~ /^y/i
+    require "tty-prompt" unless defined?(TTY::Prompt)
+    exit(1) unless TTY::Prompt.new(interrupt: :exit).ask(msg) =~ /^y/i
   end
 end
 end

data/lib/chef_backup/strategy/restore/tar.rb

@@ -1,6 +1,6 @@
-require "fileutils"
-require "pathname"
-require "forwardable"
+require "fileutils" unless defined?(FileUtils)
+require "pathname" unless defined?(Pathname)
+require "forwardable" unless defined?(Forwardable)
 require "chef_backup/deep_merge"
 
 # rubocop:disable IndentationWidth

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_backup
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -31,25 +31,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
+        version: '0.21'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: '0.21'
 description: A library to backup a Chef Server
 email:
 - oss@chef.io
@@ -94,11 +102,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A library to backup a Chef Server