valise 0.5 → 0.6

data/doc/README

@@ -1,27 +1,32 @@
-== Fileset
+== Valise
 === Simple file management
 
-Applications tend to need preferences and configuration files, which can be a bit of a pain to maintain.  Fileset allows you to describe a directory structure with raw files or YAML documents, and then populate the local directories of the install target.
+Applications tend to need preferences and configuration files, which can be a bit of a pain to maintain.  Valise allows you to describe a directory structure with raw files or YAML documents, and then populate the local directories of the install target.
 
 === Features
 
-With FileSet you get the following things:
+With Valise::Set you get the following things:
 * Default file contents
 * Search paths
 * Even simpler file access
 
 === Usage
 
-Essentially, FileSet lets you do this:
+Essentially, Valise::Set lets you do this:
 
 ==== Search paths
 
- set = FileSet.new([""] + %w{etc myapp}, %w{~ .myapp}, %{.myapp})
+ set = Valise::Set.define do
+   rw %w{.myapp}
+   rw %w{~ .myapp} 
+   rw [""] + %w{etc myapp}
+   ro from_here("myapp_defaults")
+ end
 
 When you create a fileset, the directories you give it define where in the
 filesystem it will work.
 
-Throughout, FileSet uses arrays of strings to reference files, which is a little cheaper when manipulating file paths, and slightly more platform agnostic than strings delimited by '/'.  Development so far has been entirely in Linux, so I'd imagine this will work pretty well on OS X, and mostly all right on Windows - although I wouldn't expect Windows-style %ESCAPES% to work.
+Throughout, Valise::Set uses arrays of strings to reference files, which is a little cheaper when manipulating file paths, and slightly more platform agnostic than strings delimited by '/'.  Development so far has been entirely in Linux, so I'd imagine this will work pretty well on OS X, and mostly all right on Windows - although I wouldn't expect Windows-style %ESCAPES% to work.
 
 ==== Definition
  set.define do
@@ -45,16 +50,16 @@ A few features:
 * a simple DSL for definition of files
 * Basic text or yaml file definition
 * Left flush alignment of file text (aligned an optional '<<<')
-* Definition blocks can be repeated, as can dir blocks, so the FileSet can be handed around to different program modules to collect their file requirements
+* Definition blocks can be repeated, as can dir blocks, so the Valise::Set can be handed around to different program modules to collect their file requirements
 
 ==== Filesystem population
  set.populate
 
-This step creates directories and writes files.  The first directory listed in the search path used to initialize the FileSet that can be written to is the destination for the files.  The intention is that an administrator will be able to deploy system-wide configuration, while users will still be able to install default configs in their home directories.
+This step creates directories and writes files.  The first directory listed in the search path used to initialize the Valise::Set that can be written to is the destination for the files.  The intention is that an administrator will be able to deploy system-wide configuration, while users will still be able to install default configs in their home directories.
 
-FileSet::populate won't overwrite existing files, so re-populating won't wipe out the configuration changes your users have made.
+Valise::Set::populate won't overwrite existing files, so re-populating won't wipe out the configuration changes your users have made.
 
-FileSet::populate is intentionally left as a separate step, so that it can be initiated as appropriate to the application.  Some apps may want to populate automatically every time they're run, others might want to wait for a commandline switch.
+Valise::Set::populate is intentionally left as a separate step, so that it can be initiated as appropriate to the application.  Some apps may want to populate automatically every time they're run, others might want to wait for a commandline switch.
 
 If populate is never run, the default values in the define block will be returned if the files are read.
 
@@ -64,6 +69,6 @@ If populate is never run, the default values in the define block will be returne
  conf.contents['count'] += 1
  conf.store
 
-FileSet#load returns the contents of the file: either a string or the data stored in the YAML document.
+Valise::Set#load returns the contents of the file: either a string or the data stored in the YAML document.
 
-FileSet#get_file returns a wrapper that allows the contents of the file to be accessed, changed, and then rewritten with FileSet#store.
+Valise::Set#get_file returns a wrapper that allows the contents of the file to be accessed, changed, and then rewritten with Valise::Set#store.

data/lib/valise/stack.rb

@@ -86,7 +86,7 @@ module Valise
       end
 
       def merge_stack(stack)
-        stack.inject({}) do |hash, item|
+        stack.present.inject({}) do |hash, item|
           deep_merge(hash, item.load_contents)
         end
       end

data/spec/merge_diff.rb

@@ -21,14 +21,15 @@ describe Valise do
     sandbox.new :directory => "base/test"
     sandbox.new :directory => "layer2/test"
     sandbox.new :directory => "layer3/test"
-    sandbox.new :file => "base/test/file", :with_contents => YAML::dump(bottom_hash)
-    sandbox.new :file => "layer2/test/file", :with_contents => YAML::dump(middle_hash)
-    sandbox.new :file => "layer3/test/file", :with_contents => YAML::dump(top_hash)
+    sandbox["base/test/file"].contents = YAML::dump(bottom_hash)
+    sandbox["layer2/test/file"].contents = YAML::dump(middle_hash)
+    sandbox["layer3/test/file"].contents = YAML::dump(top_hash)
 
     Valise::Set.define do
       handle "test/file", :yaml, :hash_merge
       rw "layer3"
       rw "layer2"
+      rw "missing"
       rw "base"
     end
   end
@@ -55,7 +56,7 @@ describe Valise do
       top_hash[:a] = 1
 
       item.contents.should == {:a => 1}
-      item.stack.map{|stack| stack.contents[:a]}.should == [1,2,3]
+      item.stack.map{|stack| stack.contents[:a]}.should == [1,2,3,3]
     end
 
     it "should prefer top nil to bottom value" do
@@ -69,7 +70,7 @@ describe Valise do
       middle_hash[:a] = {:a => {:a => 2}}
       top_hash[:a] = {:a => {:a => 1}}
 
-      item.stack.map{|stack| stack.contents[:a][:a][:a]}.should == [1,2,3]
+      item.stack.map{|stack| stack.contents[:a][:a][:a]}.should == [1,2,3,3]
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: valise
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.5"
+  version: "0.6"
 platform: ruby
 authors: 
 - Judson Lester
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 Z
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: corundum
@@ -191,7 +191,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- valise-0.5 RDoc
+- valise-0.6 RDoc
 require_paths: 
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -950433005
+      hash: 940501423
       segments: 
       - 0
       version: "0"