lace 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2EwOWNjNGJiNTg5NWE0YTM0NGVmZjcyMGJlZGEwNzkyZmRlZWU3YQ==
+  data.tar.gz: !binary |-
+    NzM4NzhkMWU0NTRhZjljYjVjZTA1OWFlMjA1MmQyMWViYjg1NmQ1Ng==
+SHA512:
+  metadata.gz: !binary |-
+    MzQ3ZjA0OWU5OTU2YWVmOTAzMDAxYjQ5MDU3NWI4MDFkMDNkMDZjMzMxZDVm
+    NjVmODEwMjcyYzcxZTk2MDAyMWE5NDI2MTlhMWEyMjAyYTc5NWM4NmQxMmFk
+    OThkODU1NzM5MWRhNDk0NmRkMjM1NDNiNTIxYjJlZjc3MTk4MmU=
+  data.tar.gz: !binary |-
+    ZjI3N2ZkMTczNDdkMWZkY2U1ZDgwMzYzYTZkMGY5NTRlMzY0ZTVhZDM5ZWJi
+    MjdjY2RjYjY4NDAxMjBjODkzMmM1NjkzNGM1M2Y1ZGFjNDMxNTIyOWQ4ZDAx
+    MmYxMTQ3ZTU1M2ZmN2ZhMzY2MDA1NjUwN2QxMTRhYmY0Y2RiMDM=

data/bin/lace

@@ -30,6 +30,14 @@ if ARGV.debug?
   require "debugger"
 end
 
+def require? path
+  require path.to_s.chomp
+rescue LoadError => e
+  # HACK :( because we should raise on syntax errors but
+  # not if the file doesn't exist. TODO make robust!
+  raise unless e.to_s.include? path
+end
+
 case ARGV.first when '-h', '--help', '--usage', '-?', 'help', nil
   require 'cmd/help'
   puts Lace.help_s
@@ -58,7 +66,8 @@ begin
   cmd = ARGV.shift
   cmd = aliases[cmd] if aliases[cmd]
 
-  if require "cmd/" + cmd
+
+  if require? "cmd/" + cmd
     Lace.send cmd.to_s.gsub('-', '_').downcase
   else
     onoe "Unknown command: #{cmd}"

data/lib/cmd/activate.rb

@@ -6,7 +6,7 @@ module Lace extend self
 	def activate
 		package_name = ARGV.shift
 		raise ResourceNotSpecified if not package_name
-		PackageUtils.activate package_name, ARGV
+		PackageUtils.activate package_name
 	end
 end
 

data/lib/cmd/deactivate.rb

@@ -5,7 +5,7 @@ module Lace extend self
 	def deactivate
 		package_name = ARGV.shift
 		raise ResourceNotSpecified if not package_name
-		PackageUtils.deactivate package_name, ARGV
+		PackageUtils.deactivate package_name
 	end
 end
 

data/lib/cmd/fetch.rb

@@ -5,6 +5,6 @@ module Lace extend self
 	def fetch
 		resource = ARGV.shift
 		raise ResourceNotSpecified if not resource
-		PackageUtils.fetch resource, ARGV
+		PackageUtils.fetch resource
 	end
 end

data/lib/cmd/inspect.rb

@@ -4,10 +4,11 @@ require 'lace/package'
 require 'lace/exceptions'
 
 INSPECT = <<-EOS
-Inspection of simple:
+Inspection of <%= package.name %>:
   active:      <%= package.is_active? %>
   flavors:     <%= package.flavors %>
   version:     <%= package.version %>
+  homepage:    <%= package.homepage %>
   upgradeable: <%= package.upgradeable? %>
   manifest:    <%= package.manifest %>
 EOS
@@ -18,7 +19,7 @@ module Lace extend self
     raise ResourceNotSpecified if not resource
     package = PackagePresenter.new Package.new(resource, false)
     puts ERB.new(INSPECT).result(binding)
-	end
+  end
 end
 
 class PackagePresenter
@@ -28,6 +29,10 @@ class PackagePresenter
     @pkg = obj
   end
 
+  def name
+    @pkg.name
+  end
+
   def is_active?
     pkg.is_active?
   end
@@ -46,6 +51,10 @@ class PackagePresenter
     @pkg.facts.version or 'n/a'
   end
 
+  def homepage
+    @pkg.facts.homepage or 'n/a'
+  end
+
   def upgradeable?
     @pkg.is_git_repo?
   end

data/lib/cmd/install.rb

@@ -5,6 +5,6 @@ module Lace extend self
 	def install
 		resource = ARGV.shift
 		raise ResourceNotSpecified if not resource
-		PackageUtils.install resource, ARGV
+		PackageUtils.install resource
 	end
 end

data/lib/cmd/list.rb

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

data/lib/cmd/remove.rb

@@ -5,7 +5,7 @@ module Lace extend self
 	def remove
 		package_name = ARGV.shift
 		raise ResourceNotSpecified if not package_name
