ruby_gpg 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddc082532dfd54e87fcf5397f812a356cb6e2c88
-  data.tar.gz: da78a488b46f410a1a0065e928d8c947899c6ff0
+  metadata.gz: 6d1ad6b2c566e53ec312b16bce941701c2ccd6f1
+  data.tar.gz: 382e6a41d5ff7bf83345dad13857b84da07ec168
 SHA512:
-  metadata.gz: 34c146085c41bf2bcf1dd01da8ab47b0c2408879d95d0d47a03b2e7897252ebe3cb35311c1bc1d0ac513481c49e90e95b45b6a074b86d6713d764e3a914f68f1
-  data.tar.gz: 82e35ad90b5912635453b6608362558730769b2d5e3e417207d556c9290dc3c32ab31d0ce47ff9e78cc082fa5ca3154b2e2610220e96aa50c51e02433bdff795
+  metadata.gz: 11ada8a63e7d9ea993332d2febc5ebc71c153b15b22f484460dbc1666d385c0f966412cf1f7d5f873abbe5e7091a60fbbf36ddf1ec7db9d553d0398421527019
+  data.tar.gz: 5cbb2bc3f890f1dcab7651a3c4a36ae405ced643d5c981436abc7a21b6ef9e4faf82e371062fa8fbf4d0ec3d215436efead33c1f7381c7c543d4ef7f8b872553

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# v0.3.2 (2015-04-21)
+
+* Check exit status instead of contents of stderr (e97bea52)
+* Stop using jeweler to manage gemspec and releases (978a6124)
+
 # v0.3.1 (2014-02-27)
 
 * Make it work in jruby (2916bbba92d1b9a4fd2847883ed27c77617295a5)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/ruby_gpg.rb

@@ -56,12 +56,13 @@ module RubyGpg
   
   def run_command(command, input = nil)
     output = ""
-    Open3.popen3(command) do |stdin, stdout, stderr|
+    Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
       stdin.write(input) if input
       stdin.close
       output << stdout.read
+      exitcode = wait_thr.value.exitstatus
       error = stderr.read
-      if error && !error.empty?
+      if exitcode != 0
         raise "GPG command (#{command}) failed with: #{error}"
       end
     end

data/ruby_gpg.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_gpg}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Blake"]

data/spec/ruby_gpg_spec.rb

@@ -1,6 +1,21 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "RubyGpg" do
+  class MockProcessStatus
+    attr_accessor :exitstatus
+    def initialize(exitstatus)
+      @exitstatus = exitstatus
+    end
+  end
+  
+  class MockProcessThread
+    attr_accessor :pid, :value
+    @pid = 1
+    def initialize(exitstatus)
+      @value = MockProcessStatus.new(exitstatus)
+    end
+  end
+  
   def expect_command_to_match(part_of_command)
     Open3.expects(:popen3).with do |command|
       case part_of_command
@@ -18,12 +33,17 @@ describe "RubyGpg" do
     @stderr.write(error_message)
     @stderr.rewind
   end
-
+  
+  def stub_exitstatus(exitstatus)
+    @thread.value.exitstatus = exitstatus
+  end
+  
   before do
     @stdin = StringIO.new
     @stdout = StringIO.new
     @stderr = StringIO.new
-    Open3.stubs(:popen3).yields(@stdin, @stdout, @stderr)
+    @thread = MockProcessThread.new(0)
+    Open3.stubs(:popen3).yields(@stdin, @stdout, @stderr, @thread)
   end
   
   it "allows the use of a custom path to the gpg executable" do
@@ -76,11 +96,13 @@ describe "RubyGpg" do
     end
     
     it "raises any errors from gpg" do
-      stub_error("error message")  
+      stub_error("error message")
+      stub_exitstatus(1)
       lambda { run_encrypt }.should raise_error(/GPG command \(.*gpg.*--encrypt.*filename\) failed with: error message/)
     end
     
-    it "does not raise if there is no output from gpg" do
+    it "does not raise if gpg exit status is 0" do
+      stub_error("error message")
       lambda { run_encrypt }.should_not raise_error
     end
   end
@@ -174,10 +196,12 @@ describe "RubyGpg" do
     
     it "raises any errors from gpg" do
       stub_error("error message")
+      stub_exitstatus(1)
       lambda { run_decrypt }.should raise_error(/GPG command \(.*gpg.*--decrypt.*filename\.gpg\) failed with: error message/)
     end
     
-    it "does not raise if there is no output from gpg" do
+    it "does not raise if gpg exits with 0" do
+      stub_error("error message")
       lambda { run_decrypt }.should_not raise_error
     end
   end
@@ -234,10 +258,12 @@ describe "RubyGpg" do
     
     it "raises any errors from gpg" do
       stub_error("error message")
+      stub_exitstatus(1)
       lambda { run_decrypt_string }.should raise_error(/GPG command \(.*gpg.*--decrypt.*\) failed with: error message/)
     end
     
-    it "does not raise if there is no output from gpg" do
+    it "does not raise if gpg exitstatus is 0" do
+      stub_error("error message")
       lambda { run_decrypt_string }.should_not raise_error
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gpg
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Justin Blake
@@ -136,4 +136,3 @@ summary: Ruby wrapper for the gpg binary
 test_files:
 - spec/ruby_gpg_spec.rb
 - spec/spec_helper.rb
-has_rdoc: