lace 0.4.3 → 0.5.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjlhNmZlYTA1ZDNhM2FjNGRiM2E2YWU1YTBkNGJjNmM5ZDcwMjkzMw==
-  data.tar.gz: !binary |-
-    ZjkzNjE1ZTY5NTA1ZjEzODkxYjQ3YmMxNzQyMDkzYTU5NTYyN2E1MA==
+SHA256:
+  metadata.gz: d98c40941c6f892e520dbd99ba1d29f7a3485ce59353e12efbe8268ec38cbe68
+  data.tar.gz: 6f04e59649921e470016585f28390e13c3b3e6fed0c229bb47cf291d2c795999
 SHA512:
-  metadata.gz: !binary |-
-    N2NkYTRiZTkzOTQyYTI4ZjBiZTE4ZjkyZDA3ZDg0YTVjMjVhYmViNjFhMTRm
-    M2U0MjJmOTM1NzhmNTc5ZDUyYzgxNWMxNzM0YjZjYmFhMjE2MzFjYzc4YTdk
-    NDU4ZTczMmQ4NWM3MDM5ZjY0Y2RjMzBmMTY0NDg0ZjBkOWU3MmI=
-  data.tar.gz: !binary |-
-    M2JlY2ZmNDZjZjY0OWQ1NDNlOWMzNWQwYjQzMjliYjg1YTE5ZTNmNTNlYzM5
-    ZjkwZDQzZDdhODc2OTRiNzI3ZmUwNjllMGM3OTE3OTEwYzM3MjI4YmE0ZTAw
-    NWVjZDYwMGQ5MmU2NDM5ODdjZmUxMTUwOWUxZDljZTQ5MDgxMDY=
+  metadata.gz: 2972f704cc11a8e6075bd3a2adff8cc560a318af551bc91dbb751f82777f75b23d0419c4fc43f7618f2d02dcdce79fab57757ab1ba9e1f9dda70f090ef8e0dc8
+  data.tar.gz: e367b0b4e7e5faf9ae965a8cd807b5ac775e8e4b431604ec5500590308488d960523fff4fd8b1b5a0c687425e466eb8be98d5b8e136baeb491d3b74f667fc672

data/bin/lace

@@ -36,10 +36,6 @@ require "extend/pathname"
 
 ARGV.extend(LaceArgvExtension)
 
-if ARGV.debug?
-  require 'pry'
-end
-
 def require? path
   require path.to_s.chomp
 rescue LoadError => e
@@ -55,12 +51,6 @@ case ARGV.first when '-h', '--help', '--usage', '-?', 'help', nil
 when '--version'
   puts Lace::VERSION
   exit 0
-when '-v'
-  puts "lace #{Lace::VERSION}"
-  # Shift the -v to the end of the parameter list
-  ARGV << ARGV.shift
-  # If no other arguments, just quit here.
-  exit 0 if ARGV.length == 1
 end
 
 
@@ -99,7 +89,6 @@ rescue Interrupt => e
 rescue RuntimeError, SystemCallError => e
   raise if e.message.empty?
   onoe e
-  puts e.backtrace if false
   exit 1
 rescue Exception => e
   onoe e

data/lib/cmd/activate.rb

@@ -1,12 +1,11 @@
-
 require 'lace/package'
 require 'lace/exceptions'
 
 module Lace extend self
-	def activate
-		package_name = ARGV.shift
-		raise ResourceNotSpecified unless package_name
-		PackageUtils.activate package_name
-	end
+  def activate
+    package_name = ARGV.shift
+    raise ResourceNotSpecified unless package_name
+    PackageUtils.activate package_name
+  end
 end
 

data/lib/cmd/deactivate.rb

@@ -2,10 +2,10 @@ require 'lace/package'
 require 'lace/exceptions'
 
 module Lace extend self
-	def deactivate
-		package_name = ARGV.shift
-		raise ResourceNotSpecified unless package_name
-		PackageUtils.deactivate package_name
-	end
+  def deactivate
+    package_name = ARGV.shift
+    raise ResourceNotSpecified unless package_name
+    PackageUtils.deactivate package_name
+  end
 end
 

data/lib/cmd/fetch.rb

@@ -2,18 +2,18 @@ require 'lace/package'
 require 'lace/exceptions'
 
 module Lace extend self
-	def fetch
-		resource = ARGV.shift
+  def fetch
+    resource = ARGV.shift
     desired_package_name = ARGV.value "name"
-		raise ResourceNotSpecified unless resource
-		package_name, target_folder = PackageUtils.fetch(resource, desired_package_name)
+    raise ResourceNotSpecified unless resource
+    package_name, target_folder = PackageUtils.fetch(resource, desired_package_name)
     begin
-        Package.new(package_name, false)
+      Package.new(package_name, false)
     rescue PackageFactsNotFound => e
-        onoe e.message
-        onoe "Removing fetched files"
-        FileUtils.rm_rf(target_folder)
-        Lace.failed = true
+      onoe e.message
+      onoe "Removing fetched files"
+      FileUtils.rm_rf(target_folder)
+      Lace.failed = true
     end
-	end
+  end
 end

data/lib/cmd/list.rb

@@ -3,11 +3,18 @@ require 'lace/package'
 module Lace extend self
 
   def linked_files
-    home_dir = ENV["HOME"]
-    Dir.foreach(home_dir).map do |filename|
-      next if filename == '.' or filename == '..'
-      File.readlink File.join(home_dir, filename) if File.symlink? File.join(home_dir, filename)
-    end.compact.uniq
+    home_dir = Pathname.new ENV["HOME"]
+    find_links home_dir
+  end
+
+  def find_links dir
+    dir.children.map do |path|
+      if path.directory? && !path.symlink?
+        find_links path
+      else
+        File.readlink path if path.symlink?
+      end
+    end.flatten.compact.uniq
   end
 
   def active_packages

data/lib/cmd/remove.rb

@@ -2,10 +2,10 @@ require 'lace/package'
 require 'lace/exceptions'
 
 module Lace extend self
-	def remove
-		package_name = ARGV.shift
-		raise ResourceNotSpecified unless package_name
-		PackageUtils.remove package_name
-	end
+  def remove
+    package_name = ARGV.shift
+    raise ResourceNotSpecified unless package_name
+    PackageUtils.remove package_name
+  end
 end
 

data/lib/cmd/setup.rb

@@ -2,8 +2,8 @@ require 'lace/package'
 require 'lace/exceptions'
 
 module Lace extend self
-	def setup
-		package_name = ARGV.shift
-		PackageUtils.setup package_name
-	end
+  def setup
+    package_name = ARGV.shift
+    PackageUtils.setup package_name
+  end
 end

data/lib/cmd/update.rb

@@ -2,9 +2,9 @@ require 'lace/package'
 require 'lace/exceptions'
 
 module Lace extend self
-	def update
-		resource = ARGV.shift
-		raise ResourceNotSpecified unless resource
-		PackageUtils.update resource
-	end
+  def update
+    resource = ARGV.shift
+    raise ResourceNotSpecified unless resource
+    PackageUtils.update resource
+  end
 end

data/lib/cmd/upgrade.rb

@@ -2,7 +2,7 @@ require 'lace/package'
 require 'lace/exceptions'
 
 module Lace extend self
-	def upgrade
+  def upgrade
     require 'cmd/list'
     if Lace.active_packages.empty?
       upgrade_lace_folder
@@ -10,7 +10,7 @@ module Lace extend self
       onoe "Please deactivate all packages before continuing"
       Lace.failed = true
     end
-	end
+  end
   def upgrade_lace_folder
     old_dir = Pathname.new(ENV["HOME"])/".cassias"
     if old_dir.exist?

data/lib/cmd/validate.rb

@@ -17,14 +17,14 @@ Lace-Manifest Validation Report:
 EOS
 
 module Lace extend self
-	def validate
-		resource = ARGV.shift
+  def validate
+    resource = ARGV.shift
     flavor = ARGV.shift
-		raise ResourceNotSpecified unless resource
+    raise ResourceNotSpecified unless resource
     validation = PackageValidator.new(PackageFacts.new(resource), flavor)
     puts ERB.new(VALIDATE, nil, '-').result(binding)
     Lace.failed = true if validation.has_errors?
-	end
+  end
 end
 
 class PackageValidator
@@ -58,7 +58,7 @@ class PackageValidator
   def check_hooks hook_cmd
     hook_cmd.map do |cmd|
       if !File.exist? cmd
-         "#{cmd} cannot be found"
+        "#{cmd} cannot be found"
       elsif !File.executable? cmd
         "#{cmd} is not executable"
       end

data/lib/cmd/where.rb

@@ -0,0 +1,16 @@
+require 'lace/package'
+require 'lace/exceptions'
+
+module Lace extend self
+  def where
+    package_name = ARGV.shift
+    raise ResourceNotSpecified unless package_name
+    begin
+      package = Package.new(package_name, false)
+      puts "#{package.path}"
+    rescue PackageFactsNotFound => e
+      onoe "asd"
+      Lace.failed = true
+    end
+  end
+end

data/lib/lace/download_strategy.rb

@@ -155,9 +155,9 @@ class GitDownloadStrategy < AbstractDownloadStrategy
     if super
       super
     elsif @uri.include? "github.com"
-       @uri.split("/")[-2]
+      @uri.split("/")[-2]
     elsif File.directory? @uri
-        File.basename(@uri)
+      File.basename(@uri)
     else
       raise "Cannot determine a proper name with #@uri"
     end
@@ -177,15 +177,8 @@ end
 
 
 class DownloadStrategyDetector
-  def self.detect(uri, strategy=nil)
-    if strategy.nil?
+  def self.detect(uri)
       detect_from_uri(uri)
-    elsif Symbol === strategy
-      detect_from_symbol(strategy)
-    else
-      raise TypeError,
-        "Unknown download strategy specification #{strategy.inspect}"
-    end
   end
 
   def self.detect_from_uri(uri)
@@ -200,20 +193,11 @@ class DownloadStrategyDetector
     end
 
     case uri
-      when %r[^git://] then GitDownloadStrategy
-      when %r[^https?://.+\.git$] then GitDownloadStrategy
+    when %r[^git://] then GitDownloadStrategy
+    when %r[^https?://.+\.git$] then GitDownloadStrategy
       # else CurlDownloadStrategy
     else
       raise "Cannot determine download startegy from #{uri}"
     end
   end
-
-  def self.detect_from_symbol(symbol)
-    case symbol
-    when :git then GitDownloadStrategy
-    when :local_file then LocalFileStrategy
-    else
-      raise "Unknown download strategy #{strategy} was requested."
-    end
-  end
 end

data/lib/lace/exceptions.rb

@@ -21,8 +21,8 @@ class NonActiveFlavorError < RuntimeError
 end
 
 class PackageAlreadyInstalled < RuntimeError
-  def initialize
-    super "Package already installed"
+  def initialize location
+    super "Package already installed at #{location}"
   end
 end
 
@@ -58,6 +58,14 @@ class PackageFlavorDoesNotExist < FlavorError
   end
 end
 
+class WouldOverwriteError < RuntimeError
+  def initialize dest, src
+    super %Q(Refusing to overwrite #{dest} with #{src}
+Use glob pattern in .lace.yaml like #{src.basename}/**/* 
+or invoke lace with `--force` to create backup of #{dest})
+  end
+end
+
 class ManifestErbError < RuntimeError
   def initialize fact, exception
     super "#{exception.to_s}\nin #{fact.facts_file}"

data/lib/lace/package/facts.rb

@@ -43,7 +43,7 @@ class PackageFacts
   end
 
   def has_key? key
-    @unflavorable_facts && ( @unflavorable_facts.has_key?(key) or @facts.has_key?(key))
+    @unflavorable_facts && (@unflavorable_facts.has_key?(key) or @facts.has_key?(key))
   end
 
   def version
@@ -87,11 +87,11 @@ class PackageFacts
   protected
   def facts_file_to_hash
     begin
-      rendered_manifest = ERB.new(@facts_file.read, nil, '-').result(binding)
+      rendered_manifest = ERB.new(@facts_file.read, trim_mode: '-').result(binding)
     rescue Exception => e
       raise ManifestErbError.new(self, e)
     end
-    value = YAML.load rendered_manifest
+    value = YAML.load rendered_manifest, aliases: true
     if value.is_a?(String) && value == "---"
       return Hash.new
     else

data/lib/lace/package/package.rb

@@ -82,14 +82,15 @@ class Package
     # if ends in erb -> generate it
     src = file
     dest = src.as_dotfile(home_dir, @path)
-    if dest.exist? && dest.directory? && ARGV.force?
+    if dest.exist? && dest.directory?
+      raise WouldOverwriteError.new(dest, src) unless ARGV.force?
       FileUtils.mv dest, dest.as_backup
     end
     link_file_or_directory src, dest
   end
 
   def link_file_or_directory(src, dest)
-    if !dest.dirname.exist?
+    unless dest.dirname.exist?
       dest.dirname.mkpath
     end
     FileUtils.ln_s src, dest, :force => ARGV.force?

data/lib/lace/package/utils.rb

@@ -5,7 +5,7 @@ class PackageUtils
   def self.fetch uri, desired_package_name=nil
     downloader_cls = DownloadStrategyDetector.detect(uri)
     downloader = downloader_cls.new(uri, desired_package_name)
-    raise PackageAlreadyInstalled.new if downloader.target_folder.exist?
+    raise PackageAlreadyInstalled.new(downloader.target_folder) if downloader.target_folder.exist?
     downloader.fetch
     return downloader.name, downloader.target_folder
   end

data/lib/lace/package.rb

@@ -1,5 +1,3 @@
 require 'lace/package/utils'
 require 'lace/package/facts'
 require 'lace/package/package'
-
-

data/lib/lace/utils.rb

@@ -90,9 +90,9 @@ end
 
 def determine_os
   case RUBY_PLATFORM
-    when /darwin/ then :mac
-    when /linux/ then :linux
-    else raise InvalidOSError
+  when /darwin/ then :mac
+  when /linux/ then :linux
+  else raise InvalidOSError
   end
 end
 

data/lib/lace/version.rb

@@ -1,3 +1,3 @@
 module Lace
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Kai Richard Koenig
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies: []
 description: Lace lets you manage your dotfiles when using them on multiple machines
-email: kai@kairichardkoenig.de
+email: kai.richard.koenig@gmail.com
 executables:
 - lace
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/lace
 - lib/cmd/activate.rb
 - lib/cmd/deactivate.rb
 - lib/cmd/fetch.rb
@@ -28,40 +29,39 @@ files:
 - lib/cmd/update.rb
 - lib/cmd/upgrade.rb
 - lib/cmd/validate.rb
+- lib/cmd/where.rb
 - lib/extend/ARGV.rb
 - lib/extend/pathname.rb
+- lib/lace.rb
 - lib/lace/download_strategy.rb
 - lib/lace/exceptions.rb
+- lib/lace/package.rb
 - lib/lace/package/facts.rb
 - lib/lace/package/package.rb
 - lib/lace/package/utils.rb
-- lib/lace/package.rb
 - lib/lace/utils.rb
 - lib/lace/version.rb
-- lib/lace.rb
-- bin/lace
 homepage: https://github.com/kairichard/lace
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.1.11
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Manage your .dotfiles
 test_files: []