postmodern 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6751185ec42ad83428d20347ec925ecca99080a
-  data.tar.gz: e2055ed0ca440c7739ccda5d1a4e1687a64c1ef7
+  metadata.gz: f405030c5dbf5f51a061e1ff2835e4a64910ce50
+  data.tar.gz: 915def7fe244751c7bba0a86601c225f89c7e706
 SHA512:
-  metadata.gz: 67846656007c0e10721af39593d07ad28fe93a15fd3a1a17f6a13874a6ea232f5fdcf14f7e508634d71453e1bd2ee06d030495d84027c44c234b6503eebd04da
-  data.tar.gz: db5af7acb228f891ae5e447bbb3259298308134fd8f564e97f078539fcff59c08e7ff6076e8b45d5256236edfeac1d553af762e756cdd98dedfc9572d1897da5
+  metadata.gz: 5850bf34a46775aa89ac3dcd5d95d1485e424c75bf05f710a29f4e4373da32dc250c8ff9c3428b4fae46e5f9c359c92d5825431fdd1517251a913a61770a46f5
+  data.tar.gz: ef083017586db98680ceb3fd7f55dfc9a3940c820c809958d915847efe2115916aefbffc486f828cbcdf65a69ee1b58374ac6de0732187a9e93a33cbb019f41e

data/README.md

@@ -24,13 +24,13 @@ wrappers for YOUR archiving mechanism.
 In postgresql.conf
 
 ```
-archive_command = 'pg_wal_archive %p %f'
+archive_command = 'postmodern archive --path %p --filename %f'
 ```
 
 In recovery.conf
 
 ```
-restore_command = 'pg_wal_restore %p %f'
+restore_command = 'postmodern restore --path %p --filename %f'
 ```
 
 By default these scripts will do nothing. With the presence of local
@@ -39,15 +39,15 @@ exported to the environment and the local scripts called (with arguments
 preserved):
 
 ```ruby
-ENV['WAL_ARCHIVE_PATH'] = ARGV[0]
-ENV['WAL_ARCHIVE_FILE'] = ARGV[1]
+ENV['WAL_ARCHIVE_PATH'] = path
+ENV['WAL_ARCHIVE_FILE'] = filename
 ```
 
 Local scripts can be written in any language. They should be able access
 the relevant arguments either as $1, $2 or using the variables listed above.
 
-`pg_wal_archive` will attempt to call a `pg_wal_archive.local` script.
-`pg_wal_restore` will attempt to call a `pg_wal_restore.local` script.
+`archive` will attempt to call a `postmodern_archive.local` script.
+`restore` will attempt to call a `postmodern_restore.local` script.
 
 
 ## Contributing

data/bin/postmodern

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require 'postmodern/wal'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: postmodern (archive|restore) <options>"
+
+  opts.on('-f', '--filename FILE', 'File name to archive') do |o|
+    options[:file] = o
+  end
+
+  opts.on('-p', '--path PATH', 'Path name of file to archive') do |o|
+    options[:path] = o
+  end
+end.parse!
+
+Postmodern::WAL.run(ARGV.first, options[:file], options[:path])

data/lib/postmodern/version.rb

@@ -1,3 +1,3 @@
 module Postmodern
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/postmodern/wal.rb

@@ -0,0 +1,15 @@
+require 'postmodern/wal/archive'
+require 'postmodern/wal/restore'
+
+module Postmodern
+  module WAL
+    COMMANDS = {
+      'archive' => Postmodern::WAL::Archive,
+      'restore' => Postmodern::WAL::Restore
+    }
+
+    def self.run(command, filename, path)
+      COMMANDS[command].new(filename, path).run
+    end
+  end
+end

data/lib/postmodern/wal/archive.rb

@@ -0,0 +1,8 @@
+require_relative 'base'
+
+module Postmodern
+  module WAL
+    class Archive < Base
+    end
+  end
+end

data/lib/postmodern/wal/base.rb

@@ -0,0 +1,38 @@
+module Postmodern
+  module WAL
+    class Base
+      attr_reader :filename, :path
+
+      def initialize(filename, path)
+        @filename = filename
+        @path = path
+
+        ENV['WAL_ARCHIVE_PATH'] = path
+        ENV['WAL_ARCHIVE_FILE'] = filename
+      end
+
+      def run
+        if local_script_exists?
+          log
+          `#{local_script} #{path} #{filename}`
+        end
+      end
+
+      private
+
+      def local_script_exists?
+        `which #{local_script} >/dev/null 2>/dev/null`
+        $?.exitstatus == 0
+      end
+
+      def local_script
+        'postmodern_archive.local'
+      end
+
+      def log
+        puts "Archiving file: #{filename}, path: #{path}"
+      end
+    end
+  end
+end
+

