dotfile_linker 1.0.0 → 1.0.2

data/README.md

@@ -18,8 +18,14 @@ This gem is hosted on [rubygems.org](https://rubygems.org/gems/dotfile_linker),
 ## Usage
 
 Run `dotfile_linker` from your dotfiles directory. The script will then run through each file that isn't already
-symlinked in your home directory and ask if you want to symlink it. The `-d` option cycles through existing symlinks in
-your home directory and asks if you'd like to remove them.
+symlinked in your home directory and ask if you want to symlink it. The `-u` option unlinks and restores files to your
+home directory.
+
+![Link example](http://i.imgur.com/k4O1z.jpg)
+
+
+
+![Unlink example](http://i.imgur.com/7JUY9.png)
 
 ## Contributing
 

data/lib/dotfile_linker/version.rb

@@ -1,3 +1,3 @@
 module DotfileLinker
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/lib/dotfile_linker.rb

@@ -19,6 +19,20 @@ module DotfileLinker
       @options = {}
     end
 
+    def parse_options
+      optparse = OptionParser.new do |opts|
+        opts.on('-p', '--path PATH', 'Use [PATH] as dotfiles directory (instead of current directory)') { |path| @options[:path] = File.expand_path(path) }
+        opts.on_tail('-u', '--unlink', 'Unlink mode') { @options[:unlink_mode] = true }
+        opts.on_tail('-v', '--version', 'Show version') { puts VERSION; exit }
+        opts.on_tail('-h', '--help', 'Show this message') { puts opts; exit }
+      end
+      optparse.parse!
+    end
+
+      def each_dotfile(dirname)
+        Dir.foreach(dirname) { |filename| yield filename if filename =~ /^\./ }
+      end
+
     def dotfiles_dir
       @options[:path] || Dir.pwd
     end
@@ -33,12 +47,12 @@ module DotfileLinker
 
     def raise_if_home_and_dotfiles_dir_match
       if File.expand_path(home_dir) == File.expand_path(dotfiles_dir)
-        raise InvalidDotfilesDir, "Please specify your dotfiles directory by running `link_dotfiles` from that path, or providing a --path flag".red
+        raise InvalidDotfilesDir, "#{ dotfiles_dir } is not a valid dotfiles directory. Please specify your dotfiles directory by running `link_dotfiles` from that path, or providing a --path flag".red
       end
     end
 
-    def user_response(message)
-      puts message
+    def user_response(message, choices)
+      puts "#{message} #{choices}"
       case gets.strip
       when /^y/i
         :yes
@@ -49,12 +63,12 @@ module DotfileLinker
       when /^q/i
         :quit
       else
-        user_response("Please enter a valid response")
+        user_response("Please enter a valid response", choices)
       end
     end
 
-    def user_response_or_exit(message)
-      response = user_response(message)
+    def user_response_or_exit(message, choices)
+      response = user_response(message, choices)
       if response == :quit
         puts "Exiting"
         exit
@@ -62,16 +76,6 @@ module DotfileLinker
       response
     end
 
-    def parse_options
-      optparse = OptionParser.new do |opts|
-        opts.on('-p', '--path PATH', String, 'Use [PATH] as dotfiles directory (instead of current directory)') { |path| @options[:path] = File.expand_path(path) }
-        opts.on_tail('-u', '--unlink', 'Unlink mode') { @options[:unlink_mode] = true }
-        opts.on_tail('-v', '--version', 'Show version') { puts VERSION; exit }
-        opts.on_tail('-h', '--help', 'Show this message') { puts opts; exit }
-      end
-      optparse.parse!
-    end
-
     def ignore_list
       @ignore_list ||=
         begin
@@ -95,26 +99,26 @@ module DotfileLinker
       home_dir_file_path = File.expand_path("~/#{ filename }")
       dotfiles_dir_file_path = File.expand_path("#{ dotfiles_dir }/#{ filename }")
       unless File.symlink?(home_dir_file_path) || exclude_file?(filename)
-        case user_response_or_exit("move and link #{ home_dir_file_path.human_filename.magenta } -> #{ dotfiles_dir_file_path.human_filename.cyan }? (y/n/i[gnore])")
+        case user_response_or_exit("move and link #{ home_dir_file_path.human_filename.magenta } -> #{ dotfiles_dir_file_path.human_filename.cyan }?", " (y/n/i[gnore]/q)")
         when :yes
           FileUtils.mv(home_dir_file_path, dotfiles_dir_file_path, :verbose => true)
           FileUtils.ln_s(dotfiles_dir_file_path, home_dir_file_path, :verbose => true)
         when :ignore
           ignore_file(filename)
-          puts "ignored #{filename.cyan}"
+          puts "added #{filename.cyan} to ignore file"
         end
       end
     end
 
     def link_files
-      Dir.foreach(home_dir) { |filename| link_file(filename) }
+      each_dotfile(home_dir) { |filename| link_file(filename) }
     end
 
     def unlink_file(filename)
       home_dir_symlink_path = File.expand_path("~/#{ filename }")
       dotfiles_dir_file_path = File.expand_path("#{ dotfiles_dir }/#{ filename }")
       if File.symlink?(home_dir_symlink_path)
-        case user_response_or_exit("unlink #{ home_dir_symlink_path.human_filename.magenta } and restore #{ dotfiles_dir_file_path.human_filename.cyan }? (y/n)")
+        case user_response_or_exit("unlink #{ home_dir_symlink_path.human_filename.magenta } and restore #{ dotfiles_dir_file_path.human_filename.cyan }?", " (y/n/q)")
         when :yes
           FileUtils.rm(home_dir_symlink_path, :verbose => true)
           FileUtils.mv(dotfiles_dir_file_path, home_dir_symlink_path, :verbose => true)
@@ -123,12 +127,12 @@ module DotfileLinker
     end
 
     def unlink_files
-      Dir.foreach(dotfiles_dir) { |filename| unlink_file(filename) }
+      each_dotfile(dotfiles_dir) { |filename| unlink_file(filename) }
     end
 
     def start
-      raise_if_home_and_dotfiles_dir_match
       parse_options
+      raise_if_home_and_dotfiles_dir_match
       if @options[:unlink_mode]
         unlink_files
       else

data/spec/dotfile_linker_spec.rb

@@ -21,12 +21,25 @@ describe DotfileLinker::Linker do
       values.each do |k, v|
         v.each do |response|
           @linker.stub(:gets).and_return(response)
-          @linker.user_response('fake message').should == k
+          @linker.user_response('fake message', 'fake options').should == k
         end
       end
     end
   end
 
+  describe "#each_dotfile" do
+    it "should return only files starting with ." do
+      dotfiles = %w{ .bash_profile .emacs .gitconfig .tmux.conf }
+      normal_files = %w{ Applications Users SomeFolder test}
+      all_files = dotfiles + normal_files
+      expectation = Dir.should_receive(:foreach).with('/some/path/')
+      all_files.each { |file| expectation.and_yield(file) }
+      actual = []
+      @linker.each_dotfile('/some/path/') { |filename| actual << filename }
+      actual.should == dotfiles
+    end
+  end
+
   describe "#exclude_file?" do
     it "excludes files in blacklist" do
       %w{ . .. .git }.each { |filename| @linker.exclude_file?(filename).should be }
@@ -88,8 +101,8 @@ describe DotfileLinker::Linker do
       end
 
       it "should call #ignore_file" do
-        @linker.should_receive(:ignore_file).with("file I want to ignore")
-        @linker.link_file("file I want to ignore")
+        @linker.should_receive(:ignore_file).with(".dotfile_i_want_to_ignore")
+        @linker.link_file(".dotfile_i_want_to_ignore")
       end
     end
 
@@ -147,7 +160,7 @@ describe DotfileLinker::Linker do
     [true, false].each do |home_dir_file_is_symlink|
       describe "when symlink #{ "isn't" unless home_dir_file_is_symlink } in ~" do
         it "should #{ "not" unless home_dir_file_is_symlink } remove symlink and move file" do
-          filename = "file_to_unlink"
+          filename = ".file_to_unlink"
           home_dir_file_path = "#{ ENV['HOME'] }/#{ filename }"
           dotfiles_dir_file_path = "#{ @linker.dotfiles_dir }/#{ filename }"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dotfile_linker
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Dillon Kearns