athens 0.3.2 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeee2d9b7817273521ffe4d0f54865b8f5ce21d185175381ce9d8f013b4efca6
-  data.tar.gz: c7ed5eacc1231fb5d81061bdfd700ca96bcab9f2e6635f3a9a24512de2f27107
+  metadata.gz: dce70371a1505fb7f63bfbcd872ba136b998b146b005e084ae7d4f3bf5394c7b
+  data.tar.gz: 69e24000860943707e5b52f24dbb2289e76e0dd35c970ca9f50a59aab07289cd
 SHA512:
-  metadata.gz: 78c927b03a064c1e9d8ce3ae471aa6fc6f1852ba192abe69a14deae61bf8e020cebda5b3dcc6e8607a9944e373192df9f3ccb3ba23d9b8277ac4ac8b4043f006
-  data.tar.gz: a0cc740c6bf5a6238e3ecf192257c187d94f8e05a34422661d538949a4207abb856d1930263cf489d2a1950770724e1e047f4b30185cdbd7a7e0fc8193d85f54
+  metadata.gz: e7b59f65553704094baf50bb4d609bacb2ec698f788ff89f27a679e9663418aa3c08282dbcd9a5a65c42a9b15065a74a2b35af111900b0965af103ef5538e29c
+  data.tar.gz: 62c44387712ce5bdc94da5f4091b676d7ef6e4a330ddd90732bc92f6e64cfb61a8078f93e3aaf930be04fc1e952a0c827cb4177c3c6226c37eedcbfee21b7aca

data/.gitignore

@@ -8,4 +8,5 @@
 /tmp/
 
 /.vagrant/
-/ubuntu-xenial-16.04-cloudimg-console.log
+/ubuntu-xenial-16.04-cloudimg-console.log
+/vendor/

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.3.6 / 2021-11-16
+
+* Addition of :result_encryption as a configuration option to change encryption options for query results (https://github.com/getletterpress/athens/issues/12)
+* Bumped development gem versions to latest releases
+
+## 0.3.5 / 2021-05-19
+
+* Addition of :aws_profile as a configuration option for credentials (thanks [oisin](https://github.com/oisin))
+* Fix for BigDecimal in Ruby 3.x (thanks [mediafinger](https://github.com/mediafinger))
+* Bumped development gem versions to latest releases
+
+## 0.3.4 / 2021-03-02
+
+* Added configurable polling period (thanks [jesseproudman](https://github.com/jesseproudman))
+
+## 0.3.3 / 2021-01-12
+
+* Added support for Ruby 3.0 (thanks [blackjiro](https://github.com/blackjiro))
+
 ## 0.3.2 / 2020-11-24
 
 * Added optional `request_token` and `work_group` parameters to the query execute method (thanks [mediafinger](https://github.com/mediafinger))

data/Gemfile.lock

@@ -1,34 +1,36 @@
 PATH
   remote: .
   specs:
-    athens (0.3.1)
+    athens (0.3.6)
       aws-sdk-athena (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-eventstream (1.1.0)
-    aws-partitions (1.343.0)
-    aws-sdk-athena (1.30.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.530.0)
+    aws-sdk-athena (1.43.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.104.1)
+    aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sigv4 (1.2.1)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     jmespath (1.4.0)
-    rake (13.0.1)
+    rake (13.0.6)
+    rexml (3.2.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   athens!
-  bundler (~> 1.17)
+  bundler (>= 1.17)
   rake (~> 13.0)
+  rexml (~> 3.2)
 
 BUNDLED WITH
-   2.1.4
+   2.2.5

data/README.md

@@ -44,8 +44,8 @@ When your query is done, grab the results as an array:
 ```ruby
 results = query.to_a
 # [
-#   ['column_1', 'column_2', 'column_3'], 
-#   [15, 'data', true], 
+#   ['column_1', 'column_2', 'column_3'],
+#   [15, 'data', true],
 #   [20, 'foo', false],
 #   ...
 # ]
@@ -55,7 +55,7 @@ Or as a hash (which is really an array where each row is a hash):
 ```ruby
 results = query.to_h
 # [
-#   {'column_1': 15, 'column_2': 'data', 'column_3': true}, 
+#   {'column_1': 15, 'column_2': 'data', 'column_3': true},
 #   {'column_1': 20, 'column_2': 'foo', 'column_3': false},
 #   ...
 # ]
@@ -87,9 +87,12 @@ Configure your AWS settings in an `Athens.configure` block (in rails put this in
 ```ruby
 Athens.configure do |config|
   config.output_location = "s3://my-bucket/my-folder/athena/results/"  # Required
-  config.aws_access_key = 'access'     # Optional
-  config.aws_secret_key = 'secret'     # Optional
-  config.aws_region     = 'us-east-1'  # Optional
+  config.aws_access_key      = 'access'     # Optional
+  config.aws_secret_key      = 'secret'     # Optional
+  config.aws_profile         = 'myprofile'  # Optional
+  config.aws_region          = 'us-east-1'  # Optional
+  config.wait_polling_period = 0.25         # Optional - What period should we poll for the complete query?
+  config.result_encryption   = nil          # Optional, see below
 end
 ```
 
@@ -103,6 +106,14 @@ conn = Athens::Connection.new(aws_client_override: {})
 
 Take a look at the [AWS Athena SDK](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/Athena/Client.html#initialize-instance_method) for a list of all the available options.
 
+The `result_encryption` option controls how the Athens results will be encrypted at the `output_location`.  By default it's set to use the Amazon SSE encryption if you don't set it at all:
+
+```ruby
+{ encryption_option: "SSE_S3" }
+```
+
+If you set it to `nil`, it'll default to the bucket encryption settings.  You can also use a customer kms key, see https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/Athena/Types/EncryptionConfiguration.html for the correct format.
+
 ### Advanced Usage
 
 Providing a database name to the connection is optional, if you omit the name you'll have to specify it in your query:
@@ -172,3 +183,4 @@ The gem is available as open source under the terms of the [WTFPL License](http:
 ## Code of Conduct
 
 Everyone interacting in the Athens project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/getletterpress/athens/blob/master/CODE_OF_CONDUCT.md).
+

data/athens.gemspec

@@ -32,10 +32,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '~> 2.4'
+  spec.required_ruby_version = '>= 2.4'
 
   spec.add_dependency "aws-sdk-athena", "~> 1"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", ">= 1.17"
   spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rexml", "~> 3.2"
 end

data/lib/athens/configuration.rb

@@ -1,15 +1,21 @@
 module Athens
   class Configuration
-    attr_accessor :aws_access_key, 
+    attr_accessor :aws_access_key,
                   :aws_secret_key,
                   :aws_region,
-                  :output_location
+                  :output_location,
+                  :wait_polling_period,
+                  :aws_profile,
+                  :result_encryption
 
     def initialize
       @aws_access_key = nil
       @aws_secret_key = nil
       @aws_region = nil
       @output_location = nil
+      @wait_polling_period = 0.25
+      @aws_profile = nil
+      @result_encryption = { encryption_option: "SSE_S3" }
     end
   end
-end
+end

data/lib/athens/connection.rb

@@ -11,7 +11,8 @@ module Athens
       client_config = {
         access_key_id: Athens.configuration.aws_access_key,
         secret_access_key: Athens.configuration.aws_secret_key,
-        region: Athens.configuration.aws_region
+        region: Athens.configuration.aws_region,
+        profile: Athens.configuration.aws_profile
       }.merge(aws_client_override).compact
 
       @client = Aws::Athena::Client.new(client_config)
@@ -47,9 +48,7 @@ module Athens
       def result_config
         Aws::Athena::Types::ResultConfiguration.new(
           output_location: Athens.configuration.output_location,
-          encryption_configuration: {
-            encryption_option: "SSE_S3"
-          }
+          encryption_configuration: Athens.configuration.result_encryption
         )
       end
 

data/lib/athens/query.rb

@@ -14,6 +14,7 @@ module Athens
 
       version = RUBY_VERSION.split('.').map {|v| v.to_i}
       @decimal_without_new = (version[0] >= 2 && version[1] >= 5)
+      @decimal_without_new = (version[0] == 2 && version[1] >= 5) || (version[0] >= 3)
     end
 
     def state
@@ -49,7 +50,7 @@ module Athens
         end
 
         # Wait a bit and check again
-        sleep(0.25)
+        sleep(Athens.configuration.wait_polling_period.to_f)
       end
     end
 
@@ -173,9 +174,8 @@ module Athens
         end
 
         return mapped
-      end    
+      end
 
 
   end
 end
-

data/lib/athens/version.rb

@@ -1,3 +1,3 @@
 module Athens
-  VERSION = "0.3.2"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: athens
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.6
 platform: ruby
 authors:
 - Chris Schulte
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-athena
@@ -28,14 +28,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: Allows you to easily access AWS Athena databases and run queries
 email:
 - chris@oceanbreezesoftware.com
@@ -84,13 +98,13 @@ metadata:
   homepage_uri: https://github.com/getletterpress/athens
   source_code_uri: https://github.com/getletterpress/athens
   changelog_uri: https://github.com/getletterpress/athens/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -99,8 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Run simple SQL queries in AWS Athena
 test_files: []