hiera-mysql-backend 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b238516159dbc557c0f028f1ed64309d58662a
-  data.tar.gz: f434c79cde6fbf9687145894cace532a177dd17d
+  metadata.gz: 80b1ee50dbad3c03c12cb304258cddeeff5b43f4
+  data.tar.gz: 9b7eb5add117640cc6acf7cb5700f22708d007d3
 SHA512:
-  metadata.gz: 34396bca064fdf98a4d8748e5a629742001342ad9c613a72e826c7936f938dcf96945e9dcb90604f09fc9d0bae83f2399d7b538e39bc7591b677fc8f2ff4273f
-  data.tar.gz: 1e221ab27a654fbebc50b02088ed5a8b2fce1af2c81f7fdb98108cb784160c4be4cda5666e1e2288727dd88522638a75de5e2eb345c21c166e3c9d16c8e7f4fc
+  metadata.gz: f01c50cc82931af61aca1effff5073860653ea135450345d744b27aeffe0a90aa58c3ff3182c276871275097a48e02474f50adbbbe386194bcda5dea4a869c60
+  data.tar.gz: f41ab3d9f8410890192f18611ae91403bfbc08804cf45b5c065b86b62a3f39773e5102441a850d9fc1c0dd13b1ea7719575656ef3e733ad04f66647759fc2833

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+### 0.0.1
+- Initial Release
+
+### 0.0.2 - 0.0.3
+- Minor Updates
+
+### 0.0.4
+- Connection strings can now be defined per hierarchy file instead of being global
+
+### 0.0.5
+- Added port as one of the settings that can be defined, thanks [Dave Seff](https://github.com/daveseff)
+
+### 0.0.6
+
+- Made improvements to the connection Hash
+- Fixed an issue where if no port was defined nill would be passed
+- Added defaults for hostname and port, hostname will default to `localhost` port to `3306`

data/hiera-mysql-backend-java.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |gem|
+  gem.name          = "hiera-mysql-backend"
+  gem.version       = "0.0.8"
+  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')
+end

data/hiera-mysql-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-backend"
-  gem.version       = "0.0.6"
+  gem.version       = "0.0.8"
   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.add_dependency('mysql2')
-  gem.add_dependency('hiera')
-  gem.add_development_dependency('rake')
+  gem.requirements << 'mysql'
+  gem.requirements << 'jdbc-mysql'
+
 end

data/lib/hiera/backend/mysql2_backend.rb

@@ -3,11 +3,16 @@ class Hiera
     class Mysql2_backend
 
       def initialize(cache=nil)
-        begin
-          require 'mysql2'
-        rescue LoadError
-          require 'rubygems'
-          require 'mysql2'
+        if defined?(JRUBY_VERSION)
+          require 'jdbc/mysql'
+          require 'java'
+        else
+          begin
+            require 'mysql2'
+          rescue LoadError
+            require 'rubygems'
+            require 'mysql2'
+          end
         end
 
         @cache = cache || Filecache.new
@@ -50,14 +55,14 @@ class Hiera
             :reconnect => true}
 
 
-            Hiera.debug("data #{data.inspect}")
-            next if data.empty?
-            next unless data.include?(key)
+          Hiera.debug("data #{data.inspect}")
+          next if data.empty?
+          next unless data.include?(key)
 
-            Hiera.debug("Found #{key} in #{source}")
+          Hiera.debug("Found #{key} in #{source}")
 
-            new_answer = Backend.parse_answer(data[key], scope)
-            results = query(connection_hash, new_answer)
+          new_answer = Backend.parse_answer(data[key], scope)
+          results = query(connection_hash, new_answer)
 
         end
         return results
@@ -68,20 +73,52 @@ class Hiera
         Hiera.debug("Executing SQL Query: #{query}")
 
         data=nil
-        client = Mysql2::Client.new(connection_hash)
-        begin
-          data = client.query(query).to_a
-          Hiera.debug("Mysql Query returned #{data.size} rows")
-        rescue => e
-          Hiera.debug e.message
-          data = nil
-        ensure
-          client.close
+        if defined?(JRUBY_VERSION)
+          Jdbc::MySQL.load_driver
+          url = "jdbc:mysql://#{mysql_host}:#{mysql_port}/#{mysql_database}"
+          props = java.util.Properties.new
+          props.set_property :user, mysql_user
+          props.set_property :password, mysql_pass
+
+          conn = com.mysql.jdbc.Driver.new.connect(url,props)
+          stmt = conn.create_statement
+
+          res = stmt.execute_query(sql)
+          md = res.getMetaData
+          numcols = md.getColumnCount
+
+          Hiera.debug("Mysql Query returned #{numcols} rows")
+
+          while ( res.next ) do
+            if numcols < 2
+              Hiera.debug("Mysql value : #{res.getString(1)}")
+              data << res.getString(1)
+            else
+              row = {}
+              (1..numcols).each do |c|
+                row[md.getColumnName(c)] = res.getString(c)
+              end
+              data << row
+            end
+          end
+
+        else
+          client = Mysql2::Client.new(connection_hash)
+          begin
+            data = client.query(query).to_a
+            Hiera.debug("Mysql Query returned #{data.size} rows")
+          rescue => e
+            Hiera.debug e.message
+            data = nil
+          ensure
+            client.close
+          end
         end
 
         return data
 
       end
+
     end
   end
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql-backend
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Telmo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 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'
+date: 2016-03-31 00:00:00.000000000 Z
+dependencies: []
 description: Alternative MySQL backend for hiera
 email:
 - telmox@gmail.com
@@ -60,11 +18,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- hiera-mysql-backend-java.gemspec
 - hiera-mysql-backend.gemspec
 - lib/hiera/backend/mysql2_backend.rb
 homepage: https://github.com/Telmo/hiera-mysql-backend
@@ -85,9 +45,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- mysql
+- jdbc-mysql
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Alternative MySQL backend for hiera