dropbox-dotfiles 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6165496469dee4cea42d571896e056ab06ecbf8
-  data.tar.gz: dc4987a1e8389bf926e2783bbb9289f1056d8b53
+  metadata.gz: 28bb1f871fa6772cf29c21ee1983e380c0aac32e
+  data.tar.gz: 6e63284bb0ebf3b823952c4313d12bf0454d0933
 SHA512:
-  metadata.gz: bd8e286bf612d02019995ba5a8662e66fd5452166b2226c77e513124f6b3314f18825ab566b6e709c78653f062d31160a1a9b2fda0e6d4d9fd2d029fa332f901
-  data.tar.gz: 0bb930fdda7ad057021ad12b7b48e9e5ab7e19f34c1a3dffd97b08df8ef2a20345286ca7af677c93a9c97dec743f4c50e1ba08bbff139ec08b6c5e24d9d1a670
+  metadata.gz: af6be4bea823e34ad23b9c3f3ae5ecb4bc0de74e2e5e7666f04a8997253946f5463845682e3090735f75d17e593b7075c8c911cbc840003794f99a3e172a3de2
+  data.tar.gz: 11a605bcadbe0a3d493a6740eea4f5f8796420f25a3d8f54da905c6d5728be77734981c63aadfa20262b4e3d24108de54a86f7418d3e3c0aaeeef983a1c97585

data/bin/dropbox-dotfiles

@@ -7,24 +7,57 @@ def error(message)
   puts "#{message}".red
 end
 
+def get_dropbox_dir_from_dotfile
+  dotfile = File.expand_path '~/.dropbox-dotfiles'
+
+  if File.exists? dotfile
+    File.read dotfile
+  end
+end
+
+def get_dropbox_dir_from_args
+  if ARGV.size == 1
+    ARGV[0]
+  end
+end
+
+def get_dropbox_directory
+  directory = '~/Dropbox'
+
+  from_dotfile = get_dropbox_dir_from_dotfile
+  if from_dotfile.to_s != ''
+    directory = from_dotfile
+  end
+
+  from_args = get_dropbox_dir_from_args
+  if from_args.to_s != ''
+    directory = from_args
+
+    File.open(File.expand_path('~/.dropbox-dotfiles'), 'w+') do |f|
+      f.write(from_args)
+    end
+  end
+
+  File.expand_path directory
+end
+
 def check_if_dropbox_dir_exist
-  dropbox_directory = File.expand_path '~/Dropbox'
+  dropbox_directory = File.expand_path $my_dropbox_directory
   unless File.directory? dropbox_directory
     error "'#{dropbox_directory}' doesn't exists or is not a directory!"
-    puts 'This program expect to find your Dropbox directory in your home\'s root.'
     exit!
   end
 end
 
 def check_if_dotfiles_dir_exist
-  dotfiles_directory = File.expand_path '~/Dropbox/Dotfiles'
+  dotfiles_directory = File.expand_path File.join $my_dropbox_directory, '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
+    print 'Should I create the directory for you? (y/N): '
+    response = STDIN.gets.chomp.downcase
     if response == 'y'
       begin
-        FileUtils.mkdir_p dotfiles_directory
+        Dir.mkdir dotfiles_directory
       rescue Exception => e
         error e.message
         exit!
@@ -34,14 +67,14 @@ def check_if_dotfiles_dir_exist
 end
 
 def check_if_configuration_exist(configuration_file)
-  if File.exist? configuration_file
+  if File.exists? 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
+    response = STDIN.gets.chomp.downcase
     if response == 'y'
       create_example_configuration configuration_file
     else
@@ -80,7 +113,7 @@ rescue Exception => e
 else
   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."
+  puts 'When you\'re done launch dropbox-dotfiles again.'
   exit! 0
 end
 
@@ -125,7 +158,7 @@ class DropboxDotfiles
   end
 
   def DropboxDotfiles.configuration(&block)
-    dropbox = File.expand_path '~/Dropbox/Dotfiles'
+    dropbox = File.expand_path File.join $my_dropbox_directory, 'Dotfiles'
     home = File.expand_path '~'
 
     dp = DropboxDotfiles.new(dropbox, home, Stats.new)
@@ -135,7 +168,7 @@ class DropboxDotfiles
 
   def report
     if @stats.correct_links == 0 and @stats.links_created == 0 and @stats.errors == 0
-      puts "Your configuration file is empty!"
+      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
@@ -160,12 +193,12 @@ class DropboxDotfiles
 private
   def create_dir_if_doesnt_exists(dir)
     unless File.directory? dir
-      if File.exist? dir
+      if File.exists? dir
         error "'#{dir}' is not a directory!"
         exit!
       else
         begin
-          FileUtils.mkdir_p dir
+          Dir.mkdir dir
         rescue Exception => e
           error "#{e.message}"
           exit!
@@ -193,12 +226,12 @@ private
         correct_link dropbox, home, is
       end
     else
-      if File.exist? home
+      if File.exists? home
         if File.send is, home
-          if File.exist? dropbox
+          if File.exists? 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
+            response = STDIN.gets.chomp.downcase
             if response == 'y'
               backup = home + '.old'
               FileUtils.move home, backup
@@ -209,7 +242,7 @@ private
             end
           else
             print "Should I move '#{home}' inside Dropbox and create a link? (y/N): "
-            response = gets.chomp.downcase
+            response = STDIN.gets.chomp.downcase
             if response == 'y'
               FileUtils.move home, dropbox
               File.symlink dropbox, home
@@ -242,9 +275,9 @@ private
   end
 
   def correct_link(dropbox, home, is)
-    if File.exist? dropbox and File.send is, dropbox
+    if File.exists? 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
+      response = STDIN.gets.chomp.downcase
       if response == 'y'
         backup = File.join home, '.old'
         File.move home, backup
@@ -259,7 +292,9 @@ private
   end
 end
 
-configuration_file = File.expand_path '~/Dropbox/Dotfiles/.configuration'
+$my_dropbox_directory = get_dropbox_directory
+puts "using '#{$my_dropbox_directory}' as the Dropbox directory"
+configuration_file = File.join $my_dropbox_directory, 'Dotfiles/.configuration'
 
 check_if_dropbox_dir_exist
 check_if_dotfiles_dir_exist

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropbox-dotfiles
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Mirco Macrelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Easy dotfiles's synchronization via Dropbox