dropbox-dotfiles 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e1804afb6e37eb382895a92672a891efeb34349
-  data.tar.gz: fa58ca82d5fb50b73df68e293f1f22048af6bd86
+  metadata.gz: 874bbf7b0fdb10bf64fe8393eaa3743f523df9e9
+  data.tar.gz: 9e05412004f6634370a78674138572c272edd367
 SHA512:
-  metadata.gz: a6d8240e4db55f8faa655fa1f1b3643a47849b206e7a1d9c96949d3200f12613dffaac64a8c359e0e9143d5ef7cfa5b9b278e4360c63ae0796f9cef3368ca526
-  data.tar.gz: 133032e6514eec54f88f2fe0a58c5ad09e529cde1aec7381431ff6e6addb15340fc1f466471b257fff8dcf19bfd3e292513084914c14ea75e493931b60fd6d39
+  metadata.gz: b073508111e25a6b31b974a20d3b7f251ff8608ecd5bc901c986146ccbea36b2d4558b87cda7db984cf522885c5e8085d080d969591301641048565e82cc90ea
+  data.tar.gz: 66f3d2d4c5800e0825c61eebeb7cf6aaf03b106907044562864cb2723df68148936cb13e9f8f09b1f051a11ad002c077b762626a0c4fdfec1ae712d5ae58cde0

data/bin/dropbox-dotfiles

@@ -4,7 +4,7 @@ require 'colorize'
 require 'FileUtils'
 
 def error(message)
-  puts 'ERROR:'.red + ' ' + message
+  puts "#{message}".red
 end
 
 def check_if_dropbox_dir_exist
@@ -16,35 +16,58 @@ def check_if_dropbox_dir_exist
   end
 end
 
+def check_if_dotfiles_dir_exist
+  dotfiles_directory = File.expand_path '~/Dropbox/Dotfiles'
+  unless File.directory? dotfiles_directory
+    error "'#{dotfiles_directory}' doesn't exists or is not a directory!"
+    puts 'Should I create the directory for you? (y/N): '
+    response = gets.chomp.downcase
+    if response == 'y'
+      begin
+        FileUtils.mkdir_p dotfiles_directory
+      rescue Exception => e
+        error e.message
+        exit!
+      end
+    end
+  end
+end
+
 def check_if_configuration_exist(configuration_file)
-  unless File.file? configuration_file
-    error "'#{configuration_file}' doesn't exists or is not a file!"
-    puts 'Is this the first time you launched Dropbox Dotfiles?'
-    print 'Should I create the file with an example configuration? (Y/n): '
+  if File.exist? configuration_file
+    unless File.file? configuration_file
+      error "'#{configuration_file}' is not a file!"
+    end
+  else
+    error "'#{configuration_file}' doesn't exists!"
+    print 'Should I create a new the file with an example configuration? (y/N): '
     response = gets.chomp.downcase
-    if response == '' or response == 'y'
+    if response == 'y'
       create_example_configuration configuration_file
+    else
+      exit!
     end
   end
 end
 
 def create_example_configuration(configuration_file)
-  File.open(configuration_file, 'w') do |f|
-    f.puts <<CONFIGURATION
+  File.open configuration_file, 'w' do |example|
+    example.puts <<CONFIGURATION
 DropboxDotfiles.configuration {
-  # if you want to create a link for a single file use the command file followed by its name
+  # if you want to create a link for a single file use the command 'file' like this:
   # file '.vimrc'
 
-  # if its a directory you want to link use the dir command followed by the name
+  # if its a directory you want to link use the command 'dir' like this:
   # dir '.gem'
 
-  # when you use file and dir Dropbox Dotfiles assume that the file a directory are in your
-  # home. If you want to link something inside a sub directory without creating a link
-  # to the folder itself use the command cd to change the root then use file and dir normally.
-  # cd statement can be nested
-  # cd("Library") {
+  # when you use a 'file' or 'dir' command dropbox-dotfiles assumes that the source
+  # file or directory are in your home. If you want to link something inside a sub
+  # directory without creating a link to the folder itself use the command cd to
+  # change the root then use file and dir normally.
+  # cd statements can be nested
+  # cd('Library') {
   #   dir 'Fonts'
-  #   cd("Preferences") {
+  #   cd('Preferences') {
   #     file 'com.apple.Terminal.plist'
   #   }
   # }
@@ -55,7 +78,9 @@ rescue Exception => e
   error e.message
   exit!
 else
-  puts 'Ok. File created!'
+  puts 'File created!'.green
+  puts "Now open '#{configuration_file}' in your favourite text editor and edit the configuration."
+  puts "When you're done launch dropbox-dotfiles again."
   exit! 0
 end
 
@@ -70,15 +95,15 @@ class Stats
     @correct_links = 0
   end
 
-  def correct
+  def correct!
     @correct_links += 1
   end
 
-  def error
+  def error!
     @errors += 1
   end
 
-  def created
+  def created!
     @links_created += 1
   end
 end
@@ -100,7 +125,7 @@ class DropboxDotfiles
   end
 
   def DropboxDotfiles.configuration(&block)
-    dropbox = File.expand_path '~/Dropbox'
+    dropbox = File.expand_path '~/Dropbox/Dotfiles'
     home = File.expand_path '~'
 
     dp = DropboxDotfiles.new(dropbox, home, Stats.new)
@@ -109,9 +134,13 @@ class DropboxDotfiles
   end
 
   def report
-    puts "#{@stats.correct_links} link were already present and correct"
-    puts "#{@stats.links_created} new links were created" if @stats.links_created > 0
-    puts "#{@stats.errors} errors" if @stats.errors > 0
+    if @stats.correct_links == 0 and @stats.links_created == 0 and @stats.errors == 0
+      puts "Your configuration file is empty!"
+    else
+      puts "#{@stats.correct_links} link were already present and correct"
+      puts "#{@stats.links_created} new links were created" if @stats.links_created > 0
+      puts "#{@stats.errors} errors" if @stats.errors > 0
+    end
   end
 
   def file(name)
@@ -131,11 +160,16 @@ class DropboxDotfiles
 private
   def create_dir_if_doesnt_exists(dir)
     unless File.directory? dir
-      begin
-        FileUtils.mkdir_p dir
-      rescue Exception => e
-        error "#{e.message}"
+      if File.exist? dir
+        error "'#{dir}' is not a directory!"
         exit!
+      else
+        begin
+          FileUtils.mkdir_p dir
+        rescue Exception => e
+          error "#{e.message}"
+          exit!
+        end
       end
     end
   end
@@ -149,54 +183,85 @@ private
       link = File.readlink home
       if File.send is, home
         if dropbox == link
-          @stats.correct
+          @stats.correct!
         else
           error "'#{home}' points to '#{link}' and not '#{dropbox}'"
-          @stats.error
+          correct_link dropbox, home, is
         end
       else
         error "'#{home}' points to '#{dropbox}' which is not a #{type}"
-        @stats.error
+        correct_link dropbox, home, is
       end
     else
       if File.exist? home
         if File.send is, home
-          print "should I move '#{home}' inside Dropbox and create a link? (N/y): "
-          response = gets.chomp.downcase
-          if response == 'y'
-            FileUtils.move home, dropbox
-            puts "'#{home}' #{type} moved"
-            File.symlink dropbox, home
-            puts "link '#{home}' created"
-            @stats.created
+          if File.exist? dropbox
+            print "Dropbox already contains '#{home}'"
+            print "Do you want to create a backup of '#{home}' and then create the link? (y/N): "
+            response = gets.chomp.downcase
+            if response == 'y'
+              backup = File.join home, '.old'
+              File.move home, backup
+              File.symlink dropbox, home
+            else
+              puts "'#{home}' not touched. remember to correct the conflict manually!"
+              @stats.error!
+            end
           else
-            puts "'#{home}' ignored"
+            print "Should I move '#{home}' inside Dropbox and create a link? (y/N): "
+            response = gets.chomp.downcase
+            if response == 'y'
+              FileUtils.move home, dropbox
+              File.symlink dropbox, home
+              puts "link '#{home}' created"
+              @stats.created!
+            else
+              puts "'#{home}' ignored"
+            end
           end
         else
           error "'#{home}' is not a #{type}"
-          @stats.error
+          @stats.error!
         end
       else
-        if File.exits? dropbox
+        if File.exists? dropbox
           if File.send is, dropbox
             File.symlink dropbox, home
             puts "link '#{home}' created"
-            @stats.created
+            @stats.created!
           else
             error "'#{dropbox}' is not a #{type}"
-            @stats.error
+            @stats.error!
           end
         else
           error "'#{dropbox}' doesnt exists!"
-          @stats.error
+          @stats.error!
         end
       end
     end
   end
+
+  def correct_link(dropbox, home, is)
+    if File.exist? dropbox and File.send is, dropbox
+      puts 'Do you want to create a backup of the link and then correct it? (y/N): '
+      response = gets.chomp.downcase
+      if response == 'y'
+        backup = File.join home, '.old'
+        File.move home, backup
+        File.symlink dropbox, home
+      else
+        puts 'link not corrected'
+        @stats.error!
+      end
+    else
+      @stats.error!
+    end
+  end
 end
 
-configuration_file = File.expand_path '~/Dropbox/.dropbox-dotfiles.cfg'
+configuration_file = File.expand_path '~/Dropbox/Dotfiles/.configuration'
 
 check_if_dropbox_dir_exist
+check_if_dotfiles_dir_exist
 check_if_configuration_exist configuration_file
 load configuration_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropbox-dotfiles
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mirco Macrelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -30,8 +30,10 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
-description: This gem can be used to sync a dotfiles with Dropbox
-email: mmacrelli@gmail.com
+description: This gem provides a binary called dropbox-dotfiles that can be used to
+  synchronize your dotfiles with Dropbox. Which files or folders are synched must
+  be defined in an easy to edit configuration file.
+email: mail@mircomacrelli.net
 executables:
 - dropbox-dotfiles
 extensions: []
@@ -61,5 +63,5 @@ rubyforge_project:
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: Dotfiles synch with Dropbox
+summary: Easy dotfiles's synchronization via Dropbox
 test_files: []