From 783cf0abbc2b365387b5bb919156991b0ac7d3fc Mon Sep 17 00:00:00 2001 From: "G. Gibson" Date: Fri, 31 Mar 2023 07:43:43 -0700 Subject: [PATCH] GxG DB Stubs --- gxg-framework.gemspec | 60 +++++++++++++++++++++-------------------- lib/gxg-framework.rb | 8 +++--- lib/gxg/gxg_database.rb | 3 +++ 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/gxg-framework.gemspec b/gxg-framework.gemspec index fdd460d..9321c99 100644 --- a/gxg-framework.gemspec +++ b/gxg-framework.gemspec @@ -1,9 +1,9 @@ Gem::Specification.new do |s| s.name = 'gxg-framework' - s.version = '0.0.53' + s.version = '0.0.54' s.licenses = ['UNLICENSED'] - s.summary = "GxG Framework for JRuby" - s.description = "GxG Framework for JRuby" + s.summary = "GxG Framework" + s.description = "GxG Framework" s.authors = ["G. Gibson"] s.email = 'mistergibson@disroot.org' s.files = ['gxg-framework.gemspec'] + ['lib/gxg-framework.rb'] + Dir['lib/gxg/*'] @@ -23,7 +23,7 @@ Gem::Specification.new do |s| # FIX : big hassle with windows - exclude for now # s.add_runtime_dependency 'ffi-rzmq' # s.add_runtime_dependency 'ezmq' - s.add_runtime_dependency 'nokogiri' + # s.add_runtime_dependency 'nokogiri' s.add_runtime_dependency 'mimemagic' s.add_runtime_dependency 'rubysl-securerandom' s.add_runtime_dependency 'net-ssh' @@ -38,29 +38,31 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'state_machines' s.add_runtime_dependency 'net-ldap' # ### Database Adapters: - s.add_runtime_dependency 'jdbc-sqlite3' - s.add_runtime_dependency 'jdbc-mysql' - s.add_runtime_dependency 'jdbc-postgresql' - s.add_runtime_dependency 'jdbc-as400' - s.add_runtime_dependency 'jdbc-cassandra' - s.add_runtime_dependency 'jdbc-crate' - s.add_runtime_dependency 'jdbc-derby' - s.add_runtime_dependency 'jdbc-filemaker' - s.add_runtime_dependency 'jdbc-firebird' - s.add_runtime_dependency 'jdbc-h2' - s.add_runtime_dependency 'jdbc-hive2' - s.add_runtime_dependency 'jdbc-hsqldb' - s.add_runtime_dependency 'jdbc-jt400' - s.add_runtime_dependency 'jdbc-jtds' - s.add_runtime_dependency 'jdbc-luciddb' - s.add_runtime_dependency 'jdbc-mssql' - s.add_runtime_dependency 'jdbc-nuodb' - # ### FIX : openedge requires external .jars in classpath -- exclude for now. - # s.add_runtime_dependency 'jdbc-openedge' - s.add_runtime_dependency 'jdbc-orientdb' - s.add_runtime_dependency 'jdbc-phoenix' - # ### FIX : redshift is missing the RedshiftJDBC4.jar file -- exclude for now. - # s.add_runtime_dependency 'jdbc-redshift' - s.add_runtime_dependency 'jdbc-splice' - s.add_runtime_dependency 'jdbc-vertica' + if ::RUBY_ENGINE == "jruby" + s.add_runtime_dependency 'jdbc-sqlite3' + s.add_runtime_dependency 'jdbc-mysql' + s.add_runtime_dependency 'jdbc-postgresql' + s.add_runtime_dependency 'jdbc-as400' + s.add_runtime_dependency 'jdbc-cassandra' + s.add_runtime_dependency 'jdbc-crate' + s.add_runtime_dependency 'jdbc-derby' + s.add_runtime_dependency 'jdbc-filemaker' + s.add_runtime_dependency 'jdbc-firebird' + s.add_runtime_dependency 'jdbc-h2' + s.add_runtime_dependency 'jdbc-hive2' + s.add_runtime_dependency 'jdbc-hsqldb' + s.add_runtime_dependency 'jdbc-jt400' + s.add_runtime_dependency 'jdbc-jtds' + s.add_runtime_dependency 'jdbc-luciddb' + s.add_runtime_dependency 'jdbc-mssql' + s.add_runtime_dependency 'jdbc-nuodb' + # ### FIX : openedge requires external .jars in classpath -- exclude for now. + # s.add_runtime_dependency 'jdbc-openedge' + s.add_runtime_dependency 'jdbc-orientdb' + s.add_runtime_dependency 'jdbc-phoenix' + # ### FIX : redshift is missing the RedshiftJDBC4.jar file -- exclude for now. + # s.add_runtime_dependency 'jdbc-redshift' + s.add_runtime_dependency 'jdbc-splice' + s.add_runtime_dependency 'jdbc-vertica' + end end diff --git a/lib/gxg-framework.rb b/lib/gxg-framework.rb index 2327f88..9e87219 100644 --- a/lib/gxg-framework.rb +++ b/lib/gxg-framework.rb @@ -35,7 +35,7 @@ requirements.push({:requirement => "chronic", :gem => "chronic"}) # FIX : big hassle with windows - exclude for now # requirements.push({:requirement => "ffi-rzmq", :gem => "ffi-rzmq"}) # requirements.push({:requirement => "ezmq", :gem => "ezmq"}) -requirements.push({:requirement => "nokogiri", :gem => "nokogiri"}) +# requirements.push({:requirement => "nokogiri", :gem => "nokogiri"}) requirements.push({:requirement => "rufus-scheduler", :gem => "rufus-scheduler"}) requirements.push({:requirement => "mimemagic", :gem => "mimemagic"}) # requirements.push({:requirement => "mimemagic/overlay", :gem => "mimemagic"}) @@ -442,8 +442,10 @@ unless load_error # --------------------------------------------------------------------------------------------------------------------- require File.expand_path("./gxg/gxg_entities.rb",File.dirname(__FILE__)) # --------------------------------------------------------------------------------------------------------------------- - require 'jruby' - JRuby.objectspace = true + if ::RUBY_ENGINE == "jruby" + require 'jruby' + JRuby.objectspace = true + end require File.expand_path("./gxg/gxg_engine.rb",File.dirname(__FILE__)) # --------------------------------------------------------------------------------------------------------------------- # Alterations to Object class: GxG::Engine dependency - quota supports diff --git a/lib/gxg/gxg_database.rb b/lib/gxg/gxg_database.rb index 681aefc..e02bc67 100644 --- a/lib/gxg/gxg_database.rb +++ b/lib/gxg/gxg_database.rb @@ -1,4 +1,7 @@ # require sequel here to ensure other mods are underneath it +require_relative "./gxg_sqlite.rb" +require_relative "./gxg_mysql.rb" +require_relative "./gxg_postgres.rb" require "sequel" require "securerandom" require "openssl"