gooddata_datawarehouse 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb47425e959803a032aadd5eafa8b1b40c0ba1695648a49c8c3bed737be40b2
-  data.tar.gz: c81839b299f2c9cab6a5cced6fa403e7edd9f287fa05d02aa5d23c52139dd9ae
+  metadata.gz: 8b921d1b0bbe1457b707f798c19f0a960edd456459b937c4b2e8da9712df85ab
+  data.tar.gz: 4a79964523cd16ad3cd84ed62cd18e84b0472403b986960c21d607dbecd6445c
 SHA512:
-  metadata.gz: 5225c46a79009619c6eaab6651d3d8f3d5f636572daa1db6ab9a27240a78e85bb77d7312957b89733da5df1a784c48fe7acb81f5ee5d2fdb1e625c43c4b3945d
-  data.tar.gz: 9eaf09fb89d312a544f33d357505ce95b44c3f5a1068ecce6a4dbbe80e06a99b2442050678976d866f6ea4023f452cd66d0fb19bc9cb725751ab55b47ec49f76
+  metadata.gz: 3ea0f80a4e10b4e0177689d9c319aa932b69561220cfd13306fcd4db7528ede9fbe5e79b045c485e91cde0a74469c1d0f2e28db7aa123a4a153da7133c5c65cd
+  data.tar.gz: 62fa5a6c6c49380d60ae0d0ea543f9554bab48c7cd3b2fd4aef9e784d60c7d904d64bc2fc8a0a9af1ac35f976d6863f0c18ff35a8dd9ff1eda0551b2d7cc9424

data/README.md

@@ -50,6 +50,12 @@ dwh = GoodData::Datawarehouse.new('you@gooddata.com', 'yourpass', 'your ADS inst
 # for custom jdbc url do:
 # dwh = GoodData::Datawarehouse.new('you@gooddata.com', 'yourpass', nil, :jdbc_url => 'jdbc:dss://whatever.com/something')
 
+# connect with SST (available from version 0.0.10)
+# dwh = GoodData::Datawarehouse.new_instance(:instance_id => 'your ADS instance id', :sst => 'SST token')
+# for custom jdbc url do:
+# dwh = GoodData::Datawarehouse.new_instance(:jdbc_url => 'jdbc:dss://whatever.com/something', :sst => 'SST token')
+ 
+
 # import a csv
 dwh.csv_to_new_table('my_table', 'path/to/my.csv')
 

data/lib/gooddata_datawarehouse/datawarehouse.rb

@@ -10,14 +10,17 @@ require_relative 'sql_generator'
 module GoodData
   class Datawarehouse
     PARALEL_COPY_THREAD_COUNT = 10
+
+    def self.new_instance(opts={})
+      self.new(opts[:username], opts[:password], opts[:instance_id], opts)
+    end
+
     def initialize(username, password, instance_id, opts={})
       @logger = Logger.new(STDOUT)
       @username = username
       @password = password
+      @sst_token = opts[:sst]
       @jdbc_url = opts[:jdbc_url] || "jdbc:gdc:datawarehouse://secure.gooddata.com/gdc/datawarehouse/instances/#{instance_id}"
-      if @username.nil? || @password.nil?
-        fail ArgumentError, "username and/or password are nil. All of them are mandatory."
-      end
 
       if instance_id.nil? && opts[:jdbc_url].nil?
         fail ArgumentError, "you must either provide instance_id or jdbc_url option."
@@ -192,11 +195,15 @@ module GoodData
     end
 
     def connect
-      Sequel.connect @jdbc_url,
-        :username => @username,
-        :password => @password do |connection|
-          yield(connection)
+      if @username.to_s.empty? || @password.to_s.empty?
+        @connection = Sequel.connect(@jdbc_url, :driver => Java.com.gooddata.dss.jdbc.driver.DssDriver, :jdbc_properties => {'sst' => @sst_token})
+      else
+        @connection = Sequel.connect(@jdbc_url, :username => @username, :password => @password)
       end
+      yield(@connection)
+    ensure
+      @connection.disconnect unless @connection.nil?
+      Sequel.synchronize{::Sequel::DATABASES.delete(@connection)}
     end
 
     private

data/lib/gooddata_datawarehouse/version.rb

@@ -1,5 +1,5 @@
 module GoodData
   class Datawarehouse
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/spec/datawarehouse_spec.rb

@@ -7,10 +7,17 @@ WRONG_CSV_PATH = 'spec/data/wrong-bike.csv'
 EMPTY_HEADER_CSV_PATH = 'spec/data/emptyheader-bike.csv'
 CSV_REGEXP = 'spec/data/bike*.csv'
 
+SST_TOKEN = ENV['GDC_SST']
+
 class Helper
   def self.create_default_connection
     GoodData::Datawarehouse.new(ENV['USERNAME'], ENV['PASSWORD'], ENV['INSTANCE_ID'])
   end
+
+  def self.create_connection_with_sst
+    GoodData::Datawarehouse.new_instance(:jdbc_url => ENV['JDBC_URL'], :sst => SST_TOKEN)
+  end
+
   def self.line_count(f)
     i = 0
     CSV.foreach(f, :headers => true) {|_| i += 1}
@@ -21,13 +28,23 @@ end
 describe GoodData::Datawarehouse do
   describe "dwh instance creation" do
     it "creates an instance with custom jdbc url" do
-      dwh = GoodData::Datawarehouse.new(ENV['USERNAME'], ENV['PASSWORD'], nil, :jdbc_url => "jdbc:dss://secure.gooddata.com/gdc/dss/instances/#{ENV['INSTANCE_ID']}")
-      expect(dwh.table_exists?('hahahaha')).to eq false
+      if SST_TOKEN.to_s.empty?
+        dwh = GoodData::Datawarehouse.new(ENV['USERNAME'], ENV['PASSWORD'], nil, :jdbc_url => "jdbc:dss://secure.gooddata.com/gdc/dss/instances/#{ENV['INSTANCE_ID']}")
+        expect(dwh.table_exists?('hahahaha')).to eq false
+      else
+        dwh = Helper::create_connection_with_sst
+        expect(dwh.table_exists?('hahahaha')).to eq false
+      end
     end
   end
+
   describe 'Table operations' do
     before(:each) do
-      @dwh = Helper::create_default_connection
+      if SST_TOKEN.to_s.empty?
+        @dwh = Helper::create_default_connection
+      else
+        @dwh = Helper::create_connection_with_sst
+      end
       @random = rand(10000000).to_s
       @random_table_name = "temp_#{@random}"
       @created_tables = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gooddata_datawarehouse
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Petr Cvengros
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,23 +69,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   name: coveralls
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.7.9
 signing_key:
 specification_version: 4
 summary: Convenient work with GoodData's Datawarehouse (ADS)