lace 0.2.3 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2EwOWNjNGJiNTg5NWE0YTM0NGVmZjcyMGJlZGEwNzkyZmRlZWU3YQ==
+    YTE1YjU3OTUwMmFjYzNkOTYwZWFjODA1ZjUyZDU5NWY3YzYwMDA2ZQ==
   data.tar.gz: !binary |-
-    NzM4NzhkMWU0NTRhZjljYjVjZTA1OWFlMjA1MmQyMWViYjg1NmQ1Ng==
+    OGYxN2E5M2ZhY2VjZDQzMWJmY2I3MWFmYWM1YzRiMDA0ODRmOGRmNg==
 SHA512:
   metadata.gz: !binary |-
-    MzQ3ZjA0OWU5OTU2YWVmOTAzMDAxYjQ5MDU3NWI4MDFkMDNkMDZjMzMxZDVm
-    NjVmODEwMjcyYzcxZTk2MDAyMWE5NDI2MTlhMWEyMjAyYTc5NWM4NmQxMmFk
-    OThkODU1NzM5MWRhNDk0NmRkMjM1NDNiNTIxYjJlZjc3MTk4MmU=
+    MjEzNDY5ZmQxNzE5ODJlMmNiZjM2YmRkZjkxOWY1MWY5MzE1YmRmYzZlZDIx
+    ODRiY2EwMjYwMDEzYjJiZDEzM2JlZTVlMjllNjNhODlmZWJiNTZiZmZlNzYy
+    ZDc0MjVjYmZhMTNjNGM4ODYwMTMxNWJiMGZiNzhkMTUxNzI1N2M=
   data.tar.gz: !binary |-
-    ZjI3N2ZkMTczNDdkMWZkY2U1ZDgwMzYzYTZkMGY5NTRlMzY0ZTVhZDM5ZWJi
-    MjdjY2RjYjY4NDAxMjBjODkzMmM1NjkzNGM1M2Y1ZGFjNDMxNTIyOWQ4ZDAx
-    MmYxMTQ3ZTU1M2ZmN2ZhMzY2MDA1NjUwN2QxMTRhYmY0Y2RiMDM=
+    Y2RkNzExZWJiNzQ2NjJmNzNmNTg5NjZmZjA1OTlhM2Y2MWU3ZjE4NjJiYWU5
+    NWUwOTJhMzYxYWRjMTIxODg4ZTUyN2I3MWE2MjY5YWRlNzZlOWUzN2QwNWI0
+    NWQyM2QwNWZkZTgzYTcyZjE3NmQwNDJhOWU4M2U5NGRmNjM1ZTY=

data/bin/lace

@@ -61,6 +61,7 @@ begin
   end
 
   aliases = {'ls' => 'list',
+             'info' => 'inspect',
              'rm' => 'remove'}
 
   cmd = ARGV.shift

data/lib/cmd/fetch.rb

@@ -5,6 +5,14 @@ module Lace extend self
 	def fetch
 		resource = ARGV.shift
 		raise ResourceNotSpecified if not resource
-		PackageUtils.fetch resource
+		package_name, target_folder = PackageUtils.fetch resource
+    begin
+        Package.new package_name, false
+    rescue PackageFactsNotFound => e
+        onoe e.message
+        onoe "Removing fetched files"
+        FileUtils.rm_rf target_folder
+        Lace.failed = true
+    end
 	end
 end

data/lib/cmd/help.rb

@@ -1,15 +1,15 @@
 HELP = <<-EOS
 Example usage:
   Synopsis:
-    lace <cmd> <pkg-uri/name> [<flavor>] [--name=<name>] [--version] [--no-hooks]
+    lace <cmd> <pkg-uri/name> [<flavor>] [--name=<name>] [--version] [--no-hooks] [--force]
 
   lace ls
 
   lace fetch <pkg-uri>
   lace fetch <pkg-uri>
 
-  lace install <pkg-uri>
-  lace install <pkg-uri> <flavor>
+  lace setup <pkg-uri>
+  lace setup <pkg-uri> <flavor>
 
   lace activate <pkg-name>
   lace activate <pkg-name> <flavor>

data/lib/cmd/list.rb

@@ -26,7 +26,7 @@ module Lace extend self
     if installed_packages.length > 0
       installed_packages.map do |d|
         package = Package.new d, false
-        puts "- [#{Tty.green}#{package.is_active? ? "*" : " "}#{Tty.reset}] #{d}"
+        puts "[#{Tty.green}#{package.is_active? ? "*" : " "}#{Tty.reset}] #{d}"
       end
     else
       puts "There are no pkgs installed"

data/lib/cmd/setup.rb

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

data/lib/cmd/validate.rb

@@ -40,7 +40,7 @@ class PackageValidator
   validate 'config-files', :config_files_present
   validate 'version', :version_present
   validate 'homepage', :homepage_present
-  validate 'post-install hook', :post_install_hooks_ok
+  validate 'setup', :setup_ok
   validate 'post-update hook', :post_update_hooks_ok
 
   def initialize facts, flavor=nil