-		PackageUtils.remove package_name, ARGV
+		PackageUtils.remove package_name
 	end
 end
 

data/lib/cmd/update.rb

@@ -5,6 +5,6 @@ module Lace extend self
 	def update
 		resource = ARGV.shift
 		raise ResourceNotSpecified if not resource
-		PackageUtils.update resource, ARGV
+		PackageUtils.update resource
 	end
 end

data/lib/extend/pathname.rb

@@ -1,5 +1,5 @@
 require 'pathname'
-
+# borrowed from brew.sh
 # we enhance pathname to make our code more readable
 class Pathname
 
@@ -136,55 +136,6 @@ class Pathname
     (dirname+link).exist?
   end
 
-  # perhaps confusingly, this Pathname object becomes the symlink pointing to
-  # the src paramter.
-  def make_relative_symlink src
-    src = Pathname.new(src) unless src.kind_of? Pathname
-
-    self.dirname.mkpath
-    Dir.chdir self.dirname do
-      # NOTE only system ln -s will create RELATIVE symlinks
-      quiet_system 'ln', '-s', src.relative_path_from(self.dirname), self.basename
-      if not $?.success?
-        if self.exist?
-          raise <<-EOS.undent
-            Could not symlink file: #{src.expand_path}
-            Target #{self} already exists. You may need to delete it.
-            To force the link and overwrite all other conflicting files, do:
-              brew link --overwrite formula_name
-
-            To list all files that would be deleted:
-              brew link --overwrite --dry-run formula_name
-            EOS
-        # #exist? will return false for symlinks whose target doesn't exist
-        elsif self.symlink?
-          raise <<-EOS.undent
-            Could not symlink file: #{src.expand_path}
-            Target #{self} already exists as a symlink to #{readlink}.
-            If this file is from another formula, you may need to
-            `brew unlink` it. Otherwise, you may want to delete it.
-            To force the link and overwrite all other conflicting files, do:
-              brew link --overwrite formula_name
-
-            To list all files that would be deleted:
-              brew link --overwrite --dry-run formula_name
-            EOS
-        elsif !dirname.writable_real?
-          raise <<-EOS.undent
-            Could not symlink file: #{src.expand_path}
-            #{dirname} is not writable. You should change its permissions.
-            EOS
-        else
-          raise <<-EOS.undent
-            Could not symlink file: #{src.expand_path}
-            #{self} may already exist.
-            #{dirname} may not be writable.
-            EOS
-        end
-      end
-    end
-  end
-
   def / that
     join that.to_s
   end

data/lib/lace/download_strategy.rb

@@ -20,7 +20,7 @@ end
 class LocalFileStrategy < AbstractDownloadStrategy
   def fetch
     ohai "Fetching #@uri into #@target_folder"
-    FileUtils.cp_r @uri, @target_folder
+    FileUtils.cp_r @uri, @target_folder, :preserve => true
     @target_folder
   end
 

data/lib/lace/exceptions.rb

@@ -20,6 +20,45 @@ class NonActiveFlavorError < RuntimeError
   end
 end
 
+class PackageAlreadyInstalled < RuntimeError
+  def initialize
+    super "Package already installed"
+  end
+end
+
+class CannotRemoveActivePackage < RuntimeError
+  def initialize
+    super "Cannot remove active pkg, deactivate first"
+  end
+end
+
+class PackageNotInstalled < RuntimeError
+  def initialize name
+    super "Package #{name} is not installed"
+  end
+end
+
+class FlavorError < RuntimeError; end
+
+class FlavorArgumentRequired < FlavorError
+  def initialize available_flavors
+    super FlavorArgumentMsg % available_flavors.join("\n- ")
+  end
+end
+
+class PackageFactsNotFound < RuntimeError
+  def initialize path
+    super "No PackageFacts found in #{path}"
+  end
+end
+
+class PackageFlavorDoesNotExist < FlavorError
+  def initialize which_flavor, flavors
+    super "Flavor '#{which_flavor}' does not exist"
+  end
+end
+
+
 FlavorArgumentMsg = <<-EOS
 Sorry, this command needs a flavor argument you can choose from the following:
 - %s

data/lib/lace/package.rb

@@ -1,67 +1,73 @@
+require 'set'
 require 'yaml'
 require 'ostruct'
-require 'set'
 
 require 'lace/download_strategy'
 require 'lace/exceptions'
 
 class PackageUtils
-  def self.is_package_any_flavor_active name
+  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?}
+    facts.flavors.any?{|f| Package.new(@name, f).is_active? }
   end
 
-  def self.fetch uri, argv
+  def self.fetch uri
     downloader = DownloadStrategyDetector.detect(uri).new(uri)
-    if downloader.target_folder.exist?
-      raise "Package already installed"
-    end
+    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
 
-  def self.remove package_name, argv
-    ohai "Removing"
+  def self.remove package_name
     package = Package.new package_name, false
