lace 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDdkYjU0Nzc1NDE2ZWI0YTQyMGVmMWRmODI2YTEzN2FmNTY4Y2M1Yw==
-  data.tar.gz: !binary |-
-    NGNjODYwMzAyY2Q0Y2QyNzllZGY2YWFmMDFiNmM1NTIyZTY4ODdkZg==
+SHA1:
+  metadata.gz: bc158e1d6fcfc6821a0d1b777e978a912b6fb975
+  data.tar.gz: e00ee505a2bfc0536ef2fb04ea8feac8cef5ea0b
 SHA512:
-  metadata.gz: !binary |-
-    YzM0M2ZlZTA5MjRiZWJhMjc1ODI2NDViZjg0Yjg3NDA2M2NkZjBmYTVjYWYz
-    NmNiYWJmZDBlMzIxMDU2ZGE1YjU2ZWM5NmNiMzc3Njk0MzdlZWNlZTk2YmM0
-    YTA4MjdmOWE2YjA3ZTg2OWVhYmQwYmUxMjEwNmZhN2YzNGQ4MTM=
-  data.tar.gz: !binary |-
-    NzIzM2E0OTc3YjA2M2I2NjRjZTcwZmM2MDVkMDY5ZGRmZGViMWRlNmFiZTFj
-    NzM4YmZmMWU4MGZmMzI1YzFiZjRkYmNjYWZjNGY5YmEyMjgzYjkwNzVjMWRh
-    ZDgwZDVkZDEyYTAwOTlkNDVlNmRlNGRmNDMyNzkzNzA2ODg4NTg=
+  metadata.gz: 62d67ba5996037f32838dba6ae25a3134499f1413defd3b3c4b6b2392c67fd16c823b9413aeda4bc1719983fec0fd3f29ae8bb77a5a52e294e9db37cffba5314
+  data.tar.gz: 24c58a76a3db779ebdc3fa5f31f9b65908b258d86a248b2341037bf94da847f8475c837f80c27a0492d8265b9981811ef53365d8b6cc9cb702e356040a0885e4

data/lib/cmd/validate.rb

@@ -73,7 +73,7 @@ class PackageValidator
       if errors.length > 0
         ["#{Tty.red}error#{Tty.reset}", errors]
       else
-        ["ok", nil]
+        ["#{Tty.green}ok#{Tty.reset}", nil]
       end
     end
   end

data/lib/lace/exceptions.rb

@@ -58,6 +58,12 @@ class PackageFlavorDoesNotExist < FlavorError
   end
 end
 
+class ManifestErbError < RuntimeError
+  def initialize fact, exception
+    super "#{exception.to_s}\nin #{fact.facts_file}"
+  end
+end
+
 
 FlavorArgumentMsg = <<-EOS
 Sorry, this command needs a flavor argument you can choose from the following:

data/lib/lace/package.rb

@@ -67,6 +67,11 @@ 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"
@@ -107,7 +112,7 @@ class Facts
 
   def flavors
     if @_facts && @_facts.key?("flavors")
-      @_facts["flavors"].keys
+      @_facts["flavors"].keys.sort
     else
       []
     end
@@ -133,7 +138,11 @@ class Facts
 
   protected
   def facts_file_to_hash
-    rendered_lace = ERB.new(@facts_file.read, nil, '-').result(binding)
+    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
@@ -214,7 +223,7 @@ class Package
     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?
+      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.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lace
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kai Richard Koenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-14 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
@@ -18,7 +18,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/lace
 - lib/cmd/activate.rb
 - lib/cmd/deactivate.rb
 - lib/cmd/fetch.rb
@@ -36,6 +35,7 @@ files:
 - lib/lace/package.rb
 - lib/lace/utils.rb
 - lib/lace/version.rb
+- bin/lace
 homepage: https://github.com/kairichard/lace
 licenses:
 - MIT
@@ -46,17 +46,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.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Manage your .dotfiles