chef_backup 0.0.1.dev.1 → 0.0.1.dev.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bec5855a4a67f6d47efbf80b1b13be09338de3d
-  data.tar.gz: c02131b03380815d3a79c281da26fb8fe51f7f7f
+  metadata.gz: 77676069a215d7829c14023e70d43e71d27581a1
+  data.tar.gz: e218d8428ec0edb82a440f9003db3035435e539d
 SHA512:
-  metadata.gz: 34616288ba8212f0e86fb3e5b26ad75bd6a912c9de52123ea954179c1a52ced09ed5f4f00368bf2c17b4ddb32642ba0f78e76a0da0071510bf8851bc0af93a1f
-  data.tar.gz: 02e5d4f0bc8868228c9f329702adfe8099c7f866e7f2e82760a65cd153a487c861e950184eddc938e578db894eb41ac6fcb6a84e7498641a7cbc7a0bb0e26f32
+  metadata.gz: e3850ccefb42090d4c73decaa3c9c661d50529aee9eb00a667bb97f648337871e2dafa9fbe1ad6c8cbb082f6ccb908a3d8799721da778c133402530fdb7c5d7c
+  data.tar.gz: d89dc2fb4ef4bc7d95f907e1dec161cb26a0ff2749cee9e8cb1069e823c345d255a42227edd0cf48f638cbc2277d497fedc90689f95102b8f5f4a77599331708

data/README.md

@@ -1,21 +1,9 @@
 # ChefBackup
-[![Build Status](https://travis-ci.org/ryancragun/chef_backup.svg?branch=master)](https://travis-ci.org/ryancragun/chef_backup)
+[![Build Status](https://travis-ci.org/chef/chef_backup.svg?branch=master)](https://travis-ci.org/chef/chef_backup)
+[![Gem Version](https://badge.fury.io/rb/chef_backup.svg)](http://badge.fury.io/rb/chef_backup)
 
-A gem that backs up and restores Chef servers.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'chef_backup'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install chef_backup
+A gem that backs up and restores Chef servers.  Used as the backend for
+`chef-server-ctl backup` and `chef-server-ctl restore`
 
 ## Usage
 
@@ -26,7 +14,7 @@ chef-server-ctl restore some_backup.tgz
 
 ## Contributing
 
-1. Fork it ( https://github.com/ryancragun/chef_backup/fork )
+1. Fork it ( https://github.com/chef/chef_backup/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/chef_backup.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = ChefBackup::VERSION
   spec.authors       = ['Ryan Cragun']
   spec.email         = ['me@ryan.ec']
-  spec.summary       = 'A library to backup an Enterprise Chef server'
+  spec.summary       = 'A library to backup a Chef Server'
   spec.description   = spec.summary
-  spec.homepage      = 'https://github.com/ryancragun/chef_backup'
+  spec.homepage      = 'https://github.com/chef/chef_backup'
   spec.license       = 'Apachev2'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/chef_backup/helpers.rb

@@ -100,18 +100,6 @@ module Helpers
     File.directory?("/etc/#{service}")
   end
 
-  def pg_dump?
-    if frontend? # don't dump postgres on frontends
-      false
-    elsif private_chef['backup']['always_dump_db'] == true # defaults to true
-      true
-    elsif strategy !~ /lvm|ebs/ && backend? # backup non-block device backends
-      true
-    else
-      false # if we made it here then we're on lvm/ebs and overrode defaults
-    end
-  end
-
   def strategy
     private_chef['backup']['strategy']
   end

data/lib/chef_backup/logger.rb

@@ -15,25 +15,25 @@ module ChefBackup
     attr_accessor :stdout
 
     def initialize(logfile = nil)
-      @stdout = logfile || $stdout
-      @highline = HighLine.new($stdin, @stdout)
+      $stdout = logfile ? File.open(logfile, 'ab') : $stdout
+      @highline = HighLine.new($stdin, $stdout)
     end
 
     def log(msg, level = :info)
       case level
       when :warn
         msg = "WARNING: #{msg}"
-        @stdout.puts(color? ? @highline.color(msg, :yellow) : msg)
+        $stdout.puts(color? ? @highline.color(msg, :yellow) : msg)
       when :error
         msg = "ERROR: #{msg}"
-        @stdout.puts(color? ? @highline.color(msg, :red) : msg)
+        $stdout.puts(color? ? @highline.color(msg, :red) : msg)
       else
-        @stdout.puts(msg)
+        $stdout.puts(msg)
       end
     end
 
     def color?
-      @stdout.tty?
+      $stdout.tty?
     end
   end
 end

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

@@ -160,6 +160,11 @@ class TarBackup
     res = shell_out(cmd)
     res
   end
+
+  def pg_dump?
+    # defaults to true
+    private_chef['backup']['always_dump_db']
+  end
 end
 end
 end

data/lib/chef_backup/version.rb

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

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

@@ -277,4 +277,18 @@ describe ChefBackup::Strategy::TarBackup do
       end
     end
   end
+
+  describe '.pg_dump?' do
+    it 'returns true' do
+      expect(subject.pg_dump?).to eq(true)
+    end
+
+    context 'when db dump is disabled' do
+      before { private_chef('backup' => { 'always_dump_db' => false }) }
+
+      it 'returns false' do
+        expect(subject.pg_dump?).to eq(false)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_backup
 version: !ruby/object:Gem::Version
-  version: 0.0.1.dev.1
+  version: 0.0.1.dev.2
 platform: ruby
 authors:
 - Ryan Cragun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: di-ruby-lvm
@@ -164,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A library to backup an Enterprise Chef server
+description: A library to backup a Chef Server
 email:
 - me@ryan.ec
 executables: []
@@ -213,7 +213,7 @@ files:
 - spec/unit/strategy/restore/shared_examples/restore.rb
 - spec/unit/strategy/restore/tar_spec.rb
 - spec/unit/strategy_spec.rb
-homepage: https://github.com/ryancragun/chef_backup
+homepage: https://github.com/chef/chef_backup
 licenses:
 - Apachev2
 metadata: {}
@@ -236,7 +236,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A library to backup an Enterprise Chef server
+summary: A library to backup a Chef Server
 test_files:
 - spec/fixtures/chef-server-running.json
 - spec/spec_helper.rb