dotmation 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/dotmation.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dotmation"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John T. Prince"]
-  s.date = "2013-05-09"
+  s.date = "2013-05-16"
   s.description = "ruby dsl/config to softlink dotfiles that is somewhat github aware"
   s.email = "jtprince@gmail.com"
   s.executables = ["dotmation"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "spec/dotmation/repo_spec.rb",
     "spec/dotmation_spec.rb",
     "spec/spec_helper.rb",
+    "spec/testfiles/Dropbox/special_stash/dot-fonts/somefile.ttf",
     "spec/testfiles/config"
   ]
   s.homepage = "http://github.com/jtprince/dotmation"

data/lib/dotmation.rb

@@ -60,11 +60,11 @@ class Dotmation
     unless opts[:no_update_github]
       update_github_repos!
     end
-    link!
+    link!(opts)
   end
 
-  def link!
-    repos.each(&:link!)
+  def link!(opts={})
+    repos.each {|repo| repo.link!(opts) }
   end
 
   def update_github_repos!

data/lib/dotmation/repo.rb

@@ -1,6 +1,9 @@
 require 'fileutils'
 
 class Dotmation
+  class TryingToSoftLinkOverExistingDir < Exception
+  end
+
   module Repo
     Sys = FileUtils
 
@@ -25,6 +28,102 @@ class Dotmation
       self.class.to_s.downcase.split('::').last.to_sym
     end
 
+    # makes sure the directory exists.  If it is a file, deletes the file
+    # and makes a directory
+    def ensure_dir(dir)
+      if File.exist?(dir)
+        unless File.directory?(dir)
+          File.rm_f(dir)
+          ensure_dir(dir)
+        end
+      else
+        Sys.mkpath(dir)
+      end
+      true
+    end
+
+    def no_trailing_slash(dir)
+      (dir[-1] == '/') ? dir[0...-1] : dir
+    end
+
+    # returns true if defined and there is a trailing slash
+    def link_to_reside_under_dir?(dir)
+      dir && (dir[-1] == '/')
+    end
+
+    def ensure_underdir( link )
+      dir = File.dirname(link)
+      Sys.mkpath(dir)
+    end
+
+    # path/file => .file
+    # path/.file => .file
+    # path/to/file => .file
+    # file => .file
+    # .file => .file
+    def base_dot(file_path)
+      base = file_path.split('/').last
+      (base[0] == '.') ? base[0] : ('.' + base)
+    end
+
+    # clears @link upon all successul linkages
+    def link!(opts={})
+      opts[:home] ||= ENV['HOME']
+      opts[:config_home] ||= Dotmation::CONFIG_HOME
+      [:home, :config_home].each {|sym| opts[sym] = no_trailing_slash(opts[sym]) }
+
+      ensure_dir( opts[:config_home] )
+      ensure_dir( opts[:home] )
+
+      real_base_dir = self.respond_to?(:cache_dir) ? cache_dir : File.expand_path(opts[:home])
+
+      Dir.chdir(real_base_dir) do
+        Dir.chdir(self.path) do 
+          @links.each do |link|
+            has_slashes = link.linkname && link.linkname.include?("/")
+            link_to_reside_under_dir = link_to_reside_under_dir?(link.linkname)
+            symlink = 
+              case link.methd
+              when :cfg
+                File.join( opts[:config_home], link.linkname || '' )
+              when :dot
+                if link.linkname
+                  File.join( opts[:home], link.linkname )
+                else
+                  File.join( opts[:home], (link.file[0]=='.') ? link.file : base_dot(link.file) )
+                end
+              when :ln
+                if link.linkname
+                  File.join( opts[:home], link.linkname )
+                else
+                  File.join( opts[:home], link.file )
+                end
+              end
+
+            if link.linkname && link.linkname.include?('/')
+              ensure_underdir( symlink )
+            end
+            ensure_dir( symlink ) if link_to_reside_under_dir
+            if File.exist?(symlink)
+              if File.directory?(symlink) && !link_to_reside_under_dir && !File.symlink?(symlink) && has_slashes
+                raise Dotmation::TryingToSoftLinkOverExistingDir, "a real directory already exists where you are trying to place a softlink, delete it before proceeding or trail the symlink with a slash in your config file to put the link under it: #{symlink}"
+              elsif !File.directory?(symlink) && !File.symlink?(symlink)
+                File.unlink(symlink)
+              end
+            end
+            file_to_link = File.expand_path(link.file)
+            #puts "TO LINK AN D SYMLINK:"
+            #p File.exist?(file_to_link)
+            #p file_to_link
+            #p symlink
+            Sys.ln_sf(file_to_link, symlink)
+          end
+          # clear all the links
+          @links.clear
+        end
+      end
+    end
+
     class Local
       include Repo
     end
