dutiful 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6e4c29b27d8c3ae5615ff691a712b33210694a7
-  data.tar.gz: e8dcdd5062a88e517f0e336af7e6ff99b0413930
+  metadata.gz: c8a2e348ad20c4d7f7f6c8020c335d26f307fcbb
+  data.tar.gz: 40ec00a948a65351aeaa8c0a79282f4e6f5bd2a0
 SHA512:
-  metadata.gz: e9d9245efc419702a02ae9fdce52efebca255fa0412cd73292c925dbf56bd86a3330bfa7e68d0e8bd7253e20ae5bbc22a2c77512178f338e06bf937416b9e053
-  data.tar.gz: 4515e4eaff2eaaf3654e9026256355c92ff2830b59c5cd941e0c20616ddd44400f2e8d5fe0a45a1ed5ef82417a6275af66bbd65e8a78ab843f119291619b7f43
+  metadata.gz: a83c9c088f34fa2e491f7a36398ee11336e0b9dc36a2d440aa251efe077f6a716c8d39902beb508016b87f81bf7054f7ebcfd8ba34253b2ecb5e4fe1f7bc6c11
+  data.tar.gz: 6496d9a4531a3eefe2099f4c91e8bc76efc3385e2fb46f44d25f571d4a9042888320488e751f68c6e0353148c1562eba0281a8764de5639ce50ed9b57aff8460

data/bin/dutiful

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'dutiful'
-require 'dutiful/command'
+require 'dutiful/commands'
 require 'dutiful/version'
 
-Dutiful::Command.run
+Dutiful::Command::Main.run

data/config/dropbox.toml

@@ -0,0 +1,3 @@
+[storage]
+name = 'Dropbox'
+path = '~/Dropbox'

data/config/icloud.toml

@@ -0,0 +1,3 @@
+[storage]
+name = 'iCloud'
+path = '~/Library/Mobile Documents'

data/db/bundler.toml

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

data/db/dutiful.toml

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

data/db/fish.toml

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

data/db/git.toml

@@ -0,0 +1,5 @@
+[application]
+name = 'Git'
+
+[[files]]
+path = '.gitconfig'

data/db/iterm2.toml

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

data/db/tmux.toml

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

data/db/vim.toml

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

data/lib/dutiful/application.rb

@@ -1,69 +1,54 @@
-module Dutiful
-  class Application
-    def initialize(path)
-      @path = path
-    end
+class Dutiful::Application
+  def initialize(path)
+    @path = path
+  end
 
-    def name
-      content[:application][:name]
-    end
+  def name
+    content[:application][:name]
+  end
 
-    def files
-      content[:files].map { |file| File.new file[:path] }
-    end
+  def files
+    content[:files].map { |file| Dutiful::ApplicationFile.new file[:path] }
+  end
 
-    def exist?
-      files.any? &:exist?
-    end
+  def exist?
+    files.any? &:exist?
+  end
 
-    def sync
-      files.each do |file|
-        if file.exist?
-          result = Dutiful::Config.storage.sync(file) if file.exist?
-          yield file, result
-        else
-          yield file
-        end
+  def sync
+    files.each do |file|
+      if file.exist? || file.has_backup?
+        result = Dutiful::Config.storage.sync(file)
+        yield file, result if block_given?
+      else
+        yield file if block_given?
       end
     end
+  end
 
-    def to_s
-      output = "#{name}:\n"
-
-      files.each_with_index do |file, index|
-        next unless file.exist?
-
-        if file.synced?
-          output << "  #{file.path} ✔".green
-        else
-          output << "  #{file.path} (pending)".yellow
-        end
-
-        output << "\n" if index < files.count
-      end
+  def to_s
+    output = "#{name}:\n"
 
-      output
-    end
-
-    def self.all
-      Dir.foreach('db').map do |filename|
-        next if filename == '.' or filename == '..'
+    output << files.map do |file|
+      "  #{file}" if file.exist? || file.has_backup?
+    end.compact.join("\n")
+  end
 
-        application = Dutiful::Application.new "db/#{filename}"
-        application if application.exist?
-      end.compact
-    end
+  def self.all
+    Dir["#{Dutiful.dir}/db/*.toml"].map do |filename|
+      Dutiful::Application.new filename
+    end.compact
+  end
 
-    def self.each
-      return enum_for(:each) unless block_given?
+  def self.each
+    return enum_for(:each) unless block_given?
 
-      all.each { |application| yield application }
-    end
+    all.each { |application| yield application }
+  end
 
-    private
+  private
 
-    def content
-      @content ||= Tomlrb.load_file(@path, symbolize_keys: true)
-    end
+  def content
+    @content ||= Tomlrb.load_file(@path, symbolize_keys: true)
   end
 end

data/lib/dutiful/application_file.rb

@@ -0,0 +1,46 @@
+class Dutiful::ApplicationFile
+  attr_reader :full_path, :path
+
+  def initialize(path)
+    @path      = path
+    @full_path = File.expand_path "~/#{path}"
+  end
+
+  def backup_path
+    Dutiful::Config.storage.path path
+  end
+
+  def backup_timestamp
+    File.mtime backup_path if has_backup?
+  end
+
+  def timestamp
+    File.mtime full_path if exist?
+  end
+
+  def exist?
+    File.exist? full_path
+  end
+
+  def has_backup?
+    Dutiful::Config.storage.exist? self
+  end
+
+  def synced?
+    has_backup? && Dutiful::Config.storage.synced?(self)
+  end
+
+  def to_s
+    if exist?
+      return "#{path} ✔".green if synced?
+
+      if has_backup?
+        return "#{path} (modified)".yellow
+      else
+        return "#{path} (pending backup)".yellow
+      end
+    end
+
+    "#{path} (pending restore)".yellow if has_backup?
+  end
+end

data/lib/dutiful/commands/list.rb

@@ -0,0 +1,7 @@
+class Dutiful::Command::List < Clamp::Command
+  def execute
+    puts "Storage: #{Dutiful::Config.storage.name}\n\n"
+
+    puts Dutiful::Application.all
+  end
+end

data/lib/dutiful/commands/main.rb

@@ -0,0 +1,21 @@
+class Dutiful::Command::Main < Clamp::Command
+  option ['-v', '--version'], :flag, 'Show version' do
+    puts "dutiful #{Dutiful::VERSION}"
+    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
+end

data/lib/dutiful/commands/sync.rb

@@ -0,0 +1,23 @@
+class Dutiful::Command::Sync < 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"
+
+      application.sync do |file, result|
+        if result
+          if result.success?
+            puts "  #{file.path} ✔".green
+          else
+            puts "  #{file.path} ✖ - #{result.error}".red
+          end
+        else
+          puts "  #{file.path} does not exist (skipping)".yellow if verbose?
+        end
+      end
+    end
+  end
+end

data/lib/dutiful/commands.rb

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

data/lib/dutiful/config.rb

@@ -1,5 +1,5 @@
 class Dutiful::Config
-  PATH = ::File.expand_path '~/.dutiful/config.toml'
+  PATH = File.expand_path '~/.dutiful/config.toml'
 
   def self.storage
     @storage ||= if content[:storage]
@@ -15,6 +15,6 @@ class Dutiful::Config
   private
 
   def self.content
-    @content ||= Tomlrb.load_file(PATH, symbolize_keys: true) || {}
+    @content ||= Tomlrb.load_file(PATH, symbolize_keys: true) rescue {}
   end
 end

data/lib/dutiful/storage.rb

@@ -2,59 +2,60 @@ require 'fileutils'
 require 'shellwords'
 
 class Dutiful::Storage
-  attr_reader :content, :full_path, :path
+  attr_reader :name, :storage_path
 
   def initialize(name: nil, path: nil)
     name ||= 'Custom folder'
-    path ||= Tomlrb.load_file("config/#{name.downcase}.toml", symbolize_keys: true)[:storage][:path]
+    path ||= Tomlrb.load_file("#{Dutiful.dir}/config/#{name.downcase}.toml", symbolize_keys: true)[:storage][:path]
 
-    @content = {
-      name: name,
-      path: path
-    }
+    @name         = name
+    @storage_path = File.expand_path path
+    @path         = "#{@storage_path}/dutiful"
   end
 
   def available?
-    ::File.exist? path
+    File.exist? storage_path
   end
 
   def create_dir(file)
-    file_directory_path = ::File.dirname "#{dutiful_path}/#{file.path}"
-    `mkdir -p #{file_directory_path.shellescape}`
-  end
-
-  def dutiful_path
-    "#{path}/dutiful"
+    FileUtils.mkdir_p File.dirname "#{path}/#{file.path}".shellescape
   end
 
   def exist?(file)
-    ::File.exist? "#{dutiful_path}/#{file.path}"
+    File.exist? "#{path}/#{file.path}"
   end
 
-  def name
-    content[:name]
-  end
-
-  def path
-    @path ||= ::File.expand_path content[:path]
+  def path(path = nil)
+    if path
+      "#{@path}/#{path}"
+    else
+      @path
+    end
   end
 
   def sync(file)
     create_dir file
-    Rsync.run file.full_path.shellescape, "#{dutiful_path}/#{file.path}".shellescape
+
+    if file.exist?
+      if file.has_backup? && file.backup_timestamp > file.timestamp
+        Rsync.run file.backup_path.shellescape, file.full_path.shellescape
+      else
+        Rsync.run file.full_path.shellescape, file.backup_path.shellescape
+      end
+    else
+      Rsync.run file.backup_path.shellescape, file.full_path.shellescape
+    end
   end
 
   def synced?(file)
-    FileUtils.identical? file.full_path, "#{dutiful_path}/#{file.path}"
+    FileUtils.identical? file.full_path, "#{path}/#{file.path}"
   end
 
   private
 
   def self.all
-    Dir.foreach('config').map do |filename|
-      next if filename == '.' or filename == '..'
-
-      data = Tomlrb.load_file("config/#{filename}", symbolize_keys: true)[:storage]
+    Dir["#{Dutiful.dir}/config/*.toml"].map do |filename|
+      data = Tomlrb.load_file(filename, symbolize_keys: true)[:storage]
       Dutiful::Storage.new name: data[:name], path: data[:path]
     end.compact
   end

data/lib/dutiful/version.rb

@@ -1,3 +1,3 @@
 module Dutiful
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/dutiful.rb

@@ -1,7 +1,13 @@
+module Dutiful
+  def self.dir
+    File.dirname(__dir__)
+  end
+end
+
 require 'dutiful/application'
-require 'dutiful/command'
+require 'dutiful/application_file'
+require 'dutiful/commands'
 require 'dutiful/config'
-require 'dutiful/file'
 require 'dutiful/storage'
 require 'colorize'
 require 'rsync'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dutiful
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bruno Pinto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: Dotfiles manager
 email: brunoferreirapinto@gmail.com
 executables:
@@ -74,11 +102,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/dutiful
+- config/dropbox.toml
+- config/icloud.toml
+- db/bundler.toml
+- db/dutiful.toml
+- db/fish.toml
+- db/git.toml
+- db/iterm2.toml
+- db/tmux.toml
+- db/vim.toml
 - lib/dutiful.rb
 - lib/dutiful/application.rb
-- lib/dutiful/command.rb
+- lib/dutiful/application_file.rb
+- lib/dutiful/commands.rb
+- lib/dutiful/commands/list.rb
+- lib/dutiful/commands/main.rb
+- lib/dutiful/commands/sync.rb
 - lib/dutiful/config.rb
-- lib/dutiful/file.rb
 - lib/dutiful/storage.rb
 - lib/dutiful/version.rb
 homepage: http://github.com/bpinto/dutiful
@@ -104,5 +144,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: dutiful-0.0.2
+summary: dutiful-0.0.3
 test_files: []

data/lib/dutiful/command.rb

@@ -1,52 +0,0 @@
-require 'clamp'
-
-class Dutiful::Command < Clamp::Command
-  option ['-v', '--version'], :flag, 'Show version' do
-    puts "dutiful #{Dutiful::VERSION}"
-    exit 0
-  end
-
-  subcommand 'backup', 'Backup all preference files' do
-    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"
-
-        application.sync do |file, result|
-          if result
-            if result.success?
-              puts "  #{file.path} ✔".green
-            else
-              puts "  #{file.path} ✖ - #{result.error}".red
-            end
-          else
-            puts "  #{file.path} does not exist (skipping)".yellow if verbose?
-          end
-        end
-      end
-    end
-  end
-
-  subcommand 'list', 'List all preference files' do
-    def execute
-      puts "Storage: #{Dutiful::Config.storage.name}\n\n"
-
-      puts Dutiful::Application.all
-    end
-  end
-
-  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
-end

data/lib/dutiful/file.rb

@@ -1,18 +0,0 @@
-module Dutiful
-  class File
-    attr_reader :full_path, :path
-
-    def initialize(path)
-      @path      = path
-      @full_path = ::File.expand_path "~/#{path}"
-    end
-
-    def exist?
-      ::File.exist? @full_path
-    end
-
-    def synced?
-      Dutiful::Config.storage.exist?(self) && Dutiful::Config.storage.synced?(self)
-    end
-  end
-end