dutiful 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c142c67f340f829180610527d671d12f3d94caca
-  data.tar.gz: c4dfcb8159c02cb28d97a61a5b78df61ab81c35b
+  metadata.gz: 7c4ff77357fdd7e791b53d6f82c7cbef2940a2f1
+  data.tar.gz: 2d3bcf04350bb48e0f41f8ad04395b54024547bc
 SHA512:
-  metadata.gz: aed637c66c65c152a6b0ce3ce61ba031708dae7a2ea58adf27857d0e7dab2d44f6363ab6133f300fd9a3c806ad6a037051d20e453376f998813fa3c8fa099666
-  data.tar.gz: af82d91d168afa3a261e9618f2678e233af6e5f0b972f19a67c705b4bd75dd9cd460b1fe95b59798d4eee2ad1182c5e9f495e7650aeced89b538fbf16b16ec9a
+  metadata.gz: 80a690af56ded5e3278396feda4da1aa49744012f7169b19089673492a9a8cade27a8a6ee2c757bb5d2e6d17ebd1209671f28ba5942ec67c71f8cb143d05e907
+  data.tar.gz: 3f0234c53031fc8020aa4ed1c43356f830606aec3651b1e23521d2264a8e8f13a01eee3b702d81e7a4bb1c4d0ac070062aea29c277582ba4e4b2d07d9def0bcc

data/db/alfred.toml

@@ -0,0 +1,22 @@
+[application]
+name = 'Alfred'
+
+[[file]]
+path = 'Library/Preferences/com.runningwithcrayons.Alfred-2.plist'
+
+[[file]]
+path = 'Library/Preferences/com.runningwithcrayons.Alfred-Preferences.plist'
+
+[[file]]
+path = 'Library/Application Support/Alfred 2/license.plist'
+
+  [file.condition]
+    command          = 'defaults read-type com.runningwithcrayons.Alfred-Preferences syncfolder 2>&1'
+    expected_output  = 'Type is string'
+
+[[file]]
+path = 'Library/Application Support/Alfred 2/'
+
+  [file.condition]
+    command          = 'defaults read-type com.runningwithcrayons.Alfred-Preferences syncfolder 2>&1'
+    expected_status  = 1

data/db/brew.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'Brew'
 
-[[files]]
+[[file]]
 path = 'Brewfile'

data/db/bundler.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'Bundler'
 
-[[files]]
+[[file]]
 path = '.bundle/config'

data/db/dash.toml

@@ -1,14 +1,14 @@
 [application]
 name = 'Dash'
 
-[[files]]
+[[file]]
 path = 'Library/Application Support/Dash/library.dash'
 
-[[files]]
+[[file]]
 path = 'Library/Application Support/Dash/License/license.dash-license'
 
-[[files]]
+[[file]]
 path = 'Library/Preferences/com.kapeli.dash.plist'
 
-[[files]]
+[[file]]
 path = 'Library/Preferences/com.kapeli.dashdoc.plist'

data/db/dutiful.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'Dutiful'
 
-[[files]]
+[[file]]
 path = '.dutiful/config.toml'

data/db/fish.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'Fish'
 
-[[files]]
+[[file]]
 path = '.config/fish/config.fish'

data/db/git.toml

@@ -1,6 +1,6 @@
 [application]
 name = 'Git'
 
-[[files]]
+[[file]]
 path = '.gitconfig'
 path = '.gitignore'

data/db/iterm2.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'iTerm2'
 
-[[files]]
+[[file]]
 path = 'Library/Preferences/com.googlecode.iterm2.plist'

data/db/oh-my-zsh.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'Oh My Zsh'
 
-[[files]]
+[[file]]
 path = '.oh-my-zsh/'

data/db/popcorn-time.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'Popcorn-Time'
 
-[[files]]
+[[file]]
 path = 'Library/Application Support/Popcorn-Time/data/'

data/db/rubymine.toml

@@ -1,15 +1,15 @@
 [application]
 name = 'RubyMine'
 
-[[files]]
+[[file]]
 path = 'Library/Application Support/RubyMine60'
 
-[[files]]
+[[file]]
 path = 'Library/Preferences/RubyMine60'
 
-[[files]]
+[[file]]
 path = 'Library/Application Support/RubyMine70'
 
-[[files]]
+[[file]]
 path = 'Library/Preferences/RubyMine70'
 

data/db/the_silver_searcher.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'The Silver Seacher'
 
-[[files]]
+[[file]]
 path = '.agignore'

data/db/tmux.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'tmux'
 
-[[files]]
+[[file]]
 path = '.tmux.conf'

data/db/tmuxline.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'tmuxline.vim'
 
-[[files]]
+[[file]]
 path = '.tmuxline'

data/db/vim.toml

@@ -1,8 +1,8 @@
 [application]
 name = 'Vim'
 
-[[files]]
+[[file]]
 path = '.vimrc'
 
-[[files]]
+[[file]]
 path = '.gvimrc'

data/db/z.toml

@@ -1,5 +1,5 @@
 [application]
 name = 'z'
 
-[[files]]
+[[file]]
 path = '.z'

data/db/zsh.toml

@@ -1,17 +1,17 @@
 [application]
 name = 'Zsh'
 
-[[files]]
+[[file]]
 path = '.zshenv'
 
