chef_backup 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e824870ac3e10eb6ffaa5bedd55483721a1af6b15cb61c7cb58cc2ccbcf7d9
-  data.tar.gz: 73be0c4d4911cd7f2f238aa0c9bd93b67a5fe7fdbfeb90294a8bfbffdcc42d7d
+  metadata.gz: abf3acd4e6bd56e159617ce5fc550b0eca43520bb9a804cac9795ffb86b05c07
+  data.tar.gz: 997e7b9b797959b88b5cff52de0d8f5b10ece2fd23098d89e69a7ac67efba21d
 SHA512:
-  metadata.gz: 718ef11067a9e995f10bef3ccee17ac176b42a9a08fd9c3eebad64856dd5fda41f63c3e75e82d5e22fbb37dff521c0dd8e231436a580ace946366fb7dc9f1bc3
-  data.tar.gz: 03d05f2b1fd933cbd1842fc3563392b63f91127697ab17ae066eaf7c19f094c9c14aaeb083b9bbcbd580db0eb6ed0a71a67b20371821466308a2e1103a8fcbfb
+  metadata.gz: 476e6227c7b64a8fe35467802aca311f5c6c8b80241bb54b21f0ef5d08c40041c218760e965f54798a2806521397c6b272507a7a8f4503c00aafbe3280c7a2e3
+  data.tar.gz: b0d905d8893045fe1c3c3b0ee2c43b785d26d122825abf98185e1e492d6e03f479d228895be01b8d74728fdfd14090c29bcb1eafea56e3246f550e163bcbf52e

data/lib/chef_backup/config.rb

@@ -1,6 +1,7 @@
-require "fileutils"
-require "json"
-require "forwardable"
+require "fileutils" unless defined?(FileUtils)
+require "json" unless defined?(JSON)
+require "forwardable" unless defined?(Forwardable)
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 module ChefBackup
   # ChefBackup Global Config
@@ -12,10 +13,10 @@ module ChefBackup
       "backup" => {
         "always_dump_db" => true,
         "strategy" => "none",
-        "export_dir" => "/var/opt/chef-backup",
-        "project_name" => "opscode",
-        "ctl-command" => "chef-server-ctl",
-        "running_filepath" => "/etc/opscode/chef-server-running.json",
+        "export_dir" => "/var/opt/#{ChefUtils::Dist::Infra::SHORT}-backup",
+        "project_name" => ChefUtils::Dist::Org::LEGACY_CONF_DIR,
+        "ctl-command" => ChefUtils::Dist::Server::SERVER_CTL,
+        "running_filepath" => "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/#{ChefUtils::Dist::Server::SERVER}-running.json",
         "database_name" => "opscode_chef",
       },
     }.freeze

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/helpers.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'mixlib/shellout'
 require 'chef_backup/config'
 require 'chef_backup/logger'
+require 'chef-utils/dist'
 
 # rubocop:disable ModuleLength
 # rubocop:disable IndentationWidth
@@ -29,7 +30,7 @@ module Helpers
       'ctl_command' => 'opscode-analytics-ctl'
     },
     'chef-ha' => {
-      'config_file' => '/etc/opscode/chef-server.rb'
+      'config_file' => "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/#{ChefUtils::Dist::Server::SERVER}.rb"
     },
     'chef-sync' => {
       'config_file' => '/etc/chef-sync/chef-sync.rb',

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
@@ -181,7 +180,7 @@ class TarBackup
     cleanup
     log 'Backup Complete!'
   rescue => e
-    log "Something wen't terribly wrong, aborting backup", :error
+    log "Something went terribly wrong, aborting backup", :error
     log e.message, :error
     cleanup
     start_chef_server
@@ -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,7 @@
-require "fileutils"
-require "pathname"
-require "forwardable"
+require "fileutils" unless defined?(FileUtils)
+require "pathname" unless defined?(Pathname)
+require "forwardable" unless defined?(Forwardable)
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 require "chef_backup/deep_merge"
 
 # rubocop:disable IndentationWidth
@@ -93,7 +94,7 @@ class TarRestore
   end
 
   def touch_sentinel
-    dir = "/var/opt/opscode"
+    dir = "/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}"
     sentinel = File.join(dir, "bootstrapped")
     FileUtils.mkdir_p(dir) unless File.directory?(dir)
     File.open(sentinel, "w") { |file| file.write "bootstrapped!" }
@@ -135,11 +136,11 @@ class TarRestore
 
   def fix_ha_plugins
     log "Fixing HA plugins directory (https://github.com/chef/chef-server/issues/115)"
-    plugins_dir = "/var/opt/opscode/plugins"
+    plugins_dir = "/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/plugins"
     drbd_plugin = File.join(plugins_dir, "chef-ha-drbd.rb")
 
     FileUtils.mkdir_p(plugins_dir) unless Dir.exist?(plugins_dir)
-    FileUtils.ln_sf("/opt/opscode/chef-server-plugin.rb", drbd_plugin) unless
+    FileUtils.ln_sf("/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/chef-server-plugin.rb", drbd_plugin) unless
       File.exist?(drbd_plugin)
   end
 
@@ -158,8 +159,8 @@ class TarRestore
 
   def touch_drbd_ready
     log "Touching drbd_ready file"
-    FileUtils.touch("/var/opt/opscode/drbd/drbd_ready") unless
-      File.exist?("/var/opt/opscode/drbd/drbd_ready")
+    FileUtils.touch("/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/drbd/drbd_ready") unless
+      File.exist?("/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/drbd/drbd_ready")
   end
 
   def reconfigure_server

data/lib/chef_backup/version.rb

@@ -1,4 +1,4 @@
 # ChefBackup module
 module ChefBackup
-  VERSION = "0.1.0".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_backup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -31,25 +31,47 @@ 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'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: chef-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 16.5.54
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.9
+        version: 16.5.54
 description: A library to backup a Chef Server
 email:
 - oss@chef.io
@@ -98,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A library to backup a Chef Server