hiera-puppet 0.3.0 → 1.0.0rc2

data/spec/unit/puppet/parser/functions/hiera_array_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Puppet::Parser::Functions#hiera_array' do
+  let(:scope) { PuppetlabsSpec::PuppetSeams.parser_scope }
+
+  it 'should require a key argument' do
+    expect { scope.function_hiera_array([]) }.to raise_error(Puppet::ParseError)
+  end
+
+  it 'should raise a useful error when nil is returned' do
+    Hiera.any_instance.expects(:lookup).returns(nil)
+    expect { scope.function_hiera_array("badkey") }.to raise_error(Puppet::ParseError, /Could not find data item badkey/ )
+  end
+
+  it 'should use the array resolution_type' do
+    Hiera.any_instance.expects(:lookup).with() { |*args| args[4].should be :array }.returns([])
+    scope.function_hiera_array(['key'])
+  end
+end

data/spec/unit/puppet/parser/functions/hiera_hash_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Puppet::Parser::Functions#hiera_hash' do
+  let(:scope) { PuppetlabsSpec::PuppetSeams.parser_scope }
+
+  it 'should require a key argument' do
+    expect { scope.function_hiera_hash([]) }.to raise_error(Puppet::ParseError)
+  end
+
+  it 'should raise a useful error when nil is returned' do
+    Hiera.any_instance.expects(:lookup).returns(nil)
+    expect { scope.function_hiera_hash("badkey") }.to raise_error(Puppet::ParseError, /Could not find data item badkey/ )
+  end
+
+  it 'should use the hash resolution_type' do
+    Hiera.any_instance.expects(:lookup).with() { |*args| args[4].should be :hash }.returns({})
+    scope.function_hiera_hash(['key'])
+  end
+end

data/spec/unit/puppet/parser/functions/hiera_include_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Puppet::Parser::Functions#hiera_include' do
+  let(:scope) { PuppetlabsSpec::PuppetSeams.parser_scope }
+
+  it 'should require a key argument' do
+    expect { scope.function_hiera_include([]) }.to raise_error(Puppet::ParseError)
+  end
+
+  it 'should raise a useful error when nil is returned' do
+    Hiera.any_instance.expects(:lookup).returns(nil)
+    expect { scope.function_hiera_include("badkey") }.to raise_error(Puppet::ParseError, /Could not find data item badkey/ )
+  end
+
+  it 'should use the array resolution_type' do
+    Hiera.any_instance.expects(:lookup).with() { |*args| args[4].should be :array }.returns([])
+    scope.function_hiera_include(['key'])
+  end
+end

data/spec/unit/puppet/parser/functions/hiera_spec.rb

@@ -0,0 +1,21 @@
+#! /usr/bin/env ruby -S rspec
+
+require 'spec_helper'
+
+describe 'Puppet::Parser::Functions#hiera' do
+  let(:scope) { PuppetlabsSpec::PuppetSeams.parser_scope }
+
+  it 'should require a key argument' do
+    expect { scope.function_hiera([]) }.to raise_error(Puppet::ParseError)
+  end
+
+  it 'should raise a useful error when nil is returned' do
+    Hiera.any_instance.expects(:lookup).returns(nil)
+    expect { scope.function_hiera("badkey") }.to raise_error(Puppet::ParseError, /Could not find data item badkey/ )
+  end
+
+  it 'should use the priority resolution_type' do
+    Hiera.any_instance.expects(:lookup).with() { |*args| args[4].should be :priority }.returns('foo_result')
+    scope.function_hiera(['key']).should == 'foo_result'
+  end
+end

data/spec/watchr.rb

@@ -0,0 +1,79 @@
+ENV['FOG_MOCK'] ||= 'true'
+ENV['AUTOTEST'] = 'true'
+ENV['WATCHR']   = '1'
+
+system 'clear'
+
+def growl(message)
+  growlnotify = `which growlnotify`.chomp
+  title = "Watchr Test Results"
+  image = case message
+  when /(\d+)\s+?(failure|error)/i
+    ($1.to_i == 0) ? "~/.watchr_images/passed.png" : "~/.watchr_images/failed.png"
+  else
+    '~/.watchr_images/unknown.png'
+  end
+  options = "-w -n Watchr --image '#{File.expand_path(image)}' -m '#{message}' '#{title}'"
+  system %(#{growlnotify} #{options} &)
+end
+
+def run(cmd)
+  puts(cmd)
+  `#{cmd}`
+end
+
+def run_spec_test(file)
+  if File.exist? file
+    result = run "rspec --format p --color #{file}"
+    growl result.split("\n").last
+    puts result
+  else
+    puts "FIXME: No test #{file} [#{Time.now}]"
+  end
+end
+
+def filter_rspec(data)
+  data.split("\n").find_all do |l|
+    l =~ /^(\d+)\s+exampl\w+.*?(\d+).*?failur\w+.*?(\d+).*?pending/
+  end.join("\n")
+end
+
+def run_all_tests
+  system('clear')
+  files = Dir.glob("spec/**/*_spec.rb").join(" ")
+  result = run "rspec #{files}"
+  growl_results = filter_rspec result
+  growl growl_results
+  puts result
+  puts "GROWL: #{growl_results}"
+end
+
+# Ctrl-\
+Signal.trap 'QUIT' do
+  puts " --- Running all tests ---\n\n"
+  run_all_tests
+end
+
+@interrupted = false
+
+# Ctrl-C
+Signal.trap 'INT' do
+  if @interrupted then
+    @wants_to_quit = true
+    abort("\n")
+  else
+    puts "Interrupt a second time to quit"
+    @interrupted = true
+    Kernel.sleep 1.5
+    # raise Interrupt, nil # let the run loop catch it
+    run_suite
+  end
+end
+
+watch( 'spec/.*_spec\.rb' ) do |md|
+  run_all_tests
+end
+
+watch( 'lib/.*\.rb' ) do |md|
+  run_all_tests
+end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hiera-puppet
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 2711208307
+  prerelease: 5
   segments: 
+  - 1
   - 0
-  - 3
   - 0
-  version: 0.3.0
+  - rc
+  - 2
+  version: 1.0.0rc2
 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: 
 - !ruby/object:Gem::Dependency 
   name: hiera
@@ -25,12 +27,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 description: Store and query Hiera data from Puppet
@@ -45,13 +46,21 @@ files:
 - bin/extlookup2hiera
 - lib/hiera/backend/puppet_backend.rb
 - lib/hiera/scope.rb
+- lib/hiera_puppet.rb
 - lib/puppet/parser/functions/hiera.rb
 - lib/puppet/parser/functions/hiera_array.rb
 - lib/puppet/parser/functions/hiera_hash.rb
 - lib/puppet/parser/functions/hiera_include.rb
+- spec/helpers.rb
 - spec/spec_helper.rb
-- spec/unit/puppet_backend_spec.rb
-- spec/unit/scope_spec.rb
+- spec/unit/hiera/backend/puppet_backend_spec.rb
+- spec/unit/hiera/scope_spec.rb
+- spec/unit/hiera_puppet_spec.rb
+- spec/unit/puppet/parser/functions/hiera_array_spec.rb
+- spec/unit/puppet/parser/functions/hiera_hash_spec.rb
+- spec/unit/puppet/parser/functions/hiera_include_spec.rb
+- spec/unit/puppet/parser/functions/hiera_spec.rb
+- spec/watchr.rb
 homepage: https://github.com/puppetlabs/hiera-puppet
 licenses: []
 
@@ -72,20 +81,29 @@ 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: Puppet query interface and backend for Hiera
 test_files: 
+- spec/helpers.rb
 - spec/spec_helper.rb
-- spec/unit/puppet_backend_spec.rb
-- spec/unit/scope_spec.rb
+- spec/unit/hiera/backend/puppet_backend_spec.rb
+- spec/unit/hiera/scope_spec.rb
+- spec/unit/hiera_puppet_spec.rb
+- spec/unit/puppet/parser/functions/hiera_array_spec.rb
+- spec/unit/puppet/parser/functions/hiera_hash_spec.rb
+- spec/unit/puppet/parser/functions/hiera_include_spec.rb
+- spec/unit/puppet/parser/functions/hiera_spec.rb
+- spec/watchr.rb

data/spec/unit/puppet_backend_spec.rb

@@ -1,118 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-class Hiera
-    module Backend
-        describe Puppet_backend do
-            before do
-                Hiera.stubs(:warn)
-                Hiera.stubs(:debug)
-                Backend.stubs(:datasources).yields([])
-                Puppet::Parser::Functions.stubs(:function).with(:include)
-
-                @mockresource = mock
-                @mockresource.stubs(:name).returns("ntp::config")
-
-                @mockscope = mock
-                @mockscope.stubs(:resource).returns(@mockresource)
-
-                @scope = Scope.new(@mockscope)
-
-                @backend = Puppet_backend.new
-            end
-
-            describe "#hierarchy" do
-                it "should use the configured datasource" do
-                    Config.expects("[]").with(:puppet).returns({:datasource => "rspec"})
-                    Config.expects("[]").with(:hierarchy)
-
-                    ["ntp", "ntp::config"].each do |klass|
-                        Backend.expects(:parse_string).with(klass, @scope, {"calling_module" => "ntp", "calling_class" => "ntp::config"}).returns(klass)
-                    end
-
-                    @backend.hierarchy(@scope, nil).should == ["rspec::ntp::config", "rspec::ntp", "ntp::config::rspec", "ntp::rspec"]
-                end
-
-                it "should not include empty class names" do
-                    Config.expects("[]").with(:puppet).returns({:datasource => "rspec"})
-                    Config.expects("[]").with(:hierarchy).returns(["%{foo}", "common"])
-
-                    Backend.expects(:parse_string).with("common", @scope, {"calling_module" => "ntp", "calling_class" => "ntp::config"}).returns("common")
-                    Backend.expects(:parse_string).with("%{foo}", @scope, {"calling_module" => "ntp", "calling_class" => "ntp::config"}).returns("")
-
-                    @backend.hierarchy(@scope, nil).should == ["rspec::common", "ntp::config::rspec", "ntp::rspec"]
-                end
-
-                it "should allow for an override data source" do
-                    Config.expects("[]").with(:puppet).returns({:datasource => "rspec"})
-                    Config.expects("[]").with(:hierarchy)
-
-                    ["ntp", "ntp::config"].each do |klass|
-                        Backend.expects(:parse_string).with(klass, @scope, {"calling_module" => "ntp", "calling_class" => "ntp::config"}).returns(klass)
-                    end
-
-                    @backend.hierarchy(@scope, "override").should == ["rspec::override", "rspec::ntp::config", "rspec::ntp", "ntp::config::rspec", "ntp::rspec"]
-                end
-
-                describe "#lookup" do
-                    it "should attempt to load data from unincluded classes" do
-                        Backend.expects(:empty_answer).returns(nil)
-                        Backend.expects(:parse_answer).with("rspec", @scope).returns("rspec")
-
-                        catalog = mock
-                        catalog.expects(:classes).returns([])
-
-                        @scope.expects(:catalog).returns(catalog)
-                        @scope.expects(:function_include).with("rspec")
-                        @mockscope.expects(:lookupvar).with("rspec::key").returns("rspec")
-
-                        @backend.expects(:hierarchy).with(@scope, nil).returns(["rspec"])
-                        @backend.lookup("key", @scope, nil, nil).should == "rspec"
-                    end
-
-                    it "should not load loaded classes" do
-                        Backend.expects(:empty_answer).returns(nil)
-                        Backend.expects(:parse_answer).with("rspec", @scope).returns("rspec")
-                        catalog = mock
-                        catalog.expects(:classes).returns(["rspec"])
-                        @mockscope.expects(:catalog).returns(catalog)
-                        @mockscope.expects(:function_include).never
-                        @mockscope.expects(:lookupvar).with("rspec::key").returns("rspec")
-
-                        @backend.expects(:hierarchy).with(@scope, nil).returns(["rspec"])
-                        @backend.lookup("key", @scope, nil, nil).should == "rspec"
-                    end
-
-                    it "should return the first found data" do
-                        Backend.expects(:empty_answer).returns(nil)
-                        Backend.expects(:parse_answer).with("rspec", @scope).returns("rspec")
-                        catalog = mock
-                        catalog.expects(:classes).returns(["rspec", "override"])
-                        @mockscope.expects(:catalog).returns(catalog)
-                        @mockscope.expects(:function_include).never
-                        @mockscope.expects(:lookupvar).with("override::key").returns("rspec")
-                        @mockscope.expects(:lookupvar).with("rspec::key").never
-
-                        @backend.expects(:hierarchy).with(@scope, "override").returns(["override", "rspec"])
-                        @backend.lookup("key", @scope, "override", nil).should == "rspec"
-                    end
-
-                    it "should return an array of found data for array searches" do
-                        Backend.expects(:empty_answer).returns([])
-                        Backend.expects(:parse_answer).with("rspec::key", @scope).returns("rspec::key")
-                        Backend.expects(:parse_answer).with("test::key", @scope).returns("test::key")
-                        catalog = mock
-                        catalog.expects(:classes).returns(["rspec", "test"])
-                        @mockscope.expects(:catalog).returns(catalog)
-                        @mockscope.expects(:function_include).never
-                        @mockscope.expects(:lookupvar).with("rspec::key").returns("rspec::key")
-                        @mockscope.expects(:lookupvar).with("test::key").returns("test::key")
-
-                        @backend.expects(:hierarchy).with(@scope, nil).returns(["rspec", "test"])
-                        @backend.lookup("key", @scope, nil, :array).should == ["rspec::key", "test::key"]
-                    end
-                end
-            end
-        end
-    end
-end
-

data/spec/unit/scope_spec.rb

@@ -1,64 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-class Hiera
-    describe Scope do
-        describe "#initialize" do
-            it "should store the supplied puppet scope" do
-                real = {}
-                scope = Scope.new(real)
-                scope.real.should == real
-            end
-        end
-
-        describe "#[]" do
-            it "should treat '' as nil" do
-                real = mock
-                real.expects(:lookupvar).with("foo").returns("")
-
-                scope = Scope.new(real)
-                scope["foo"].should == nil
-            end
-
-            it "sould return found data" do
-                real = mock
-                real.expects(:lookupvar).with("foo").returns("bar")
-
-                scope = Scope.new(real)
-                scope["foo"].should == "bar"
-            end
-
-            it "should get calling_class and calling_module from puppet scope" do
-                real = mock
-                resource = mock
-                resource.expects(:name).returns("Foo::Bar").twice
-
-                real.expects(:resource).returns(resource).twice
-
-                scope = Scope.new(real)
-                scope["calling_class"].should == "foo::bar"
-                scope["calling_module"].should == "foo"
-            end
-        end
-
-        describe "#include?" do
-            it "should correctly report missing data" do
-                real = mock
-                real.expects(:lookupvar).with("foo").returns("")
-
-                scope = Scope.new(real)
-                scope.include?("foo").should == false
-            end
-
-            it "should always return true for calling_class and calling_module" do
-                real = mock
-                real.expects(:lookupvar).with("calling_class").never
-                real.expects(:lookupvar).with("calling_module").never
-
-                scope = Scope.new(real)
-                scope.include?("calling_class").should == true
-                scope.include?("calling_module").should == true
-            end
-        end
-    end
-end
-