hiera 1.3.2.rc1 → 1.3.2.rc2

data/lib/hiera/backend.rb

@@ -1,5 +1,4 @@
 require 'hiera/util'
-require 'hiera/recursive_guard'
 require 'hiera/interpolate'
 
 begin
@@ -90,7 +89,7 @@ class Hiera
       #
       # @api public
       def parse_string(data, scope, extra_data={})
-        Hiera::Interpolate.interpolate(data, Hiera::RecursiveGuard.new, scope, extra_data)
+        Hiera::Interpolate.interpolate(data, scope, extra_data)
       end
 
       # Parses a answer received from data files

data/lib/hiera/interpolate.rb

@@ -1,22 +1,36 @@
 require 'hiera/backend'
+require 'hiera/recursive_guard'
 
 class Hiera::Interpolate
   class << self
     INTERPOLATION = /%\{([^\}]*)\}/
     METHOD_INTERPOLATION = /%\{(scope|hiera)\(['"]([^"']*)["']\)\}/
 
-    def interpolate(data, recurse_guard, scope, extra_data)
+    def interpolate(data, scope, extra_data)
+      if data.is_a?(String)
+        # Wrapping do_interpolation in a gsub block ensures we process
+        # each interpolation site in isolation using separate recursion guards.
+        data.gsub(INTERPOLATION) do |match|
+          do_interpolation(match, Hiera::RecursiveGuard.new, scope, extra_data)
+        end
+      else
+        data
+      end
+    end
+
+    def do_interpolation(data, recurse_guard, scope, extra_data)
       if data.is_a?(String) && (match = data.match(INTERPOLATION))
         interpolation_variable = match[1]
         recurse_guard.check(interpolation_variable) do
           interpolate_method, key = get_interpolation_method_and_key(data)
           interpolated_data = send(interpolate_method, data, key, scope, extra_data)
-          interpolate(interpolated_data, recurse_guard, scope, extra_data)
+          do_interpolation(interpolated_data, recurse_guard, scope, extra_data)
         end
       else
         data
       end
     end
+    private :do_interpolation
 
     def get_interpolation_method_and_key(data)
       if (match = data.match(METHOD_INTERPOLATION))
@@ -35,13 +49,13 @@ class Hiera::Interpolate
       if value.nil? || value == :undefined
         value = extra_data[key]
       end
-      data.sub(INTERPOLATION, value.to_s)
+
+      value
     end
     private :scope_interpolate
 
     def hiera_interpolate(data, key, scope, extra_data)
-      value = Hiera::Backend.lookup(key, nil, scope, nil, :priority)
-      data.sub(METHOD_INTERPOLATION, value)
+      Hiera::Backend.lookup(key, nil, scope, nil, :priority)
     end
     private :hiera_interpolate
   end

data/lib/hiera/version.rb

@@ -7,7 +7,7 @@
 
 
 class Hiera
-  VERSION = "1.3.2-rc1"
+  VERSION = "1.3.2-rc2"
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/spec_helper.rb

@@ -8,6 +8,17 @@ require 'tmpdir'
 
 RSpec.configure do |config|
   config.mock_with :mocha
+
+  config.after :suite do
+    # Log the spec order to a file, but only if the LOG_SPEC_ORDER environment variable is
+    #  set.  This should be enabled on Jenkins runs, as it can be used with Nick L.'s bisect
+    #  script to help identify and debug order-dependent spec failures.
+    if ENV['LOG_SPEC_ORDER']
+      File.open("./spec_order.txt", "w") do |logfile|
+        config.instance_variable_get(:@files_to_run).each { |f| logfile.puts f }
+      end
+    end
+  end
 end
 
 # In ruby 1.8.5 Dir does not have mktmpdir defined, so this monkey patches

data/spec/unit/backend_spec.rb

@@ -253,6 +253,12 @@ class Hiera
         end.to raise_error Hiera::InterpolationLoop, "Detected in [first, second]"
       end
 
+      it "replaces repeated occurances of the same lookup" do
+        scope = {"rspec" => "value"}
+        input = "it replaces %{rspec} and %{rspec}"
+        Backend.parse_string(input, scope).should == "it replaces value and value"
+      end
+
       it "replaces hiera interpolations with data looked up in hiera" do
         input = "%{hiera('key1')}"
         scope = {}

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: hiera
 version: !ruby/object:Gem::Version
-  version: 1.3.2.rc1
+  version: 1.3.2.rc2
+  prerelease: 6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A pluggable data store for hierarcical data
@@ -32,69 +35,70 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/hiera
-- lib/hiera/backend.rb
-- lib/hiera/backend/json_backend.rb
-- lib/hiera/backend/yaml_backend.rb
-- lib/hiera/config.rb
+- lib/hiera.rb
 - lib/hiera/console_logger.rb
-- lib/hiera/error.rb
+- lib/hiera/noop_logger.rb
+- lib/hiera/backend/yaml_backend.rb
+- lib/hiera/backend/json_backend.rb
 - lib/hiera/fallback_logger.rb
 - lib/hiera/filecache.rb
+- lib/hiera/version.rb
+- lib/hiera/config.rb
 - lib/hiera/interpolate.rb
-- lib/hiera/noop_logger.rb
-- lib/hiera/puppet_logger.rb
 - lib/hiera/recursive_guard.rb
 - lib/hiera/util.rb
-- lib/hiera/version.rb
-- lib/hiera.rb
+- lib/hiera/backend.rb
+- lib/hiera/puppet_logger.rb
+- lib/hiera/error.rb
 - COPYING
 - README.md
 - LICENSE
-- spec/spec_helper.rb
-- spec/unit/backend/json_backend_spec.rb
+- spec/unit/hiera_spec.rb
+- spec/unit/filecache_spec.rb
 - spec/unit/backend/yaml_backend_spec.rb
+- spec/unit/backend/json_backend_spec.rb
+- spec/unit/console_logger_spec.rb
 - spec/unit/backend_spec.rb
+- spec/unit/version_spec.rb
+- spec/unit/puppet_logger_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/console_logger_spec.rb
 - spec/unit/fallback_logger_spec.rb
-- spec/unit/filecache_spec.rb
-- spec/unit/hiera_spec.rb
-- spec/unit/puppet_logger_spec.rb
 - spec/unit/util_spec.rb
-- spec/unit/version_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/hiera
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Light weight hierarchical data store
 test_files:
-- spec/spec_helper.rb
-- spec/unit/backend/json_backend_spec.rb
+- spec/unit/hiera_spec.rb
+- spec/unit/filecache_spec.rb
 - spec/unit/backend/yaml_backend_spec.rb
+- spec/unit/backend/json_backend_spec.rb
+- spec/unit/console_logger_spec.rb
 - spec/unit/backend_spec.rb
+- spec/unit/version_spec.rb
+- spec/unit/puppet_logger_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/console_logger_spec.rb
 - spec/unit/fallback_logger_spec.rb
-- spec/unit/filecache_spec.rb
-- spec/unit/hiera_spec.rb
-- spec/unit/puppet_logger_spec.rb
 - spec/unit/util_spec.rb
-- spec/unit/version_spec.rb
+- spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d09536712a42df9adc396179e989930ecad02f68
-  data.tar.gz: a9f6f071ebcd6d4b2f3b51b5356ebdc5539965c8
-SHA512:
-  metadata.gz: 75b92dd7914f57c1181531b1b6f9fb107b3d4f60ceeabea05c845b8cea478dff95169e0d2b3338293a0f4de4239e99c8cd82f4008d1cf1296d0250b83deca5a9
-  data.tar.gz: 1b33ca1476383bcb4946995b463f98d58f127c34a4f7146d75b4f1995328708487e45e008fc4357bd7dab1c8e69c7bd1ec7f315e8d18cf28393b5c6f5e12961e