understudy 0.0.8 → 0.0.9

data/Gemfile

@@ -2,15 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in understudy.gemspec
 gemspec
-
-group :development, :test do
-  gem "rspec", "~> 2"
-  gem "rake"
-  gem "coveralls"
-  gem "fakefs"
-end
-
-group :development do
-  gem "bundler", "~> 1.3"
-  gem 'guard-rspec', :require => false
-end

data/bin/understudy

@@ -1,119 +1,8 @@
 #!/usr/bin/env ruby
 
-ENV['TMPDIR']='/tmp/backup/'
-require 'optparse'
-require 'ostruct'
-require 'fileutils'
-require 'rdiff_simple'
+# Trap interrupts to quit cleanly.
+# See https://twitter.com/mitchellh/status/283014103189053442
+Signal.trap("INT") { exit 1 }
 
-options = OpenStruct.new
-@verbose = false
-
-usage = "Usage: understudy [options] job-name"
-
-OptionParser.new do |opts|
-  opts.banner = usage
-  opts.on '-v', '--verbose', 'Output extra information' do |v|
-    @verbose = v
-  end
-  opts.on '-f', '--first-time', 'Force first-time run' do |f|
-    options.first = f
-  end
-end.parse!
-
-def error msg
-  STDERR.puts "ERROR: #{msg}"
-  exit 255
-end
-
-error usage if ARGV.length != 1
-
-job_name = ARGV.shift
-
-config_file = "/etc/understudy/#{job_name}.conf"
-
-error "Cannot find '#{config_file}'" unless File.exist? config_file
-
-DATA_DIR = "/var/lib/understudy/#{job_name}"
-
-FileUtils.mkdir_p DATA_DIR
-
-lockfile = File.open( "#{DATA_DIR}/LOCK", File::RDWR|File::CREAT, 0644 )
-unless lockfile.flock File::LOCK_EX|File::LOCK_NB
-  error "Job #{job_name} is already running"
-end
-lockfile.puts $$
-lockfile.flush
-
-config = OpenStruct.new
-
-# Any options that aren't our options go to rdiff-backup
-OUR_OPTIONS = %w{source dest command}
-
-rdiff_args = []
-
-File.read( config_file ).split( /\n/ ).each do |line|
-  line.sub! /#.*$/, ''
-  line.sub! /^\s+/, ''
-  line.sub! /\s+$/, ''
-  next if line.empty?
-
-  line =~ /^([-\w]+)(\s+=\s+(.*))?$/ or raise "Strange line in config: #{line}"
-  key = $1
-  val = $3
-  if OUR_OPTIONS.member? key
-    config.send "#{key}=".to_sym, val
-  else
-    rdiff_args.push "--#{key}" + ( val ? "=#{val}" : "" )
-  end
-end
-
-error "Missing 'dest' config option" unless config.dest
-error "Missing 'source' config option" unless config.source
-
-rdiff_data = "#{config.dest}/rdiff-backup-data"
-exists = File.directory? rdiff_data
-if exists && options.first
-  error "Cannot force first time, destination '#{config.dest}' already exists"
-elsif !exists && !options.first
-  error "Destination '#{config.dest}' does not appear to exist, try again with --first-time"
-end
-
-def info message
-  return unless @verbose
-end
-
-def run command
-  friendly = nil
-  if command.is_a? Array
-    friendly = command.map { |i| i =~ /[^-=\/\.\w]/ ? "#{i}" : i }.join ' '
-    info "Running: #{friendly}"
-    RdiffSimple.execute( friendly ) or error "Could not run #{friendly}"
-  else
-    friendly = command
-    info "Running: #{friendly}"
-    RdiffSimple.execute( friendly ) or error "Could not run #{friendly}"
-  end
-  if $? != 0
-    error "Could not run #{friendly}"
-  end
-end
-
-ENV['PATH'] += ":/etc/understudy"
-run config.command if config.command
-
-command = []
-
-command << "--terminal-verbosity=5" if @verbose
-command << "--print-statistics"
-
-command += rdiff_args
-
-command << config.source
-command << config.dest
-
-run command
-
-info "Backup successful"
-
-exit 0
+require 'understudy'
+Understudy::CLI.start

data/lib/understudy/cli.rb

