chef_backup 0.0.1.dev.4 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94cbd6726cb86fe838709bb6cd0102f18ff98a02
-  data.tar.gz: 7a38dd28ef497ae4b1ec8a59adb22634e28f2fc4
+  metadata.gz: 3aaeca0a04fa4fe4ee8443b47d5f9295929d201d
+  data.tar.gz: 82f06bbc30bff3a57c235d98012f0a251498af9c
 SHA512:
-  metadata.gz: 4f1c58f55e246331ab7cc8c9919f6e9dafaba9922d4c597e5546bd59701634e3766461d4e58f3efffcea09cf1267724e52d3f11b4b9fc6b37be68eecdc1664b4
-  data.tar.gz: af600e295428765fb2e8bd0316039108a1133c5fd7a82ea8df83b1c518019c965a4239935cc9625010522b2bc82ff23aab588ab4afc9f0f24e06a0ebac846478
+  metadata.gz: 688f33e0046368ac2c35dcf7dce9ae9f474cf5e8d8628651c105af4c709769fe7728e5e4a8fd66d530f0e2ad82577039bd42874ffdb34b4a168b563045460b1f
+  data.tar.gz: 3c965dbc203fd45876c38d051cc2427ba67e9a8a97c38db7b947f85d2d4e277de620a06dd0fa9a7bf29f04eec327787006e17679e2b6140e84445f36e1e9dac0

data/chef_backup.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'pry-rescue'
-  spec.add_development_dependency 'rubocop', '>= 0.32.1'
+  spec.add_development_dependency 'rubocop', '~> 0.37.2'
   spec.add_development_dependency 'simplecov'
 end

data/lib/chef_backup/config.rb

@@ -7,11 +7,16 @@ module ChefBackup
   class Config
     extend Forwardable
 
+    DEFAULT_BASE = 'private_chef'.freeze
     DEFAULT_CONFIG = {
       'backup' => {
         'always_dump_db' => true,
         'strategy' => 'none',
-        'export_dir' => '/var/opt/chef-backup'
+        'export_dir' => '/var/opt/chef-backup',
+        'project_name' => 'opscode',
+        'ctl-command' => 'chef-server-ctl',
+        'running_filepath' => '/etc/opscode/chef-server-running.json',
+        'database_name' => 'opscode_chef'
       }
     }.freeze
 
@@ -45,13 +50,18 @@ module ChefBackup
     # @param config [Hash] a Hash of the private-chef-running.json
     #
     def initialize(config = {})
-      config['private_chef'] ||= {}
-      config['private_chef']['backup'] ||= {}
-      config['private_chef']['backup'] =
-        DEFAULT_CONFIG['backup'].merge(config['private_chef']['backup'])
+      config['config_base'] ||= DEFAULT_BASE
+      base = config['config_base']
+      config[base] ||= {}
+      config[base]['backup'] ||= {}
+      config[base]['backup'] = DEFAULT_CONFIG['backup'].merge(config[base]['backup'])
       @config = config
     end
 
+    def to_hash
+      @config
+    end
+
     def_delegators :@config, :[], :[]=
   end
 end

data/lib/chef_backup/helpers.rb

@@ -9,23 +9,62 @@ module ChefBackup
 module Helpers
   # rubocop:enable IndentationWidth
 
-  SERVER_ADD_ONS = %w(
-    opscode-manage
-    opscode-reporting
-    opscode-push-jobs-server
-    opscode-analytics
-    chef-ha
-    chef-sync
-  ).freeze
-
-  def private_chef
-    config['private_chef']
-  end
+  SERVER_ADD_ONS = {
+    'opscode-manage' => {
+      'config_file' => '/etc/opscode-manage/manage.rb',
+      'ctl_command' => 'opscode-manage-ctl'
+    },
+    'opscode-reporting' => {
+      'config_file' => '/etc/opscode-reporting/opscode-reporting.rb',
+      'ctl_command' => 'opscode-reporting-ctl'
+    },
+    'opscode-push-jobs-server' => {
+      'config_file' => '/etc/opscode-push-jobs-server/opscode-push-jobs-server.rb',
+      'ctl_command' => 'opscode-push-jobs-server-ctl'
+    },
+    'opscode-analytics' => {
+      'config_file' => '/etc/opscode-analytics/opscode-analytics.rb',
+      'ctl_command' => 'opscode-analytics-ctl'
+    },
+    'chef-ha' => {
+      'config_file' => 'etc/opscode/chef-server.rb'
+    },
+    'chef-sync' => {
+      'config_file' => '/etc/chef-sync/chef-sync.rb',
+      'ctl_command' => 'chef-sync-ctl'
+    },
+    'chef-marketplace' => {
+      'config_file' => '/etc/chef-marketplace/marketplace.rb',
+      'ctl_command' => 'chef-marketplace-ctl'
+    }
+  }.freeze
+
+  DEFAULT_PG_OPTIONS = '-c statement_timeout=3600000'.freeze
 
   def config
     ChefBackup::Config
   end
 
