ath 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 399f1d61c2594b897dfaa078b3a37efcf845e4d4
-  data.tar.gz: 991941010b0cdc593d03b8cdb90c7661e0626c60
+  metadata.gz: d5a50c633facd053d721acff0fb97f8f5d0adb82
+  data.tar.gz: dc576e3a4548ac632b145281aa0e0786252bf6e7
 SHA512:
-  metadata.gz: 5ab2de1eeee5ecbf2e56995c0bac3681e2438fd984404a141c8f0cc0dfc7f3f094db60e07b4db565a6a7c3218a1db9402e893c97137056d6f7adb25ee96adcaa
-  data.tar.gz: 27e37541d13f6fa18626be07a33a846d5bda8b43bbda8f3083362eacfbebf0c2044aa5c922287bb1a501003cb1c8cb07ee3dee00edbbed4ddaaf498d5c15ac61
+  metadata.gz: bc8524c18109b05bc5610749434381dea009e13dd18e3d23a73e6b0f0f2eec0897302ae9df8e09a42da737ee7cfaf3b193d1a6dbb73953856ab684732a8f3a45
+  data.tar.gz: 737154660475921c40bd7fcea791dab6ac87c95ad26d59cde4c857381582a13b5e195d1b44c145b4ff16f44f0afc4a81cf23f87ca36d013423a2503c50c2d015

data/README.md

@@ -2,6 +2,8 @@
 
 ath is a interactive [Amazon Athena](https://aws.amazon.com/athena/) shell.
 
+[![Gem Version](https://badge.fury.io/rb/ath.svg)](https://badge.fury.io/rb/ath)
+
 [![asciicast](https://asciinema.org/a/127476.png)](https://asciinema.org/a/127476)
 
 ## Installation
@@ -44,7 +46,11 @@ sampledb> select * from elb_logs limit 3;
 "2015-01-01T08:00:00.516940Z","elb_demo_009","240.136.98.149","25858","172.51.67.62","8888","9.99E-4","8.11E-4","0.001561","200","200","0","428","GET","https://www.example.com/articles/746","HTTP/1.1","""Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Safari/602.1.50""","DHE-RSA-AES128-SHA","TLSv1.2"
 "2015-01-01T08:00:00.902953Z","elb_demo_008","244.46.184.108","27758","172.31.168.31","443","6.39E-4","0.001471","3.73E-4","200","200","0","4231","GET","https://www.example.com/jobs/688","HTTP/1.1","""Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0.1""","DHE-RSA-AES128-SHA","TLSv1.2"
 "2015-01-01T08:00:01.206255Z","elb_demo_008","240.120.203.212","26378","172.37.170.107","8888","0.001174","4.97E-4","4.89E-4","200","200","0","2075","GET","http://www.example.com/articles/290","HTTP/1.1","""Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246""","-","-"
+```
 
+### Detach Query
+
+```sh
 sampledb> select * from elb_logs limit 3 &
 QueryExecution 2335c77b-d138-4c5d-89df-12f2781c311b
 
@@ -74,7 +80,11 @@ sampledb> /result 2335c77b-d138-4c5d-89df-12f2781c311b
 "2015-01-01T16:00:00.516940Z","elb_demo_009","242.76.140.141","18201","172.42.159.57","80","0.001448","8.46E-4","9.97E-4","302","302","0","2911","GET","https://www.example.com/articles/817","HTTP/1.1","""Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0.1""","DHE-RSA-AES128-SHA","TLSv1.2"
 "2015-01-01T16:00:00.902953Z","elb_demo_005","246.233.91.115","1950","172.42.232.155","8888","9.59E-4","0.001703","8.93E-4","200","200","0","3027","GET","http://www.example.com/jobs/509","HTTP/1.1","""Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Safari/602.1.50""","-","-"
 "2015-01-01T16:00:01.206255Z","elb_demo_002","250.96.73.238","12800","172.34.87.144","80","0.001549","9.68E-4","0.001908","200","200","0","888","GET","http://www.example.com/articles/729","HTTP/1.1","""Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246""","-","-"
+```
+
+### Use Pager
 
+```sh
 sampledb> /pager column -t -s,
 
 sampledb> select elb_name, count(*) from elb_logs group by elb_name;
@@ -88,7 +98,11 @@ sampledb> select elb_name, count(*) from elb_logs group by elb_name;
 "elb_demo_004"  "151062"
 "elb_demo_002"  "151284"
 "elb_demo_003"  "148761"
+```
+
+### Save Result
 
+```sh
 sampledb> /list 1
 2017-07-03 20:52:24 +0900 cf881630-a845-424a-8035-afe155505cac SUCCEEDED select elb_name   cou..
 
@@ -96,10 +110,17 @@ default> /save cf881630-a845-424a-8035-afe155505cac
 Save to /Users/.../cf881630-a845-424a-8035-afe155505cac.csv
 ```
 
+### Input Query from File
+
 ```sh
 $ echo 'select count(*) from elb_logs' | ath -d sampledb -f -
 "_col0"
 "1356206"
+
+$ echo 'select count(*) from elb_logs' > count.sql
+$ ath -d sampledb -f count.sql
+"_col0"
+"1356206"
 ```
 
 ## Usage

data/exe/ath

@@ -1,99 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 
-require 'logger'
-require 'optparse'
 require 'ath'
-
 Version = Ath::VERSION
-
-options = {
-  database: 'default',
-  output_location: ENV['ATH_OUTPUT_LOCATION'],
-  pager: ENV['ATH_PAGER'],
-  debug: false,
-}
-
-query = nil
-query_file = nil
-
-ARGV.options do |opt|
-  aws_opts = {}
-  creds_opts = {}
-
-  begin
-    opt.on('-p', '--profile PROFILE_NAME')  {|v| creds_opts[:profile_name]    = v    }
-    opt.on(''  , '--credentials-path PATH') {|v| creds_opts[:path]            = v    }
-    opt.on('-k', '--access-key ACCESS_KEY') {|v| aws_opts[:access_key]        = v    }
-    opt.on('-s', '--secret-key SECRET_KEY') {|v| aws_opts[:secret_access_key] = v    }
-    opt.on('-r', '--region REGION')         {|v| aws_opts[:region]            = v    }
-    opt.on(''  , '--output-location S3URI') {|v| options[:output_location]    = v    }
-    opt.on('-d', '--database DATABASE')     {|v| options[:database]           = v    }
-    opt.on('-e', '--execute QUERY')         {|v| query                        = v    }
-    opt.on('-f', '--file QUERY_FILE')       {|v| query_file                   = v    }
-    opt.on('',   '--pager PAGER')           {|v| options[:pager]              = v    }
-    opt.on('',   '--[no-]progress')         {|v| options[:progress]           = v    }
-    opt.on(''  , '--debug')                 {    options[:debug]              = true }
-    opt.parse!
-
-    unless options[:output_location]
-      raise Ath::Error, '"--output-location" or ATH_OUTPUT_LOCATION is required'
-    end
-
-    if not creds_opts.empty?
-      creds = Aws::SharedCredentials.new(credentials_opts)
-      aws_opts[:credentials] = creds
-    end
-
-    Aws.config.update(aws_opts)
-  rescue Ath::Error, OptionParser::ParseError => e
-    $stderr.puts("[ERROR] #{e.message}")
-    exit 1
-  rescue => e
-    $stderr.puts("[ERROR] #{e.message}")
-    puts "\t" + e.backtrace.join("\n\t")
-    exit 1
-  end
-end
-
-if options[:debug]
-  Aws.config.update(
-    http_wire_trace: true,
-    logger: Logger.new($stdout).tap {|l| l.level = Logger::DEBUG },
-  )
-end
-
-begin
-  shell = Ath::Shell.new(
-    output_location: options.delete(:output_location),
-    database: options.delete(:database),
-    pager: options.delete(:pager),
-    options: options)
-
-  if query_file
-    if query_file == '-'
-      query = $stdin.read
-    else
-      query = File.read(query_file)
-    end
-  end
-
-  if query
-    options[:progress] = false unless options.has_key?(:progress)
-    query.strip!
-    query << ';' if query !~ /[;&]\z/
-    shell.oneshot(query)
-  else
-    options[:progress] = true unless options.has_key?(:progress)
-    shell.start
-  end
-rescue Interrupt
-  # nothing to do
-rescue => e
-  if options[:debug]
-    raise e
-  else
-    $stderr.puts("[ERROR] #{[e.message, e.backtrace.first].join("\n\t")}")
-    exit 1
-  end
-end
+Ath::CLI.new(argv: ARGV).main

data/lib/ath.rb

@@ -1,3 +1,6 @@
+require 'erb'
+require 'logger'
+require 'optparse'
 require 'readline'
 require 'strscan'
 require 'tempfile'
@@ -6,6 +9,7 @@ require 'aws-sdk'
 require 'ruby-progressbar'
 
 require 'ath/version'
+require 'ath/cli'
 require 'ath/command'
 require 'ath/driver'
 require 'ath/error'

data/lib/ath/cli.rb

@@ -0,0 +1,104 @@
+class Ath::CLI
+  def initialize(argv:)
+    @argv = argv
+  end
+
+  def parse_options
+    options = {
+      database: 'default',
+      output_location: ENV['ATH_OUTPUT_LOCATION'],
+      pager: ENV['ATH_PAGER'],
+      debug: false,
+    }
+
+    query = nil
+    query_file = nil
+
+    @argv.options do |opt|
+      aws_opts = {}
+      creds_opts = {}
+
+      begin
+        opt.on('-p', '--profile PROFILE_NAME')  {|v| creds_opts[:profile_name]    = v    }
+        opt.on(''  , '--credentials-path PATH') {|v| creds_opts[:path]            = v    }
+        opt.on('-k', '--access-key ACCESS_KEY') {|v| aws_opts[:access_key]        = v    }
+        opt.on('-s', '--secret-key SECRET_KEY') {|v| aws_opts[:secret_access_key] = v    }
+        opt.on('-r', '--region REGION')         {|v| aws_opts[:region]            = v    }
+        opt.on(''  , '--output-location S3URI') {|v| options[:output_location]    = v    }
+        opt.on('-d', '--database DATABASE')     {|v| options[:database]           = v    }
+        opt.on('-e', '--execute QUERY')         {|v| query                        = v    }
+        opt.on('-f', '--file QUERY_FILE')       {|v| query_file                   = v    }
+        opt.on('',   '--pager PAGER')           {|v| options[:pager]              = v    }
+        opt.on('',   '--[no-]progress')         {|v| options[:progress]           = v    }
+        opt.on(''  , '--debug')                 {    options[:debug]              = true }
+        opt.parse!
+
+        unless options[:output_location]
+          raise Ath::Error, '"--output-location" or ATH_OUTPUT_LOCATION is required'
+        end
+
+        if not creds_opts.empty?
+          creds = Aws::SharedCredentials.new(credentials_opts)
+          aws_opts[:credentials] = creds
+        end
+
+        Aws.config.update(aws_opts)
+      rescue Ath::Error, OptionParser::ParseError => e
+        $stderr.puts("[ERROR] #{e.message}")
+        exit 1
+      rescue => e
+        $stderr.puts("[ERROR] #{e.message}")
+        puts "\t" + e.backtrace.join("\n\t")
+        exit 1
+      end
+    end
+
+    if options[:debug]
+      Aws.config.update(
+        http_wire_trace: true,
+        logger: Logger.new($stdout).tap {|l| l.level = Logger::DEBUG },
+      )
+    end
+
+    options[:output_location] = ERB.new(options[:output_location]).result
+
+    return [options, query, query_file]
+  end
+
+  def main
+    options, query, query_file = parse_options
+
+    shell = Ath::Shell.new(
+      output_location: options.delete(:output_location),
+      database: options.delete(:database),
+      pager: options.delete(:pager),
+      options: options)
+
+    if query_file
+      if query_file == '-'
+        query = $stdin.read
+      else
+        query = File.read(query_file)
+      end
+    end
+
+    if query
+      options[:progress] = false unless options.has_key?(:progress)
+      query.strip!
+      query << ';' if query !~ /[;&]\z/
+      shell.oneshot(query)
+    else
+      options[:progress] = true unless options.has_key?(:progress)
+      shell.start
+    end
+  rescue Interrupt
+    # nothing to do
+  rescue => e
+    if options[:debug]
+      raise e
+    else
+      $stderr.puts("[ERROR] #{[e.message, e.backtrace.first].join("\n\t")}")
+      exit 1
+    end
+  end
+end

data/lib/ath/version.rb

@@ -1,3 +1,3 @@
 module Ath
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ath
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -107,6 +107,7 @@ files:
 - bin/setup
 - exe/ath
 - lib/ath.rb
+- lib/ath/cli.rb
 - lib/ath/command.rb
 - lib/ath/driver.rb
 - lib/ath/error.rb