@@ -53,82 +152,6 @@ class Dotmation
         path_parts[2..-1].join('/')
       end
 
-      # makes sure the directory exists.  If it is a file, deletes the file
-      # and makes a directory
-      def ensure_dir(dir)
-        if File.exist?(dir)
-          unless File.directory?(dir)
-            File.rm_f(dir)
-            ensure_dir(dir)
-          end
-        else
-          Sys.mkpath(dir)
-        end
-        true
-      end
-
-      def no_trailing_slash(dir)
-        (dir[-1] == '/') ? dir[0...-1] : dir
-      end
-
-      # returns true if defined and there is a trailing slash
-      def target_is_dir?(dir)
-        dir && (dir[-1] == '/')
-      end
-
-      def ensure_underdir( link )
-        dir = File.dirname(link)
-        Sys.mkpath(dir)
-      end
-
-      def link!(opts={})
-        opts[:home] ||= ENV['HOME']
-        opts[:config_home] ||= Dotmation::CONFIG_HOME
-        [:home, :config_home].each {|sym| opts[sym] = no_trailing_slash(opts[sym]) }
-
-        ensure_dir( opts[:config_home] )
-        ensure_dir( opts[:home] )
-
-        Dir.chdir(cache_dir) do
-          Dir.chdir(self.path) do 
-            @links.each do |link|
-              target_is_dir = target_is_dir?(link.linkname)
-              symlink = 
-                case link.methd
-                when :cfg
-                  File.join( opts[:config_home], link.linkname || '' )
-                when :dot
-                  if link.linkname
-                    File.join( opts[:home], link.linkname )
-                  else
-                    File.join( opts[:home], (link.file[0]=='.') ? link.file : ".#{link.file}" )
-                  end
-                when :ln
-                  if link.linkname
-                    File.join( opts[:home], link.linkname )
-                  else
-                    File.join( opts[:home], link.file )
-                  end
-                end
-              
-              if link.linkname && link.linkname.include?('/')
-                ensure_underdir( symlink )
-              end
-              ensure_dir( symlink ) if target_is_dir
-              if File.exist?(symlink) && !File.directory?(symlink)
-                File.unlink(symlink)
-              end
-              file_to_link = File.expand_path(link.file)
-              #puts "TO LINK AN D SYMLINK:"
-              #p File.exist?(file_to_link)
-              #p file_to_link
-              #p symlink
-              Sys.ln_sf(file_to_link, symlink)
-            end
-          end
-        end
-      end
-
     end
   end
 end

data/spec/dotmation/repo_spec.rb

@@ -13,6 +13,10 @@ describe Dotmation::Repo do
       @internal_git_dir = @cache_dir + '/user/project'
       FileUtils.mkpath @internal_git_dir
       @file = @internal_git_dir + "/myfile"
+      @dir = @internal_git_dir + "/somedir"
+      @internal_file = @dir + "/internal"
+      FileUtils.mkpath( @dir )
+      File.write(@internal_file, 'it is internal')
       File.write(@file, 'hiya')
     end
 
@@ -36,6 +40,50 @@ describe Dotmation::Repo do
       FileUtils.rm_rf cfg_dir
     end
 
+    specify 'can make links relative to folder inside dir' do
+      cfg_dir =  File.expand_path(TESTFILES + '/tmp_cfg')
+
+      repo = Dotmation::Repo::Github.new('user/project/somedir')
+
+      repo.cache_dir = @cache_dir
+
+      repo.links << Dotmation::Repo::Link.new(:cfg, "internal")
+      repo.links << Dotmation::Repo::Link.new(:cfg, ".")
+      # this will ln the directory under: creating/a/path/somedir
+      repo.links << Dotmation::Repo::Link.new(:cfg, ".", "creating/a/path/")
+
+      repo.link!(config_home: cfg_dir)
+
+      %w(internal somedir creating/a/path/somedir).each do |linkname|
+        link = cfg_dir + '/' + linkname
+        File.symlink?(link).should be_true
+      end
+      File.directory?(cfg_dir + '/' + 'creating/a/path').should be_true
+      File.directory?(cfg_dir + '/' + 'somedir').should be_true
+      IO.read(cfg_dir + '/' + 'internal').should == 'it is internal'
+
+      FileUtils.rm_rf cfg_dir
+    end
+
+    specify 'links as the directory if none exists but will not overwrite if a dir does' do
+      cfg_dir =  File.expand_path(TESTFILES + '/tmp_cfg')
+
+      repo = Dotmation::Repo::Github.new('user/project/somedir')
+
+      repo.cache_dir = @cache_dir
+
+      # this will ln the directory under: creating/a/path/somedir
+      repo.links << Dotmation::Repo::Link.new(:cfg, ".", "creating/a/path")
+      repo.links << Dotmation::Repo::Link.new(:cfg, ".", "creating/a")
+
+      expect { repo.link!(config_home: cfg_dir) }.to raise_error(Dotmation::TryingToSoftLinkOverExistingDir)
+
+      File.symlink?(cfg_dir + '/' + 'creating/a/path').should be_true
+      File.symlink?(cfg_dir + '/' + 'creating/a').should be_false
+
+      FileUtils.rm_rf cfg_dir
+    end
+
     specify 'dot makes proper links to home dir' do
       home_dir =  File.expand_path(TESTFILES + '/tmp_home')
       repo = Dotmation::Repo::Github.new('user/project')