+  def config_base
+    ChefBackup::Config['config_base']
+  end
+
+  def service_config
+    ChefBackup::Config[config_base]
+  end
+
+  def ctl_command
+    service_config['backup']['ctl-command']
+  end
+
+  def running_filepath
+    service_config['backup']['running_filepath']
+  end
+
+  def database_name
+    service_config['backup']['database_name']
+  end
+
   def log(message, level = :info)
     ChefBackup::Logger.logger.log(message, level)
   end
@@ -38,7 +77,7 @@ module Helpers
   # @return [TrueClass, FalseClass]
   #
   def ensure_file!(file, exception, message)
-    File.exist?(file) ? true : fail(exception, message)
+    File.exist?(file) ? true : raise(exception, message)
   end
 
   def shell_out(*command)
@@ -54,8 +93,32 @@ module Helpers
     cmd
   end
 
+  def project_name
+    service_config['backup']['project_name']
+  end
+
+  def base_install_dir
+    "/opt/#{project_name}"
+  end
+
+  def base_config_dir
+    "/etc/#{project_name}"
+  end
+
+  def chpst
+    "#{base_install_dir}/embedded/bin/chpst"
+  end
+
+  def pgsql
+    "#{base_install_dir}/embedded/bin/psql"
+  end
+
+  def pg_options
+    config['pg_options'] || DEFAULT_PG_OPTIONS
+  end
+
   def all_services
-    Dir['/opt/opscode/sv/*'].map { |f| File.basename(f) }.sort
+    Dir["#{base_install_dir}/sv/*"].map { |f| File.basename(f) }.sort
   end
 
   def enabled_services
@@ -67,16 +130,16 @@ module Helpers
   end
 
   def service_enabled?(service)
-    File.symlink?("/opt/opscode/service/#{service}")
+    File.symlink?("#{base_install_dir}/service/#{service}")
   end
 
   def stop_service(service)
-    res = shell_out("chef-server-ctl stop #{service}")
+    res = shell_out("#{ctl_command} stop #{service}")
     res
   end
 
   def start_service(service)
-    res = shell_out("chef-server-ctl start #{service}")
+    res = shell_out("#{ctl_command} start #{service}")
     res
   end
 
@@ -92,32 +155,55 @@ module Helpers
     enabled_services.each { |sv| start_service(sv) }
   end
 
-  def enabled_addons
-    SERVER_ADD_ONS.select { |service| addon?(service) }
+  def restart_chef_server
+    shell_out("#{ctl_command} restart #{service}")
   end
 
-  def addon?(service)
-    File.directory?("/etc/#{service}")
+  def reconfigure_add_ons
+    enabled_addons.each do |_name, config|
+      shell_out("#{config['ctl_command']} reconfigure") if config.key?('ctl_command')
+    end
+  end
+
+  def restart_add_ons
+    enabled_addons.each do |_name, config|
+      shell_out("#{config['ctl_command']} restart") if config.key?('ctl_command')
+    end
+  end
+
+  def reconfigure_marketplace
+    log 'Setting up Chef Marketplace'
+    shell_out('chef-marketplace-ctl reconfigure')
+  end
+
+  def enabled_addons
+    SERVER_ADD_ONS.select do |_name, config|
+      begin
+        File.directory?(File.dirname(config['config_file']))
+      rescue
+        false
+      end
+    end
   end
 
   def strategy
-    private_chef['backup']['strategy']
+    service_config['backup']['strategy']
   end
 
   def topology
-    private_chef['topology']
+    service_config['topology']
   end
 
   def frontend?
-    private_chef['role'] == 'frontend'
+    service_config['role'] == 'frontend'
   end
 
   def backend?
-    private_chef['role'] =~ /backend|standalone/
+    service_config['role'] =~ /backend|standalone/
   end
 
   def online?
-    private_chef['backup']['mode'] == 'online'
+    service_config['backup']['mode'] == 'online'
   end
 
   def ha?
@@ -132,10 +218,14 @@ module Helpers
     topology == 'standalone'
   end
 
+  def marketplace?
+    shell_out('which chef-marketplace-ctl').exitstatus == 0
+  end
+
   def tmp_dir
     @tmp_dir ||= begin
       dir = safe_key { config['tmp_dir'] } ||
-            safe_key { private_chef['backup']['tmp_dir'] }
+            safe_key { service_config['backup']['tmp_dir'] }
       if dir
         FileUtils.mkdir_p(dir) unless File.directory?(dir)
         dir

data/lib/chef_backup/runner.rb

@@ -17,7 +17,7 @@ module ChefBackup
     #
     def initialize(running_config)
       ChefBackup::Config.config = running_config
-      ChefBackup::Logger.logger(private_chef['backup']['logfile'] || nil)
+      ChefBackup::Logger.logger(service_config['backup']['logfile'] || nil)
     end
 
     #
@@ -28,6 +28,13 @@ module ChefBackup
       @backup.backup
     end
 
+    #
+    # @return [ChefBackup::Config]
+    #
+    def config
+      ChefBackup::Config.config
+    end
+
     #
     # @return [TrueClass, FalseClass] Execute Chef Server restore
     #
@@ -40,7 +47,7 @@ module ChefBackup
     # @return [String] String name of the configured backup strategy
     #
     def backup_strategy
-      config['private_chef']['backup']['strategy']
+      service_config['backup']['strategy']
     end
 
     #
@@ -62,7 +69,7 @@ module ChefBackup
         elsif ebs_snapshot?
           'ebs'
         else
-          fail InvalidStrategy, "#{restore_param} is not a valid backup"
+          raise InvalidStrategy, "#{restore_param} is not a valid backup"
         end
       end
     end

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

@@ -27,8 +27,8 @@ class TarBackup
   def export_dir
     @export_dir ||= begin
       dir =
-        if private_chef['backup']['export_dir']
-          private_chef['backup']['export_dir']
+        if service_config['backup']['export_dir']
+          service_config['backup']['export_dir']
         else
           msg = ["backup['export_dir'] has not been set.",
                  'defaulting to: /var/opt/chef-backups'].join(' ')
@@ -47,24 +47,38 @@ class TarBackup
   #
   def dump_db
     return true unless pg_dump?
-    pg_user = private_chef['postgresql']['username']
+    if external_pg?
+      log('Cannot backup external postgresql', :warn)
+      return false
+    end
+    pg_user = service_config['postgresql']['username']
     sql_file = "#{tmp_dir}/chef_backup-#{backup_time}.sql"
