synco 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c010b88d796296e7d601db57d7668bea27452bf4
-  data.tar.gz: 38defa9392d35ccdf751bf407a003492447ba8fc
+SHA256:
+  metadata.gz: 5836163e56294236c873d3ed73f1f10ae20f164db3339118a3477831e9551f2d
+  data.tar.gz: 59f01018eaa9cd7bb703efc6f4f23c2c0b2eadc89d031482decf15398417d8cd
 SHA512:
-  metadata.gz: 48ced35efeb57e29b8f9e063f171f08af459e58aa1d9f12f16edd59c5dee5b015e6820549ba646e2235b24153d3f46e7ee542377723a489861e0b3f71193febe
-  data.tar.gz: 7868549488bc957338966e87f1d676e70e064012f47060c6e057fbab3bef12d71206b052cad4431a308bb7c81b452136ab125d9dd8d333b6fbeff39b0efc6641
+  metadata.gz: 42ec3e6db31d1d9c723509c200a36b41db10a95023374d9a6506704c344e8306090680c1524c08f400a78967f067085e24fb90aaa8dd4fe1014a97a4eb664d32
+  data.tar.gz: 92577fbd8cde9a481648fffeca5301401e19353fc5d85149e6b19eb8590811093f1f7ba9fd3ccb0c96fa960ab6af4457dd48d62269c53eb184366484985225f7

data/.github/workflows/development.yml

@@ -0,0 +1,40 @@
+name: Development
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7]
+    runs-on: ${{matrix.os}}
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+
+    - uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: bundle-use-ruby-${{matrix.os}}-${{matrix.ruby}}-${{hashFiles('**/Gemfile')}}
+        restore-keys: |
+          bundle-use-ruby-${{matrix.os}}-${{matrix.ruby}}-
+    
+    - name: Installing packages (ubuntu)
+      if: matrix.os == 'ubuntu-latest'
+      run: sudo apt-get install rsync
+    
+    - name: Installing packages (macos)
+      if: matrix.os == 'macos-latest'
+      run: brew install rsync
+    
+    - name: Bundle install...
+      run: |
+        bundle config path vendor/bundle
+        bundle install
+
+    - run: bundle exec rake

data/.rspec

@@ -1,4 +1,4 @@
---color
 --format documentation
 --backtrace
+--require spec_helper
 --warnings

data/Gemfile

@@ -4,8 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
-	
 	gem 'fssm'
 end

data/README.md

@@ -1,4 +1,4 @@
-# Synco
+# Synco ![Development](https://github.com/ioquatix/synco/workflows/Development/badge.svg)
 
 Synco is a tool for scripted synchronization and backups. It provides a custom Ruby DSL for describing backup and synchronization tasks involving one more more system and disk. It is designed to provide flexibility while reducing the complexity multi-server backups.
 
