postmodern 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b671e30a5ee0c8ecfa77d5733c84590ca63fdd
-  data.tar.gz: 15a7be3b455918273f5f2c8792bf358edcfe9732
+  metadata.gz: cbecfcf25d7aab04bd19df71c1edd12680eb84a7
+  data.tar.gz: 3a104d4e01a2297319572ff763345a40da950a9a
 SHA512:
-  metadata.gz: bde4d0dfe8c99fe8e96f8e3a94605162420693fae1a56661a98595d51eb5c162cf05611ec6b549cb85a7a2367a419e7799e65da5322ad856d8c38f65db990070
-  data.tar.gz: 00c15cf153c20293a3f51b197c93c33a741fa4ce5034c8e15e685a19b466357b85b4a106e2fecc7e74feca5269fe79c1ec7dab0007e500ebc870ef43ea4925a2
+  metadata.gz: 7e133e8e11e56f7cb9dd594c9784cefb9311b68216e1656618f9e06b7896bbc4e6955f6606e8a416af86f2c0b348c0889b09233cd3c0f2520c7a49c366d8cdd3
+  data.tar.gz: 8de3bd8f674ae01174bce7b0046d53473d42b245d2da849ea29f037a392c694055012b77df04bf919987dabd765f16c3a88c91c67d8f34411395bc35810e68d1

data/Gemfile

@@ -9,8 +9,8 @@ group :development do
 end
 
 group :test do
-  gem 'rspec'
-  gem 'aruba-rspec'
+  gem 'rspec', '>= 3.0.0'
+  gem 'aruba-rspec', '>= 1.0.0'
   gem 'guard-bundler'
   gem 'guard-rspec'
   gem 'timecop'

data/README.md

@@ -5,6 +5,7 @@ Postmodern
 
 Tools for managing PostgreSQL databases.
 
+* Vacuum and Vacuum freeze tasks
 * WAL archiving and restoration
 
 ## Dependencies

data/lib/postmodern/version.rb

@@ -1,3 +1,3 @@
 module Postmodern
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/postmodern/wal/archive.rb

@@ -1,4 +1,5 @@
 require 'postmodern/command'
+require 'open3'
 
 module Postmodern
   module WAL
@@ -32,12 +33,10 @@ module Postmodern
 
       def run
         if local_script_exists?
-          IO.popen("#{local_script} #{path} #{filename}",
-                   env: {
-            'WAL_ARCHIVE_PATH' => path,
-            'WAL_ARCHIVE_FILE' => filename,
-            'PATH' => ENV['PATH']
-          }) { |f| puts f.gets }
+          stdout, stderr, status = Open3.capture3(script_env, "#{local_script} #{path} #{filename}")
+          $stdout.print stdout
+          $stderr.print stderr
+          exit status.exitstatus
         end
       end
 
@@ -58,6 +57,14 @@ module Postmodern
       def local_script
         'postmodern_archive.local'
       end
+
+      def script_env
+        {
+          'WAL_ARCHIVE_PATH' => path,
+          'WAL_ARCHIVE_FILE' => filename,
+          'PATH' => ENV['PATH']
+        }
+      end
     end
   end
 end

data/spec/fixtures/wal/env/postmodern_archive.local

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "WAL_ARCHIVE_PATH: ${WAL_ARCHIVE_PATH}"
+echo "WAL_ARCHIVE_FILE: ${WAL_ARCHIVE_FILE}"
+
+exit ${EXITSTATUS:-0}

data/spec/postmodern/wal/archive_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 require 'postmodern/wal/archive'
 
 describe Postmodern::WAL::Archive do
-  before { allow(IO).to receive(:popen) }
+  let(:stdout) { double(to_s: '') }
+  let(:stderr) { double(to_s: '') }
+  let(:status) { double(exitstatus: 0) }
 
   let(:filename) { "some_file" }
   let(:path) { "/path/to/file" }
@@ -10,6 +12,11 @@ describe Postmodern::WAL::Archive do
 
   subject(:archiver) { Postmodern::WAL::Archive.new(arguments) }
 
+  before do
+    allow(Open3).to receive(:capture3).and_return([stdout, stderr, status])
+    allow(archiver).to receive(:exit)
+  end
+
   describe '#run' do
     let(:expected_command) { "postmodern_archive.local #{path} #{filename}" }
 
@@ -18,12 +25,13 @@ describe Postmodern::WAL::Archive do
 
       it 'executes postmodern_archive.local with filename and path' do
         archiver.run
-        expect(IO).to have_received(:popen).with(expected_command, env:
+        expect(Open3).to have_received(:capture3).with(
           {
             'WAL_ARCHIVE_PATH' => path,
             'WAL_ARCHIVE_FILE' => filename,
             'PATH' => anything
-          }
+          },
+          expected_command
         )
       end
     end
@@ -33,7 +41,7 @@ describe Postmodern::WAL::Archive do
 
       it 'executes postmodern_archive.local with filename and path' do
         archiver.run
-        expect(IO).not_to have_received(:popen)
+        expect(Open3).not_to have_received(:capture3)
       end
     end
   end

data/spec/postmodern/wal/restore_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 require 'postmodern/wal/restore'
 
 describe Postmodern::WAL::Restore do
-  before { allow(IO).to receive(:popen) }
+  let(:stdout) { double(to_s: '') }
+  let(:stderr) { double(to_s: '') }
+  let(:status) { double(exitstatus: 0) }
 
   let(:filename) { "some_file" }
   let(:path) { "/path/to/file" }
@@ -10,6 +12,11 @@ describe Postmodern::WAL::Restore do
 
   subject(:restorer) { Postmodern::WAL::Restore.new(arguments) }
 
+  before do
+    allow(Open3).to receive(:capture3).and_return([stdout, stderr, status])
+    allow(restorer).to receive(:exit)
+  end
+
   describe '#run' do
     let(:expected_command) { "postmodern_restore.local #{path} #{filename}" }
 
@@ -18,12 +25,13 @@ describe Postmodern::WAL::Restore do
 
       it 'executes postmodern_restore.local with filename and path' do
         restorer.run
-        expect(IO).to have_received(:popen).with(expected_command, env:
+        expect(Open3).to have_received(:capture3).with(
           {
             'WAL_ARCHIVE_PATH' => path,
             'WAL_ARCHIVE_FILE' => filename,
             'PATH' => anything
-          }
+          },
+          expected_command
         )
       end
     end
@@ -33,7 +41,7 @@ describe Postmodern::WAL::Restore do
 
       it 'executes postmodern_restore.local with filename and path' do
         restorer.run
-        expect(IO).not_to have_received(:popen)
+        expect(Open3).not_to have_received(:capture3)
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'timecop'
 require 'support/logger'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postmodern
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Eric Saxby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -88,6 +88,7 @@ files:
 - spec/features/freeze_spec.rb
 - spec/features/restore_spec.rb
 - spec/features/vacuum_spec.rb
+- spec/fixtures/wal/env/postmodern_archive.local
 - spec/postmodern/command_spec.rb
 - spec/postmodern/db/adapter_spec.rb
 - spec/postmodern/postmodern_spec.rb
@@ -128,6 +129,7 @@ test_files:
 - spec/features/freeze_spec.rb
 - spec/features/restore_spec.rb
 - spec/features/vacuum_spec.rb
+- spec/fixtures/wal/env/postmodern_archive.local
 - spec/postmodern/command_spec.rb
 - spec/postmodern/db/adapter_spec.rb
 - spec/postmodern/postmodern_spec.rb