@@ -64,8 +64,8 @@ class PackageValidator
     end.compact
   end
 
-  def hook_ok hook
-    hook_cmd = @facts.post(hook)
+  def hook_ok config_files
+    hook_cmd = config_files
     if hook_cmd.empty?
       ["#{Tty.green}skipped#{Tty.reset}", nil]
     else
@@ -78,12 +78,12 @@ class PackageValidator
     end
   end
 
-  def post_install_hooks_ok
-    hook_ok :install
+  def setup_ok
+    hook_ok @facts.setup_files
   end
 
   def post_update_hooks_ok
-    hook_ok :update
+    hook_ok @facts.post :update
   end
 
   def homepage_present

data/lib/extend/ARGV.rb

@@ -33,6 +33,10 @@ module LaceArgvExtension
     flag? '--no-hooks'
   end
 
+  def force?
+    flag? '--force'
+  end
+
   def interactive?
     flag? '--interactive'
   end

data/lib/extend/pathname.rb

@@ -12,16 +12,6 @@ class Pathname
     return dst
   end
 
-  # extended to support common double extensions
-  alias extname_old extname
-  def extname(path=to_s)
-    BOTTLE_EXTNAME_RX.match(path)
-    return $1 if $1
-    /(\.(tar|cpio|pax)\.(gz|bz2|xz|Z))$/.match(path)
-    return $1 if $1
-    return File.extname(path)
-  end
-
   # for filetypes we support, basename without extension
   def stem
     File.basename((path = to_s), extname(path))
@@ -49,68 +39,6 @@ class Pathname
     FileUtils.chmod_R perms, to_s
   end
 
-  def abv
-    out=''
-    n=`find #{to_s} -type f ! -name .DS_Store | wc -l`.to_i
-    out<<"#{n} files, " if n > 1
-    out<<`/usr/bin/du -hs #{to_s} | cut -d"\t" -f1`.strip
-  end
-
-  def compression_type
-    # Don't treat jars or wars as compressed
-    return nil if self.extname == '.jar'
-    return nil if self.extname == '.war'
-
-    # OS X installer package
-    return :pkg if self.extname == '.pkg'
-
-    # If the filename ends with .gz not preceded by .tar
-    # then we want to gunzip but not tar
-    return :gzip_only if self.extname == '.gz'
-
-    # Get enough of the file to detect common file types
-    # POSIX tar magic has a 257 byte offset
-    # magic numbers stolen from /usr/share/file/magic/
-    case open('rb') { |f| f.read(262) }
-    when /^PK\003\004/n         then :zip
-    when /^\037\213/n           then :gzip
-    when /^BZh/n                then :bzip2
-    when /^\037\235/n           then :compress
-    when /^.{257}ustar/n        then :tar
-    when /^\xFD7zXZ\x00/n       then :xz
-    when /^Rar!/n               then :rar
-    when /^7z\xBC\xAF\x27\x1C/n then :p7zip
-    else
-      # This code so that bad-tarballs and zips produce good error messages
-      # when they don't unarchive properly.
-      case extname
-      when ".tar.gz", ".tgz", ".tar.bz2", ".tbz" then :tar
-      when ".zip" then :zip
-      end
-    end
-  end
-
-  def text_executable?
-    %r[^#!\s*\S+] === open('r') { |f| f.read(1024) }
-  end
-
-  def incremental_hash(hasher)
-    incr_hash = hasher.new
-    buf = ""
-    open('rb') { |f| incr_hash << buf while f.read(1024, buf) }
-    incr_hash.hexdigest
-  end
-
-  def sha1
-    require 'digest/sha1'
-    incremental_hash(Digest::SHA1)
-  end
-
-  def sha256
-    require 'digest/sha2'
-    incremental_hash(Digest::SHA2)
-  end
-
   if '1.9' <= RUBY_VERSION
     alias_method :to_str, :to_s
   end
@@ -140,59 +68,8 @@ class Pathname
     join that.to_s
   end
 
-  def ensure_writable
-    saved_perms = nil
-    unless writable_real?
-      saved_perms = stat.mode
-      chmod 0644
-    end
-    yield
-  ensure
-    chmod saved_perms if saved_perms
-  end
-
-  # Writes an exec script in this folder for each target pathname
-  def write_exec_script *targets
-    targets.flatten!
-    if targets.empty?
-      opoo "tried to write exec scripts to #{self} for an empty list of targets"
-    end
-    targets.each do |target|
-      target = Pathname.new(target) # allow pathnames or strings
-      (self+target.basename()).write <<-EOS.undent
-      #!/bin/bash
-      exec "#{target}" "$@"
-      EOS
-    end
+  def as_dotfile base_folder
+    Pathname.new File.join(base_folder, ".#{basename}")
   end
 
-  # We redefine these private methods in order to add the /o modifier to
-  # the Regexp literals, which forces string interpolation to happen only
-  # once instead of each time the method is called. This is fixed in 1.9+.
-  if RUBY_VERSION <= "1.8.7"
-    alias_method :old_chop_basename, :chop_basename
-    def chop_basename(path)
-      base = File.basename(path)
-      if /\A#{Pathname::SEPARATOR_PAT}?\z/o =~ base
-        return nil
-      else
-        return path[0, path.rindex(base)], base
-      end
-    end
-    private :chop_basename
-
-    alias_method :old_prepend_prefix, :prepend_prefix
-    def prepend_prefix(prefix, relpath)
-      if relpath.empty?
-        File.dirname(prefix)
-      elsif /#{SEPARATOR_PAT}/o =~ prefix
-        prefix = File.dirname(prefix)
-        prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
-        prefix + relpath
-      else
-        prefix + relpath
-      end
-    end
-    private :prepend_prefix
-  end
 end

data/lib/lace/exceptions.rb

@@ -16,7 +16,7 @@ end
 
 class NonActiveFlavorError < RuntimeError
   def initialize
-    super "It looks like the flavor you tried to deactivate is not active after all"
+    super "Cannot deactivate package that is not active"
   end
 end
 

data/lib/lace/package.rb

@@ -16,14 +16,8 @@ class PackageUtils
     downloader = DownloadStrategyDetector.detect(uri).new(uri)
     raise PackageAlreadyInstalled.new if downloader.target_folder.exist?
     downloader.fetch
-    begin
-      package = Package.new downloader.name, false
-    rescue PackageFactsNotFound => e
-      onoe e.message
-      onoe "Removing fetched files"
-      FileUtils.rm_rf downloader.target_folder
-    end
-  end
+    return downloader.name, downloader.target_folder
+ end
 
   def self.remove package_name
     package = Package.new package_name, false
@@ -32,13 +26,11 @@ class PackageUtils
     FileUtils.rm_rf package.path
   end
 
-  def self.install uri
-    downloader = DownloadStrategyDetector.detect(uri).new(uri)
-    self.fetch uri
+  def self.setup package_name
     begin
-      package = Package.new downloader.name, ARGV.first
+      package = Package.new package_name, ARGV.first
       package.activate!
-      package.after_install
+      package.setup
     rescue FlavorError => e
       onoe e.message
       onoe "Package remains installed but was not activated"
@@ -47,7 +39,7 @@ class PackageUtils
 
   def self.deactivate package_name
     package = Package.new package_name, ARGV.first
-    raise NonActiveFlavorError.new unless package.is_active?
+    raise NonActiveFlavorError.new unless package.is_active? || ARGV.force?
     ohai "Deactivating"
     package.deactivate!
   end
@@ -104,6 +96,10 @@ class Facts
     @_facts["version"] if @_facts.key? "version"
   end
 
+  def setup_files
+    @facts["setup"].flatten rescue []
+  end
+
   def homepage
     @_facts["homepage"] if @_facts.key? "homepage"
   end
@@ -149,11 +145,10 @@ class Package
   include GitCommands
   attr_reader :name, :facts, :path
 
-  def after_install
+  def setup
     return if ARGV.nohooks?
      @path.cd do
-       ENV["CURRENT_DOTTY"] = @path
-       facts.post(:install).each do |cmd|
+       facts.setup_files.each do |cmd|
          safe_system cmd
        end
      end
@@ -162,7 +157,6 @@ class Package
   def after_update
     return if ARGV.nohooks?
     @path.cd do
-      ENV["CURRENT_DOTTY"] = @path
       facts.post(:update).each do |cmd|
         system cmd
       end
@@ -207,8 +201,9 @@ class Package
     files = @facts.config_files
     home_dir = ENV["HOME"]
     files.each do |file|
-      pn = Pathname.new file
-      FileUtils.rm_f File.join(home_dir, "." + pn.basename)
+      file = Pathname.new(file)
+      dotfile = file.as_dotfile(home_dir)
+      FileUtils.rm_f dotfile if dotfile.exist? && dotfile.readlink == file
     end
   end
 
@@ -217,8 +212,7 @@ class Package
     home_dir = ENV["HOME"]
     files.each do |file|
       # if ends in erb -> generate it
-      pn = Pathname.new file
-      FileUtils.ln_s file, File.join(home_dir, "." + pn.basename)
+      FileUtils.ln_s file, Pathname.new(file).as_dotfile(home_dir), force: ARGV.force?
     end
   end
 end

data/lib/lace/version.rb

@@ -1,3 +1,3 @@
 module Lace
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies: []
 description: This is a simple/unfinished tool which i use to manage my dotfiles on
   all the different machines
@@ -24,9 +24,9 @@ files:
 - lib/cmd/fetch.rb
 - lib/cmd/help.rb
 - lib/cmd/inspect.rb
-- lib/cmd/install.rb
 - lib/cmd/list.rb
 - lib/cmd/remove.rb
+- lib/cmd/setup.rb
 - lib/cmd/update.rb
 - lib/cmd/validate.rb
 - lib/extend/ARGV.rb

data/lib/cmd/install.rb

@@ -1,10 +0,0 @@
-require 'lace/package'
-require 'lace/exceptions'
-
-module Lace extend self
-	def install
-		resource = ARGV.shift
-		raise ResourceNotSpecified if not resource
-		PackageUtils.install resource
-	end
-end