gooddata-dss-jdbc 0.1.16 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ce8a40877d819241fb1d7109019558b7af3a91d
-  data.tar.gz: 6856d8e9116db0f32888cd1a273fd338c3772475
+SHA256:
+  metadata.gz: 1fff11750e09c79f550f2981134df8421eaafd422a2104b792b961e35e2d9d2a
+  data.tar.gz: 846d8ca91207d527a812475daf564118e9a795517b8060c6603bc04c3a46f1cc
 SHA512:
-  metadata.gz: 2d2448371db637ff3cef1eb4b2338f4a948f11f6d221c6abf03c1999d2f373d8dd1387d44a520937313f748d635b018c67229ade6d35e9ee670c07377e239280
-  data.tar.gz: 32389c76f69c7ca8ddf3970fbcacb85a26d7262ca63a1a31715c95336350edc1da684798951359831bd5aecda15e7ae85cb169c5f9ca53b41fcc08898bcaed4a
+  metadata.gz: a184c01cf393b39611628f9e3236a5b945d314edb1d682fd099d8cad65068ca886968661eb1c8836eba6d5b6404029e7b1a9230a1b1d11336ce8cc3ff27108f0
+  data.tar.gz: 222f73833e713d0a666ec193cdee89c6c8641be53fcebe9ca2377cd529faa61348589af84e17cdb56b0f1d3d2584624d455198c40b9ace08f42d8a272788acd0

data/lib/jdbc/dss.rb

@@ -5,15 +5,15 @@ rescue
 end
 
 require 'jdbc/dss/version'
-require 'slf4j-api-1.7.25.jar'
-require 'slf4j-simple-1.7.25.jar'
+require 'rjack-slf4j'
+require 'rjack-slf4j/simple'
 
 # JDBC Wrapper
 module Jdbc
   # DSS Wrapper
   module DSS
     def self.driver_jar
-      "dss-jdbc-driver-#{DRIVER_VERSION}.jar"
+      "datawarehouse-jdbc-driver-#{DRIVER_VERSION}.jar"
     end
 
     def self.load_driver(method = :load)
@@ -21,7 +21,7 @@ module Jdbc
     end
 
     def self.driver_name
-      'com.gooddata.dss.jdbc.driver.DssDriver'
+      'com.gooddata.datawarehouse.jdbc.driver.DatawarehouseDriver'
     end
 
     if defined?(JRUBY_VERSION) && # enable backwards-compat behavior :

data/lib/jdbc/dss/version.rb

@@ -4,7 +4,7 @@
 module Jdbc
   # DSS Wrapper
   module DSS
-    DRIVER_VERSION = '2.9.0'
-    VERSION = '0.1.16'
+    DRIVER_VERSION = '3.0.2'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: gooddata-dss-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.2.0
 platform: ruby
 authors:
 - Pavel Kolesnikov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.19.0
+  name: rjack-slf4j
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.19.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -122,13 +142,9 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.rdoc
-- lib/dss-jdbc-driver-2.9.0.jar
+- lib/datawarehouse-jdbc-driver-3.0.2.jar
 - lib/jdbc/dss.rb
-- lib/jdbc/dss.rb.orig
 - lib/jdbc/dss/version.rb
-- lib/jdbc/dss/version.rb.orig
-- lib/slf4j-api-1.7.25.jar
-- lib/slf4j-simple-1.7.25.jar
 homepage: http://github.com/gooddata/gooddata-dss-ruby
 licenses: []
 metadata: {}
@@ -148,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: A minimal Ruby wrapper of the GoodData DSS JDBC driver

data/lib/jdbc/dss.rb.orig

@@ -1,38 +0,0 @@
-begin
-  JRUBY_VERSION.nil?
-rescue
-  warn 'Jdbc-DSS is only for use with JRuby'
-end
-
-require 'jdbc/dss/version'
-<<<<<<< HEAD
-require 'slf4j-jars'
-=======
-require 'slf4j-api-1.7.25.jar'
-require 'slf4j-simple-1.7.25.jar'
->>>>>>> 3fa65f2... Use raw slf4j jars
-
-# JDBC Wrapper
-module Jdbc
-  # DSS Wrapper
-  module DSS
-    def self.driver_jar
-      "datawarehouse-jdbc-driver-#{DRIVER_VERSION}.jar"
-    end
-
-    def self.load_driver(method = :load)
-      send method, driver_jar
-    end
-
-    def self.driver_name
-      'com.gooddata.datawarehouse.jdbc.driver.DatawarehouseDriver'
-    end
-
-    if defined?(JRUBY_VERSION) && # enable backwards-compat behavior :
-       (Java::JavaLang::Boolean.get_boolean('jdbc.driver.autoload') ||
-         Java::JavaLang::Boolean.get_boolean('jdbc.dss.autoload'))
-      warn "autoloading JDBC driver on require 'jdbc/dss'" if $VERBOSE
-      load_driver :require
-    end
-  end
-end

data/lib/jdbc/dss/version.rb.orig

@@ -1,14 +0,0 @@
-# encoding: utf-8
-
-# JDBC Wrapper
-module Jdbc
-  # DSS Wrapper
-  module DSS
-    DRIVER_VERSION = '3.1.3'
-<<<<<<< HEAD
-    VERSION = '0.2.3'
-=======
-    VERSION = '0.2.4'
->>>>>>> 24e9974... Bump version to 0.2.4
-  end
-end