astrails-safe 0.1.7 → 0.1.8

data/README.markdown

@@ -25,7 +25,7 @@ Note
 
 Support for pg_dump and svndump was contributed but since I don't personally use them i don't have an easy
 way of testing it. So if you use Subversion or PostgreSQL please test the new functionality and report if
-there are any problems.
+there are any problems. Issues tracker is [here](http://github.com/astrails/safe/issues)
 
 Usage
 -----

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 7
+:patch: 8

data/examples/unit/gpg_example.rb

@@ -17,16 +17,16 @@ describe Astrails::Safe::Gpg do
     )
   end
 
-  before(:each) do
-    @gpg = gpg()
-    stub(@gpg).gpg_password_file {"pwd-file"}
-    stub(@gpg).pipe {"|gpg -BLAH"}
-  end
-
   after(:each) { Astrails::Safe::TmpFile.cleanup }
 
   describe :process do
 
+    before(:each) do
+      @gpg = gpg()
+      stub(@gpg).gpg_password_file {"pwd-file"}
+      stub(@gpg).pipe {"|gpg -BLAH"}
+    end
+
     describe "when active" do
       before(:each) do
         stub(@gpg).active? {true}
@@ -38,7 +38,7 @@ describe Astrails::Safe::Gpg do
       end
 
       it "should add command pipe" do
-        mock(@backup.command) << (/\|gpg -/)
+        mock(@backup.command) << (/\|gpg -BLAH/)
         @gpg.process
       end
 
@@ -103,7 +103,7 @@ describe Astrails::Safe::Gpg do
 
     describe "with key" do
       before(:each) do
-        @gpg = gpg(:gpg => {:key => "foo"}, :options => "OPT")
+        @gpg = gpg(:gpg => {:key => "foo", :options => "GPG-OPT"}, :options => "OPT")
       end
 
       it "should not call gpg_password_file" do
@@ -111,19 +111,19 @@ describe Astrails::Safe::Gpg do
         @gpg.send(:pipe)
       end
 
-      it "should use '-r' and options" do
-        @gpg.send(:pipe).should == "|gpg OPT -e -r foo"
+      it "should use '-r' and :options" do
+        @gpg.send(:pipe).should == "|gpg GPG-OPT -e -r foo"
       end
     end
 
     describe "with password" do
       before(:each) do
-        @gpg = gpg(:gpg => {:password => "bar"}, :options => "OPT")
+        @gpg = gpg(:gpg => {:password => "bar", :options => "GPG-OPT"}, :options => "OPT")
         stub(@gpg).gpg_password_file(anything) {"pass-file"}
       end
 
       it "should use '--passphrase-file' and :options" do
-        @gpg.send(:pipe).should == "|gpg OPT -c --passphrase-file pass-file"
+        @gpg.send(:pipe).should == "|gpg GPG-OPT -c --passphrase-file pass-file"
       end
     end
   end

data/lib/astrails/safe/gpg.rb

@@ -10,9 +10,9 @@ module Astrails
 
       def pipe
         if key
-          "|gpg #{@config[:options]} -e -r #{key}"
+          "|gpg #{@config[:gpg, :options]} -e -r #{key}"
         elsif password
-          "|gpg #{@config[:options]} -c --passphrase-file #{gpg_password_file(password)}"
+          "|gpg #{@config[:gpg,:options]} -c --passphrase-file #{gpg_password_file(password)}"
         end
       end
 
@@ -23,7 +23,7 @@ module Astrails
       def active?
         raise RuntimeError, "can't use both gpg password and pubkey" if key && password
 
-        password || key
+        !!(password || key)
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astrails-safe
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Astrails Ltd.