-[[files]]
+[[file]]
 path = '.zprofile'
 
-[[files]]
+[[file]]
 path = '.zshrc'
 
-[[files]]
+[[file]]
 path = '.zlogin'
 
-[[files]]
+[[file]]
 path = '.zlogout'

data/lib/dutiful/application.rb

@@ -8,7 +8,7 @@ class Dutiful::Application
   end
 
   def files
-    content[:files].map { |file| Dutiful::ApplicationFile.new file[:path] }
+    content[:file].map { |file| Dutiful::ApplicationFile.new file[:path], file[:condition] }
   end
 
   def exist?
@@ -21,7 +21,7 @@ class Dutiful::Application
 
   def sync
     files.each do |file|
-      if file.exist? || file.has_backup?
+      if file.should_sync?
         result = Dutiful::Config.storage.sync(file)
         yield file, result if block_given?
       else
@@ -30,6 +30,10 @@ class Dutiful::Application
     end
   end
 
+  def should_sync?
+    exist? || has_backup?
+  end
+
   def synced?
     files.all? &:synced?
   end

data/lib/dutiful/application_file.rb

@@ -1,8 +1,11 @@
 class Dutiful::ApplicationFile
   attr_reader :full_path, :path
 
-  def initialize(path)
-    @path      = path
+  def initialize(path, condition)
+    @command         = condition[:command] if condition
+    @expected_output = condition[:expected_output] if condition
+    @expected_status = condition[:expected_status] if condition
+    @path            = path
 
     if directory?
       @full_path = "#{File.expand_path "~/#{path}"}/"
@@ -23,6 +26,20 @@ class Dutiful::ApplicationFile
     File.mtime full_path if exist?
   end
 
+  def meets_conditions?
+    if has_condition?
+      output = `#{@command}`
+
+      if @expected_status
+        $?.exitstatus == @expected_status
+      else
+        $?.success? && output.strip == @expected_output
+      end
+    else
+      true
+    end
+  end
+
   def directory?
     path.chars.last == '/'
   end
@@ -35,11 +52,21 @@ class Dutiful::ApplicationFile
     Dutiful::Config.storage.exist? self
   end
 
+  def has_condition?
+    @command
+  end
+
+  def should_sync?
+    (exist? || has_backup?) && meets_conditions?
+  end
+
   def synced?
     has_backup? && Dutiful::Config.storage.synced?(self)
   end
 
   def to_s
+    return "#{path} does not meet conditions (skipping)".yellow unless meets_conditions?
+
     if exist?
       if has_backup?
         if synced?

data/lib/dutiful/commands/list.rb

@@ -5,10 +5,10 @@ class Dutiful::Command::List < Clamp::Command
     puts "Storage: #{Dutiful::Config.storage.name}\n\n"
 
     Dutiful::Application.each do |application|
-      puts "#{application.name}:\n" if application.exist? || application.has_backup? || verbose?
+      puts "#{application.name}:\n" if application.should_sync? || verbose?
 
       application.files.map do |file|
-        puts "  #{file}" if file.exist? || file.has_backup? || verbose?
+        puts "  #{file}" if (file.should_sync?) || verbose?
       end.compact.join("\n")
     end
   end

data/lib/dutiful/commands/sync.rb

@@ -5,7 +5,7 @@ class Dutiful::Command::Sync < Clamp::Command
     puts "Storage: #{Dutiful::Config.storage.name}\n\n"
 
     Dutiful::Application.each do |application|
-      puts "#{application.name}:\n" if application.exist? || application.has_backup? || verbose?
+      puts "#{application.name}:\n" if application.should_sync? || verbose?
 
       application.sync do |file, result|
         if result
@@ -15,7 +15,7 @@ class Dutiful::Command::Sync < Clamp::Command
             puts "  #{file.path} ✖ - #{result.error}".red
           end
         elsif verbose?
-          puts "  #{file.path} does not exist (skipping)".yellow
+          puts "  #{file}"
         end
       end
     end

data/lib/dutiful/storage.rb

@@ -19,7 +19,7 @@ class Dutiful::Storage
 
   def create_dir(file)
     FileUtils.mkdir_p File.dirname "#{path}/#{file.path}"
-    FileUtils.mkdir_p "/Users/bpinto/Dropbox/dutiful/Library/Application\ Support/Dash"
+    FileUtils.mkdir_p File.dirname "#{file.full_path}"
   end
 
   def exist?(file)
@@ -54,7 +54,9 @@ class Dutiful::Storage
         filename = File.basename(file_path)
         file_backup_path = path "#{file.path}#{filename}"
 
-        FileUtils.identical? file_path, file_backup_path
+        File.exist?(file_path) &&
+          File.exist?(file_backup_path) &&
+          FileUtils.identical?(file_path, file_backup_path)
       end
     else
       FileUtils.identical? file.full_path, "#{path}/#{file.path}"

data/lib/dutiful/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dutiful
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Bruno Pinto
@@ -104,6 +104,7 @@ files:
 - bin/dutiful
 - config/dropbox.toml
 - config/icloud.toml
+- db/alfred.toml
 - db/brew.toml
 - db/bundler.toml
 - db/dash.toml
@@ -153,5 +154,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: dutiful-0.0.6
+summary: dutiful-0.0.7
 test_files: []