ath 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2048d603b91207098eaf1e020d539a909ff227
-  data.tar.gz: 0bbb1519eae02dfc64d5fb2b9e46d0ce5f3ea4a9
+  metadata.gz: 80ffe06cac04232d653df61585e7b55bb9dbad32
+  data.tar.gz: 7324f607b6f3a5938851bcb4ec1abd959a9354d4
 SHA512:
-  metadata.gz: f215fbf6efb8de0fb895b77babf09501bb8bbb953135b9fb7673a8d9ddc1906d41e0d303c4f706391340a7f7525164f416a4cd03933ead8b5bdd98373bb9d59a
-  data.tar.gz: ce9ef15b32050292976e959e4339e4ba66a456c1d4e4aedd6f72e8c2b569a36d99a6c50a52b4b24f770f85bdde3ff742e15a2657dd8d0ea599f689044e109e8a
+  metadata.gz: 18fc95d03296eb96fedacec2fd7f0003a1beb805c8432e2da5687ec7ea3b9dc4689fc52ea509b2d9fdcbbd1b04fd9bba5c81aad8327a86d5943672a021a3daaa
+  data.tar.gz: 9cdb21d2198f16043b14008a4f6769a3060d6871cebd03cf93f09afb8e133f01d8fa259513c50c35dbe01274a2507b4e647740b22d39fc1edeb66eb26db49ef8

data/README.md

@@ -93,7 +93,9 @@ default> /help
 /desc QUERY_EXECUTION_ID
 /help
 /list [NUM]
+/output_location [S3URL]
 /pager PAGER
+/region [REGION]
 /result QUERY_EXECUTION_ID
 /stop QUERY_EXECUTION_ID
 /use DATABASE

data/exe/ath

@@ -61,7 +61,10 @@ if options[:debug]
 end
 
 begin
-  shell = Ath::Shell.new(database: options.delete(:database), options: options)
+  shell = Ath::Shell.new(
+    output_location: options.delete(:output_location),
+    database: options.delete(:database),
+    options: options)
 
   if query_file
     if query_file == '-'

data/lib/ath/command.rb

@@ -51,6 +51,12 @@ class Ath::Command
       end
 
       out = lines.join("\n")
+    when 'output_location'
+      if @arg
+        @shell.driver.output_location = @arg
+      else
+        out = @shell.driver.output_location
+      end
     when 'pager'
       if @arg
         @shell.pager = @arg
@@ -58,6 +64,12 @@ class Ath::Command
         @shell.pager = nil
         out = "Using stdout"
       end
+    when 'region'
+      if @arg
+        @shell.driver.region = @arg
+      else
+        out = @shell.driver.region
+      end
     when 'result'
       if @arg
         out = @shell.driver.get_query_execution_result(query_execution_id: @arg)
@@ -72,7 +84,7 @@ class Ath::Command
       end
     when 'use'
       if @arg
-        @shell.database = @arg
+        @shell.driver.database = @arg
       else
         out = "Usage: /use DATABASE"
       end
@@ -91,7 +103,9 @@ class Ath::Command
 /desc QUERY_EXECUTION_ID
 /help
 /list [NUM]
+/output_location [S3URL]
 /pager PAGER
+/region [REGION]
 /result QUERY_EXECUTION_ID
 /stop QUERY_EXECUTION_ID
 /use DATABASE

data/lib/ath/driver.rb

@@ -1,11 +1,14 @@
 class Ath::Driver
-  def initialize(athena:, s3:)
+  attr_accessor :database
+
+  def initialize(athena:, s3:, output_location:, database:)
     @athena = athena
     @s3 = s3
+    @output_location = output_location
+    @database = database
   end
 
   def get_query_execution(query_execution_id:)
-
     @athena.get_query_execution(query_execution_id: query_execution_id).query_execution
   end
 
@@ -28,15 +31,32 @@ class Ath::Driver
     tmp
   end
 
-  def start_query_execution(query_string:, database:, output_location:)
+  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}
-    )
+      query_execution_context: {database: @database},
+      result_configuration: { output_location: @output_location})
   end
 
   def stop_query_execution(query_execution_id:)
     @athena.stop_query_execution(query_execution_id: query_execution_id)
   end
+
+  def output_location
+    @output_location
+  end
+
+  def output_location=(v)
+    @output_location = v
+  end
+
+  def region
+    @athena.config.region
+  end
+
+  def region=(v)
+    @athena.config.region = v
+    @athena.config.sigv4_region = v
+    @athena.config.endpoint = Aws::EndpointProvider.resolve(v, 'athena')
+  end
 end

data/lib/ath/query.rb

@@ -6,11 +6,7 @@ class Ath::Query
   end
 
   def run
-    query_execution_id = @shell.driver.start_query_execution(
-      query_string: @query,
-      database: @shell.database,
-      output_location: @shell.options.fetch(:output_location)
-    ).query_execution_id
+    query_execution_id = @shell.driver.start_query_execution(query_string: @query).query_execution_id
 
     if @detach
       return "QueryExecution #{query_execution_id}"

data/lib/ath/shell.rb

@@ -4,13 +4,11 @@ class Ath::Shell
 
   attr_reader :driver
   attr_reader :options
-  attr_accessor :database
   attr_accessor :pager
 
-  def initialize(athena: Aws::Athena::Client.new, s3: Aws::S3::Client.new, database: nil, options: {})
-    @driver = Ath::Driver.new(athena: athena, s3: s3)
+  def initialize(athena: Aws::Athena::Client.new, s3: Aws::S3::Client.new, output_location:, database: nil, options: {})
+    @driver = Ath::Driver.new(athena: athena, s3: s3, output_location: output_location, database: database)
     @options = options
-    @database = database
     @scanner = Ath::Scanner.new(shell: self)
   end
 
@@ -60,7 +58,7 @@ class Ath::Shell
   end
 
   def prompt
-    database = @database || '(none)'
+    database = @driver.database || '(none)'
 
     if @scanner.empty?
       "#{database}> "
@@ -112,15 +110,15 @@ class Ath::Shell
   end
 
   def save_history
-    if Readline::HISTORY.length < HISTSIZE
-      offset = Readline::HISTORY.length
+    history = Readline::HISTORY.map(&:strip).reject(&:empty?).reverse.uniq.reverse
+
+    if history.length < HISTSIZE
+      offset = history.length
     else
-      offset = HISTORY
+      offset = HISTSIZE
     end
 
-    history = Readline::HISTORY.map(&:strip).reject(&:empty?).uniq
     history = history.slice(-offset..-1) || []
-
     return if history.empty?
 
     open(HISTORY_FILE, 'wb') do |f|

data/lib/ath/version.rb

@@ -1,3 +1,3 @@
 module Ath
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ath
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk