lace 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: bc158e1d6fcfc6821a0d1b777e978a912b6fb975
-  data.tar.gz: e00ee505a2bfc0536ef2fb04ea8feac8cef5ea0b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjBmODJmNDczOGIyNmYxYzUxZWU3NmRmM2QzOWNlNjg2NWU3ODc2Mg==
+  data.tar.gz: !binary |-
+    YmYxMTAzMTUyNzk2Y2IzNzQ4YjUzNjA1Njc4ZDBjMDQ5MTJmODA5YQ==
 SHA512:
-  metadata.gz: 62d67ba5996037f32838dba6ae25a3134499f1413defd3b3c4b6b2392c67fd16c823b9413aeda4bc1719983fec0fd3f29ae8bb77a5a52e294e9db37cffba5314
-  data.tar.gz: 24c58a76a3db779ebdc3fa5f31f9b65908b258d86a248b2341037bf94da847f8475c837f80c27a0492d8265b9981811ef53365d8b6cc9cb702e356040a0885e4
+  metadata.gz: !binary |-
+    NzY3YzVkNTQ1ZTQ0ZmYxZjJkNGE3YzU0YWUyN2M0ZGQ4N2MxYmIzYWMyMDRj
+    MDZmM2QzNzFkYmM5YTVlMjA0NDI2ZGZhZDQ2ZmFkNjYzZmU5OWM5ZWE5MTZl
+    NjBiZjU3YTJiNGJlZWU0ZjcwM2U3YjYzNzVkZmEwZDM3ODIyNjM=
+  data.tar.gz: !binary |-
+    YjU0MWUxMzVkN2Q3NjRjOWYzNzMxMzE1MmQ5YjRkNjEzYjA1MjI5YzY4YWY4
+    YzZiNTk1Y2IyZWY3MGJjNDkzOTM5NzZiYmQ3OWZlYTk5NGVmYzM1YTVlNzdm
+    YWIyMWMxNWY0MWRmYTkyMzViMTk1MGY4MzAwNTdhZGNkNjE0NWI=

data/bin/lace

@@ -1,33 +1,43 @@
 #!/usr/bin/env ruby
+
+#Copyright 2009-2014 Max Howell and other contributors.
+#
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 std_trap = trap("INT") { exit! 130 } # no backtrace thanks
 require 'pathname'
 
 LIB_PATH = Pathname.new(__FILE__).realpath.dirname.parent.join("lib").to_s
 $:.unshift(LIB_PATH)
 
-require "lace/utils"
-require "lace/exceptions"
-require "lace/version"
+require 'lace'
 
 require "extend/ARGV"
 require "extend/pathname"
 
-packages_folder = Pathname.new(ENV["HOME"]).join(".cassias")
-
-if ENV["LACE_FOLDER"]
-  packages_folder = Pathname.new(ENV["LACE_FOLDER"])
-end
-LACE_PKGS_FOLDER = packages_folder
-
-module Lace extend self
-  attr_accessor :failed
-  alias_method :failed?, :failed
-end
-
 ARGV.extend(LaceArgvExtension)
 
 if ARGV.debug?
-  require "debugger"
+  require 'pry'
 end
 
 def require? path
@@ -62,12 +72,12 @@ begin
 
   aliases = {'ls' => 'list',
              'info' => 'inspect',
+             '--upgrade' => 'upgrade',
              'rm' => 'remove'}
 
   cmd = ARGV.shift
   cmd = aliases[cmd] if aliases[cmd]
 
-
   if require? "cmd/" + cmd
     Lace.send cmd.to_s.gsub('-', '_').downcase
   else

data/lib/cmd/activate.rb

@@ -5,7 +5,7 @@ require 'lace/exceptions'
 module Lace extend self
 	def activate
 		package_name = ARGV.shift
-		raise ResourceNotSpecified if not package_name
+		raise ResourceNotSpecified unless package_name
 		PackageUtils.activate package_name
 	end
 end

data/lib/cmd/deactivate.rb

@@ -4,7 +4,7 @@ require 'lace/exceptions'
 module Lace extend self
 	def deactivate
 		package_name = ARGV.shift
-		raise ResourceNotSpecified if not package_name
+		raise ResourceNotSpecified unless package_name
 		PackageUtils.deactivate package_name
 	end
 end

data/lib/cmd/fetch.rb

@@ -4,14 +4,15 @@ require 'lace/exceptions'
 module Lace extend self
 	def fetch
 		resource = ARGV.shift
-		raise ResourceNotSpecified if not resource
-		package_name, target_folder = PackageUtils.fetch resource
+    desired_package_name = ARGV.value "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
+        FileUtils.rm_rf(target_folder)
         Lace.failed = true
     end
 	end

data/lib/cmd/inspect.rb

@@ -16,7 +16,7 @@ EOS
 module Lace extend self
   def inspect
     resource = ARGV.shift
-    raise ResourceNotSpecified if not resource
+    raise ResourceNotSpecified unless resource
     package = PackagePresenter.new Package.new(resource, false)
     puts ERB.new(INSPECT).result(binding)
   end
@@ -60,6 +60,6 @@ class PackagePresenter
   end
 
   def manifest
-    return @pkg.facts.facts_file
+    @pkg.facts.facts_file
   end
 end

data/lib/cmd/list.rb

@@ -12,12 +12,12 @@ module Lace extend self
 
   def active_packages
     linked_files.map do |path|
-      Pathname.new File.dirname(path)
+      Pathname.new(File.dirname(path)).basename.to_s
     end.uniq
   end
 
   def installed_packages
-    Dir.glob(File.join(LACE_PKGS_FOLDER, "**")).sort.map do |p|
+    Dir.glob(File.join(Lace.pkgs_folder, "**")).sort.map do |p|
       Pathname.new(p).basename.to_s
     end
   end
@@ -25,7 +25,7 @@ module Lace extend self
   def list
     if installed_packages.length > 0
       installed_packages.map do |d|
-        package = Package.new d, false
+        package = Package.new(d, false)
         puts "[#{Tty.green}#{package.is_active? ? "*" : " "}#{Tty.reset}] #{d}"
       end
     else

data/lib/cmd/remove.rb

@@ -4,7 +4,7 @@ require 'lace/exceptions'
 module Lace extend self
 	def remove
 		package_name = ARGV.shift
-		raise ResourceNotSpecified if not package_name
+		raise ResourceNotSpecified unless package_name
 		PackageUtils.remove package_name
 	end
 end

data/lib/cmd/update.rb

@@ -4,7 +4,7 @@ require 'lace/exceptions'
 module Lace extend self
 	def update
 		resource = ARGV.shift
-		raise ResourceNotSpecified if not resource
+		raise ResourceNotSpecified unless resource
 		PackageUtils.update resource
 	end
 end

data/lib/cmd/upgrade.rb

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

data/lib/cmd/validate.rb

@@ -19,8 +19,9 @@ EOS
 module Lace extend self
 	def validate
 		resource = ARGV.shift
-		raise ResourceNotSpecified if not resource
-    validation = PackageValidator.new Facts.new(resource), ARGV.shift
+    flavor = ARGV.shift
+		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
@@ -47,7 +48,7 @@ class PackageValidator
     @facts = facts
     @errors = []
     if @facts.has_flavors? && flavor.nil?
-      raise RuntimeError.new FlavorArgumentMsg % @facts.flavors.join("\n- ")
+      raise RuntimeError.new(FlavorArgumentMsg % @facts.flavors.join("\n- "))
     elsif @facts.has_flavors? && flavor != false
       @facts.flavor! flavor
     end

data/lib/extend/ARGV.rb

@@ -1,3 +1,26 @@
+#Copyright 2009-2014 Max Howell and other contributors.
+#
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 module LaceArgvExtension
   def named
     @named ||= reject{|arg| arg[0..0] == '-'}

data/lib/extend/pathname.rb

@@ -1,5 +1,27 @@
+#Copyright 2009-2014 Max Howell and other contributors.
+#
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 require 'pathname'
-# borrowed from brew.sh
 # we enhance pathname to make our code more readable
 class Pathname
 

data/lib/lace/download_strategy.rb

@@ -1,18 +1,46 @@
+#Copyright 2009-2014 Max Howell and other contributors.
+#
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 require "fileutils"
 
 class AbstractDownloadStrategy
   attr_reader :name, :resource, :target_folder
 
-  def initialize uri
+  def initialize uri, desired_package_name=nil
+    @desired_package_name = desired_package_name
     @uri = uri
-    @target_folder = LACE_PKGS_FOLDER/name
+    @target_folder = Lace.pkgs_folder/name
+  end
+
+  def uri
+    @uri
   end
 
   # All download strategies are expected to implement these methods
   def fetch; end
   def stage; end
   def name
-    ARGV.value "name"
+    @desired_package_name
   end
 end
 
@@ -71,7 +99,7 @@ class GitUpdateStrategy
   include GitCommands
 
   def initialize name
-    @target_folder = LACE_PKGS_FOLDER/name
+    @target_folder = Lace.pkgs_folder/name
   end
 
   def update
@@ -128,6 +156,16 @@ class GitDownloadStrategy < AbstractDownloadStrategy
 
 end
 
+class AbbrevGitDownloadStrategy < GitDownloadStrategy
+  def initialize uri
+    unless uri.end_with?(".git")
+      uri = "#{uri}.git"
+    end
+    uri = "https://github.com/#{uri}"
+    super uri
+  end
+end
+
 
 class DownloadStrategyDetector
   def self.detect(uri, strategy=nil)
@@ -142,10 +180,14 @@ class DownloadStrategyDetector
   end
 
   def self.detect_from_uri(uri)
-    if File.directory?(uri) && !File.directory?(uri+"/.git")
+    is_git_dir = File.directory?(uri+"/.git")
+    has_single_slash = uri.scan("/").count == 1
+    if File.directory?(uri) && !is_git_dir
       return LocalFileStrategy
-    elsif File.directory?(uri+"/.git")
+    elsif is_git_dir
       return GitDownloadStrategy
+    elsif has_single_slash
+      return AbbrevGitDownloadStrategy
     end
 
     case uri

data/lib/lace/package/facts.rb

@@ -0,0 +1,99 @@
+require 'yaml'
+require 'erb'
+
+class PackageFacts
+  attr_reader :facts_file
+
+  def inspect
+    "#<Facts:#{@package_path}>"
+  end
+
+  def initialize package_path
+    @package_path = Pathname.new(package_path)
+    @facts_file = @package_path/".lace.yml"
+    raise PackageFactsNotFound.new(@package_path) unless @facts_file.exist?
+    @facts = facts_file_to_hash
+    @unflavorable_facts = facts_file_to_hash
+  end
+
+  def flavor_with the_flavor
+    if has_flavors? && the_flavor.nil?
+      raise FlavorArgumentRequired.new flavors
+    elsif has_flavors? && the_flavor != false
+      flavor! the_flavor
+    end
+  end
+
+  def config_files
+    if @unflavorable_facts.nil? or @facts["config_files"].nil?
+      []
+    else
+      @facts["config_files"].flatten.map do |file|
+        @package_path + file
+      end
+    end
+  end
+
+  def has_flavors?
+    @unflavorable_facts && !@unflavorable_facts["flavors"].nil?
+  end
+
+  def has_key? key
+    @unflavorable_facts && @unflavorable_facts.has_key?(key)
+  end
+
+  def version
+    @unflavorable_facts["version"] if @unflavorable_facts.key? "version"
+  end
+
+  def setup_files
+    @facts["setup"].flatten rescue []
+  end
+
+  def homepage
+    @unflavorable_facts["homepage"] if @unflavorable_facts.key? "homepage"
+  end
+
+  def flavors
+    if @unflavorable_facts && @unflavorable_facts.key?("flavors")
+      @unflavorable_facts["flavors"].keys.sort
+    else
+      []
+    end
+  end
+
+  def flavor! the_flavor
+    raise PackageFlavorDoesNotExist.new(the_flavor, flavors) unless flavors.include? the_flavor
+    @facts = @unflavorable_facts["flavors"][the_flavor]
+  end
+
+  def unflavor!
+    @facts = @unflavorable_facts
+  end
+
+  def post hook_point
+    if @unflavorable_facts.nil? or !@facts.key? "post"
+      []
+    else
+      post_hook = @facts["post"]
+      (post_hook[hook_point.to_s] || []).flatten
+    end
+  end
+
+  protected
+  def facts_file_to_hash
+    begin
+      rendered_manifest = ERB.new(@facts_file.read, nil, '-').result(binding)
+    rescue Exception => e
+      raise ManifestErbError.new(self, e)
+    end
+    value = YAML.load rendered_manifest
+    if value.is_a?(String) && value == "---"
+      return Hash.new
+    else
+      value
+    end
+  end
+end
+
+

data/lib/lace/package/package.rb

@@ -0,0 +1,75 @@
+require 'set'
+
+require 'lace/download_strategy'
+
+class Package
+  include GitCommands
+  attr_reader :name, :facts, :path
+
+  def initialize name, flavor=nil
+    require 'cmd/list'
+    raise PackageNotInstalled.new(name) unless Lace.installed_packages.include?(name)
+    @name = name
+    @path = Lace.pkgs_folder/name
+    @flavor = flavor
+    read_facts!
+  end
+
+  def setup
+    return if ARGV.nohooks?
+    ENV['LACEPKG_PATH'] = @path
+     @path.cd do
+       facts.setup_files.each do |cmd|
+         safe_system cmd
+       end
+     end
+  end
+
+  def after_update
+    return if ARGV.nohooks?
+    @path.cd do
+      facts.post(:update).each do |cmd|
+        system cmd
+      end
+    end
+  end
+
+  def is_git_repo?
+    @target_folder = @path
+    repo_valid?
+  end
+
+  def is_active?
+    if @facts.has_flavors? && @flavor == false
+      @facts.flavors.any?{|f| Package.new(@name, f).is_active?}
+    else
+      linked_files = Set.new Lace.linked_files.map(&:to_s)
+      config_files = Set.new @facts.config_files.map(&:to_s)
+      config_files.subset? linked_files
+    end
+  end
+
+  def read_facts!
+    @facts = PackageFacts.new @path
+    @facts.flavor_with @flavor
+  end
+
+  def deactivate!
+    files = @facts.config_files
+    home_dir = ENV["HOME"]
+    files.each do |file|
+      file = Pathname.new(file)
+      dotfile = file.as_dotfile(home_dir)
+      FileUtils.rm_f dotfile if dotfile.exist? && dotfile.readlink == file
+    end
+  end
+
+  def activate!
+    files = @facts.config_files
+    home_dir = ENV["HOME"]
+    files.each do |file|
+      # if ends in erb -> generate it
+      FileUtils.ln_s file, Pathname.new(file).as_dotfile(home_dir), :force => ARGV.force?
+    end
+  end
+end

data/lib/lace/package/utils.rb

@@ -0,0 +1,59 @@
+require 'lace/exceptions'
+
+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?
+    downloader.fetch
+    return downloader.name, downloader.target_folder
+  end
+
+  def self.remove package_name
+    package = Package.new(package_name, false)
+    raise CannotRemoveActivePackage.new if package.is_active?
+    ohai "Removing"
+    FileUtils.rm_rf package.path
+  end
+
+  def self.setup package_name
+    begin
+      package = Package.new(package_name, ARGV.first)
+      package.activate!
+      package.setup
+    rescue FlavorError => e
+      onoe e.message
+      onoe "Package remains installed but was not activated"
+    end
+  end
+
+  def self.deactivate package_name
+    package = Package.new(package_name, ARGV.first)
+    raise NonActiveFlavorError.new unless package.is_active? || ARGV.force?
+    ohai "Deactivating"
+    package.deactivate!
+  end
+
+  def self.activate package_name
+    package = Package.new(package_name, ARGV.first)
+    raise AlreadyActiveError.new if Package.new(package_name, false).is_active?
+    ohai "Activating"
+    package.activate!
+  end
+
+  def self.update package_name
+    package = Package.new(package_name, false)
+    raise OnlyGitReposCanBeUpdatedError.new unless package.is_git_repo?
+    updater = GitUpdateStrategy.new(package_name)
+    was_active_before_update = package.is_active?
+    self.deactivate(package_name) if was_active_before_update
+    ohai "Updating"
+    updater.update
+    self.activate(package_name) if was_active_before_update
+    package = Package.new package_name, false
+    package.after_update
+  end
+end
+
+

data/lib/lace/package.rb

@@ -1,229 +1,5 @@
-require 'set'
-require 'yaml'
-require 'ostruct'
-require 'erb'
+require 'lace/package/utils'
+require 'lace/package/facts'
+require 'lace/package/package'
 
-require 'lace/download_strategy'
-require 'lace/exceptions'
 
-class PackageUtils
-  def self.has_active_flavors name
-    @path = LACE_PKGS_FOLDER/name
-    facts = Facts.new @path
-    facts.flavors.any?{|f| Package.new(@name, f).is_active? }
-  end
-
-  def self.fetch uri
-    downloader = DownloadStrategyDetector.detect(uri).new(uri)
-    raise PackageAlreadyInstalled.new if downloader.target_folder.exist?
-    downloader.fetch
-    return downloader.name, downloader.target_folder
- end
-
-  def self.remove package_name
-    package = Package.new package_name, false
-    raise CannotRemoveActivePackage.new if package.is_active?
-    ohai "Removing"
-    FileUtils.rm_rf package.path
-  end
-
-  def self.setup package_name
-    begin
-      package = Package.new package_name, ARGV.first
-      package.activate!
-      package.setup
-    rescue FlavorError => e
-      onoe e.message
-      onoe "Package remains installed but was not activated"
-    end
-  end
-
-  def self.deactivate package_name
-    package = Package.new package_name, ARGV.first
-    raise NonActiveFlavorError.new unless package.is_active? || ARGV.force?
-    ohai "Deactivating"
-    package.deactivate!
-  end
-
-  def self.activate package_name
-    package = Package.new package_name, ARGV.first
-    raise AlreadyActiveError.new if Package.new(package_name, false).is_active?
-    ohai "Activating"
-    package.activate!
-  end
-
-  def self.update package_name
-    package = Package.new package_name, false
-    raise OnlyGitReposCanBeUpdatedError.new unless package.is_git_repo?
-    updater = GitUpdateStrategy.new package_name
-    self.deactivate package_name
-    ohai "Updating"
-    updater.update
-    self.activate package_name
-    package = Package.new package_name, false
-    package.after_update
-  end
-end
-
-class Facts
-  attr_reader :facts_file
-
-  def inspect
-    "#<Facts:#{@package_path}>"
-  end
-
-  def initialize package_path
-    @package_path = Pathname.new(package_path)
-    @facts_file = @package_path/".lace.yml"
-    raise PackageFactsNotFound.new(@package_path) unless @facts_file.exist?
-    @facts = facts_file_to_hash
-    @_facts = facts_file_to_hash
-  end
-
-  def config_files
-    if @_facts.nil? or @facts["config_files"].nil?
-      []
-    else
-      @facts["config_files"].flatten.map do |file|
-        @package_path + file
-      end
-    end
-  end
-
-  def has_flavors?
-    @_facts && !@_facts["flavors"].nil?
-  end
-
-  def has_key? key
-    @_facts && @_facts.has_key?(key)
-  end
-
-  def version
-    @_facts["version"] if @_facts.key? "version"
-  end
-
-  def setup_files
-    @facts["setup"].flatten rescue []
-  end
-
-  def homepage
-    @_facts["homepage"] if @_facts.key? "homepage"
-  end
-
-  def flavors
-    if @_facts && @_facts.key?("flavors")
-      @_facts["flavors"].keys.sort
-    else
-      []
-    end
-  end
-
-  def flavor! which_flavor
-    raise PackageFlavorDoesNotExist.new(which_flavor, flavors) unless flavors.include? which_flavor
-    @facts = @_facts["flavors"][which_flavor]
-  end
-
-  def unflavor!
-    @facts = @_facts
-  end
-
-  def post hook_point
-    if @_facts.nil? or !@facts.key? "post"
-      []
-    else
-      post_hook = @facts["post"]
-      (post_hook[hook_point.to_s] || []).flatten
-    end
-  end
-
-  protected
-  def facts_file_to_hash
-    begin
-      rendered_lace = ERB.new(@facts_file.read, nil, '-').result(binding)
-    rescue Exception => e
-      raise ManifestErbError.new(self, e)
-    end
-    value = YAML.load rendered_lace
-    if value.is_a?(String) && value == "---"
-      return Hash.new
-    else
-      value
-    end
-  end
-end
-
-class Package
-  include GitCommands
-  attr_reader :name, :facts, :path
-
-  def setup
-    return if ARGV.nohooks?
-     @path.cd do
-       facts.setup_files.each do |cmd|
-         safe_system cmd
-       end
-     end
-  end
-
-  def after_update
-    return if ARGV.nohooks?
-    @path.cd do
-      facts.post(:update).each do |cmd|
-        system cmd
-      end
-    end
-  end
-
-  def initialize name, flavor=nil
-    require 'cmd/list'
-    raise PackageNotInstalled.new(name) unless Lace.installed_packages.include? name
-    @name = name
-    @path = LACE_PKGS_FOLDER/name
-    @flavor = flavor
-    read_facts!
-  end
-
-  def is_git_repo?
-    @target_folder = @path
-    repo_valid?
-  end
-
-  def is_active?
-    if @facts.has_flavors? && @flavor == false
-      @facts.flavors.any?{|f| Package.new(@name, f).is_active?}
-    else
-      linked_files = Set.new Lace.linked_files.map(&:to_s)
-      config_files = Set.new @facts.config_files.map(&:to_s)
-      config_files.subset? linked_files
-    end
-  end
-
-  def read_facts!
-    # todo simplify
-    @facts = Facts.new @path
-    if @facts.has_flavors? && @flavor.nil?
-      raise FlavorArgumentRequired.new @facts.flavors
-    elsif @facts.has_flavors? && @flavor != false
-      @facts.flavor! @flavor
-    end
-  end
-
-  def deactivate!
-    files = @facts.config_files
-    home_dir = ENV["HOME"]
-    files.each do |file|
-      file = Pathname.new(file)
-      dotfile = file.as_dotfile(home_dir)
-      FileUtils.rm_f dotfile if dotfile.exist? && dotfile.readlink == file
-    end
-  end
-
-  def activate!
-    files = @facts.config_files
-    home_dir = ENV["HOME"]
-    files.each do |file|
-      # if ends in erb -> generate it
-      FileUtils.ln_s file, Pathname.new(file).as_dotfile(home_dir), :force => ARGV.force?
-    end
-  end
-end

