ruby_gpg 0.1.0 → 0.1.1

data/CHANGELOG.markdown

@@ -0,0 +1,7 @@
+# v0.1.1 (2010-03-16)
+
+* Improve error handling.
+
+# v0.1.0 (2010-03-16)
+
+* First version with `RubyGpg.encrypt` and `RubyGpg.decrypt` methods.

data/Rakefile

@@ -50,7 +50,9 @@ task :default => :spec
 
 begin
   require 'yard'
-  YARD::Rake::YardocTask.new
+  YARD::Rake::YardocTask.new do |y|
+    y.files << '-' << 'CHANGELOG.*' << 'TODO.*'
+  end
 rescue LoadError
   task :yardoc do
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/features/encryption.feature

@@ -3,10 +3,17 @@ Feature: Encryption
   As a user
   I want to encrypt the file
 
-  Scenario: Encrypt
+  Background:
     Given a key pair for Slow Joe Crow with passphrase test
     And a file named "secrets" containing "some content"
     And the file "secrets.gpg" does not exist
+
+  Scenario: Encrypt
     When I encrypt the file "secrets" for "Slow Joe Crow"
     Then the file "secrets.gpg" should exist
     And the file "secrets.gpg" should not contain "some content"
+
+  Scenario: Unknown recipient
+    When I try to encrypt the file "secrets" for "Sue"
+    Then the command should raise an error matching "key not found"
+    And the file "secrets.gpg" should not exist

data/features/step_definitions/ruby_gpg_steps.rb

@@ -10,7 +10,7 @@ Given /^a file named "([^\"]*)" containing "([^\"]*)"$/ do |filename, content|
 end
 
 Given /^the file "([^\"]*)" does not exist$/ do |filename|
-  if File.exist?(filename)
+  if File.exist?("#{TMP_PATH}/#{filename}")
     File.delete("#{TMP_PATH}/#{filename}")
   end
 end
@@ -19,14 +19,28 @@ When /^I encrypt the file "([^\"]*)" for "([^\"]*)"$/ do |filename, recipient|
   RubyGpg.encrypt("#{TMP_PATH}/#{filename}", recipient)
 end
 
+When /^I try to encrypt the file "([^\"]*)" for "([^\"]*)"$/ do |filename, recipient|
+  @command = lambda {
+    RubyGpg.encrypt("#{TMP_PATH}/#{filename}", recipient)
+  }
+end
+
 When /^I decrypt the file "([^\"]*)" with passphrase "([^\"]*)"$/ do |filename, passphrase|
   RubyGpg.decrypt("#{TMP_PATH}/#{filename}", passphrase)
 end
 
+Then /^the command should raise an error matching "([^\"]*)"$/ do |error|
+  @command.should raise_error(/#{Regexp.escape(error)}/)
+end
+
 Then /^the file "([^\"]*)" should exist$/ do |filename|
   File.exist?("#{TMP_PATH}/#{filename}").should be_true
 end
 
+Then /^the file "([^\"]*)" should not exist$/ do |filename|
+  File.exist?("#{TMP_PATH}/#{filename}").should_not be_true
+end
+
 Then /^the file "([^\"]*)" should not contain "([^\"]*)"$/ do |filename, content|
   File.read("#{TMP_PATH}/#{filename}").should_not include(content)
 end

data/lib/ruby_gpg.rb

@@ -9,7 +9,7 @@ module RubyGpg
   end
 
   def gpg_command
-    "#{config.executable} --homedir #{config.homedir}" +
+    "#{config.executable} --homedir #{config.homedir} --quiet" +
     " --no-secmem-warning --no-permission-warning --no-tty --yes"
   end
   
@@ -30,12 +30,9 @@ module RubyGpg
   private
   def run_command(command)
     Open3.popen3(command) do |stdin, stdout, stderr|
-      stdin.close_write
-      unless $?.exitstatus == 0
-        msg = "GPG command (#{command}) failed"
-        errors = stderr.read
-        msg << " with: #{errors}" if errors && !errors.empty?
-        raise msg
+      error = stderr.read
+      if error && !error.empty?
+        raise "GPG command (#{command}) failed with: #{error}"
       end
     end
   end

data/ruby_gpg.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ruby_gpg}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Justin Blake"]
+  s.date = %q{2010-03-16}
+  s.description = %q{Ruby wrapper for the gpg binary}
+  s.email = %q{justin@megablaix.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.markdown"
+  ]
+  s.files = [
+    ".autotest",
+     ".gitignore",
+     "CHANGELOG.markdown",
+     "LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "cucumber.yml",
+     "features/decryption.feature",
+     "features/encryption.feature",
+     "features/step_definitions/ruby_gpg_steps.rb",
+     "features/support/env.rb",
+     "lib/ruby_gpg.rb",
+     "ruby_gpg.gemspec",
+     "spec/ruby_gpg_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "test_keys/pubring.gpg",
+     "test_keys/secring.gpg",
+     "test_keys/trustdb.gpg"
+  ]
+  s.homepage = %q{http://github.com/blaix/ruby_gpg}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Ruby wrapper for the gpg binary}
+  s.test_files = [
+    "spec/ruby_gpg_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+  end
+end
+

data/spec/ruby_gpg_spec.rb

@@ -11,8 +11,7 @@ describe "RubyGpg" do
     end
   end
   
-  def expect_error(error_message)
-    $?.stubs(:exitstatus).returns(1)
+  def stub_error(error_message)
     @stderr.write(error_message)
     @stderr.rewind
   end
@@ -22,7 +21,6 @@ describe "RubyGpg" do
     @stdout = StringIO.new
     @stderr = StringIO.new
     Open3.stubs(:popen3).yields(@stdin, @stdout, @stderr)
-    $?.stubs(:exitstatus).returns(0)
   end
   
   it "allows the use of a custom path to the gpg executable" do
@@ -40,6 +38,7 @@ describe "RubyGpg" do
     command.should include("--no-secmem-warning")
     command.should include("--no-permission-warning")
     command.should include("--no-tty")
+    command.should include("--quiet")
     command.should include("--yes")
   end
 
@@ -74,7 +73,7 @@ describe "RubyGpg" do
     end
     
     it "raises any errors from gpg" do
-      expect_error("error message")  
+      stub_error("error message")  
       lambda { run_encrypt }.should raise_error(/GPG command \(.*gpg.*--encrypt.*filename\) failed with: error message/)
     end
     
@@ -114,19 +113,12 @@ describe "RubyGpg" do
     end
     
     it "raises any errors from gpg" do
-      expect_error("error message")
+      stub_error("error message")
       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
       lambda { run_decrypt }.should_not raise_error
     end
-    
-    it "does not raise when gpg spits 'successful' output to stderr" do
-      $?.stubs(:exitstatus).returns(0)
-      @stderr.write("success message")
-      @stderr.rewind
-      lambda { run_decrypt }.should_not raise_error
-    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Justin Blake
@@ -80,8 +80,8 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .autotest
-- .document
 - .gitignore
+- CHANGELOG.markdown
 - LICENSE
 - README.markdown
 - Rakefile
@@ -92,6 +92,7 @@ files:
 - features/step_definitions/ruby_gpg_steps.rb
 - features/support/env.rb
 - lib/ruby_gpg.rb
+- ruby_gpg.gemspec
 - spec/ruby_gpg_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE