ath 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e26f04434c7a6c3b7004606b78c59f7607347d7
-  data.tar.gz: 8df1c34e7d78d1b9d11b329f96234e36e4c6b35d
+  metadata.gz: f2e657482ca868e38e2823974acf2d99a7291bc0
+  data.tar.gz: fe8561a1ce77cbcee7decdb892ccbde7a0938b95
 SHA512:
-  metadata.gz: dfb56ede9208a2cf4ed8602cc46535e70766cf0638f833e30df7390f0f7ab8205276dd26e23f79b2b5aacdecbcf79ca402e6ecea6424669d69dc8814b360a7b0
-  data.tar.gz: e8b2b7e9fb5420d2f25c70ba01d275eb6493d3a6497b5b8c0e62d44b611e9db659454f40d8228d6483971d4504856bde8c3e5a7f0ca7dfb3c6d39b132568288f
+  metadata.gz: 9b80a39f2864d34af1c7c301e64419419b36215a9f04ec48e6bcf7721ab57dd0c68247df901e64d83af5ba1300ca2ecd71116f282102620b241a65bc01b255d6
+  data.tar.gz: 718f99c07022cf0305cda6434715f768a13ca11e3e6283f23986d43b200901e9b12b9c87a11dfa408c9cdce319eb1bd0851521fdc56a29843e6a9c6135e43b45

data/README.md

@@ -84,6 +84,7 @@ Usage: ath [options]
     -d, --database DATABASE
     -e, --execute QUERY
     -f, --file QUERY_FILR
+        --[no-]progress
         --debug
 ```
 

data/ath.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk', '>= 2.9.21', '< 3'
+  spec.add_dependency 'ruby-progressbar'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/exe/ath

@@ -10,6 +10,7 @@ Version = Ath::VERSION
 options = {
   database: 'default',
   output_location: ENV['ATH_OUTPUT_LOCATION'],
+  progress: true,
   debug: false,
 }
 
@@ -30,6 +31,7 @@ ARGV.options do |opt|
     opt.on('-d', '--database DATABASE')     {|v| options[:database]           = v    }
     opt.on('-e', '--execute QUERY')         {|v| query                        = v    }
     opt.on('-f', '--file QUERY_FILR')       {|v| query_file                   = v    }
+    opt.on('',   '--[no-]progress')         {|v| options[:progress]           = v    }
     opt.on(''  , '--debug')                 {    options[:debug]              = true }
     opt.parse!
 

data/lib/ath.rb

@@ -3,6 +3,7 @@ require 'strscan'
 require 'tempfile'
 
 require 'aws-sdk'
+require 'ruby-progressbar'
 
 require 'ath/version'
 require 'ath/command'

data/lib/ath/driver.rb

@@ -18,24 +18,40 @@ class Ath::Driver
   end
 
   def get_query_execution_result(query_execution_id:)
-    query_execution = @athena.get_query_execution(query_execution_id: query_execution_id).query_execution
-    output_location = query_execution.result_configuration.output_location
-    bucket, key = output_location.sub(%r{\As3://}, '').split('/', 2)
+    bucket, key = get_query_execution_result_output_location(query_execution_id: query_execution_id)
     tmp = Tempfile.create('ath')
 
-    @s3.get_object(bucket: bucket, key: key) do |chunk|
-      tmp.write(chunk)
+    if block_given?
+      @s3.get_object(bucket: bucket, key: key) do |chunk|
+        yield(chunk)
+        tmp.write(chunk)
+      end
+    else
+      @s3.get_object(bucket: bucket, key: key) do |chunk|
+        tmp.write(chunk)
+      end
     end
 
     tmp.flush
     tmp
   end
 
+  def head_query_execution_result(query_execution_id:)
+    bucket, key = get_query_execution_result_output_location(query_execution_id: query_execution_id)
+    @s3.head_object(bucket: bucket, key: key)
+  end
+
+  def get_query_execution_result_output_location(query_execution_id:)
+    query_execution = @athena.get_query_execution(query_execution_id: query_execution_id).query_execution
+    output_location = query_execution.result_configuration.output_location
+    output_location.sub(%r{\As3://}, '').split('/', 2)
+  end
+
   def start_query_execution(query_string:)
     @athena.start_query_execution(
       query_string: query_string,
       query_execution_context: {database: @database},
-      result_configuration: { output_location: @output_location})
+      result_configuration: {output_location: @output_location})
   end
 
   def stop_query_execution(query_execution_id:)

data/lib/ath/query.rb

@@ -15,8 +15,13 @@ class Ath::Query
     abort_waiting = false
     orig_handler = trap(:INT, proc { abort_waiting = true })
     query_execution = nil
+    running_progressbar = nil
 
     begin
+      if @shell.options[:progress]
+        running_progressbar = ProgressBar.create(title: 'Running', total: nil, output: $stderr)
+      end
+
       until abort_waiting
         query_execution = @shell.driver.get_query_execution(query_execution_id: query_execution_id)
 
@@ -24,9 +29,11 @@ class Ath::Query
           break
         end
 
+        running_progressbar.increment if running_progressbar
         sleep 1
       end
     ensure
+      running_progressbar.clear if running_progressbar
       trap(:INT, orig_handler)
     end
 
@@ -35,7 +42,27 @@ class Ath::Query
     end
 
     if query_execution.status.state == 'SUCCEEDED'
-      @shell.driver.get_query_execution_result(query_execution_id: query_execution_id)
+      head = @shell.driver.head_query_execution_result(query_execution_id: query_execution_id)
+      download_progressbar = nil
+
+      begin
+        if @shell.options[:progress]
+          download_progressbar = ProgressBar.create(
+            title: 'Download',
+            total: head.content_length,
+            output: $stderr)
+        end
+
+        @shell.driver.get_query_execution_result(query_execution_id: query_execution_id) do |chunk|
+          begin
+            download_progressbar.progress += chunk.length if download_progressbar
+          rescue ProgressBar::InvalidProgressError
+            # nothing to do
+          end
+        end
+      ensure
+        download_progressbar.clear if download_progressbar
+      end
     else
       "QueryExecution #{query_execution_id}: #{query_execution.status.state_change_reason}"
     end

data/lib/ath/version.rb

@@ -1,3 +1,3 @@
 module Ath
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ath
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - winebarrel
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  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: bundler
   requirement: !ruby/object:Gem::Requirement