drill-sergeant 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49028dfe96747f9e9597e498c53ed2ca72ff2d7af184d4823cc73679998c91c5
-  data.tar.gz: b0d1b5d1da91f2ee15c6f34f8a415fffe8d546e9bdf71c91cf39c38fb5905a52
+  metadata.gz: aeb08242b5c896d36dd67b9af8c14d7eaa989643898939d9b6d6c81e03a4c578
+  data.tar.gz: a35e5e3b79f54a896490bab937c05ee0018175887d9659a466d2bc24bb9ee75f
 SHA512:
-  metadata.gz: 51369b3960b21262523dd62b157cf22af3d8c634c2ef235dc7f67d5ade8443e2e22a52e71945b008ec78661d4fd217900e389ab93a883b1c8e900d5b6b913bea
-  data.tar.gz: 05feeba2d6047c508e9b6c9bb4efeb224940c779010c063bdf81e7ed76713261ccfff3d18f78eaae28af0e724a44c41ae1235a185719a7c7f734f1c8d245a06b
+  metadata.gz: e9a459e815fe4abe80b8b8057f58f6e324011a9391b4dc50ace0522bcdac387e0712125419e787d7c1d59d0dc72a4e0a485b5d6ed4bd6a05c2a3619be06fc18d
+  data.tar.gz: 5ba841223a2be425a9b414c7ee0ffb52e60fdcc891d82f07aa3d1db317ab621ba8e1928a9ef299f7833786728c94bb0f4ee1e41e68c9f1a19dae8461a5bf7035

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3
+
+- Added more endpoints
+
 ## 0.1.2
 
 - Added support for HTTPS

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2017-2019 Andrew Kane
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -2,15 +2,18 @@
 
 Ruby client for Apache Drill
 
+[![Build Status](https://travis-ci.org/ankane/drill-sergeant.svg?branch=master)](https://travis-ci.org/ankane/drill-sergeant)
+
 ## Installation
 
-First, [download Apache Drill](https://drill.apache.org/docs/installing-drill-on-linux-and-mac-os-x/). Start it with:
+First, [install Apache Drill](https://drill.apache.org/docs/installing-drill-on-linux-and-mac-os-x/). For Homebrew, use:
 
 ```sh
-bin/drill-embedded
+brew install apache-drill
+drill-embedded
 ```
 
-Then add this line to your application’s Gemfile:
+And add this line to your application’s Gemfile:
 
 ```ruby
 gem 'drill-sergeant'
@@ -30,6 +33,52 @@ And query away
 drill.query("SELECT * FROM dfs.`/path/to/some/file.csvh`")
 ```
 
+## Endpoints
+
+[API docs](https://drill.apache.org/docs/rest-api-introduction/)
+
+Get profiles
+
+```ruby
+drill.profiles
+```
+
+Get profile by query id
+
+```ruby
+drill.profiles(query_id)
+```
+
+Get storage
+
+```ruby
+drill.storage
+```
+
+Get storage by name
+
+```ruby
+drill.storage(name)
+```
+
+Get cluster info
+
+```ruby
+drill.cluster
+```
+
+Get metrics
+
+```ruby
+drill.metrics
+```
+
+Get options
+
+```ruby
+drill.options
+```
+
 ## Reference
 
 Set timeouts

data/lib/drill-sergeant.rb

@@ -1,5 +1,9 @@
+# dependencies
+require "cgi"
 require "json"
 require "net/http"
+
+# modules
 require "drill/version"
 
 class Drill
@@ -12,8 +16,8 @@ class Drill
 
   def initialize(url: nil, open_timeout: 3, read_timeout: nil)
     url ||= ENV["DRILL_URL"] || "http://localhost:8047"
-    # strip trailing slash if exists
-    @uri = URI.parse("#{url.sub(/\/\z/, "")}/query.json")
+    # remove trailing slash
+    @uri = URI.parse(url.sub(/\/\z/, ""))
     @http = Net::HTTP.new(@uri.host, @uri.port)
     @http.use_ssl = true if @uri.scheme == "https"
     @http.open_timeout = open_timeout if open_timeout
@@ -26,16 +30,7 @@ class Drill
       query: statement
     }
 
-    begin
-      response = @http.post(@uri.request_uri, data.to_json, HEADERS)
-    rescue Errno::ECONNREFUSED => e
-      raise Drill::Error, e.message
-    end
-
-    body = JSON.parse(response.body)
-    if body["errorMessage"]
-      raise Drill::Error, body["errorMessage"].split("\n")[0]
-    end
+    body = post("query.json", data)
 
     # return columns in order
     result = []
@@ -45,4 +40,61 @@ class Drill
     end
     result
   end
+
+  def profiles(query_id = nil)
+    path = query_id ? "profiles/#{escape_path(query_id)}.json" : "profiles.json"
+    get(path)
+  end
+
+  def storage(name = nil)
+    path = name ? "storage/#{escape_path(name)}.json" : "storage.json"
+    get(path)
+  end
+
+  def cluster
+    get("cluster.json")
+  end
+
+  def metrics
+    # no .json suffix
+    get("status/metrics")
+  end
+
+  def options
+    get("options.json")
+  end
+
+  private
+
+  def get(path)
+    handle_response do
+      @http.get("#{@uri.request_uri}#{path}", HEADERS)
+    end
+  end
+
+  def post(path, data)
+    handle_response do
+      @http.post("#{@uri.request_uri}#{path}", data.to_json, HEADERS)
+    end
+  end
+
+  def handle_response
+    begin
+      response = yield
+    rescue Errno::ECONNREFUSED => e
+      raise Drill::Error, e.message
+    end
+
+    unless response.kind_of?(Net::HTTPSuccess)
+      body = JSON.parse(response.body) rescue nil
+      message = body["errorMessage"] || "Bad response: #{response.code}"
+      raise Drill::Error, message
+    end
+
+    JSON.parse(response.body)
+  end
+
+  def escape_path(path)
+    CGI.escape(path).gsub("+", "%20")
+  end
 end

data/lib/drill/version.rb

@@ -1,3 +1,3 @@
 class Drill
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drill-sergeant
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- LICENSE.txt
 - README.md
 - lib/drill-sergeant.rb
 - lib/drill/version.rb
@@ -74,15 +75,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby client for Apache Drill