heira: update to 3.12.0

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

4 files changed, 52 insertions, 43 deletions

diff --git a/recipes-support/hiera/hiera/add_hiera_gemspec.patch b/recipes-support/hiera/hiera/add_hiera_gemspec.patch
deleted file mode 100644
index 7e302cf..0000000
--- a/recipes-support/hiera/hiera/add_hiera_gemspec.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN hiera-1.3.4_ori/hiera.gemspec hiera-1.3.4/hiera.gemspec
---- hiera-1.3.4_ori/hiera.gemspec       1970-01-01 08:00:00.000000000 +0800
-+++ hiera-1.3.4/hiera.gemspec   2014-11-12 14:30:07.000000000 +0800
-@@ -0,0 +1,19 @@
-+$:.unshift(File.dirname(__FILE__) + '/lib')
-+require 'hiera/version'
-+
-+Gem::Specification.new do |s|
-+  s.name = 'hiera'
-+  s.version = Hiera::VERSION
-+  s.platform = Gem::Platform::RUBY
-+  s.summary = 'A simple pluggable Hierarchical Database.'
-+  s.description = s.summary
-+  s.author = 'Yang Haibo'
-+  s.email = 'b40869@freescale.com'
-+  s.homepage = 'https://projects.puppetlabs.com/projects/hiera'
-+  s.license = 'Apache 2.0'
-+
-+  s.bindir       = 'bin'
-+  s.executables  = ['hiera']
-+  s.require_path = 'lib'
-+  s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+end
diff --git a/recipes-support/hiera/hiera/hiera.gemspec b/recipes-support/hiera/hiera/hiera.gemspec
new file mode 100644
index 0000000..5d3ae06
--- /dev/null
+++ b/recipes-support/hiera/hiera/hiera.gemspec
@@ -0,0 +1,28 @@
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'bundler/version'
+
+Gem::Specification.new do |s|
+  s.name        = "hiera-file"
+  s.version     = '1.1.1'
+  s.platform    = Gem::Platform::RUBY
+
+  s.authors     = ["Hunter Haugen", "Adrien Thebo", "Reid Vandewiele"]
+  s.authors     = "adrien@puppetlabs.com"
+  s.homepage    = "http://github.com/adrienthebo/hiera-file"
+  s.summary     = "File backend for Hiera"
+  s.description = "A data backend for Hiera that can return the content of whole files"
+
+  # hiera is omitted as an explicit dependency so that hiera-file can be
+  # installed as a gem when hiera is installed via system package.
+  #s.add_dependency 'hiera', '>= 1.0.0'
+
+  s.add_development_dependency 'rspec', '~> 2.10.0'
+  s.add_development_dependency 'mocha', '~> 0.10.5'
+
+  s.files        = Dir.glob("lib/**/*")
+  s.require_path = 'lib'
+
+  s.test_files   = Dir.glob("spec/**/*_spec.rb")
+end
diff --git a/recipes-support/hiera/hiera_1.3.4.bb b/recipes-support/hiera/hiera_1.3.4.bb
deleted file mode 100644
index eb633ff..0000000
--- a/recipes-support/hiera/hiera_1.3.4.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "A simple pluggable Hierarchical Database"
-HOMEPAGE = "https://projects.puppetlabs.com/projects/hiera"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8ac92c91fbec097f798223679c1a7491"
-
-SRC_URI = " \
-    https://downloads.puppetlabs.com/hiera/hiera-${PV}.tar.gz \
-    file://add_hiera_gemspec.patch \
-"
-SRC_URI[md5sum] = "6abccc518edb55291a63129ef30888cd"
-SRC_URI[sha256sum] = "d3ecbfedc7d8493fd00c7dd624efbb225705d289442fe7706cb81a3a7230e70e"
-
-
-inherit ruby
-
-DEPENDS += " \
-        ruby \
-"
-
-RUBY_INSTALL_GEMS = "hiera-${PV}.gem"
diff --git a/recipes-support/hiera/hiera_3.12.0.bb b/recipes-support/hiera/hiera_3.12.0.bb
new file mode 100644
index 0000000..7a465a8
--- /dev/null
+++ b/recipes-support/hiera/hiera_3.12.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "A simple pluggable Hierarchical Database"
+HOMEPAGE = "https://projects.puppetlabs.com/projects/hiera"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=cb05cd62f0184c1950374f251caef471"
+
+SRC_URI = " \
+    https://downloads.puppetlabs.com/hiera/hiera-${PV}.tar.gz \
+    file://hiera.gemspec \
+"
+
+SRC_URI[md5sum] = "899ca6294677757ec8c5b6422c0090e2"
+SRC_URI[sha256sum] = "1c258f6b290f0884f6b6e892985b58d0dd24f389b42f5911c83f392030c403e1"
+
+inherit ruby
+
+DEPENDS += " \
+        ruby \
+"
+
+RUBY_INSTALL_GEMS = "hiera-file-1.1.1.gem"
+
+do_compile:prepend() {
+    cp ${UNPACKDIR}/hiera.gemspec ${S}
+}