data/lib/lace/utils.rb

@@ -1,3 +1,26 @@
+#Copyright 2009-2014 Max Howell and other contributors.
+#
+#Redistribution and use in source and binary forms, with or without
+#modification, are permitted provided that the following conditions
+#are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 class Tty
   class << self
     def blue; bold 34; end

data/lib/lace/version.rb

@@ -1,3 +1,3 @@
 module Lace
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/lace.rb

@@ -0,0 +1,23 @@
+require "lace/utils"
+require "lace/exceptions"
+require "lace/version"
+
+module Lace extend self
+  attr_accessor :failed
+  alias_method :failed?, :failed
+
+  def self.pkgs_folder
+    packages_folder = Pathname.new(ENV["HOME"]).join(".lace.pkgs")
+
+    if ENV["LACE_FOLDER"]
+      packages_folder = Pathname.new(ENV["LACE_FOLDER"])
+    end
+    packages_folder
+  end
+
+  def self.pstore
+    @pstore ||= PStore.new(pkgs_folder/".lace.pstore")
+  end
+end
+
+

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2015-06-03 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
+description: Lace lets you manage your dotfiles when using them on multiple machines
 email: kai@kairichardkoenig.de
 executables:
 - lace
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/lace
 - lib/cmd/activate.rb
 - lib/cmd/deactivate.rb
 - lib/cmd/fetch.rb
@@ -27,15 +27,19 @@ files:
 - lib/cmd/remove.rb
 - lib/cmd/setup.rb
 - lib/cmd/update.rb
+- lib/cmd/upgrade.rb
 - lib/cmd/validate.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/utils.rb
 - lib/lace/version.rb
-- bin/lace
 homepage: https://github.com/kairichard/lace
 licenses:
 - MIT
@@ -46,17 +50,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Manage your .dotfiles