hiera 1.0.0 → 1.1.0.rc1

data/bin/hiera

@@ -107,6 +107,8 @@ def load_scope(source, type=:yaml)
 end
 
 OptionParser.new do |opts|
+  opts.banner = "Usage: hiera [options] key [default value] [variable='text'...]\n\nThe default value will be used if no value is found for the key. Scope variables\nwill be interpolated into %{variable} placeholders in the hierarchy and in\nreturned values.\n\n"
+
   opts.on("--version", "-V", "Version information") do
     puts Hiera.version
     exit
@@ -116,11 +118,11 @@ OptionParser.new do |opts|
     options[:verbose] = true
   end
 
-  opts.on("--array", "-a", "Array search") do
+  opts.on("--array", "-a", "Return all values as an array") do
     options[:resolution_type] = :array
   end
 
-  opts.on("--hash", "-h", "Hash search") do
+  opts.on("--hash", "-h", "Return all values as a hash") do
     options[:resolution_type] = :hash
   end
 
@@ -151,7 +153,7 @@ OptionParser.new do |opts|
     end
   end
 
-  opts.on("--mcollective IDENTITY", "-m", "Retrieve facts from a node via mcollective as scope") do |v|
+  opts.on("--mcollective IDENTITY", "-m", "Use facts from a node (via mcollective) as scope") do |v|
     begin
       options[:scope] = load_scope(v, :mcollective)
     rescue Exception => e
@@ -160,7 +162,7 @@ OptionParser.new do |opts|
     end
   end
 
-  opts.on("--inventory_service IDENTITY", "-i", "Retrieve facts for a node via Puppet's inventory service as scope") do |v|
+  opts.on("--inventory_service IDENTITY", "-i", "Use facts from a node (via Puppet's inventory service) as scope") do |v|
     begin
       options[:scope] = load_scope(v, :inventory_service)
     rescue Exception => e

data/lib/hiera.rb

@@ -5,7 +5,7 @@ end
 require 'yaml'
 
 class Hiera
-  VERSION = "1.0.0"
+  VERSION = "1.1.0-rc1"
 
   autoload :Config,         "hiera/config"
   autoload :Util,           "hiera/util"

data/lib/hiera/backend/json_backend.rb

@@ -0,0 +1,45 @@
+class Hiera
+  module Backend
+    class Json_backend
+      def initialize
+        require 'json'
+
+        Hiera.debug("Hiera JSON backend starting")
+      end
+
+      def lookup(key, scope, order_override, resolution_type)
+        answer = nil
+
+        Hiera.debug("Looking up #{key} in JSON backend")
+
+        Backend.datasources(scope, order_override) do |source|
+          Hiera.debug("Looking for data source #{source}")
+
+          jsonfile = Backend.datafile(:json, scope, source, "json") || next
+
+          data = JSON.parse(File.read(jsonfile))
+
+          next if data.empty?
+          next unless data.include?(key)
+
+          # for array resolution we just append to the array whatever
+          # we find, we then goes onto the next file and keep adding to
+          # the array
+          #
+          # for priority searches we break after the first found data item
+          new_answer = Backend.parse_answer(data[key], scope)
+          case resolution_type
+          when :array
+            answer ||= []
+            answer << new_answer
+          else
+            answer = Backend.parse_answer(data[key], scope)
+            break
+          end
+        end
+
+        return answer
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,9 +2,9 @@ $:.insert(0, File.join([File.dirname(__FILE__), "..", "lib"]))
 
 require 'rubygems'
 require 'rspec'
-require 'hiera'
-require 'rspec/mocks'
 require 'mocha'
+require 'hiera'
+require 'tmpdir'
 
 RSpec.configure do |config|
   config.mock_with :mocha

data/spec/unit/backend/json_backend_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+require 'hiera/backend/json_backend'
+
+class Hiera
+  module Backend
+    describe Json_backend do
+      before do
+        Hiera.stubs(:debug)
+        Hiera.stubs(:warn)
+        Hiera::Backend.stubs(:empty_answer).returns(nil)
+        @backend = Json_backend.new
+      end
+
+      describe "#initialize" do
+        it "should announce its creation" do # because other specs checks this
+          Hiera.expects(:debug).with("Hiera JSON backend starting")
+          Json_backend.new
+        end
+      end
+
+      describe "#lookup" do
+        it "should look for data in all sources" do
+          Backend.expects(:datasources).multiple_yields(["one"], ["two"])
+          Backend.expects(:datafile).with(:json, {}, "one", "json").returns(nil)
+          Backend.expects(:datafile).with(:json, {}, "two", "json").returns(nil)
+
+          @backend.lookup("key", {}, nil, :priority)
+        end
+
+        it "should retain the data types found in data files" do
+          Backend.expects(:datasources).yields("one").times(3)
+          Backend.expects(:datafile).with(:json, {}, "one", "json").returns("/nonexisting/one.json").times(3)
+          File.expects(:read).with("/nonexisting/one.json").returns('{"stringval":"string",
+                                                                      "boolval":true,
+                                                                      "numericval":1}').times(3)
+
+          Backend.stubs(:parse_answer).with('string', {}).returns('string')
+          Backend.stubs(:parse_answer).with(true, {}).returns(true)
+          Backend.stubs(:parse_answer).with(1, {}).returns(1)
+
+          @backend.lookup("stringval", {}, nil, :priority).should == "string"
+          @backend.lookup("boolval", {}, nil, :priority).should == true
+          @backend.lookup("numericval", {}, nil, :priority).should == 1
+        end
+
+        it "should pick data earliest source that has it for priority searches" do
+          scope = {"rspec" => "test"}
+          Backend.stubs(:parse_answer).with('answer', scope).returns("answer")
+          Backend.stubs(:parse_answer).with('test_%{rspec}', scope).returns("test_test")
+          Backend.expects(:datasources).multiple_yields(["one"], ["two"])
+          Backend.expects(:datafile).with(:json, scope, "one", "json").returns("/nonexisting/one.json")
+          Backend.expects(:datafile).with(:json, scope, "two", "json").returns(nil).never
+          File.expects(:read).with("/nonexisting/one.json").returns("one.json")
+          JSON.expects(:parse).with("one.json").returns({"key" => "test_%{rspec}"})
+
+          @backend.lookup("key", scope, nil, :priority).should == "test_test"
+        end
+
+        it "should build an array of all data sources for array searches" do
+          Hiera::Backend.stubs(:empty_answer).returns([])
+          Backend.stubs(:parse_answer).with('answer', {}).returns("answer")
+          Backend.expects(:datafile).with(:json, {}, "one", "json").returns("/nonexisting/one.json")
+          Backend.expects(:datafile).with(:json, {}, "two", "json").returns("/nonexisting/two.json")
+
+          Backend.expects(:datasources).multiple_yields(["one"], ["two"])
+
+          File.expects(:read).with("/nonexisting/one.json").returns("one.json")
+          File.expects(:read).with("/nonexisting/two.json").returns("two.json")
+
+          JSON.expects(:parse).with("one.json").returns({"key" => "answer"})
+          JSON.expects(:parse).with("two.json").returns({"key" => "answer"})
+
+          @backend.lookup("key", {}, nil, :array).should == ["answer", "answer"]
+        end
+
+        it "should parse the answer for scope variables" do
+          Backend.stubs(:parse_answer).with('test_%{rspec}', {'rspec' => 'test'}).returns("test_test")
+          Backend.expects(:datasources).yields("one")
+          Backend.expects(:datafile).with(:json, {"rspec" => "test"}, "one", "json").returns("/nonexisting/one.json")
+
+          File.expects(:read).with("/nonexisting/one.json").returns("one.json")
+          JSON.expects(:parse).with("one.json").returns({"key" => "test_%{rspec}"})
+
+          @backend.lookup("key", {"rspec" => "test"}, nil, :priority).should == "test_test"
+        end
+      end
+    end
+  end
+end

data/spec/unit/backend/yaml_backend_spec.rb

@@ -1,8 +1,5 @@
-require 'tmpdir'
-require 'hiera/backend/yaml_backend'
-require 'hiera/backend'
-require 'fileutils'
 require 'spec_helper'
+require 'hiera/backend/yaml_backend'
 
 class Hiera
   module Backend

data/spec/unit/config_spec.rb

@@ -12,14 +12,14 @@ class Hiera
       end
 
       it "should treat string sources as a filename" do
-        expect { Config.load("/nonexisting") }.should raise_error
+        expect { Config.load("/nonexisting") }.to 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"
+        expect { Config.load("/nonexisting") }.to raise_error "Config file /nonexisting not found"
       end
 
       it "should attempt to YAML load config files" do

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hiera
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: -3857070536
+  prerelease: 6
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  - rc
+  - 1
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,9 +17,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 Z
-dependencies: []
-
+date: 2012-09-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: A pluggable data store for hierarcical data
 email: info@puppetlabs.com
 executables: 
@@ -28,6 +43,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/hiera
+- lib/hiera/backend/json_backend.rb
 - lib/hiera/backend/yaml_backend.rb
 - lib/hiera/backend.rb
 - lib/hiera/config.rb
@@ -36,12 +52,11 @@ files:
 - lib/hiera/puppet_logger.rb
 - lib/hiera/util.rb
 - lib/hiera.rb
-- CHANGELOG
 - COPYING
 - README.md
 - LICENSE
-- spec/spec.opts
 - spec/spec_helper.rb
+- spec/unit/backend/json_backend_spec.rb
 - spec/unit/backend/yaml_backend_spec.rb
 - spec/unit/backend_spec.rb
 - spec/unit/config_spec.rb
@@ -68,12 +83,14 @@ 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: 
@@ -82,8 +99,8 @@ signing_key:
 specification_version: 3
 summary: Light weight hierarchical data store
 test_files: 
-- spec/spec.opts
 - spec/spec_helper.rb
+- spec/unit/backend/json_backend_spec.rb
 - spec/unit/backend/yaml_backend_spec.rb
 - spec/unit/backend_spec.rb
 - spec/unit/config_spec.rb

data/CHANGELOG

@@ -1,119 +0,0 @@
-1.0.0
-===
-fba40d1 Fix yum repo path in yaml file
-451fd0c fix redhat spec release template variable
-f21f908 Replace sed with real vars in preflight.erb
-28cef87 Use read-only packaging repo for public access
-cfd0925 Additional logging when finding keys in the YAML backend
-1084d13 Add apple packaging file_mapping file
-6f2da41 Change debhelper depends to 7
-7b6766a Fixup redhat spec erb for F17
-c5ff482 Rework packaging to use packaging repo
-e1922ca Change debhelper depends to 7
-ba34a74 (#15291) Add Vendor tag to Hiera spec file
-22f1775 Update Debian packaging rake task to correctly create the orig.tar.gz
-4332f46 Fix debian package task to create correct orig.tar.gz and use debversion in directory creation.
-6887137 (maint) Add Getting Started tutorial
-091fea3 Overhaul Hiera packaging
-7947dd6 Consolidate changelog, update erb templates
-4698cf1 (#15105) Update README YAML examples
-fcd3d2c (maint) Hiera now has a LICENSE file
-ca47463 Remove datadir value in hiera.yaml
-92a148f (maint) Fix failing Hiera::Util specs
-07366d8 Use File::ALT_SEPARATOR to test platform
-1b7f787 Add specs for Hiera::Util
-cdd7364 (#14867) Add windows support
-16c3dd3 (#12122) Merge arrays and hashes across backends
-480d86c (#12122) Correctly fall through backends during loop
-d0fcc57 Add default config to hiera
-3ec4165 match data in puppet ${::fact} style to get rid of puppet deprecation warnings
-a1a885a Adding package task liberally copied from puppet-dashboard.
-3527443 Updating apple pkg task to refer to ext directory.
-445a6f2 ext is more appropriate than conf for a dirname.
-ade5567 Adding debian packaging to hiera.
-3ef4f96 Move redhat spec into conf dir, to standardize packaging.
-b6218b9 (maint) Hiera should raise an error when config is missing
-1df7201 Update mac packaging to dynamically generate preflight
-10f930f Add mac packaging to hiera
-22a98ee Remove Puppet parser functions
-0067cd2 (maint) Additional tests for Hiera array and hash lookups
-7312a95 (maint) Add Hiera acceptance tests
-9808a64 (#14514) Use default config when hiera.yaml is missing
-fd644b6 Add require hiera/backend to test
-fe3d509 Remove empty Puppet class definition
-fa3081c Updating hiera.spec, CHANGELOG for Hiera 1.0.0rc1
-6de3d4c Moving CHANGES.txt to CHANGELOG. Updating CHANGELOG with git log from initial commit to v0.3.0 tag.
-dbf9fe3 Update README to reference deb and rpm packages
-f697b7f Updated hiera.spec to include puppet functions and put in the right place.
-540d2d6 (#14460) Add Puppet parser functions
-29c5ad7 Add hiera.spec for building hiera on redhat
-24ef7b9 (#13600) Monkey patch mktmpdir on ruby 1.8.5
-b7b3280 (maint) Make noop logger work on Ruby 1.9.x
-602c526 (maint) Fix failing spec test on Ruby 1.9.3
-82881e3 (#14150) Use tar_gz instead of tar
-7ef2821 (#14148) Add docs to Hiera packaging
-67f91d6 (#14147) Handle lack of rubygems gracefully
-f6c9f5d (#14124) Load rake tasks directly to fix tests for Ruby 1.9.x
-122b891 (#13641) Fix Hiera::Backend#parse_string to support :undefined in extra_data
-e6dea8e Commit caching on YAML Backend
-ddd5b66 Fix VERSION contant in lib/hiera.rb
-50f9771 hiera working on ruby 1.9.2/1.9.3, issue #10975 (http://projects.puppetlabs.com/issues/10975)
-794265f (maint) Code base cleanup, use 2 space indention.
-
-v0.3.0
-===
-
-d3b9c41 Fixes a quoting string issue
-2b6c3e7 Change Rakefile to autoversion
-1e7affb Rspec 2.7 has introduced some non backwards compatible changes that is exposed by using require with full paths.
-d136fc2 Switch branding to Puppet Labs
-731f2ef Fix warnings for rake
-0a53e96 fix failing test after sort was removed
-15fb3bd Do not sort arrays after building them as array data with complex data in them like hashes will fail to sort and raise exceptions
-f296a18 Test cases for #21
-dcf51ce Fixes: Hiera errors on empty yaml files
-d2d59d7 Revising backend bool spec test that nil /= false
-3cd4cec Fixes #15 Hiera return nil for false value
-17a2a98 Adding inventory_service option to scope.
-6ecab35 (#13) Hierarchy includes sub-hierarchy
-79b0d4b Corrected invalid YAML markup.
-c05823a Add specs to verify datatypes are being retained
-dedeb8c Make hiera handle boolean/numeric values correctly instead of just returning nil
-b78b3e4 Add type mismatch error output and test cases
-95e60ce Added additional spec tests for hash.
-f078414 Revising spec test for hash merge.
-9d72afa Hash was merged wrong direction.
-b4a90ba Adding hashes to CHANGES.txt
-90a23be Adding hash spec unit tests
-d1171d7 Adding hash support to hiera and yaml backend
-aa6af39 Fix logic around handling of defaults in array searches.  It used to always return [nil] for unknown data in array searches now it returns the supplied default.
-51a0a57 Fix versioning and autoload the Puppet logger
-fb88a3b Removed :json type from load_scope when parsing YAML format
-3839126 Fix typo
-8b7e036 More 0.2.0 update information
-93711a9 Fix spacing
-e804daf Update readme with information for 0.2.0
-4c990e1 Release 0.2.0
-1977a1e Improve tests based on recent changes
-3683a62 Simplify plugins that reads serialized data from files by moving more to the Backend module
-9d92041 Update changes file
-61e3574 Add Puppet logger plugin
-98a9525 Add array merge searches to the framework and the yaml backend Add array search to the command line Parse %{var}s in Strings, Arrays and Hashes correctly
-19cbf04 Update doco
-0f0837c Add querying facts via mcollective for scope of the CLI
-aeaef32 Remove some stray whitespace Turn a warn message into a debug message to avoid spamming logs
-27d6fd9 Fix /bin/env to /usr/bin/env (#1) Improve gem file
-dde5997 Release 0.1.0
-f69ebb2 Fix verbose checking in the cli Do not return empty sources Improve tests
-6d8130f Small language fix
-23ef93d Show variable expansion in string results
-362710c Add sample data to the readme
-dcc2ad2 Add a CLI query tool
-e3eb8de More todo items
-ced8d33 Add licence and readme
-e5d0106 avoid some debug noise
-dc41bcd Add comments and tests
-19e27c2 Small changes to the yaml backend, add a pluggable logging system and a console logger
-28cdd56 - simplify language by changing precedence with hierarchy - add gem bits - fall through to multiple backends till one provides an answer - make the backend writing process a bit easier
-19e03a7 Working YAML backend
-ca3efeb Add Readme

data/spec/spec.opts

@@ -1 +0,0 @@
---format s --colour --backtrace