hiera 0.3.0 → 1.0.0rc4

data/spec/unit/config_spec.rb

@@ -1,84 +1,90 @@
 require 'spec_helper'
 
 class Hiera
-    describe Config do
-        describe "#load" do
-            it "should treat string sources as a filename" do
-                expect {
-                    Config.load("/nonexisting")
-                }.to raise_error("Config file /nonexisting not found")
-            end
-
-            it "should raise error for missing config files" do
-                File.expects(:exist?).with("/nonexisting").returns(false)
-                YAML.expects(:load_file).with("/nonexisting").never
-
-                expect { Config.load("/nonexisting") }.should raise_error RuntimeError, /not found/
-            end
-
-            it "should attempt to YAML load config files" do
-                File.expects(:exist?).with("/nonexisting").returns(true)
-                YAML.expects(:load_file).with("/nonexisting").returns(YAML.load("---\n"))
-
-                Config.load("/nonexisting")
-            end
-
-            it "should use defaults on empty YAML config file" do
-                File.expects(:exist?).with("/nonexisting").returns(true)
-                YAML.expects(:load_file).with("/nonexisting").returns(YAML.load(""))
-
-                Config.load("/nonexisting").should == {:backends => ["yaml"], :hierarchy => "common", :logger => "console"}
-            end
-
-            it "should use hash data as source if supplied" do
-                config = Config.load({"rspec" => "test"})
-                config["rspec"].should == "test"
-            end
-
-            it "should merge defaults with the loaded or supplied config" do
-                config = Config.load({})
-                config.should == {:backends => ["yaml"], :hierarchy => "common", :logger => "console"}
-            end
-
-            it "should force :backends to be a flattened array" do
-                Config.load({:backends => [["foo", ["bar"]]]}).should == {:backends => ["foo", "bar"], :hierarchy => "common", :logger => "console"}
-            end
-
-            it "should load the supplied logger" do
-                Hiera.expects(:logger=).with("foo")
-                Config.load({:logger => "foo"})
-            end
-
-            it "should default to the console logger" do
-                Hiera.expects(:logger=).with("console")
-                Config.load({})
-            end
-        end
-
-        describe "#load_backends" do
-            it "should load each backend" do
-                Config.load(:backends => ["One", "Two"])
-                Config.expects(:require).with("hiera/backend/one_backend")
-                Config.expects(:require).with("hiera/backend/two_backend")
-                Config.load_backends
-            end
-
-            it "should warn if it cant load a backend" do
-                Config.load(:backends => ["one"])
-                Config.expects(:require).with("hiera/backend/one_backend").raises("fail")
-
-                expect {
-                    Config.load_backends
-                }.to raise_error("fail")
-            end
-        end
-
-        describe "#include?" do
-            it "should correctly report inclusion" do
-                Config.load({})
-                Config.include?(:foo).should == false
-                Config.include?(:logger).should == true
-            end
-        end
+  describe Config do
+    describe "#load" do
+      let(:default_config) do
+        {
+          :backends  => ["yaml"],
+          :hierarchy => "common",
+          :logger    => "console"
+        }
+      end
+
+      it "should treat string sources as a filename" do
+        expect { Config.load("/nonexisting") }.should raise_error
+      end
+
+      it "should raise an error for missing config files" do
+        File.expects(:exist?).with("/nonexisting").returns(false)
+        YAML.expects(:load_file).with("/nonexisting").never
+
+        expect { Config.load("/nonexisting") }.should raise_error "Config file /nonexisting not found"
+      end
+
+      it "should attempt to YAML load config files" do
+        File.expects(:exist?).with("/nonexisting").returns(true)
+        YAML.expects(:load_file).with("/nonexisting").returns(YAML.load("---\n"))
+
+        Config.load("/nonexisting")
+      end
+
+      it "should use defaults on empty YAML config file" do
+        File.expects(:exist?).with("/nonexisting").returns(true)
+        YAML.expects(:load_file).with("/nonexisting").returns(YAML.load(""))
+
+        Config.load("/nonexisting").should == default_config
+      end
+
+      it "should use hash data as source if supplied" do
+        config = Config.load({"rspec" => "test"})
+        config["rspec"].should == "test"
+      end
+
+      it "should merge defaults with the loaded or supplied config" do
+        config = Config.load({})
+        config.should == {:backends => ["yaml"], :hierarchy => "common", :logger => "console"}
+      end
+
+      it "should force :backends to be a flattened array" do
+        Config.load({:backends => [["foo", ["bar"]]]}).should == {:backends => ["foo", "bar"], :hierarchy => "common", :logger => "console"}
+      end
+
+      it "should load the supplied logger" do
+        Hiera.expects(:logger=).with("foo")
+        Config.load({:logger => "foo"})
+      end
+
+      it "should default to the console logger" do
+        Hiera.expects(:logger=).with("console")
+        Config.load({})
+      end
     end
+
+    describe "#load_backends" do
+      it "should load each backend" do
+        Config.load(:backends => ["One", "Two"])
+        Config.expects(:require).with("hiera/backend/one_backend")
+        Config.expects(:require).with("hiera/backend/two_backend")
+        Config.load_backends
+      end
+
+      it "should warn if it cant load a backend" do
+        Config.load(:backends => ["one"])
+        Config.expects(:require).with("hiera/backend/one_backend").raises("fail")
+
+        expect {
+            Config.load_backends
+        }.to raise_error("fail")
+      end
+    end
+
+    describe "#include?" do
+      it "should correctly report inclusion" do
+        Config.load({})
+        Config.include?(:foo).should == false
+        Config.include?(:logger).should == true
+      end
+    end
+  end
 end

data/spec/unit/console_logger_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 class Hiera
-    describe Console_logger do
-        describe "#warn" do
-            it "should warn to STDERR" do
-                STDERR.expects(:puts).with("WARN: 0: foo")
-                Time.expects(:now).returns(0)
-                Console_logger.warn("foo")
-            end
+  describe Console_logger do
+    describe "#warn" do
+      it "should warn to STDERR" do
+        STDERR.expects(:puts).with("WARN: 0: foo")
+        Time.expects(:now).returns(0)
+        Console_logger.warn("foo")
+      end
 
-            it "should debug to STDERR" do
-                STDERR.expects(:puts).with("DEBUG: 0: foo")
-                Time.expects(:now).returns(0)
-                Console_logger.debug("foo")
-            end
-        end
+      it "should debug to STDERR" do
+        STDERR.expects(:puts).with("DEBUG: 0: foo")
+        Time.expects(:now).returns(0)
+        Console_logger.debug("foo")
+      end
     end
+  end
 end

data/spec/unit/hiera_spec.rb

@@ -1,59 +1,62 @@
 require 'spec_helper'
+require 'hiera/util'
 
 describe "Hiera" do
-    describe "#logger=" do
-        it "should attempt to load the supplied logger" do
-            Hiera.stubs(:warn)
-            Hiera.expects(:require).with("hiera/foo_logger").raises("fail")
-            Hiera.logger = "foo"
-        end
-
-        it "should fall back to the Console logger on failure" do
-            Hiera.expects(:warn).with("Failed to load foo logger: LoadError: no such file to load -- hiera/foo_logger")
-            Hiera.logger = "foo"
-        end
-    end
-
-    describe "#warn" do
-        it "should call the supplied logger" do
-            Hiera::Console_logger.expects(:warn).with("rspec")
-            Hiera.warn("rspec")
-        end
-    end
-
-    describe "#debug" do
-        it "should call the supplied logger" do
-            Hiera::Console_logger.expects(:debug).with("rspec")
-            Hiera.debug("rspec")
-        end
-    end
-
-    describe "#initialize" do
-        it "should default to /etc/hiera.yaml for config" do
-            Hiera::Config.expects(:load).with("/etc/hiera.yaml")
-            Hiera::Config.stubs(:load_backends)
-            Hiera.new
-        end
-
-        it "should pass the supplied config to the config class" do
-            Hiera::Config.expects(:load).with({"test" => "rspec"})
-            Hiera::Config.stubs(:load_backends)
-            Hiera.new(:config => {"test" => "rspec"})
-        end
-
-        it "should load all backends on start" do
-            Hiera::Config.stubs(:load)
-            Hiera::Config.expects(:load_backends)
-            Hiera.new
-        end
-    end
-
-    describe "#lookup" do
-        it "should proxy to the Backend#lookup method" do
-            Hiera::Config.stubs(:load)
-            Hiera::Config.stubs(:load_backends)
-            Hiera::Backend.expects(:lookup).with(:key, :default, :scope, :order_override, :resolution_type)
-            Hiera.new.lookup(:key, :default, :scope, :order_override, :resolution_type)
-        end
+  describe "#logger=" do
+    it "should attempt to load the supplied logger" do
+      Hiera.stubs(:warn)
+      Hiera.expects(:require).with("hiera/foo_logger").raises("fail")
+      Hiera.logger = "foo"
     end
+
+    it "should fall back to the Console logger on failure" do
+      Hiera.expects(:warn)
+      Hiera.logger = "foo"
+      Hiera.logger.should be Hiera::Console_logger
+    end
+  end
+
+  describe "#warn" do
+    it "should call the supplied logger" do
+      Hiera::Console_logger.expects(:warn).with("rspec")
+      Hiera.warn("rspec")
+    end
+  end
+
+  describe "#debug" do
+    it "should call the supplied logger" do
+      Hiera::Console_logger.expects(:debug).with("rspec")
+      Hiera.debug("rspec")
+    end
+  end
+
+  describe "#initialize" do
+    it "should use a default config" do
+      config_file = File.join(Hiera::Util.config_dir, 'hiera.yaml')
+      Hiera::Config.expects(:load).with(config_file)
+      Hiera::Config.stubs(:load_backends)
+      Hiera.new
+    end
+
+    it "should pass the supplied config to the config class" do
+      Hiera::Config.expects(:load).with({"test" => "rspec"})
+      Hiera::Config.stubs(:load_backends)
+      Hiera.new(:config => {"test" => "rspec"})
+    end
+
+    it "should load all backends on start" do
+      Hiera::Config.stubs(:load)
+      Hiera::Config.expects(:load_backends)
+      Hiera.new
+    end
+  end
+
+  describe "#lookup" do
+    it "should proxy to the Backend#lookup method" do
+      Hiera::Config.stubs(:load)
+      Hiera::Config.stubs(:load_backends)
+      Hiera::Backend.expects(:lookup).with(:key, :default, :scope, :order_override, :resolution_type)
+      Hiera.new.lookup(:key, :default, :scope, :order_override, :resolution_type)
+    end
+  end
 end

data/spec/unit/util_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Hiera::Util do
+  describe 'Hiera::Util.posix?' do
+    it 'should return true on posix systems' do
+      Etc.expects(:getpwuid).with(0).returns(true)
+      Hiera::Util.posix?.should be_true
+    end
+
+    it 'should return false on non posix systems' do
+      Etc.expects(:getpwuid).with(0).returns(nil)
+      Hiera::Util.posix?.should be_false
+    end
+  end
+
+  describe 'Hiera::Util.microsoft_windows?' do
+    it 'should return false on posix systems' do
+      Hiera::Util.expects(:file_alt_separator).returns(nil)
+      Hiera::Util.microsoft_windows?.should be_false
+    end
+  end
+
+  describe 'Hiera::Util.config_dir' do
+    it 'should return the correct path for posix systems' do
+      Hiera::Util.expects(:file_alt_separator).returns(nil)
+      Hiera::Util.config_dir.should == '/etc'
+    end
+
+    it 'should return the correct path for microsoft windows systems' do
+      Hiera::Util.expects(:microsoft_windows?).returns(true)
+      Hiera::Util.expects(:common_appdata).returns('C:\\ProgramData')
+      Hiera::Util.config_dir.should == 'C:\\ProgramData/PuppetLabs/hiera/etc'
+    end
+  end
+
+  describe 'Hiera::Util.var_dir' do
+    it 'should return the correct path for posix systems' do
+      Hiera::Util.expects(:file_alt_separator).returns(nil)
+      Hiera::Util.var_dir.should == '/var/lib/hiera'
+    end
+
+    it 'should return the correct path for microsoft windows systems' do
+      Hiera::Util.expects(:microsoft_windows?).returns(true)
+      Hiera::Util.expects(:common_appdata).returns('C:\\ProgramData')
+      Hiera::Util.var_dir.should == 'C:\\ProgramData/PuppetLabs/hiera/var'
+    end
+  end
+end
+

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hiera
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: -1164341432
+  prerelease: 5
   segments: 
+  - 1
   - 0
-  - 3
   - 0
-  version: 0.3.0
+  - rc
+  - 4
+  version: 1.0.0rc4
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-07-20 00:00:00 Z
 dependencies: []
 
 description: A pluggable data store for hierarcical data
@@ -32,8 +34,13 @@ files:
 - lib/hiera/backend.rb
 - lib/hiera/config.rb
 - lib/hiera/console_logger.rb
+- lib/hiera/noop_logger.rb
 - lib/hiera/puppet_logger.rb
+- lib/hiera/util.rb
 - lib/hiera.rb
+- CHANGELOG
+- COPYING
+- README.md
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/backend/yaml_backend_spec.rb
@@ -41,6 +48,7 @@ files:
 - spec/unit/config_spec.rb
 - spec/unit/console_logger_spec.rb
 - spec/unit/hiera_spec.rb
+- spec/unit/util_spec.rb
 homepage: https://github.com/puppetlabs/hiera/
 licenses: []
 
@@ -61,16 +69,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Light weight hierarcical data store
@@ -82,3 +92,4 @@ test_files:
 - spec/unit/config_spec.rb
 - spec/unit/console_logger_spec.rb
 - spec/unit/hiera_spec.rb
+- spec/unit/util_spec.rb