ath 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a50c633facd053d721acff0fb97f8f5d0adb82
-  data.tar.gz: dc576e3a4548ac632b145281aa0e0786252bf6e7
+  metadata.gz: 42da3723a1c3f60623c4b20943452062c8789d93
+  data.tar.gz: 3205352665c60c5fc979bb1bde149c08f165c101
 SHA512:
-  metadata.gz: bc8524c18109b05bc5610749434381dea009e13dd18e3d23a73e6b0f0f2eec0897302ae9df8e09a42da737ee7cfaf3b193d1a6dbb73953856ab684732a8f3a45
-  data.tar.gz: 737154660475921c40bd7fcea791dab6ac87c95ad26d59cde4c857381582a13b5e195d1b44c145b4ff16f44f0afc4a81cf23f87ca36d013423a2503c50c2d015
+  metadata.gz: bb69186162a3ab810177f11e10015dbd12e75ba954293526a2d6cfcaac9262e77f878df35a67ead57092bae922a45032a41f4a03df5ac4db057f27b325af2c51
+  data.tar.gz: 5b9318386d31b7a0437c44f3d4c49dcbb17e9d29be990aab4cb6bb84b70993d1ae79ade1f578363b6e5690bc1416fbeb195f2bd4fc38f228e3fd446010484b7d

data/lib/ath/cli.rb

@@ -60,7 +60,12 @@ class Ath::CLI
       )
     end
 
-    options[:output_location] = ERB.new(options[:output_location]).result
+    begin
+      options[:output_location] = ERB.new(options[:output_location]).result
+    rescue => e
+      $stderr.puts("[ERROR] Eval output-location failed: #{e.message}")
+      exit 1
+    end
 
     return [options, query, query_file]
   end
@@ -68,37 +73,39 @@ class Ath::CLI
   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)
+    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)
+      if query_file
+        if query_file == '-'
+          query = $stdin.read
+        else
+          query = File.read(query_file)
+        end
       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
+      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
 end

data/lib/ath/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ath
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - winebarrel