hiera-mysql-backend 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bed2f5ccd27f43d661e3b382d5b5b3add9c7f01f
+  data.tar.gz: de44292bef0ed41a782bc65bc25c222c5085ee05
+SHA512:
+  metadata.gz: ad9ca9fb6314f8a4aab540b7afb9609f9b3bc1c1ee6830d9b11be896b0f069c621586e61962c751344c1e8ef14f107f0852c3b9881d29045c2d98cfb1de7775f
+  data.tar.gz: a80ffa09404dc92db4b245700f4625b812fcec43c81795d2f309381448cac46f279af70aa861670efba062564b224985d940b980fcb16b19247ab78e9d129951

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    hiera-mysql-backend (0.0.3)
+    hiera-mysql-backend (0.0.4)
       hiera
       mysql2
 
 GEM
   remote: https://rubygems.org/
   specs:
-    hiera (1.2.1)
+    hiera (1.3.1)
       json_pure
-    json_pure (1.8.0)
-    mysql2 (0.3.13)
+    json_pure (1.8.1)
+    mysql2 (0.3.14)
     rake (10.1.0)
 
 PLATFORMS

data/README.md

@@ -18,10 +18,19 @@ Exception handling. hiera-mysql would cause a puppet run to fail if one of the q
 
 The poorly named sql files are really yaml files where the key is the lookup key and the value is the SQL statement (it accepts interpolation)
 
+As of version 0.0.4 you can also add connection information to these sql files, this allows you to connect to different databases. This is optional if no connection information is found it will use the default defined in your hiera.yaml config.
+
 Lets assume your _datadir_ is `/etc/puppet/hieradata/` and your hierarchy for hiera just have a common. hiera-mysql-backend would look for /etc/puppet/hieradata/common.sql the common.sql would look like:
 
 ```yaml
 ---
+# This is optional, if not present it will use the default connection info from hiera.yaml
+:dbconfig:
+  :host: database.example.com
+  :user: hieratest
+  :pass: sekret
+  :database: testhieradb
+
 applications: SELECT * FROM applications WHERE host='%{fqdn}';
 coats: SELECT cut,name,type FROM coats WHERE color='brown';
 ```

data/hiera-mysql-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-backend"
-  gem.version       = "0.0.3"
+  gem.version       = "0.0.4"
   gem.authors       = ["Telmo"]
   gem.email         = ["telmox@gmail.com"]
   gem.description   = %q{Alternative MySQL backend for hiera}

data/lib/hiera/backend/mysql2_backend.rb

@@ -34,6 +34,19 @@ class Hiera
             YAML.load(datafile)
           end
 
+          mysql_host = data.fetch(:dbconfig, {}).fetch(:host, nil) || Config[:mysql2][:host]
+          mysql_user = data.fetch(:dbconfig, {}).fetch(:user, nil) || Config[:mysql2][:user]
+          mysql_pass = data.fetch(:dbconfig, {}).fetch(:pass, nil) || Config[:mysql2][:pass]
+          mysql_database = data.fetch(:dbconfig, {}).fetch(:database, nil) || Config[:mysql2][:database]
+
+          connection_hash = {
+            :host => mysql_host, 
+            :username => mysql_user, 
+            :password => mysql_pass, 
+            :database => mysql_database,
+            :reconnect => true}
+
+
           Hiera.debug("data #{data.inspect}")
           next if data.empty?
           next unless data.include?(key)
@@ -41,26 +54,18 @@ class Hiera
           Hiera.debug("Found #{key} in #{source}")
 
           new_answer = Backend.parse_answer(data[key], scope)
-          results = query(new_answer)
+          results = query(connection_hash, new_answer)
 
         end
-          return results
+        return results
       end
 
 
-      def query(query)
+      def query(connection_hash, query)
         Hiera.debug("Executing SQL Query: #{query}")
 
         data=nil
-        mysql_host = Config[:mysql2][:host]
-        mysql_user = Config[:mysql2][:user]
-        mysql_pass = Config[:mysql2][:pass]
-        mysql_database = Config[:mysql2][:database]
-        client = Mysql2::Client.new(:host => mysql_host, 
-                                    :username => mysql_user, 
-                                    :password => mysql_pass, 
-                                    :database => mysql_database,
-                                    :reconnect => true)
+        client = Mysql2::Client.new(connection_hash)
         begin
           data = client.query(query).to_a
           Hiera.debug("Mysql Query returned #{data.size} rows")

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql-backend
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Telmo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &24472620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24472620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hiera
-  requirement: &24472160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24472160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &24471700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24471700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Alternative MySQL backend for hiera
 email:
 - telmox@gmail.com
@@ -51,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -61,32 +69,25 @@ files:
 - lib/hiera/backend/mysql2_backend.rb
 homepage: https://github.com/Telmo/hiera-mysql-backend
 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'
-      segments:
-      - 0
-      hash: 1582863243963958738
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1582863243963958738
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Alternative MySQL backend for hiera
 test_files: []