-    unless package.is_active?
-      FileUtils.rm_rf package.path
-      ohai "Successfully removed"
-    else
-      ofail "Cannot remove active pkg, deactivate first"
-    end
+    raise CannotRemoveActivePackage.new if package.is_active?
+    ohai "Removing"
+    FileUtils.rm_rf package.path
   end
 
-  def self.install uri, argv
+  def self.install uri
     downloader = DownloadStrategyDetector.detect(uri).new(uri)
-    if downloader.target_folder.exist?
-      raise "Package already installed"
+    self.fetch uri
+    begin
+      package = Package.new downloader.name, ARGV.first
+      package.activate!
+      package.after_install
+    rescue FlavorError => e
+      onoe e.message
+      onoe "Package remains installed but was not activated"
     end
-    downloader.fetch
-    package = Package.new downloader.name, ARGV.first
-    package.activate!
-    package.after_install
   end
 
-  def self.deactivate package_name, argv
-    package = Package.new package_name, ARGV.shift
+  def self.deactivate package_name
+    package = Package.new package_name, ARGV.first
     raise NonActiveFlavorError.new unless package.is_active?
+    ohai "Deactivating"
     package.deactivate!
   end
 
-  def self.activate package_name, argv
-    package = Package.new package_name, ARGV.shift
+  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, argv
+  def self.update package_name
     package = Package.new package_name, false
     raise OnlyGitReposCanBeUpdatedError.new unless package.is_git_repo?
     updater = GitUpdateStrategy.new package_name
-    package.deactivate!
+    self.deactivate package_name
+    ohai "Updating"
     updater.update
-    package.read_facts!
-    package.activate!
+    self.activate package_name
+    package = Package.new package_name, false
     package.after_update
   end
 end
@@ -71,9 +77,9 @@ class Facts
   def initialize location
     @location = Pathname.new(location)
     @facts_file = @location/".lace.yml"
-    raise RuntimeError.new "No package file found in #@location" unless @facts_file.exist?
-    @facts = YAML.load @facts_file.read
-    @_facts = YAML.load @facts_file.read
+    raise PackageFactsNotFound.new(@location) unless @facts_file.exist?
+    @facts = facts_file_to_hash
+    @_facts = facts_file_to_hash
   end
 
   def config_files
@@ -98,6 +104,10 @@ class Facts
     @_facts["version"] if @_facts.key? "version"
   end
 
+  def homepage
+    @_facts["homepage"] if @_facts.key? "homepage"
+  end
+
   def flavors
     if @_facts && @_facts.key?("flavors")
       @_facts["flavors"].keys
@@ -107,7 +117,7 @@ class Facts
   end
 
   def flavor! which_flavor
-    raise RuntimeError.new "Flavor '#{which_flavor}' does not exist -> #{flavors.join(', ')} - use: lace <command> <pkg-uri> <flavor>" unless flavors.include? which_flavor
+    raise PackageFlavorDoesNotExist.new(which_flavor, flavors) unless flavors.include? which_flavor
     @facts = @_facts["flavors"][which_flavor]
   end
 
@@ -123,6 +133,16 @@ class Facts
       (post_hook[hook_point.to_s] || []).flatten
     end
   end
+
+  protected
+  def facts_file_to_hash
+    value = YAML.load @facts_file.read
+    if value.is_a?(String) && value == "---"
+      return Hash.new
+    else
+      value
+    end
+  end
 end
 
 class Package
@@ -151,7 +171,7 @@ class Package
 
   def initialize name, flavor=nil
     require 'cmd/list'
-    raise "Package #{name} is not installed" unless Lace.installed_dotties.include? name
+    raise PackageNotInstalled.new(name) unless Lace.installed_packages.include? name
     @name = name
     @path = LACE_PKGS_FOLDER/name
     @flavor = flavor
@@ -174,16 +194,16 @@ class Package
   end
 
   def read_facts!
+    # todo simplify
     @facts = Facts.new @path
     if @facts.has_flavors? && @flavor.nil?
-      raise RuntimeError.new FlavorArgumentMsg % @facts.flavors.join("\n- ")
+      raise FlavorArgumentRequired.new @facts.flavors
     elsif @facts.has_flavors? && @flavor != false
       @facts.flavor! @flavor
     end
   end
 
   def deactivate!
-    ohai "Deactivating"
     files = @facts.config_files
     home_dir = ENV["HOME"]
     files.each do |file|
@@ -193,7 +213,6 @@ class Package
   end
 
   def activate!
-    ohai "Activating"
     files = @facts.config_files
     home_dir = ENV["HOME"]
     files.each do |file|

data/lib/lace/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-09 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
@@ -19,6 +18,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/lace
 - lib/cmd/activate.rb
 - lib/cmd/deactivate.rb
 - lib/cmd/fetch.rb
@@ -36,30 +36,28 @@ files:
 - lib/lace/package.rb
 - lib/lace/utils.rb
 - lib/lace/version.rb
-- bin/lace
 homepage: https://github.com/kairichard/lace
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage your .dotfiles
 test_files: []