dutiful 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c4ff77357fdd7e791b53d6f82c7cbef2940a2f1
-  data.tar.gz: 2d3bcf04350bb48e0f41f8ad04395b54024547bc
+  metadata.gz: 2e0b17aa6b4926b3c741b9178b4081ef72ed5684
+  data.tar.gz: 0deafa16d607c75dec399bba7a8cb102468b3a35
 SHA512:
-  metadata.gz: 80a690af56ded5e3278396feda4da1aa49744012f7169b19089673492a9a8cade27a8a6ee2c757bb5d2e6d17ebd1209671f28ba5942ec67c71f8cb143d05e907
-  data.tar.gz: 3f0234c53031fc8020aa4ed1c43356f830606aec3651b1e23521d2264a8e8f13a01eee3b702d81e7a4bb1c4d0ac070062aea29c277582ba4e4b2d07d9def0bcc
+  metadata.gz: 93094fe71f0c948abf0f553bcd02a7284fe30e22ef25105787b24245e57d631385d0cc41fa6dc46dfa8a0c19d4df4adf1f2279c2b1209a4cda2d983bc0c8d636
+  data.tar.gz: f9605865f58cc59cc49a636763bbcb0dca10d15d2c71531c52c4cfb6f4c5a3c2ef3d1310f7bb16d7bdb81b4d7d79fceaecc82ab2eeaf2c6020e2e815de829bbd

data/lib/dutiful/application.rb

@@ -3,26 +3,33 @@ class Dutiful::Application
     @path = path
   end
 
-  def name
-    content[:application][:name]
-  end
-
   def files
     content[:file].map { |file| Dutiful::ApplicationFile.new file[:path], file[:condition] }
   end
 
-  def exist?
-    files.any? &:exist?
+  def name
+    content[:application][:name]
   end
 
-  def has_backup?
-    files.any? &:has_backup?
+  def backup(&block)
+    sync backup_only: true, &block
   end
 
-  def sync
+  def restore(&block)
+    sync restore_only: true, &block
+  end
+
+  def sync(backup_only: false, restore_only: false)
     files.each do |file|
       if file.should_sync?
-        result = Dutiful::Config.storage.sync(file)
+        result = if backup_only && file.exist?
+                   Dutiful::Config.storage.backup(file)
+                 elsif restore_only && file.has_backup?
+                   Dutiful::Config.storage.restore(file)
+                 else
+                   Dutiful::Config.storage.sync(file)
+                 end
+
         yield file, result if block_given?
       else
         yield file if block_given?
@@ -30,6 +37,14 @@ class Dutiful::Application
     end
   end
 
+  def exist?
+    files.any? &:exist?
+  end
+
+  def has_backup?
+    files.any? &:has_backup?
+  end
+
   def should_sync?
     exist? || has_backup?
   end

data/lib/dutiful/commands.rb

@@ -1,6 +1,8 @@
 module Dutiful::Command; end
 
 require 'clamp'
+require 'dutiful/commands/backup'
 require 'dutiful/commands/list'
+require 'dutiful/commands/restore'
 require 'dutiful/commands/sync'
 require 'dutiful/commands/main'

data/lib/dutiful/commands/backup.rb

@@ -0,0 +1,23 @@
+class Dutiful::Command::Backup < Clamp::Command
+  option ['-v', '--verbose'], :flag, 'Verbose mode'
+
+  def execute
+    puts "Storage: #{Dutiful::Config.storage.name}\n\n"
+
+    Dutiful::Application.each do |application|
+      puts "#{application.name}:\n" if application.should_sync? && application.exist? || verbose?
+
+      application.backup do |file, result|
+        if result
+          if result.success?
+            puts "  #{file.path} ✔".green
+          else
+            puts "  #{file.path} ✖ - #{result.error}".red
+          end
+        elsif verbose?
+          puts "  #{file}"
+        end
+      end
+    end
+  end
+end

data/lib/dutiful/commands/main.rb

@@ -4,18 +4,8 @@ class Dutiful::Command::Main < Clamp::Command
     exit 0
   end
 
-  subcommand 'sync', 'Sync all preference files', Dutiful::Command::Sync
-  subcommand 'list', 'List all preference files', Dutiful::Command::List
-
-  subcommand 'restore', 'Restore all preference files' do
-    def execute
-      puts 'Not implemented yet'
-    end
-  end
-
-  subcommand 'which', 'Display the full path to a preference file' do
-    def execute
-      puts 'Not implemented yet'
-    end
-  end
+  subcommand 'backup',  'Backup all preference files',  Dutiful::Command::Backup
+  subcommand 'list',    'List all preference files',    Dutiful::Command::List
+  subcommand 'restore', 'Restore all preference files', Dutiful::Command::Restore
+  subcommand 'sync',    'Sync all preference files',    Dutiful::Command::Sync
 end

data/lib/dutiful/commands/restore.rb

@@ -0,0 +1,23 @@
+class Dutiful::Command::Restore < Clamp::Command
+  option ['-v', '--verbose'], :flag, 'Verbose mode'
+
+  def execute
+    puts "Storage: #{Dutiful::Config.storage.name}\n\n"
+
+    Dutiful::Application.each do |application|
+      puts "#{application.name}:\n" if application.should_sync? && application.has_backup? || verbose?
+
+      application.restore do |file, result|
+        if result
+          if result.success?
+            puts "  #{file.path} ✔".green
+          else
+            puts "  #{file.path} ✖ - #{result.error}".red
+          end
+        elsif verbose?
+          puts "  #{file}"
+        end
+      end
+    end
+  end
+end

data/lib/dutiful/storage.rb

@@ -34,17 +34,25 @@ class Dutiful::Storage
     end
   end
 
+  def backup(file)
+    Rsync.run file.full_path.shellescape, file.backup_path.shellescape, '--recursive'
+  end
+
+  def restore(file)
+    Rsync.run file.backup_path.shellescape, file.full_path.shellescape, '--recursive'
+  end
+
   def sync(file)
     create_dir file
 
     if file.exist?
       if file.has_backup? && file.backup_timestamp > file.timestamp
-        Rsync.run file.backup_path.shellescape, file.full_path.shellescape, '--recursive'
+        restore file
       else
-        Rsync.run file.full_path.shellescape, file.backup_path.shellescape, '--recursive'
+        backup file
       end
     else
-      Rsync.run file.backup_path.shellescape, file.full_path.shellescape, '--recursive'
+      restore file
     end
   end
 

data/lib/dutiful/version.rb

@@ -1,3 +1,3 @@
 module Dutiful
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dutiful
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Bruno Pinto
@@ -125,8 +125,10 @@ files:
 - lib/dutiful/application.rb
 - lib/dutiful/application_file.rb
 - lib/dutiful/commands.rb
+- lib/dutiful/commands/backup.rb
 - lib/dutiful/commands/list.rb
 - lib/dutiful/commands/main.rb
+- lib/dutiful/commands/restore.rb
 - lib/dutiful/commands/sync.rb
 - lib/dutiful/config.rb
 - lib/dutiful/storage.rb
@@ -154,5 +156,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: dutiful-0.0.7
+summary: dutiful-0.0.8
 test_files: []