rdiff-simple 0.0.6 → 0.0.7

data/lib/rdiff_simple/commands.rb

@@ -0,0 +1,6 @@
+module RdiffSimple
+  COMMANDS = {
+    rdiff: 'rdiff-backup',
+    installed: "which #{:rdiff}",
+  }
+end

data/lib/rdiff_simple/errors.rb

@@ -0,0 +1,3 @@
+module RdiffSimple
+  class NotInstalledError < Exception; end
+end

data/lib/rdiff_simple/exit_codes.rb

@@ -0,0 +1,5 @@
+module RdiffSimple
+  EXIT_CODE = {
+    success: 0
+  }
+end

data/lib/rdiff_simple/rdiff_backup.rb

@@ -0,0 +1,20 @@
+require 'open3'
+
+module RdiffSimple
+  module RdiffBackup
+    def self.execute(*args)
+      raise NotInstalledError, 'rdiff-backup not installed' unless installed?
+
+      command = ['rdiff-backup', args].flatten!.compact.join(' ').strip
+
+      output, status = Open3.capture2e(command)
+      STDOUT.write output
+      status == EXIT_CODE[:success]
+    end
+
+    def self.installed?
+      output, status = Open3.capture2e(COMMANDS[:installed])
+      status == EXIT_CODE[:success]
+    end
+  end
+end

data/lib/rdiff_simple/version.rb

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

data/lib/rdiff_simple.rb

@@ -1,16 +1,6 @@
-require "rdiff_simple/version"
+require 'rdiff_simple/version'
+require 'rdiff_simple/exit_codes'
+require 'rdiff_simple/errors'
+require 'rdiff_simple/commands'
+require 'rdiff_simple/rdiff_backup'
 
-module RdiffSimple
-
-  class NotInstalledError < Exception; end
-
-  def self.execute(args)
-    raise NotInstalledError, 'rdiff-backup not installed' unless installed?
-
-    system("rdiff-backup #{args}")
-  end
-
-  def self.installed?
-    system('which rdiff-backup')
-  end
-end

data/spec/lib/rdiff_simple/rdiff_backup_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe RdiffSimple::RdiffBackup do
+  describe '.execute' do
+    context 'when rdiff-backup is installed' do
+      before do
+        Open3.stub(:capture2e).with(RdiffSimple::COMMANDS[:installed]).and_return(['', 0])
+      end
+
+      context 'when no arguments are given' do
+        before do
+          Open3.stub(:capture2e).with(RdiffSimple::COMMANDS[:rdiff]).and_return(['', 1])
+        end
+
+        subject { RdiffSimple::RdiffBackup.execute('') }
+
+        it { should be_false }
+      end
+
+      context 'when arguments are given' do
+        before do
+          Open3.stub(:capture2e).with("#{RdiffSimple::COMMANDS[:rdiff]} --version").and_return(['', 0])
+        end
+
+        subject { RdiffSimple::RdiffBackup.execute('--version') }
+
+        it { should be_true }
+      end
+    end
+
+    context 'when rdiff-backup is not installed' do
+      before do
+        Open3.stub(:capture2e).with(RdiffSimple::COMMANDS[:installed]).and_return(['', 1])
+      end
+
+      it 'should raise an exception' do
+        expect { subject.execute('--version') }.to raise_error(RdiffSimple::NotInstalledError)
+      end
+    end
+  end
+
+  describe '.installed?' do
+    context 'when rdiff-backup is installed' do
+      before do
+        Open3.stub(:capture2e).with(RdiffSimple::COMMANDS[:installed]).and_return(['', 0])
+      end
+
+      it { should be_installed }
+    end
+
+    context 'when rdiff-backup is not installed' do
+      before do
+        Open3.stub(:capture2e).with(RdiffSimple::COMMANDS[:installed]).and_return(['', 1])
+      end
+
+      it { should_not be_installed }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -11,11 +11,9 @@ if RUBY_VERSION > "1.9"
   end
 end
 
-require 'helpers'
 require 'rdiff_simple'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.include Helpers
 end

metadata

@@ -2,14 +2,14 @@
 name: rdiff-simple
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ryan Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies: []
 description: A simple wrapper around rdiff-backup
 email:
@@ -29,10 +29,13 @@ files:
 - README.md
 - Rakefile
 - lib/rdiff_simple.rb
+- lib/rdiff_simple/commands.rb
+- lib/rdiff_simple/errors.rb
+- lib/rdiff_simple/exit_codes.rb
+- lib/rdiff_simple/rdiff_backup.rb
 - lib/rdiff_simple/version.rb
 - rdiff-simple.gemspec
-- spec/helpers.rb
-- spec/rdiff_simple_spec.rb
+- spec/lib/rdiff_simple/rdiff_backup_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/ketiko/rdiff-simple
 licenses:
@@ -48,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3687603787058545755
+      hash: 2071801012397692109
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -57,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3687603787058545755
+      hash: 2071801012397692109
       version: '0'
   none: false
 requirements: []
@@ -67,6 +70,5 @@ signing_key:
 specification_version: 3
 summary: A wrapper around the rdiff-backup executable
 test_files:
-- spec/helpers.rb
-- spec/rdiff_simple_spec.rb
+- spec/lib/rdiff_simple/rdiff_backup_spec.rb
 - spec/spec_helper.rb

data/spec/helpers.rb

@@ -1,15 +0,0 @@
-module Helpers
-  def mock_rdiff_installed(value)
-    result = value == :yes
-    RdiffSimple.stub(:system).with('which rdiff-backup').and_return(result)
-  end
-
-  def mock_rdiff_command(command, value)
-    result = value == :succeeded
-
-    commands = [ 'rdiff-backup' ]
-    commands << command unless command.empty?
-
-    RdiffSimple.stub(:system).with(*commands).and_return(result)
-  end
-end

data/spec/rdiff_simple_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-describe RdiffSimple do
-  describe '#execute' do
-    context 'when rdiff-backup is installed' do
-      before { mock_rdiff_installed :yes }
-
-      context 'when no arguments are given' do
-        before { mock_rdiff_command '', :failed }
-        subject { RdiffSimple.execute }
-
-        it { should be_false }
-      end
-
-      context 'when arguments are given' do
-        before { mock_rdiff_command '--version', :succeeded }
-        subject { RdiffSimple.execute('--version') }
-
-        it { should be_true }
-      end
-    end
-
-    context 'when rdiff-backup is not installed' do
-      before { mock_rdiff_installed false }
-
-      it 'should raise an exception' do
-        expect { subject.execute('--version') }.to raise_error(RdiffSimple::NotInstalledError)
-      end
-    end
-  end
-
-  describe '#installed?' do
-    context 'when rdiff-backup is installed' do
-      before { mock_rdiff_installed :yes }
-
-      it { should be_installed }
-    end
-
-    context 'when rdiff-backup is not installed' do
-      before { mock_rdiff_installed :no }
-
-      it { should_not be_installed }
-    end
-  end
-end