@@ -8,10 +8,6 @@ Synco is a tool for scripted synchronization and backups. It provides a custom R
 * Backup verification using [Fingerprint](https://github.com/ioquatix/fingerprint).
 * Data backup redundancy controlled via DNS.
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/synco.svg)](http://travis-ci.org/ioquatix/synco)
-[![Code Climate](https://codeclimate.com/github/ioquatix/synco.svg)](https://codeclimate.com/github/ioquatix/synco)
-[![Coverage Status](https://coveralls.io/repos/ioquatix/synco/badge.svg)](https://coveralls.io/r/ioquatix/synco)
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -32,28 +28,30 @@ Synco imposes a particular structure regarding the organisation of backup script
 
 A simple backup script might look something like this:
 
-	#!/usr/bin/env ruby
-
-	require 'synco'
-	require 'synco/methods/rsync'
-
-	Synco::run_script do |script|
-		script.method = Synco::Methods::RSync.new(archive: true)
-		
-		server(:master) do |server|
-			server.host = "server.example.com"
-			server.root = "/"
-		end
-		
-		server(:backup) do |server|
-			server.host = "backup.example.com"
-			server.root = "/tank/backups/server.example.com"
-		end
-		
-		backup('etc', 'var', 'srv', 'home', 
-			arguments: %W{--exclude cache/ --exclude tmp/}
-		)
+```ruby
+#!/usr/bin/env ruby
+
+require 'synco'
+require 'synco/methods/rsync'
+
+Synco::run_script do |script|
+	script.method = Synco::Methods::RSync.new(archive: true)
+	
+	server(:master) do |server|
+		server.host = "server.example.com"
+		server.root = "/"
+	end
+	
+	server(:backup) do |server|
+		server.host = "backup.example.com"
+		server.root = "/tank/backups/server.example.com"
 	end
+	
+	backup('etc', 'var', 'srv', 'home', 
+		arguments: %W{--exclude cache/ --exclude tmp/}
+	)
+end
+```
 
 This will produce an identical copy using rsync of the specified directories. As an example `server.example.com:/etc` would be copied to `backup.example.com:/tank/backups/server.example.com/etc`.
 
@@ -61,61 +59,69 @@ This will produce an identical copy using rsync of the specified directories. As
 
 Building on the above backup, you can use `Synco::Methods::RSyncSnapshot` which supports snapshot based backups. It creates a snapshot into a sub-directory called `latest.snapshot` and uses RSync's `--link-dest` to hard-link files when unchanged. Synco provides scripts to rotate and prune these backups as required, but you must invoke them as part of the script:
 
-	server(:backup) do |server|
-		server.host = "backup.example.com"
-		server.root = "/"
-		
-		server.on(:success) do
-			run "synco", "rotate", chdir: target_server.root
-			run "synco", "prune", chdir: target_server.root
-		end
+```ruby
+server(:backup) do |server|
+	server.host = "backup.example.com"
+	server.root = "/"
+	
+	server.on(:success) do
+		run "synco", "rotate", chdir: target_server.root
+		run "synco", "prune", chdir: target_server.root
 	end
+end
+```
 
 These commands can also be run from the command line.
 
-	rotate [--format <name>] [--latest <name>] [--snapshot <name>]
-		Rotate a backup snapshot into a timestamped directory.
-
-		[--format <name>]    Set the name of the backup rotations, including strftime expansions.  Default: %Y.%m.%d-%H.%M.%S
-		[--latest <name>]    The name of the latest backup symlink.                                Default: latest           
-		[--snapshot <name>]  The name of the in-progress backup snapshot.                          Default: latest.snapshot  
-
-	prune [--hourly <count>] [--daily <count>] [--weekly <count>] [--monthly <count>] [--quarterly <count>] [--yearly <count>] [--format <name>] [--latest <name>] [--keep <new|old>] [--dry]
-		Prune old backups to reduce disk usage according to a given policy.
-
-		[--hourly <count>]     Set the number of hourly backups to keep.                             Default: 24               
-		[--daily <count>]      Set the number of daily backups to keep.                              Default: 28               
-		[--weekly <count>]     Set the number of weekly backups to keep.                             Default: 52               
-		[--monthly <count>]    Set the number of monthly backups to keep.                            Default: 36               
-		[--quarterly <count>]  Set the number of quaterly backups to keep.                           Default: 40               
-		[--yearly <count>]     Set the number of yearly backups to keep.                             Default: 20               
-		[--format <name>]      Set the name of the backup rotations, including strftime expansions.  Default: %Y.%m.%d-%H.%M.%S
-		[--latest <name>]      The name of the latest backup symlink.                                Default: latest           
-		[--keep <new|old>]     Keep the younger or older backups within the same period division     Default: old              
-		[--dry]                Print out what would be done rather than doing it.                  
+```
+rotate [--format <name>] [--latest <name>] [--snapshot <name>]
+	Rotate a backup snapshot into a timestamped directory.
+
+	[--format <name>]    Set the name of the backup rotations, including strftime expansions.  Default: %Y.%m.%d-%H.%M.%S
+	[--latest <name>]    The name of the latest backup symlink.                                Default: latest           
+	[--snapshot <name>]  The name of the in-progress backup snapshot.                          Default: latest.snapshot  
+
+prune [--hourly <count>] [--daily <count>] [--weekly <count>] [--monthly <count>] [--quarterly <count>] [--yearly <count>] [--format <name>] [--latest <name>] [--keep <new|old>] [--dry]
+	Prune old backups to reduce disk usage according to a given policy.
+
+	[--hourly <count>]     Set the number of hourly backups to keep.                             Default: 24               
+	[--daily <count>]      Set the number of daily backups to keep.                              Default: 28               
+	[--weekly <count>]     Set the number of weekly backups to keep.                             Default: 52               
+	[--monthly <count>]    Set the number of monthly backups to keep.                            Default: 36               
+	[--quarterly <count>]  Set the number of quaterly backups to keep.                           Default: 40               
+	[--yearly <count>]     Set the number of yearly backups to keep.                             Default: 20               
+	[--format <name>]      Set the name of the backup rotations, including strftime expansions.  Default: %Y.%m.%d-%H.%M.%S
+	[--latest <name>]      The name of the latest backup symlink.                                Default: latest           
+	[--keep <new|old>]     Keep the younger or older backups within the same period division     Default: old              
+	[--dry]                Print out what would be done rather than doing it.                  
+```
 
 ### Mounting Disks
 
 Synco supports mounting disks before the backup begins and unmounting them after done. The specifics of this process may require some adjustment based on your OS. For example on linux, `sudo` is used to invoke `mount` and `umount`.
 
-	server(:destination) do |server|
-		self.mountpoint = '/mnt/backups'
-		self.root = File.join(server.mountpoint, 'laptop')
-		
-		server.on(:prepare) do
-			# synco mount uses labels, e.g. the disk partition has LABEL=backups
-			target_server.run "synco", "mount", target_server.mountpoint, 'backups'
-		end
-		
-		server.on(:finish) do
-			target_server.run "synco", "unmount", target_server.mountpoint
-		end
+```ruby
+server(:destination) do |server|
+	self.mountpoint = '/mnt/backups'
+	self.root = File.join(server.mountpoint, 'laptop')
+	
+	server.on(:prepare) do
+		# synco mount uses labels, e.g. the disk partition has LABEL=backups
+		target_server.run "synco", "mount", target_server.mountpoint, 'backups'
+	end
+	
+	server.on(:finish) do
+		target_server.run "synco", "unmount", target_server.mountpoint
 	end
+end
+```
 
 On Linux, you might want to create the file `/etc/sudoers.d/synco` with the following contents:
 
-	%wheel ALL=(root) NOPASSWD: /bin/mount
-	%wheel ALL=(root) NOPASSWD: /bin/umount
+```
+%wheel ALL=(root) NOPASSWD: /bin/mount
+%wheel ALL=(root) NOPASSWD: /bin/umount
+```
 
 Please make sure you take the time to educate yourself on the security of such a setup.
 
@@ -123,47 +129,53 @@ Please make sure you take the time to educate yourself on the security of such a
 
 If you'd like to dump data before running the backup, it's possible using the event handling mechanisms:
 
-	server(:master) do |server|
-		server.host = "server.example.com"
-		server.root = "/"
-		
-		server.on(:prepare) do
-			# Dump MySQL to /srv/mysql
-			run '/etc/lsync/mysql-backup.sh'
-		end
+```ruby
+server(:master) do |server|
+	server.host = "server.example.com"
+	server.root = "/"
+	
+	server.on(:prepare) do
+		# Dump MySQL to /srv/mysql
+		run '/etc/lsync/mysql-backup.sh'
 	end
+end
+```
 
 The exact contents of `mysql-backup.sh` will depend on your requirements, but here is an example:
 
-	#!/usr/bin/env bash
+```bash
+#!/usr/bin/env bash
 
-	BACKUP_DIR=/srv/mysql
-	MYSQL=/usr/bin/mysql
-	MYSQLDUMP=/usr/bin/mysqldump
-	
-	databases=`mysql --user=backup -e "SHOW DATABASES;" | grep -Ev "(Database|information_schema|performance_schema|_test|_restore)"`
-	
-	# http://stackoverflow.com/questions/451404/how-to-obtain-a-correct-dump-using-mysqldump-and-single-transaction-when-ddl-is
-	MYSQLDUMP_OPTIONS="--force --skip-opt --single-transaction --add-drop-table --create-options --quick --extended-insert --set-charset --disable-keys"
-	
-	for db in $databases; do
-		echo "Dumping database $db to $BACKUP_DIR/$db.sql.xz..."
-		mysqldump --user=backup $MYSQLDUMP_OPTIONS --databases $db | xz > "$BACKUP_DIR/$db.sql.xz"
-	done
+BACKUP_DIR=/srv/mysql
+MYSQL=/usr/bin/mysql
+MYSQLDUMP=/usr/bin/mysqldump
+
+databases=`mysql --user=backup -e "SHOW DATABASES;" | grep -Ev "(Database|information_schema|performance_schema|_test|_restore)"`
+
+# http://stackoverflow.com/questions/451404/how-to-obtain-a-correct-dump-using-mysqldump-and-single-transaction-when-ddl-is
+MYSQLDUMP_OPTIONS="--force --skip-opt --single-transaction --add-drop-table --create-options --quick --extended-insert --set-charset --disable-keys"
+
+for db in $databases; do
+	echo "Dumping database $db to $BACKUP_DIR/$db.sql.xz..."
+	mysqldump --user=backup $MYSQLDUMP_OPTIONS --databases $db | xz > "$BACKUP_DIR/$db.sql.xz"
+done
+```
 
 ### Fingerprint Integration
 
 It is possible to make a [cryptographic checksum of the data](https://github.com/ioquatix/fingerprint). On a filesystem that support immutable snapshots, you can do this before the data is copied. For traditional filesystems, you generally need to do this afterwards.
 
-	server(:master) do |server|
-		server.host = "server.example.com"
-		server.root = "/"
-		
-		server.on(:success) do
-			# Run fingerprint on the backup data:
-			run 'fingerprint', '--root', target_server.root, 'analyze'
-		end
+```ruby
+server(:master) do |server|
+	server.host = "server.example.com"
+	server.root = "/"
+	
+	server.on(:success) do
+		# Run fingerprint on the backup data:
+		run 'fingerprint', '--root', target_server.root, 'analyze'
 	end
+end
+```
 
 Fingerprint is used in many of the specs to verify file copies.
 
@@ -173,11 +185,15 @@ Fingerprint is used in many of the specs to verify file copies.
 
 Synco can manage synchronization and backups of ZFS partitions. However, to use the standard tools, it is necessary to enable `zfs_admin_snapshot`, in `/etc/modprobe.d/zfs.conf`:
 
-	options zfs zfs_admin_snapshot=1
+```
+options zfs zfs_admin_snapshot=1
+```
 
 Propagate user permissions for the ZFS partition:
 
-	sudo zfs allow -ld -u `whoami` create,mount,send,receive,snapshot tank/test
+```bash
+sudo zfs allow -ld -u `whoami` create,mount,send,receive,snapshot tank/test
+```
 
 ### Backup staging
 
@@ -193,23 +209,25 @@ Firstly, a backup script defaults to the server with the name `:master` as the m
 
 However, it is possible instead to specify a hostname, e.g. `primary.example.com`. Then, specify several servers, e.g. `s01.example.com`, `s02.example.com` and so on:
 
-	Synco::run_script do |script|
-		script.method = Synco::Methods::RSync.new(archive: true)
-		
-		script.master = "primary.example.com"
-		
-		server("s01.example.com") do |server|
-			server.root = "/"
-		end
-		
-		server("s02.example.com") do |server|
-			server.root = "/"
-		end
-		
-		backup('srv/http', 
-			arguments: %W{--exclude cache/ --exclude tmp/}
-		)
+```ruby
+Synco::run_script do |script|
+	script.method = Synco::Methods::RSync.new(archive: true)
+	
+	script.master = "primary.example.com"
+	
+	server("s01.example.com") do |server|
+		server.root = "/"
 	end
+	
+	server("s02.example.com") do |server|
+		server.root = "/"
+	end
+	
+	backup('srv/http', 
+		arguments: %W{--exclude cache/ --exclude tmp/}
+	)
+end
+```
 
 When you run the script, the behaviour will depend on whether `primary.example.com` points to `s01.example.com` or `s02.example.com`. The data will always be copied from the master server to the other servers.
 

data/Rakefile

@@ -1,8 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
-end
+RSpec::Core::RakeTask.new
 
 task :default => :spec

data/bin/synco

@@ -26,5 +26,4 @@
 
 require 'synco/command'
 
-application = Synco::Command::Top.new(ARGV)
-application.invoke
+Synco::Command::Top.call

data/lib/synco/command.rb

@@ -48,21 +48,22 @@ module Synco
 				end
 			end
 			
-			nested '<command>',
+			nested :command, {
 				'spawn' => Spawn,
 				'rotate' => Rotate,
 				'prune' => Prune,
 				'mount' => Mount,
 				'unmount' => Unmount
+			}
 			
-			def invoke(program_name: File.basename($0))
+			def call
 				if @options[:version]
 					puts "synco v#{Synco::VERSION}"
 				elsif @options[:help] or @command.nil?
 					print_usage(program_name)
 				else
 					chdir do
-						@command.invoke(self)
+						@command.call
 					end
 				end
 			end

data/lib/synco/command/disk.rb

@@ -34,7 +34,7 @@ module Synco
 			one :path, "The disk mount point."
 			one :name, "The symbolic name of the disk to mount, e.g. disk label."
 			
-			def invoke(parent)
+			def call
 				# We may not have permission to make this directory, but we should still try:
 				FileUtils.mkpath(@path) rescue nil
 				
@@ -47,7 +47,7 @@ module Synco
 			
 			one :path, "The disk mount point."
 			
-			def invoke(parent)
+			def call
 				Disk.unmount(@path)
 			end
 		end

data/lib/synco/command/prune.rb

@@ -138,7 +138,7 @@ module Synco
 				end
 			end
 			
-			def invoke(parent)
+			def call
 				backups = current_backups
 				
 				retain, erase = policy.filter(backups, keep: @options[:keep].to_sym, &:time)

data/lib/synco/command/rotate.rb

@@ -53,7 +53,7 @@ module Synco
 					backup_timestamp.strftime(@options[:format])
 				end
 				
-				def invoke(parent)
+				def call
 					snapshot_name = @options[:snapshot]
 					unless File.exist? snapshot_name
 						$stderr.puts "Snapshot directory #{snapshot_name} does not exist!"

data/lib/synco/command/spawn.rb

@@ -31,7 +31,7 @@ module Synco
 				
 				split :argv, "Command to spawn."
 				
-				def invoke(parent)
+				def call
 					Process.exec(*@argv)
 				end
 		end

data/lib/synco/scope.rb

@@ -22,7 +22,7 @@ require_relative 'script'
 
 require 'process/group'
 
-require 'logger'
+require 'console'
 require 'delegate'
 
 module Synco
@@ -39,22 +39,13 @@ module Synco
 	end
 	
 	class Runner
-		def initialize(*scripts, logger: nil, verbose: false)
+		include Console
+		
+		def initialize(*scripts)
 			@scripts = scripts
-			
-			@logger = logger || Logger.new($stderr).tap do |logger|
-				logger.formatter = CompactFormatter.new
-				
-				if verbose or ENV['SYNCO_VERBOSE']
-					logger.level = Logger::DEBUG
-				else
-					logger.level = Logger::INFO
-				end
-			end
 		end
 		
 		attr :scripts
-		attr :logger
 		
 		def call
 			start_time = Time.now
@@ -64,7 +55,7 @@ module Synco
 			Process::Group.wait do |group|
 				@scripts.each do |script|
 					Fiber.new do
-						ScriptScope.new(script, @logger, group).call
+						ScriptScope.new(script, logger, group).call
 					end.resume
 				end
 			end

data/lib/synco/script.rb

@@ -23,8 +23,6 @@ require_relative 'server'
 require_relative 'directory'
 require_relative 'controller'
 
-require_relative 'compact_formatter'
-
 require 'socket'
 
 require 'process/group'

data/lib/synco/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Synco
-	VERSION = "1.1.0"
+	VERSION = "1.2.0"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,34 @@
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'bundler/setup'
+require 'covered/rspec'
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+	
+	# Disable RSpec exposing methods globally on `Module` and `main`
+	config.disable_monkey_patching!
+	
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

data/spec/synco/directory_spec.rb

@@ -22,7 +22,7 @@
 
 require 'synco/directory'
 
-describe Synco::Directory.new(".", arguments: ['--foo']) do
+RSpec.describe Synco::Directory.new(".", arguments: ['--foo']) do
 	it "should have arguments" do
 		expect(subject.arguments).to include('--foo')
 	end

data/spec/synco/method_spec.rb

@@ -25,7 +25,7 @@ require 'synco/methods/scp'
 
 require_relative 'backup_script'
 
-describe Synco::Methods::SCP do
+RSpec.describe Synco::Methods::SCP do
 	include_context "backup script"
 	
 	let(:test_server) {ENV.fetch('TEST_SERVER', 'localhost')}

data/spec/synco/rsync_spec.rb

@@ -27,7 +27,7 @@ require 'synco/methods/rsync'
 
 require_relative 'backup_script'
 
-describe Synco::Methods::RSync do
+RSpec.describe Synco::Methods::RSync do
 	include_context "backup script"
 	
 	it 'should copy files using rsync' do
@@ -81,7 +81,7 @@ describe Synco::Methods::RSync do
 	end
 end
 
-describe Synco::Methods::RSyncSnapshot do
+RSpec.describe Synco::Methods::RSyncSnapshot do
 	it 'should generate correct command for ssh shell' do
 		expect(subject.escape(['ssh', '-o', 'BatchMode=yes'])).to be == 'ssh -o BatchMode=yes'
 	end

data/spec/synco/scp_spec.rb

@@ -27,7 +27,7 @@ require 'synco/methods/scp'
 
 require_relative 'backup_script'
 
-describe Synco::Methods::SCP do
+RSpec.describe Synco::Methods::SCP do
 	include_context "backup script"
 	
 	it 'should build a script with desired configuration' do

data/spec/synco/script_spec.rb

@@ -24,7 +24,7 @@ require 'logger'
 require 'synco/script'
 require 'synco/methods/scp'
 
-describe Synco::Script do
+RSpec.describe Synco::Script do
 	it 'should build a script with desired configuration' do
 		script = Synco::Script.build do |script|
 			script.server(:master) do |server|

data/spec/synco/shell_spec.rb

@@ -23,20 +23,18 @@
 require 'synco/server'
 require 'synco/shells/ssh'
 
-module Synco::ShellSpec
-	describe Synco::Shells::SSH do
-		let(:server) {Synco::Server.new('localhost')}
-		
-		it 'should generate a connection command' do
-			expect(subject.connection_command(server)).to be == ['ssh', 'localhost']
-		end
+RSpec.describe Synco::Shells::SSH do
+	let(:server) {Synco::Server.new('localhost')}
+	
+	it 'should generate a connection command' do
+		expect(subject.connection_command(server)).to be == ['ssh', 'localhost']
 	end
+end
+
+RSpec.describe Synco::Shells::SSH.new(batch_mode: true) do
+	let(:server) {Synco::Server.new('localhost')}
 	
-	describe Synco::Shells::SSH.new(batch_mode: true) do
-		let(:server) {Synco::Server.new('localhost')}
-		
-		it 'should generate a connection command with options' do
-			expect(subject.connection_command(server)).to be == ['ssh', '-o', 'BatchMode=yes', 'localhost']
-		end
+	it 'should generate a connection command with options' do
+		expect(subject.connection_command(server)).to be == ['ssh', '-o', 'BatchMode=yes', 'localhost']
 	end
 end

data/spec/synco/usb_spec.rb

@@ -24,7 +24,7 @@ require 'synco/disk'
 require 'synco/methods/rsync'
 require_relative 'backup_script'
 
-describe Synco::Methods::RSyncSnapshot, if: Synco::Disk.available?('TEST') do
+RSpec.describe Synco::Methods::RSyncSnapshot, if: Synco::Disk.available?('TEST') do
 	include_context "backup script"
 	
 	before(:each) do

data/spec/synco/zfs_spec.rb

@@ -25,7 +25,7 @@ require 'synco/script'
 require 'synco/scope'
 require 'synco/methods/zfs'
 
-describe Synco::Methods::ZFS do
+RSpec.describe Synco::Methods::ZFS do
 	xit 'should mirror two ZFS partitions' do
 		script = Synco::Script.build(master: :source) do |script|
 			script.method = Synco::Methods::ZFS.new

data/synco.gemspec

@@ -1,7 +1,5 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'synco/version'
+
+require_relative 'lib/synco/version'
 
 Gem::Specification.new do |spec|
 	spec.name          = "synco"
@@ -11,25 +9,23 @@ Gem::Specification.new do |spec|
 	spec.summary       = %q{Synco is a tool for scripted synchronization and backups.}
 	spec.homepage      = ""
 	spec.license       = "MIT"
-
+	
 	spec.files         = `git ls-files -z`.split("\x0")
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
-
+	
 	spec.add_dependency("periodical", "~> 1.1")
-	spec.add_dependency("samovar", "~> 1.3")
-	spec.add_dependency("fingerprint", "~> 2.0")
+	spec.add_dependency("samovar", "~> 2.0")
+	spec.add_dependency("fingerprint", "~> 3.0")
 	spec.add_dependency("mapping", "~> 1.0")
 	spec.add_dependency("build-files", "~> 1.0")
 	spec.add_dependency("process-group", "~> 1.1")
 	
 	spec.add_dependency("lockfile")
-	spec.add_dependency("rainbow", "~> 2.0")
-
-	spec.has_rdoc = "yard"
-
-	spec.add_development_dependency "bundler", "~> 1.11"
+	
+	spec.add_development_dependency "covered"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.4"
 	spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synco
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: periodical
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fingerprint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mapping
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -172,10 +172,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/development.yml"
 - ".gitignore"
 - ".rspec"
-- ".simplecov"
-- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -186,7 +185,6 @@ files:
 - lib/synco/command/prune.rb
 - lib/synco/command/rotate.rb
 - lib/synco/command/spawn.rb
-- lib/synco/compact_formatter.rb
 - lib/synco/controller.rb
 - lib/synco/directory.rb
 - lib/synco/disk.rb
@@ -200,10 +198,7 @@ files:
 - lib/synco/shell.rb
 - lib/synco/shells/ssh.rb
 - lib/synco/version.rb
-- media/LSync Logo.artx/Preview/preview.png
-- media/LSync Logo.artx/QuickLook/Preview.pdf
-- media/LSync Logo.artx/doc.thread
-- media/LSync Logo.png
+- spec/spec_helper.rb
 - spec/synco/backup_script.rb
 - spec/synco/directory_spec.rb
 - spec/synco/local_backup.rb
@@ -235,12 +230,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Synco is a tool for scripted synchronization and backups.
 test_files:
+- spec/spec_helper.rb
 - spec/synco/backup_script.rb
 - spec/synco/directory_spec.rb
 - spec/synco/local_backup.rb

data/.simplecov

@@ -1,9 +0,0 @@
-
-SimpleCov.start do
-	add_filter "/spec/"
-end
-
-if ENV['TRAVIS']
-	require 'coveralls'
-	Coveralls.wear!
-end

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - ruby-head
-  - rbx-2
-env: COVERAGE=true
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: "ruby-head"
-    - rvm: "rbx-2"

data/lib/synco/compact_formatter.rb

@@ -1,115 +0,0 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'rainbow'
-require 'shellwords'
-
-module Synco
-	class CompactFormatter
-		def initialize(verbose: true)
-			@start = Time.now
-			@verbose = verbose
-		end
-		
-		def time_offset_prefix
-			offset = Time.now - @start
-			minutes = (offset/60).floor
-			seconds = (offset - (minutes*60))
-			
-			if minutes > 0
-				"#{minutes}m#{seconds.floor}s"
-			else
-				"#{seconds.round(2)}s"
-			end.rjust(6)
-		end
-		
-		def chdir_string(options)
-			if options[:chdir]
-				" in #{options[:chdir]}"
-			else
-				""
-			end
-		end
-		
-		def format_command(arguments, buffer)
-			arguments = arguments.dup
-			
-			# environment = arguments.first.is_a?(Hash) ? arguments.shift : nil
-			options = arguments.last.is_a?(Hash) ? arguments.pop : nil
-			
-			arguments = arguments.flatten.collect(&:to_s)
-			
-			buffer << Rainbow(arguments.shelljoin).bright.blue
-			
-			if options
-				buffer << chdir_string(options)
-			end
-			
-			buffer << "\n"
-			
-			# if environment
-			# 	environment.each do |key,value|
-			# 		buffer << "\texport #{key}=#{value.dump}\n"
-			# 	end
-			# end
-		end
-		
-		def format_exception(exception, buffer)
-			buffer << Rainbow("#{exception.class}: #{exception}").bright.red << "\n"
-			exception.backtrace.each do |line|
-				buffer << "\t" << Rainbow(line).red << "\n"
-			end
-		end
-		
-		def format_line(message, severity)
-			if severity == 'ERROR'
-				Rainbow(message).red
-			else
-				message
-			end
-		end
-		
-		def call(severity, datetime, progname, message)
-			buffer = []
-			prefix = ""
-			
-			if @verbose
-				prefix = time_offset_prefix
-				buffer << Rainbow(prefix).cyan + ": "
-				prefix = " " * (prefix.size) + "| " 
-			end
-			
-			if progname == 'shell' and message.kind_of? Array
-				format_command(message, buffer)
-			elsif message.kind_of? Exception
-				format_exception(message, buffer)
-			else
-				buffer << format_line(message, severity) << "\n"
-			end
-			
-			result = buffer.join
-			
-			# This fancy regex indents lines correctly depending on the prefix:
-			result.gsub!(/\n(?!$)/, "\n#{prefix}") unless prefix.empty?
-			
-			return result
-		end
-	end
-end