data/lib/postmodern/wal/restore.rb

@@ -0,0 +1,18 @@
+require_relative 'base'
+
+module Postmodern
+  module WAL
+    class Restore < Base
+      private
+
+      def local_script
+        'postmodern_restore.local'
+      end
+      
+      def log
+        puts "Restoring file: #{filename}, path: #{path}"
+      end
+    end
+  end
+end
+

data/spec/bin/postmodern_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe 'postmodern' do
+  describe 'archive' do
+    let(:command) { `bin/postmodern archive --path filepath --filename filename` }
+
+    before do
+      double_cmd('postmodern_archive.local')
+      double_cmd('which', exit: 0)
+    end
+
+    it 'exports second argument as WAL_ARCHIVE_FILE' do
+      expect(command).to include('Archiving file: filename')
+    end
+
+    it 'exports first argument WAL_ARCHIVE_PATH' do
+      expect(command).to include('path: filepath')
+    end
+
+    context 'when local script is present' do
+      before { double_cmd('which postmodern_archive.local', exit: 0) }
+
+      it 'succeeds' do
+        expect { command }.to have_exit_status(0)
+      end
+
+      it 'calls a local file with file name and path' do
+        expect { command }.to shellout('postmodern_archive.local filepath filename')
+      end
+    end
+
+    context 'when local script is not present' do
+      before { double_cmd('which postmodern_archive.local', exit: 1) }
+
+      it 'succeeds' do
+        expect { command }.to have_exit_status(0)
+      end
+
+      it 'does nothing' do
+        expect { command }.not_to shellout('pg_wal_archive.local filepath filename')
+      end
+    end
+  end
+
+  describe 'restore' do
+    let(:command) { `bin/postmodern restore --path filepath --filename filename` }
+
+    before do
+      double_cmd('postmodern_restore.local')
+      double_cmd('which', exit: 0)
+    end
+
+    it 'exports second argument as WAL_restore_FILE' do
+      expect(command).to include('Restoring file: filename')
+    end
+
+    it 'exports first argument WAL_restore_PATH' do
+      expect(command).to include('path: filepath')
+    end
+
+    context 'when local script is present' do
+      before { double_cmd('which postmodern_restore.local', exit: 0) }
+
+      it 'succeeds' do
+        expect { command }.to have_exit_status(0)
+      end
+
+      it 'calls a local file with file name and path' do
+        expect { command }.to shellout('postmodern_restore.local filepath filename')
+      end
+    end
+
+    context 'when local script is not present' do
+      before { double_cmd('which postmodern_restore.local', exit: 1) }
+
+      it 'succeeds' do
+        expect { command }.to have_exit_status(0)
+      end
+
+      it 'does nothing' do
+        expect { command }.not_to shellout('pg_wal_restore.local filepath filename')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postmodern
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Eric Saxby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,8 +42,7 @@ description: Tools for managing PostgreSQL
 email:
 - sax@livinginthepast.org
 executables:
-- pg_wal_archive
-- pg_wal_restore
+- postmodern
 extensions: []
 extra_rdoc_files: []
 files:
@@ -55,13 +54,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/pg_wal_archive
-- bin/pg_wal_restore
+- bin/postmodern
 - lib/postmodern.rb
 - lib/postmodern/version.rb
+- lib/postmodern/wal.rb
+- lib/postmodern/wal/archive.rb
+- lib/postmodern/wal/base.rb
+- lib/postmodern/wal/restore.rb
 - postmodern.gemspec
-- spec/bin/pg_wal_archive_spec.rb
-- spec/bin/pg_wal_restore_spec.rb
+- spec/bin/postmodern_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/wanelo/postmodern
 licenses:
@@ -88,7 +89,6 @@ signing_key:
 specification_version: 4
 summary: Tools for managing PostgreSQL
 test_files:
-- spec/bin/pg_wal_archive_spec.rb
-- spec/bin/pg_wal_restore_spec.rb
+- spec/bin/postmodern_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/bin/pg_wal_archive

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-
-# This script is a wrapper for a user-generated pg_wal_archive.local
-# script. If that script does not exist, this executable does nothing
-# and WAL files are not archived.
-#
-# This script (and the local script) should be executable as the
-# postgres user.
-
-archive_path = ARGV[0]
-archive_file = ARGV[1]
-
-ENV['WAL_ARCHIVE_PATH']=archive_path # maps to %p in postgres archiving
-ENV['WAL_ARCHIVE_FILE']=archive_file # maps to %f in postgres archiving
-
-puts "Archiving file: #{archive_file}, path: #{archive_path}"
-
-def local_script_exists?
-  `which pg_wal_archive.local >/dev/null 2>/dev/null`
-  $?.exitstatus == 0
-end
-
-if local_script_exists?
-  `pg_wal_archive.local #{archive_path} #{archive_file}`
-end

data/bin/pg_wal_restore

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-archive_path = ARGV[0]
-archive_file = ARGV[1]
-
-ENV['WAL_ARCHIVE_PATH']=archive_path # maps to %p in postgres archiving
-ENV['WAL_ARCHIVE_FILE']=archive_file # maps to %f in postgres archiving
-
-puts "Archiving file: #{archive_file}, path: #{archive_path}"
-
-def local_script_exists?
-  `which pg_wal_restore.local >/dev/null 2>/dev/null`
-  $?.exitstatus == 0
-end
-
-if local_script_exists?
-  `pg_wal_restore.local #{archive_path} #{archive_file}`
-end

data/spec/bin/pg_wal_archive_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe 'pg_wal_archive' do
-  before do
-    double_cmd('pg_wal_archive.local')
-    double_cmd('which', exit: 1)
-  end
-
-  it 'exports second argument as WAL_ARCHIVE_FILE' do
-    expect(`bin/pg_wal_archive filepath filename`).to include('Archiving file: filename')
-  end
-
-  it 'exports first argument WAL_ARCHIVE_PATH' do
-    expect(`bin/pg_wal_archive filepath filename`).to include('path: filepath')
-  end
-
-  context 'when local script is present' do
-    before { double_cmd('which pg_wal_archive.local', exit: 0) }
-
-    it 'succeeds' do
-      expect { `bin/pg_wal_archive 1 2` }.to have_exit_status(0)
-    end
-
-    it 'calls a local file with file name and path' do
-      expect {
-        `bin/pg_wal_archive 11111 222222`
-      }.to shellout('pg_wal_archive.local 11111 222222')
-    end
-  end
-
-  context 'when local script is not present' do
-    before { double_cmd('which pg_wal_archive.local', exit: 1) }
-
-    it 'succeeds' do
-      expect { `bin/pg_wal_archive 1 2` }.to have_exit_status(0)
-    end
-
-    it 'does nothing' do
-      expect {
-        `bin/pg_wal_archive 11111 222222`
-      }.not_to shellout('pg_wal_archive.local 11111 222222')
-    end
-  end
-end

data/spec/bin/pg_wal_restore_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe 'pg_wal_restore' do
-  before do
-    double_cmd('pg_wal_restore.local')
-    double_cmd('which')
-  end
-
-  it 'exports second argument as WAL_ARCHIVE_FILE' do
-    expect(`bin/pg_wal_restore filepath filename`).to include('Archiving file: filename')
-  end
-
-  it 'exports first argument as WAL_ARCHIVE_PATH' do
-    expect(`bin/pg_wal_restore filepath filename`).to include('path: filepath')
-  end
-
-  context 'when local script exists' do
-    before { double_cmd('which pg_wal_restore.local', exit: 0) }
-
-    it 'succeeds' do
-      expect {`bin/pg_wal_restore 1 2`}.to have_exit_status(0)
-    end
-
-    it 'calls a local file with file name and path' do
-      expect {
-        `bin/pg_wal_restore 11111 222222`
-      }.to shellout('pg_wal_restore.local 11111 222222')
-    end
-  end
-
-  context 'when local script does not exists' do
-    before { double_cmd('which pg_wal_restore.local', exit: 1) }
-
-    it 'succeeds' do
-      expect {`bin/pg_wal_restore 1 2`}.to have_exit_status(0)
-    end
-
-    it 'does nothing' do
-      expect {
-        `bin/pg_wal_restore 11111 222222`
-      }.not_to shellout('pg_wal_restore.local')
-    end
-  end
-end