-    cmd = ['/opt/opscode/embedded/bin/chpst',
+    cmd = [chpst,
            "-u #{pg_user}",
-           '/opt/opscode/embedded/bin/pg_dumpall',
+           pg_dumpall,
            "> #{sql_file}"
           ].join(' ')
     log "Dumping Postgresql database to #{sql_file}"
-    shell_out!(cmd)
+    shell_out!(cmd, env: ["PGOPTIONS=#{pg_options}"])
     data_map.services['postgresql']['pg_dump_success'] = true
     data_map.services['postgresql']['username'] = pg_user
     true
   end
 
+  def chpst
+    "#{base_install_dir}/embedded/bin/chpst"
+  end
+
+  def pg_dumpall
+    "#{base_install_dir}/embedded/bin/pg_dumpall"
+  end
+
   def populate_data_map
-    stateful_services.each do |service|
-      next unless private_chef.key?(service)
-      data_map.add_service(service, private_chef[service]['data_dir'])
+    unless config_only?
+      stateful_services.each do |service|
+        next unless service_config.key?(service)
+        data_map.add_service(service, service_config[service]['data_dir'])
+      end
     end
 
     config_directories.each do |config|
@@ -72,14 +86,14 @@ class TarBackup
     end
 
     # Don't forget the upgrades!
-    if private_chef.key?('upgrades')
-      data_map.add_service('upgrades', private_chef['upgrades']['dir'])
+    if service_config.key?('upgrades')
+      data_map.add_service('upgrades', service_config['upgrades']['dir'])
     end
 
-    if ha?
-      data_map.add_service('keepalived', private_chef['keepalived']['dir'])
-      data_map.add_ha_info('provider', private_chef['ha']['provider'])
-      data_map.add_ha_info('path', private_chef['ha']['path'])
+    if ha? && !config_only?
+      data_map.add_service('keepalived', service_config['keepalived']['dir'])
+      data_map.add_ha_info('provider', service_config['ha']['provider'])
+      data_map.add_ha_info('path', service_config['ha']['path'])
     end
   end
 
@@ -94,22 +108,25 @@ class TarBackup
     end
   end
 
+  DEFAULT_STATEFUL_SERVICES = %w(rabbitmq
+                                 opscode-solr4
+                                 elasticsearch
+                                 redis_lb
+                                 postgresql
+                                 bookshelf).freeze
+
   def stateful_services
-    if private_chef.key?('drbd') && private_chef['drbd']['enable'] == true
+    if service_config.key?('drbd') && service_config['drbd']['enable'] == true
       ['drbd']
     else
-      %w(
-        rabbitmq
-        opscode-solr4
-        redis_lb
-        postgresql
-        bookshelf
-      )
+      DEFAULT_STATEFUL_SERVICES.select do |service|
+        service_enabled?(service)
+      end
     end
   end
 
   def config_directories
-    %w(opscode) + enabled_addons
+    [project_name] + enabled_addons.keys
   end
 
   # The data_map is a working record of all of the data that is backed up.
@@ -123,25 +140,27 @@ class TarBackup
 
   def not_implemented
     msg = "#{caller[0].split[1]} is not implemented for this strategy"
-    fail NotImplementedError, msg
+    raise NotImplementedError, msg
   end
 
   def backup
-    log 'Starting Chef Server backup'
+    log "Starting Chef Server backup #{config_only? ? '(config only)' : ''}"
     populate_data_map
-    if backend?
+    stopped = false
+    if backend? && !config_only?
       if !online?
         ask_to_go_offline unless offline_permission_granted?
         stop_chef_server(except: [:keepalived, :postgresql])
         dump_db
         stop_service(:postgresql)
+        stopped = true
       else
         dump_db
       end
     end
     write_manifest
     create_tarball
-    start_chef_server if backend? && !online?
+    start_chef_server if stopped
     export_tarball
     cleanup
     log 'Backup Complete!'
@@ -156,7 +175,7 @@ class TarBackup
   def create_tarball
     log 'Creating backup tarball'
     cmd = [
-      "tar -czf #{tmp_dir}/chef-backup-#{backup_time}.tgz",
+      "tar -czf #{tmp_dir}/#{export_filename}",
       data_map.services.map { |_, v| v['data_dir'] }.compact.join(' '),
       data_map.configs.map { |_, v| v['data_dir'] }.compact.join(' '),
       Dir["#{tmp_dir}/*"].map { |f| File.basename(f) }.join(' ')
@@ -168,19 +187,40 @@ class TarBackup
 
   def export_tarball
     log "Exporting tarball to #{export_dir}"
-    cmd = "rsync -chaz #{tmp_dir}/chef-backup-#{backup_time}.tgz #{export_dir}/"
+    cmd = "rsync -chaz #{tmp_dir}/#{export_filename} #{export_dir}/"
 
     res = shell_out(cmd)
     res
   end
 
+  def export_filename
+    postfix = if config_only?
+                '-config'
+              else
+                ''
+              end
+    "chef-backup#{postfix}-#{backup_time}.tgz"
+  end
+
+  def service_enabled?(service)
+    service_config[service] && service_config[service]['enable'] && !service_config[service]['external']
+  end
+
+  def external_pg?
+    service_config['postgresql']['external']
+  end
+
   def pg_dump?
     # defaults to true
-    private_chef['backup']['always_dump_db']
+    service_config['backup']['always_dump_db']
   end
 
   def offline_permission_granted?
-    private_chef['backup']['agree_to_go_offline']
+    service_config['backup']['agree_to_go_offline']
+  end
+
+  def config_only?
+    service_config['backup']['config_only']
   end
 
   def ask_to_go_offline

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

@@ -15,18 +15,19 @@ class TarRestore
   extend Forwardable
 
   attr_accessor :tarball_path
+  attr_writer :manifest
 
   def_delegators :@log, :log
 
   def initialize(path)
     @tarball_path = path
-    @log = ChefBackup::Logger.logger(private_chef['backup']['logfile'] || nil)
+    @log = ChefBackup::Logger.logger(service_config['backup']['logfile'] || nil)
   end
 
   def restore
     log 'Restoring Chef Server from backup'
     cleanse_chef_server(config['agree_to_cleanse'])
-    if manifest['topology'] == 'ha'
+    if ha?
       log 'Performing HA restore - please ensure that keepalived is not running on the standby host'
       fix_ha_plugins
       check_ha_volume
@@ -35,10 +36,13 @@ class TarRestore
     restore_configs
     restore_services unless frontend?
     touch_sentinel
+    reconfigure_marketplace if marketplace?
     reconfigure_server
     update_config
     import_db if restore_db_dump?
     start_chef_server
+    reconfigure_add_ons
+    restart_add_ons
     cleanup
     log 'Restoration Completed!'
   end
@@ -64,15 +68,15 @@ class TarRestore
                          "chef_backup-#{manifest['backup_time']}.sql")
     ensure_file!(sql_file, InvalidDatabaseDump, "#{sql_file} not found")
 
-    cmd = ['/opt/opscode/embedded/bin/chpst',
+    cmd = [chpst,
            "-u #{manifest['services']['postgresql']['username']}",
-           '/opt/opscode/embedded/bin/psql',
+           pgsql,
            "-U #{manifest['services']['postgresql']['username']}",
-           '-d opscode_chef',
+           "-d #{database_name}",
            "< #{sql_file}"
           ].join(' ')
     log 'Importing Database dump'
-    shell_out!(cmd)
+    shell_out!(cmd, env: ["PGOPTIONS=#{pg_options}"])
   end
 
   def restore_services
@@ -123,7 +127,7 @@ class TarRestore
     ha_data_dir = manifest['ha']['path']
 
     unless ha_data_dir_mounted?(ha_data_dir)
-      fail "Please mount the data directory #{ha_data_dir} and perform any DRBD configuration before continuing"
+      raise "Please mount the data directory #{ha_data_dir} and perform any DRBD configuration before continuing"
     end
   end
 
@@ -139,17 +143,17 @@ class TarRestore
 
   def reconfigure_server
     log 'Reconfiguring the Chef Server'
-    shell_out('chef-server-ctl reconfigure')
+    shell_out("#{ctl_command} reconfigure")
   end
 
   def cleanse_chef_server(agree)
     log 'Cleaning up any old files'
-    shell_out!("chef-server-ctl cleanse #{agree || ''}")
+    shell_out!("#{ctl_command} cleanse #{agree || ''}")
   end
 
   def running_config
     @running_config ||=
-      JSON.parse(File.read('/etc/opscode/chef-server-running.json')) || {}
+      JSON.parse(File.read(running_filepath)) || {}
   end
 
   def update_config

data/lib/chef_backup/version.rb

@@ -1,4 +1,4 @@
 # ChefBackup module
 module ChefBackup
-  VERSION = '0.0.1.dev.4'
+  VERSION = '0.0.1'.freeze
 end

data/spec/spec_helper.rb

@@ -17,11 +17,6 @@ def private_chef!(args = {})
   ChefBackup::Config.config = args
 end
 
-# Merge attributes into existing cli_args
-def cli_args(*args)
-  Chef::Mixin::DeepMerge.deep_merge!(*args, ChefBackup::Config.config)
-end
-
 # Overwrite config with given CLI args
 def cli_args!(args)
   ChefBackup::Config.config = args

data/spec/unit/strategy/backup/tar_spec.rb

@@ -26,6 +26,15 @@ describe ChefBackup::Strategy::TarBackup do
       allow(subject).to receive(:dump_db).and_return(true)
     end
 
+    context 'when config_only is true' do
+      before do
+        private_chef('backup' => { 'config_only' => true })
+      end
+
+      it_behaves_like 'a tar based backup'
+      it_behaves_like 'a tar based frontend'
+    end
+
     context 'on a frontend' do
       before { private_chef('role' => 'frontend') }
 
@@ -98,13 +107,14 @@ describe ChefBackup::Strategy::TarBackup do
       ].join(' ')
     end
 
+    let(:pg_options) { ["PGOPTIONS=#{ChefBackup::Helpers::DEFAULT_PG_OPTIONS}"] }
     let(:tmp_dir) { '/tmp/notaswear' }
     let(:backup_time) { Time.now }
 
     before do
       allow(subject).to receive(:tmp_dir).and_return(tmp_dir)
       allow(subject).to receive(:backup_time).and_return(backup_time)
-      allow(subject).to receive(:shell_out!).with(dump_cmd).and_return(true)
+      allow(subject).to receive(:shell_out!).with(dump_cmd, env: pg_options).and_return(true)
       private_chef('postgresql' => { 'username' => 'opscode-pgsql' })
       subject.data_map.add_service('postgresql', '/data/dir')
     end
@@ -116,7 +126,7 @@ describe ChefBackup::Strategy::TarBackup do
         end
 
         it 'dumps the db' do
-          expect(subject).to receive(:shell_out!).with(dump_cmd)
+          expect(subject).to receive(:shell_out!).with(dump_cmd, env: pg_options)
           subject.dump_db
         end
 
@@ -181,12 +191,13 @@ describe ChefBackup::Strategy::TarBackup do
 
   describe '.write_manifest' do
     let(:manifest) do
-      { 'some' => {
-        'nested' => {
-          'hash' => true
-        },
-        'another' => true
-      }
+      { 'some' =>
+        {
+          'nested' => {
+            'hash' => true
+          },
+          'another' => true
+        }
       }
     end
 
@@ -269,6 +280,28 @@ describe ChefBackup::Strategy::TarBackup do
       end
     end
 
+    context 'when config_only is true' do
+      before do
+        private_chef('role' => 'standalone', 'backup' => { 'config_only' => true })
+        data_mock = double('DataMap')
+        allow(subject).to receive(:data_map).and_return(data_mock)
+      end
+
+      it 'populates the data map with config and upgrade directories only' do
+        configs.each do |config|
+          expect(subject.data_map)
+            .to receive(:add_config)
+            .with(config, "/etc/#{config}")
+        end
+
+        expect(subject.data_map)
+          .to receive(:add_service)
+          .with('upgrades', '/var/opt/opscode/upgrades')
+
+        subject.populate_data_map
+      end
+    end
+
     context 'on a frontend' do
       before { private_chef(config.merge('role' => 'frontend')) }
 

data/spec/unit/strategy/restore/tar_spec.rb

@@ -41,7 +41,7 @@ describe ChefBackup::Strategy::TarRestore do
     before do
       %i(shell_out shell_out! unpack_tarball stop_chef_server ensure_file!
          start_chef_server reconfigure_server cleanse_chef_server
-         update_config import_db touch_sentinel
+         update_config import_db touch_sentinel restart_add_ons
       ).each do |method|
         allow(subject).to receive(method).and_return(true)
       end
@@ -60,6 +60,7 @@ describe ChefBackup::Strategy::TarRestore do
 
       allow(subject).to receive(:tarball_path).and_return(tarball_path)
       allow(subject).to receive(:manifest).and_return(manifest)
+      allow(subject).to receive(:marketplace?).and_return(false)
     end
 
     it_behaves_like 'a tar based restore'
@@ -121,11 +122,25 @@ describe ChefBackup::Strategy::TarRestore do
 
         it_behaves_like 'a tar based backend restore without db dump'
       end
+
+      context 'on a marketplace all-in-one' do
+        before do
+          allow(subject).to receive(:marketplace?).and_return(true)
+          allow(subject).to receive(:reconfigure_marketplace?).and_return(true)
+        end
+
+        it 'sets up chef-marketplace' do
+          expect(subject).to receive(:reconfigure_marketplace).once
+          subject.restore
+        end
+
+        it_behaves_like 'a tar based backend restore'
+      end
     end
   end
 
   describe '.manifest' do
-    let(:json) { "{\"some\":\"json\"}" }
+    let(:json) { '{"some":"json"}' }
     let(:manifest_json) { File.join(restore_dir, 'manifest.json') }
 
     it 'parses the manifest from the restore dir' do
@@ -177,6 +192,8 @@ describe ChefBackup::Strategy::TarRestore do
   end
 
   describe '.import_db' do
+    let(:pg_options) { ["PGOPTIONS=#{ChefBackup::Helpers::DEFAULT_PG_OPTIONS}"] }
+
     before do
       allow(subject).to receive(:manifest).and_return(manifest)
       allow(subject).to receive(:shell_out!).and_return(true)
@@ -214,7 +231,7 @@ describe ChefBackup::Strategy::TarRestore do
       end
 
       it 'imports the database' do
-        expect(subject).to receive(:shell_out!).with(import_cmd)
+        expect(subject).to receive(:shell_out!).with(import_cmd, env: pg_options)
         subject.import_db
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_backup
 version: !ruby/object:Gem::Version
-  version: 0.0.1.dev.4
+  version: 0.0.1
 platform: ruby
 authors:
 - Ryan Cragun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: di-ruby-lvm
@@ -140,16 +140,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.37.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.37.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -228,12 +228,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library to backup a Chef Server
@@ -251,4 +251,3 @@ test_files:
 - spec/unit/strategy/restore/shared_examples/restore.rb
 - spec/unit/strategy/restore/tar_spec.rb
 - spec/unit/strategy_spec.rb
-has_rdoc: