hiera-mysql-backend 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b1ee50dbad3c03c12cb304258cddeeff5b43f4
-  data.tar.gz: 9b7eb5add117640cc6acf7cb5700f22708d007d3
+  metadata.gz: 66ad1c9f5a74fef154d3175e20aa1a6f043ccc39
+  data.tar.gz: ef2c2ff532cd32cef5b9e6b2ea2d0491b8fa9c48
 SHA512:
-  metadata.gz: f01c50cc82931af61aca1effff5073860653ea135450345d744b27aeffe0a90aa58c3ff3182c276871275097a48e02474f50adbbbe386194bcda5dea4a869c60
-  data.tar.gz: f41ab3d9f8410890192f18611ae91403bfbc08804cf45b5c065b86b62a3f39773e5102441a850d9fc1c0dd13b1ea7719575656ef3e733ad04f66647759fc2833
+  metadata.gz: 61abecc9a53760b021a42b92b05b3d6f04223852ab04339f66ce87618199936646f1451aa5f28b31b2ac5b7be0011cab15bdc3bda630fb4fc09ef9eb0c3c1581
+  data.tar.gz: c52a9f5a31602946ebe84f15230b76026d4bd343977a371ce527688cfda6aecfe4e649ae3d6e8fa6a0499cdb54784eefe34d6cf2addc2048c5341be99777210a

data/Rakefile

@@ -1 +1,2 @@
+require "bundler"
 require "bundler/gem_tasks"

data/{hiera-mysql-backend-java.gemspec → hiera-mysql-backend-puppetserver.gemspec}

@@ -1,21 +1,19 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
-  gem.name          = "hiera-mysql-backend"
-  gem.version       = "0.0.8"
+  gem.name          = "hiera-mysql-backend-jruby"
+  gem.version       = "0.0.9"
   gem.authors       = ["Telmo"]
   gem.email         = ["telmox@gmail.com"]
   gem.description   = %q{Alternative MySQL backend for hiera}
   gem.summary       = %q{Alternative MySQL backend for hiera}
   gem.homepage      = "https://github.com/Telmo/hiera-mysql-backend"
   gem.license       = "MIT"
-  gem.platform      = "java"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency('jdbc-mysql', '~> 0')
-  gem.add_dependency('hiera', '~> 0')
-  gem.add_development_dependency('rake', '~> 0')
+  gem.add_dependency('jdbc-mysql')
+  gem.add_development_dependency('rake')
 end

data/hiera-mysql-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-backend"
-  gem.version       = "0.0.8"
+  gem.version       = "0.0.9"
   gem.authors       = ["Telmo"]
   gem.email         = ["telmox@gmail.com"]
   gem.description   = %q{Alternative MySQL backend for hiera}
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.requirements << 'mysql'
-  gem.requirements << 'jdbc-mysql'
-
+  gem.add_dependency('mysql2')
+  gem.add_dependency('hiera')
+  gem.add_development_dependency('rake')
 end

data/lib/hiera/backend/mysql2_backend.rb

@@ -72,7 +72,13 @@ class Hiera
       def query(connection_hash, query)
         Hiera.debug("Executing SQL Query: #{query}")
 
-        data=nil
+        data=[]
+        mysql_host=connection_hash[:host]
+        mysql_user=connection_hash[:username]
+        mysql_pass=connection_hash[:password]
+        mysql_database=connection_hash[:database]
+        mysql_port=connection_hash[:port]
+
         if defined?(JRUBY_VERSION)
           Jdbc::MySQL.load_driver
           url = "jdbc:mysql://#{mysql_host}:#{mysql_port}/#{mysql_database}"
@@ -83,7 +89,7 @@ class Hiera
           conn = com.mysql.jdbc.Driver.new.connect(url,props)
           stmt = conn.create_statement
 
-          res = stmt.execute_query(sql)
+          res = stmt.execute_query(query)
           md = res.getMetaData
           numcols = md.getColumnCount
 
@@ -118,7 +124,6 @@ class Hiera
         return data
 
       end
-
     end
   end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql-backend
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Telmo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
-dependencies: []
+date: 2017-04-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hiera
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Alternative MySQL backend for hiera
 email:
 - telmox@gmail.com
@@ -24,7 +66,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- hiera-mysql-backend-java.gemspec
+- hiera-mysql-backend-puppetserver.gemspec
 - hiera-mysql-backend.gemspec
 - lib/hiera/backend/mysql2_backend.rb
 homepage: https://github.com/Telmo/hiera-mysql-backend
@@ -45,11 +87,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- mysql
-- jdbc-mysql
+requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Alternative MySQL backend for hiera