@@ -0,0 +1,103 @@
+require 'ostruct'
+require 'fileutils'
+
+module Understudy
+  class CLI < Thor
+
+    desc "perform [job]", "Perform backup [job]"
+    method_option :verbose, type: :boolean, banner: "Enable verbose output mode", aliases: "-v", default: false
+    method_option "first-time", type: :boolean, banner: "Force first-time run", aliases: "-f", default: false
+    def perform(job)
+      ENV['PATH'] += ":/etc/understudy"
+      ENV['TMPDIR']='/tmp/understudy/'
+
+      log = Logger.new(STDOUT)
+      log.level = Logger::INFO if options[:verbose]
+
+      job_name = job
+
+      config_file = "/etc/understudy/#{job_name}.conf"
+
+      log.error "Cannot find '#{config_file}'" unless File.exist? config_file
+
+      data_dir = "/tmp/understudy-#{job_name}"
+
+      FileUtils.mkdir_p data_dir
+
+      lockfile = File.open( "#{data_dir}/LOCK", File::RDWR|File::CREAT, 0644 )
+      unless lockfile.flock File::LOCK_EX|File::LOCK_NB
+        log.error "Job #{job_name} is already running"
+      end
+      lockfile.puts $$
+      lockfile.flush
+
+      config = OpenStruct.new
+
+      # Any options that aren't our options go to rdiff-backup
+      our_options = %w{source dest command}
+
+      rdiff_args = []
+
+      File.read( config_file ).split( /\n/ ).each do |line|
+        line.sub! /#.*$/, ''
+        line.sub! /^\s+/, ''
+        line.sub! /\s+$/, ''
+        next if line.empty?
+
+        line =~ /^([-\w]+)(\s+=\s+(.*))?$/ or raise "Strange line in config: #{line}"
+        key = $1
+        val = $3
+        if our_options.member? key
+          config.send "#{key}=".to_sym, val
+        else
+          rdiff_args.push "--#{key}" + ( val ? "=#{val}" : "" )
+        end
+      end
+
+      log.error "Missing 'dest' config option" unless config.dest
+      log.error "Missing 'source' config option" unless config.source
+
+      rdiff_data = "#{config.dest}/rdiff-backup-data"
+      exists = File.directory? rdiff_data
+
+      if exists && options["first-time"]
+        log.error "Cannot force first time, destination '#{config.dest}' already exists"
+      elsif !exists && !options["first-time"]
+        log.error "Destination '#{config.dest}' does not appear to exist, try again with --first-time"
+      end
+
+      run config.command if config.command
+
+      command = []
+
+      command << "--terminal-verbosity=5" if options[:verbose]
+      command << "--print-statistics"
+
+      command += rdiff_args
+
+      command << config.source
+      command << config.dest
+
+      run command, log
+
+      log.info "Backup successful"
+    end
+
+    private
+    def run(command, log)
+      friendly = nil
+      if command.is_a? Array
+        friendly = command.map { |i| i =~ /[^-=\/\.\w]/ ? "#{i}" : i }.join ' '
+        log.info "Running: #{friendly}"
+        RdiffSimple.execute( friendly ) or log.error "Could not run #{friendly}"
+      else
+        friendly = command
+        log.info "Running: #{friendly}"
+        RdiffSimple.execute( friendly ) or log.error "Could not run #{friendly}"
+      end
+      if $? != 0
+        log.error "Could not run #{friendly}"
+      end
+    end
+  end
+end

data/lib/understudy/version.rb

@@ -1,3 +1,3 @@
 module Understudy
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/understudy.rb

@@ -1,3 +1,4 @@
+require 'thor'
 require 'rdiff_simple'
-require 'understudy/stage'
+require 'understudy/cli'
 require 'understudy/version'

data/understudy.gemspec

@@ -23,4 +23,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor"
   spec.add_dependency "rdiff-simple"
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 2"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "fakefs"
+  spec.add_development_dependency "guard-rspec"
 end

metadata

@@ -1,43 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: understudy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Ryan Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
   name: thor
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: rdiff-simple
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
   prerelease: false
+  name: bundler
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: rake
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
-  name: rdiff-simple
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+    none: false
+  prerelease: false
+  name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+    none: false
+  prerelease: false
+  name: coveralls
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   prerelease: false
+  name: fakefs
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: guard-rspec
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Automated system backups via rdiff-backup
 email:
 - ketiko@gmail.com
@@ -58,16 +159,14 @@ files:
 - Rakefile
 - bin/understudy
 - lib/understudy.rb
+- lib/understudy/cli.rb
 - lib/understudy/stage.rb
 - lib/understudy/version.rb
-- spec/lib/stage_spec.rb
 - spec/spec_helper.rb
-- spec/understudy_spec.rb
 - understudy.gemspec
 homepage: http://github.com/ketiko/understudy
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -75,21 +174,27 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 3610360581697942929
       version: '0'
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 3610360581697942929
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Automated system backups via rdiff-backup
 test_files:
-- spec/lib/stage_spec.rb
 - spec/spec_helper.rb
-- spec/understudy_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a0878c926cb6750c7670444a59b2eb790a634232
-  data.tar.gz: 5936917e05495ad5dcc334e98c1f64a1cf7370fe
-SHA512:
-  metadata.gz: 10082a9e57c61cb860c460553164d6207a9f81e8d252a4091107e75bd66b685acfd196d5ac8ed90fd02825d32f9b2813ebee564e95c0cc07c10c13595f9405b9
-  data.tar.gz: 98849071bb5e28420693abca8a9a6ba561d2388037bd97f016b07072b676ae8bbea71f2c91edc6d1873a583bb28897f4ca3e3d2afe142e26bc2df9cfa815f243

data/spec/lib/stage_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe Understudy::Stage do
-  describe "#setup" do
-    before(:each) do
-      Understudy::Stage.setup
-    end
-
-    it "should create the default configuration directory" do
-      File.exists?(Understudy::Stage::DEFAULT_DIRECTORY).should be_true
-    end
-
-    it "should a configuration file for the machine" do
-      File.exists?(File.join(Understudy::Stage::DEFAULT_DIRECTORY, "#{`hostname`.chomp}.config")).should be_true
-    end
-  end
-end
-

data/spec/understudy_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe Understudy do
-  it "should be defined" do
-    defined?(Understudy).should == 'constant'
-  end
-end
-