rsync_cron 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9bdf25fe2470358e6e7b7481cf95decd6ea923a
-  data.tar.gz: 499d221a5ce98c084d37850fb50fe69a199f171a
+  metadata.gz: c2575308bc9803d0ece5c71d56115c423a4f57a3
+  data.tar.gz: 303b02d78de7296e94499745eea1a62cfe34e045
 SHA512:
-  metadata.gz: ab7773214e1c73426672aec01663191c5cae2a2b4c696af71d4932481bf1e7010dfd1467a27a5985b8a27ba4401fd8e0de72b35807708b01b2fd872dcad0849e
-  data.tar.gz: c9f9804ed7b6ed53cfe745a0ee779370b61af7295ee0a4de89325477b1241f977452ed0e0ba9ea459feca540758920db2ca50d2f88214d4678e45fb88f696c2f
+  metadata.gz: 3514d059391e6484357cbad1e1a94efb97999a8ce1f661fad92f907235e636b81ba7e8719a4bdc82f91ad9643716f8372d6af54b29687753f48da96ea601abb4
+  data.tar.gz: fa594e0265047d102fcfb01d18937999dc19aa950c659fc7685ae710a7bd7ccf77e42f84974781ef750a91d69880385b22f1fc74baf2e43d85c7b9537b0b7064

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsync_cron (1.0.8)
+    rsync_cron (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -14,14 +14,15 @@ gem install rsync_cron
 ```
 
 # Usage
-The gem comes with a CLI interface. You can print its help by:
+The gem comes with a CLI interface, you can print its help by:
 ```shell
 rsync_cron -h
-Usage: rsync_cron --cron=15,30 21 * * * --src=/ --dest=/tmp --log=/var/log/rsync.log
-    -c, --cron=CRON                  The cron string, i.e.: 15 21 * * *
+Usage: rsync_cron --cron='15,30 21' --src=/ --dest=/tmp --log=/var/log/rsync.log --opts=noatime,temp-dir='./temp'
+    -c, --cron=CRON                  The cron string, i.e.: '15 21 * * *'
     -s, --src=SRC                    The rsync source, i.e. user@src.com:files
     -d, --dest=DEST                  The rsync dest, i.e. user@dest.com:home/
     -l, --log=LOG                    log command output to specified file
+    -o, --opts=OPTS                  merge specified extra options
     -p, --print                      Print crontab command without installing it
     -k, --check                      Check src and dest before installing crontab
     -h, --help                       Prints this help
@@ -32,12 +33,5 @@ The `crontab` is scheduled one per day by default (at midnight).
 You can specify a different schedule directly on the command line:
 ```shell
 # run every sunday
-rsync_cron --cron=* * * * 0 --src=user@src.com:files --dest=~/tmp
+rsync_cron --cron='* * * * 0' --src=user@src.com:files --dest=~/tmp
 ```
-
-## Log to a file
-It is possible to log the `rsync` output to a file:
-```shell
-rsync_cron --src=user@src.com:files --dest=~/tmp --log=./rsync.log
-```
-

data/lib/rsync_cron/cli.rb

@@ -8,18 +8,21 @@ module RsyncCron
   class CLI
     SHELL = `which crontab`.strip
 
+    attr_reader :options
+
     def initialize(args, io = STDOUT, shell = SHELL)
       @args = args
       @io = io
       @cron = Cron.factory("* 0 * * *")
       @shell = shell
+      @options = Options.new
     end
 
     def call
       parser.parse!(@args)
       return @io.puts "specify valid src" unless @src
       return @io.puts "specify valid dest" unless @dest
-      command = Command.new(src: @src, dest: @dest, log: @log, io: @io)
+      command = Command.new(src: @src, dest: @dest, options: @options, log: @log, io: @io)
       return unless command.valid? if @check
       crontab = "#{@cron} #{command}"
       return @io.puts crontab unless @shell
@@ -30,9 +33,9 @@ module RsyncCron
 
     private def parser
       OptionParser.new do |opts|
-        opts.banner = "Usage: rsync_cron --cron=15,30 21 * * * --src=/ --dest=/tmp --log=/var/log/rsync.log"
+        opts.banner = "Usage: rsync_cron --cron='15,30 21' --src=/ --dest=/tmp --log=/var/log/rsync.log --opts=noatime,temp-dir='./temp'"
 
-        opts.on("-cCRON", "--cron=CRON", "The cron string, i.e.: 15 21 * * *") do |cron|
+        opts.on("-cCRON", "--cron=CRON", "The cron string, i.e.: '15 21 * * *'") do |cron|
           @cron = Cron.factory(cron)
         end
 
@@ -48,6 +51,10 @@ module RsyncCron
           @log = log
         end
 
+        opts.on("-oOPTS", "--opts=OPTS", "merge specified extra options") do |_opts|
+          @options << _opts
+        end
+
         opts.on("-p", "--print", "Print crontab command without installing it") do
           @shell = nil
         end

data/lib/rsync_cron/command.rb

@@ -14,7 +14,7 @@ module RsyncCron
     end
 
     def to_s
-      return "echo 'rsync not installed'" if @name.empty?
+      return @io.puts "rsync not installed" if @name.empty?
       "#{@name} #{@options} #{@src} #{@dest}#{log}"
     end
 

data/lib/rsync_cron/options.rb

@@ -1,37 +1,26 @@
 module RsyncCron
   class Options
-    BANDWITH_LIMIT = 5*1024
-    DEFAULT = { 
-      rsh: "ssh",
-      bwlimit: BANDWITH_LIMIT,
-      exclude: "'DfsrPrivate'"
-    }
-    FLAGS = %w[noatime verbose archive compress]
+    BW_LIMIT = 5*1024
+    DEFAULT_FLAGS = %W[verbose archive compress rsh=ssh bwlimit=#{BW_LIMIT} exclude='DfsrPrivate']
 
-    def initialize(data: DEFAULT, flags: FLAGS)
-      @data = data.to_h
-      @flags = flags.to_a
+    def initialize(flags = DEFAULT_FLAGS)
+      @flags = Array(flags.dup)
     end
 
     def to_s
-      [flags, data].compact.join(" ")
+      return if @flags.empty?
+      @flags.map { |flag| "--#{flag}" }.join(" ")
     end
 
-    def merge(opt)
-      @data = @data.merge(opt)
+    def <<(flags)
+      flags.split(",").each do |flag|
+        @flags << flag if supported?(flag)
+      end
       self
     end
 
-    private def flags
-      return if @flags.empty?
-      @flags.map { |flag| "--#{flag}" }.join(" ")
-    end
-
-    private def data
-      return if @data.empty?
-      @data.reduce([]) do |acc, (opt, val)|
-        acc << "--#{opt}=#{val}"
-      end.join(" ")
+    private def supported?(flag)
+      %x[rsync --#{flag} 2>&1].match(/unknown option/).nil?
     end
   end
 end

data/lib/rsync_cron/version.rb

@@ -1,3 +1,3 @@
 module RsyncCron
-  VERSION = "1.0.8"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsync_cron
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - costajob