ath 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8939b048b2425519025c650b50603dd3d565c04
-  data.tar.gz: 33353d8d4dd31d11f0d18e19e19b32a2c4bf7213
+  metadata.gz: 21a47438e2f1e99a854aa23c1bd7301e217e3266
+  data.tar.gz: 014b49b565e36d3ca64e4e5f3c7c5ab1de54e0b1
 SHA512:
-  metadata.gz: d6d15ebfccc697c9c9c48f67e1ff75f464dbdd76a5cdb6aa932b04e8b1850d352db7051980dd94bfbf2afc181a72325d84a9d34bd4304766e83c285f1495af17
-  data.tar.gz: 4f1fae796e638899475bc0a1f9af55e072373833a91ddf641068719dc762a6ec9f024ec09b037d2312babf3339c8de9f631a99aefcccc8007208a742d413c877
+  metadata.gz: e59acba379c679e781eef4a4324e38a8ff5b69962d91c6fa4bd5abda578405dbbe8dfa1848a590251e25ec813ce3335f72df4a83e144171474f68e20a549c743
+  data.tar.gz: faa08d22bb15c6bcad6fbe1477ade5b1247e1bc57c52823358bf286dc62e9db2f766882d607c8437ba1985d8cc4b3babcded8c2f2c36bd44d7d3cdf10ed9874a

data/22b39199-4070-4100-abed-c7bb63c13d3b.txt

@@ -0,0 +1,2 @@
+elb_logs
+elb_logs2

data/README.md

@@ -98,6 +98,7 @@ default> /help
 /pager PAGER
 /region [REGION]
 /result QUERY_EXECUTION_ID
+/save QUERY_EXECUTION_ID [PATH]
 /stop QUERY_EXECUTION_ID
 /use DATABASE
 ```

data/lib/ath/command.rb

@@ -76,6 +76,15 @@ class Ath::Command
       else
         out = "Usage: /result QUERY_EXECUTION_ID"
       end
+    when 'save'
+      if @arg
+        query_execution_id, path = @arg.split(/\s+/, 2)
+        path ||= Dir.pwd
+        path = @shell.driver.save_query_execution_result(query_execution_id: query_execution_id, path: path)
+        out = "Save to #{path}"
+      else
+        out = "Usage: /result QUERY_EXECUTION_ID [PATH]"
+      end
     when 'stop'
       if @arg
         @shell.driver.stop_query_execution(query_execution_id: @arg)
@@ -107,6 +116,7 @@ class Ath::Command
 /pager PAGER
 /region [REGION]
 /result QUERY_EXECUTION_ID
+/save QUERY_EXECUTION_ID [PATH]
 /stop QUERY_EXECUTION_ID
 /use DATABASE
     EOS

data/lib/ath/driver.rb

@@ -19,10 +19,26 @@ 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)
     tmp = Tempfile.create('ath')
+    bucket, key = get_query_execution_result_output_location(query_execution_id: query_execution_id)
+    download_query_execution_result(bucket: bucket, key: key, file: tmp)
+  end
+
+  def save_query_execution_result(query_execution_id:, path:)
+    bucket, key = get_query_execution_result_output_location(query_execution_id: query_execution_id)
+
+    if File.directory?(path)
+      path = File.join(path, File.basename(key))
+    end
+
+    open(path, 'wb') do |file|
+      download_query_execution_result(bucket: bucket, key: key, file: file)
+    end
+
+    path
+  end
+
+  def download_query_execution_result(bucket:, key:, file:)
     head = @s3.head_object(bucket: bucket, key: key)
 
     if @options[:progress] and head.content_length >= 1024 ** 2
@@ -30,7 +46,7 @@ class Ath::Driver
 
       begin
         @s3.get_object(bucket: bucket, key: key) do |chunk|
-          tmp.write(chunk)
+          file.write(chunk)
 
           begin
             download_progressbar.progress += chunk.length
@@ -43,12 +59,18 @@ class Ath::Driver
       end
     else
       @s3.get_object(bucket: bucket, key: key) do |chunk|
-        tmp.write(chunk)
+        file.write(chunk)
       end
     end
 
-    tmp.flush
-    tmp
+    file.flush
+    file
+  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:)

data/lib/ath/scanner.rb

@@ -8,7 +8,7 @@ class Ath::Scanner
     ss = StringScanner.new(line)
 
     if self.empty? and (tok = ss.scan %r{/\w+(?:\s+.*)?\z})
-      cmd, arg = tok.split(/\s+/, 2)
+      cmd, arg = tok.strip.split(/\s+/, 2)
       cmd.slice!(0)
       arg.strip! if arg
       yield(Ath::Command.new(shell: @shell, command: cmd, arg: arg))

data/lib/ath/version.rb

@@ -1,3 +1,3 @@
 module Ath
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ath
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - winebarrel
@@ -97,6 +97,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- 22b39199-4070-4100-abed-c7bb63c13d3b.txt
 - Gemfile
 - LICENSE.txt
 - README.md