data/spec/dotmation_spec.rb

@@ -34,30 +34,66 @@ describe Dotmation do
 
     end
 
-    describe 'an update' do
+    describe 'updating with local files' do
+      before do
+        cfg = <<MESSAGE
+        local "Dropbox/special_stash" do
+          dot "dot-fonts", "fonts"
+        end
+MESSAGE
+HERE!
+        @dotmation = Dotmation.new()
+      end
+    end
+
+    describe 'a real update', :pending =>  'only run occasionally -- requires internet' do
     #describe 'an update', :pending => 'only run occasionally -- requires internet' do
       let(:dotmation) { Dotmation.new(@config) }
 
       before(:all) do 
         @tmprepos_dir = TESTFILES + "/tmprepos"
+        @fake_home = TESTFILES + '/fake_home'
+        FileUtils.mkpath @fake_home
+        @fake_config_home = TESTFILES + '/fake_home/config'
+        FileUtils.mkpath @fake_config_home
+        @orig_home = ENV['HOME']
+        ENV['HOME'] = @fake_home
       end
 
       # turn on when you want to test github download
       it 'downloads github repos' do
-        dotmation.update
+        dotmation.update( home: @fake_home, config_home: @fake_config_home )
         ["jtprince/dotfiles", "robbyrussell/oh-my-zsh"].each do |path|
+          # The repos are all there
           base = @tmprepos_dir + "/" + path
           git_file = base + "/.git"
-          File.exist?( git_file ).should be_true
+          File.directory?( git_file ).should be_true
+        end
+
+        # the links are all there
+        %w(dotmation dunstrc zsh i3/config).each do |f|
+          link = @fake_config_home + '/' + f
+          File.symlink?(link).should be_true
+          File.exist?(link).should be_true
+          case f
+          when 'dotmation', 'zsh'
+            File.directory?(link).should be_true
+          end
         end
+
+        File.exist?(@fake_home + '/' + '.fonts')
+        File.symlink?(@fake_home + '/' + '.fonts')
       end
 
-      it 'updates existing repos' do
+      xit 'updates existing repos' do
         dotmation.update
       end
 
       after(:all) do
-        FileUtils.rm_rf(@tmprepos_dir) if File.directory?(@tmprepos_dir)
+        #FileUtils.rm_rf(@tmprepos_dir) if File.directory?(@tmprepos_dir)
+        #FileUtils.rm_rf(@fake_home)
+        #FileUtils.rm_rf(@fake_config_home)
+        ENV['HOME'] = @orig_home
       end
     end
 

data/spec/testfiles/config

@@ -9,19 +9,18 @@ github "jtprince/dotfiles/config" do     # stored in ~/dotrepos/jtprince/dotfile
 
   dot 'Xresources'               # symlink ~/.Xresources
   dot 'Xresources', '.Xdefaults' # symlink ~/.Xdefaults -> Xresources
+  # same as this:
+  # dot 'Xresources', 'Xdefaults' # symlink ~/.Xdefaults -> Xresources
   dot 'zsh/zshenv'               # symlink ~/.zshenv
 end
 
 github "jtprince/dotfiles" do
-  ln 'bin'
-  ln 'bin', '~/local/'
-  ln 'bin', '~/local/bin'        # same as directly above
-  ln 'bin', '~/local'            # would link to local if not exist or local/bin if local existed
+  ln 'config/irbrc', '~/local/'
 end
 
 # always interpreted from $HOME
 local "Dropbox/special_stash" do
-  dot "dot-fonts", ".fonts"
+  dot "dot-fonts", "fonts"   # ~/.fonts
 end
 
 github "robbyrussell/oh-my-zsh" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotmation
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -114,6 +114,7 @@ files:
 - spec/dotmation/repo_spec.rb
 - spec/dotmation_spec.rb
 - spec/spec_helper.rb
+- spec/testfiles/Dropbox/special_stash/dot-fonts/somefile.ttf
 - spec/testfiles/config
 homepage: http://github.com/jtprince/dotmation
 licenses:
@@ -130,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2585038009321147917
+      hash: -3068326634373493455
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: