rdiff-simple 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b76630f1141cfacad11232d8406ba3b4d72d92
-  data.tar.gz: e6662d1deeed21bbaf612dd7f738dad38cef680b
+  metadata.gz: d970e3aa2acff1a199aae08d11ecbbbef78cd396
+  data.tar.gz: 4ca3e46b6106f5cabc1fcce4e5fa07652ae39ef3
 SHA512:
-  metadata.gz: 949f2b75133ac93f0e5945e7279f020b4917cfa2ee7cf3c35ab7cfe372d43668300f620f1ac8f76438aca75d1bae45dd52f5c2d81f913398395b5d83d8fa5883
-  data.tar.gz: 4007f8fb8fda98a34f063214ae65bf87d2b2cb2ff7e99fe2e3d1a12bbceb44a2061f7988b809a1139f556733b65ffda5878e57b753ba7c47e3c317e961e675ae
+  metadata.gz: 6628d830fe10b8065ce6ce9b070caae379365ad425e12e4d28faa25dd0717f4a5f54c8fa5c401841a734f488c39944087a8e61b97c93cbf9771d86fa7483f592
+  data.tar.gz: 4fc368e8ea6c7805d2ca1f7faef5b882ffad3ea0576aeafab6d123086826db1c017ea5239c751590199d3ceb32e6d871e9c3ac5279f6ff2d4e3a277cc18eae79

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 .ruby-version
 bin
 Guardfile
+.vagrant

data/README.md

@@ -14,7 +14,9 @@ A simple wrapper around rdiff-backup
 
 ## Installation
 
+```bash
 $ gem install rdiff-simple
+```
 
 ## Quick Start
 

data/lib/rdiff_simple/options_parser.rb

@@ -3,15 +3,10 @@ module RdiffSimple
     def self.parse(*args)
       options = args.extract_options!
 
-      args.reverse!
-
-      source = args.pop
-      destination = args.pop
-
-      flags = args.reverse.map { |flag| flag.size == 1 ? "-#{flag}" : "--#{flag}" } * ' '
+      flags = args.map { |flag| flag.size == 1 ? "-#{flag}" : "--#{flag}" } * ' '
       arguments = options.map { |key, value| (key.size == 1 ? "-#{key}" : "--#{key}") + " #{value}" } * ' '
 
-      "#{flags} #{arguments} #{source} #{destination}".dasherize.strip
+      "#{flags} #{arguments}".dasherize.strip
     end
   end
 end

data/lib/rdiff_simple/rdiff_backup.rb

@@ -1,20 +1,35 @@
-
 module RdiffSimple
   class RdiffBackup
-    def initialize(logger = Logger.new(STDOUT), open3 = Open3)
-      @logger = logger
-      @open3 = open3
+    attr_accessor :logger, :open3
+
+    def initialize
+      yield self if block_given?
+
+      @open3  ||= Open3
+      @logger ||= Logger.new(STDOUT)
+    end
+
+    def backup(source, destination, *args)
+      command_args = OptionsParser.parse *args
+      execute "#{command_args} #{source} #{destination}"
+    end
+
+    def verify(destination)
+      verify_at_time destination, "now"
     end
 
-    def execute(*args)
-      command_arguments = OptionsParser.parse(*args)
+    def verify_at_time(destination, time)
+      execute "--verify-at-time #{time} #{destination}"
+    end
 
-      out, err, result = @open3.capture3("rdiff-backup #{command_arguments}".strip)
+    private
+    def execute(command)
+      output, error, result = open3.capture3 "rdiff-backup #{command}"
 
-      @logger.info(out) if out.length > 0
-      @logger.error(err) if err.length > 0
+      logger.info output unless output.empty?
+      logger.error error unless error.empty?
 
-      return result.exitstatus
+      result.exitstatus
     end
   end
 end

data/lib/rdiff_simple/version.rb

@@ -1,3 +1,3 @@
 module RdiffSimple
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/rdiff_simple.rb

@@ -1,6 +1,6 @@
 require 'logger'
 require 'open3'
-require 'active_support/all'
+require 'active_support/core_ext'
 require 'rdiff_simple/version'
 require 'rdiff_simple/options_parser'
 require 'rdiff_simple/rdiff_backup'

data/rdiff-simple.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2"
+  spec.add_development_dependency "rspec", ">= 2.0.0"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "guard-rspec"
 end

data/spec/lib/rdiff_simple/options_parser_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
 describe RdiffSimple::OptionsParser do
-  subject { RdiffSimple::OptionsParser.parse('~/Documents', '~/Test', :b, :exclude_other_filesystems, verbosity: 5, exclude: '*.png', r: Date.today) }
+  subject { RdiffSimple::OptionsParser.parse(:b, :exclude_other_filesystems, verbosity: 5, exclude: '*.png', r: Date.today) }
 
   describe '.parse' do
     it 'converts options to long argument format' do
-      expect(subject).to match /\s--verbosity\s/
+      expect(subject).to match /--verbosity/
     end
 
     it 'sets value for argument' do
-      expect(subject).to match /\s--verbosity 5\s/
+      expect(subject).to match /--verbosity 5/
     end
 
     it 'converts symbols to dasherized strings' do
-      expect(subject).to match /\s--exclude-other-filesystems\s/
+      expect(subject).to match /--exclude-other-filesystems/
     end
 
     it 'handles single letter argument' do
-      expect(subject).to match /\A-b\s/
+      expect(subject).to match /-b/
     end
 
     it 'sets value for single letter argument' do
-      expect(subject).to match /\s-r #{Date.today}\s/
+      expect(subject).to match /-r #{Date.today}/
     end
   end
 end

data/spec/lib/rdiff_simple/rdiff_backup_spec.rb

@@ -1,20 +1,59 @@
 require 'spec_helper'
 
 describe RdiffSimple::RdiffBackup do
-  let(:args) { 'rdiff-backup --exclude-other-filesystems --verbosity 5 --exclude *.png ~/Documents ~/Test' }
+  let(:source) { '~/Documents' }
+  let(:destination) { '~/Test' }
   let(:status) { double('status', exitstatus: Random.rand(100)) }
   let(:open3) { double('open3') }
-  let(:backup) { RdiffSimple::RdiffBackup.new(double('logger'), open3) }
+  let(:file) { StringIO.new }
+  let(:rdiff) do
+    RdiffSimple::RdiffBackup.new do |r|
+      r.logger = Logger.new file
+      r.open3 = open3
+    end
+  end
 
-  subject { backup.execute('~/Documents', '~/Test', :exclude_other_filesystems, verbosity: 5, exclude: '*.png') }
+  before do
+    open3.stub(:capture3).with(args) { ['output', 'error', status] }
+  end
 
-  describe '#backup' do
-    before do
-      expect(open3).to receive(:capture3).with(args) { ['', '', status] }
-    end
+  shared_examples "a command" do
+    before { subject }
 
-    it 'returns the exit code' do
+    it 'and returns the exit code' do
       expect(subject).to eq status.exitstatus
     end
+
+    it 'and logs the output' do
+      expect(file.string).to match /output/
+    end
+
+    it 'and logs any errors' do
+      expect(file.string).to match /error/
+    end
+  end
+
+  describe '#backup' do
+    let(:args) { "rdiff-backup --exclude-other-filesystems --verbosity 5 --exclude *.png #{source} #{destination}" }
+
+    subject { rdiff.backup(source, destination, :exclude_other_filesystems, verbosity: 5, exclude: '*.png') }
+
+    it_behaves_like "a command"
+  end
+
+  describe '#verify' do
+    let(:args) { "rdiff-backup --verify-at-time now #{destination}" }
+
+    subject { rdiff.verify destination }
+
+    it_behaves_like "a command"
+  end
+
+  describe '#verify_at_time' do
+    let(:args) { "rdiff-backup --verify-at-time now #{destination}" }
+
+    subject { rdiff.verify_at_time destination, 'now' }
+
+    it_behaves_like "a command"
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,11 @@
-Bundler.require(:development)
+require 'bundler/setup'
 
-if RUBY_VERSION > "1.9"
-  if ENV['TRAVIS']
-    require 'coveralls'
-    Coveralls.wear!
-  else
-    require 'simplecov'
-    SimpleCov.start
-  end
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+else
+  require 'simplecov'
+  SimpleCov.start
 end
 
 require 'rdiff_simple'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdiff-simple
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryan Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -40,34 +40,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -126,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A wrapper around the rdiff-backup executable