dotfu 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed0e8ea77f9d7aee9b7cee356605c2cccade658
-  data.tar.gz: 78416629973e69872bfe0f60a055b9619ef17a90
+  metadata.gz: 3be9876e7c3827258b2d2fbf1efd68a6963df450
+  data.tar.gz: 948c87f6da4ea64b88ee514543cecf3fa80cbe12
 SHA512:
-  metadata.gz: cabfbe695f9754bb16a36c93e1a7cc5a082455c03490ae3d2878712bf90a9f7e72fe25b3fde609620cea3a5172fdf3d5252533da68eb5940e13dd8d198b1e8ef
-  data.tar.gz: 9078d91a95e8dc1b011a7541225292d49e429fe961a9edbec80bd66e4d661df0d42726a5586f39dadc35bd416d4427698062ef1fd3644d329612ee8a648035c4
+  metadata.gz: 416127a74da102f1c562a98ed28315d1b23ffce0eede1f8dcfb621e85e1d6c9de62dcc389f17877c5e84a7c053c4a24227cbe0b86434ef03931468f098268589
+  data.tar.gz: 0c963d190761c0f9e64ad9789b89960b4bcce6047e1c7c15c7b36e34bf4fe692d9f99f8253ea3a2822f492778a6e9aad5cce026ffe97a2a5e0cb85e20a9962cc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.2.0
+* Backups!  sooner then expected.
+* Will now only make dot files in the home dir.
+* updating actually works now, though needs to be refactored.
+
 # 0.1.1
 * Switched from calling git myself to using the one on rubygems.  Has issues, but less.
 * Fixed branch logic.

data/lib/dotfu/repos.rb

@@ -6,6 +6,7 @@ module Dotfu
     attr_accessor :config_file
     attr_accessor :working_dir
     attr_accessor :target_dir
+    attr_accessor :backup_dir
 
     # r can be either a repo, or a user:repo pair.
     def initialize(arg = nil)
@@ -14,13 +15,12 @@ module Dotfu
     end
 
     ### Specialized attribute methods
-    def config_file
-      return @config_file ? @config_file : "dotfu.json"
+    def backup_dir
+      return @backup_dir ? @backup_dir : "#{Bini.data_dir}/backups/#{repo}"
     end
 
-    # prepend repo with dotfiles- if it doesn't exist as it is set.
-    def repo=(word)
-      return @repo = word.start_with?('dotfiles-') ? word : "dotfiles-#{word}"
+    def config_file
+      return @config_file ? @config_file : "dotfu.json"
     end
 
     # target_dir should always return something.
@@ -28,9 +28,9 @@ module Dotfu
       return @target_dir ? @target_dir : Dir.home
     end
 
-    # return user or the user in the config file.
-    def user
-      return @user ? @user : Dotfu.config_user
+    # prepend repo with dotfiles- if it doesn't exist as it is set.
+    def repo=(word)
+      return @repo = word.start_with?('dotfiles-') ? word : "dotfiles-#{word}"
     end
 
     # return the explicit directory this repo is cloned into.
@@ -39,7 +39,35 @@ module Dotfu
       return "#{Bini.data_dir}/repos/#{user}/#{repo}"
     end
 
+    # return user or the user in the config file.
+    def user
+      return @user ? @user : Dotfu.config_user
+    end
+
     ### Work methods
+    def backup
+      return nil if installed?
+      files = existing_files false
+
+      if files.any?
+        FileUtils.mkdir_p backup_dir
+
+        files.each do |target_file|
+          working_file = target_file.split("#{target_dir}/").last
+          next if is_my_file? target_file
+
+          begin
+            FileUtils.mv target_file, "#{backup_dir}/#{working_file}"
+          rescue Exception => e
+            puts e
+            exit
+            #puts raise RuntimeError.new "File move failed for: #{working_file} to #{backup_dir}/#{working_file} failed: #{e}"
+          end
+        end
+      end
+
+      return true
+    end
 
     # initial clone
     def clone
@@ -64,13 +92,12 @@ module Dotfu
       r = Git.init working_dir
 
       result = r.checkout(@branch ? branch : "master")
-
       raise RuntimeError.new result unless result
 
-      # lets check if we have anything in the way, and abort instead of partially
-      # installing
-      existing_files = target_files.select {|f| File.exist? f}
-      raise NotImplementedError.new "File(s) exist: #{existing_files}" if existing_files.any?
+      # Backup!
+      if existing_files(false)
+        puts "wtf, backup failed" unless backup
+      end
 
       # And now that we are ok with everything, lets make some fucking files.
       # TODO: add deep linking (mkdir + ln_s for each target) or shallow (just the first directory)
@@ -83,17 +110,31 @@ module Dotfu
     def pull
       return nil if !repo || !user
       r = Git.init working_dir
-      #TODO: I'm confident that the implicit decleration of first here is going
-      # to muck something up for someone.  Find a way to do this explicitly.
+      r.fetch
+      #TODO: I'm confident that the implicit decleration of first here is going to muck something up for someone.  Find a way to do this explicitly.
       return r.remote.merge
     end
 
+    # Restore files (as neccessary)
+    def restore
+      files = Dir.glob("#{backup_dir}/**/*")
+
+      raise "Files in the way" if existing_files
+
+      return true if files.empty?
+
+      files.each do |f|
+        FileUtils.mv f, target_dir
+      end
+
+      return true
+    end
+
     def uninstall
       raise RuntimeError.new "Not installed." unless installed?
 
-      # ok we are not installed, lets clear the links.  Later, this will restore
-      # the backups (or something similiar).
       target_files.each {|f| FileUtils.rm f}
+      restore
       return true
     end
 
@@ -124,11 +165,12 @@ module Dotfu
       return true
     end
 
-    # Return true if this file was installed from our repo.
+    # Return true if this file is linked to this repo.
     def is_my_file?(file)
       return true if File.exist?(file) && File.symlink?(file) && File.readlink(file).start_with?(working_dir)
       return false
     end
+
     # return an [Array] of base filenames.
     def files
       if !@files
@@ -139,10 +181,26 @@ module Dotfu
       return @files
     end
 
+    # return an array of existing files in the way.
+    # Accepts a [Boolean] as the only argument, true to return files we linked (default),
+    # false if we want just the files that are in the way.
+    def existing_files(my_files = true)
+      # I can do this in a convoluted set of if checks, of a couple readable selects.
+      output = target_files.select { |f| File.exist? f }
+      output.delete_if { |f| my_files && is_my_file?(f)}
+
+      return output
+    end
+
     # Return the target file.
     # Takes a [String] (explicit conversion) or [Array] for index lookup.
-    def target_file(file)
-      "#{target_dir}/.#{file_string(file)}"
+    # dot_home is a [Boolean] that will dot the target dir if it is the home
+    # dir only.
+    def target_file(file, dot_home = true)
+      output = "#{target_dir}/"
+      output += "." if dot_home && target_dir == Dir.home
+      output += file_string(file)
+      return output
     end
 
     # Return an [Array] of target files.
@@ -161,7 +219,6 @@ module Dotfu
       files.map {|f| working_file f}
     end
 
-
     private
     # So our input is now username@repo:branch
     # Repo is the only one required.
@@ -181,7 +238,7 @@ module Dotfu
       return nil unless config_file?
 
       content = Yajl.load open("#{working_dir}/#{config_file}")
-      @target_dir = content["target_directory"] if content["target_directory"]
+      @target_dir = content["target_directory"].chomp("/") if content["target_directory"]
     end
 
     # Accepts a string or fixnum.  Returns either the string or the files[fixnum]
@@ -191,3 +248,4 @@ module Dotfu
     end
   end
 end
+

data/lib/dotfu/version.rb

@@ -1,3 +1,3 @@
 module Dotfu
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotfu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bini
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: More to come . . .