pgai 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d9d2db36c8d7cae9b66a1ee25b6e5a1215a481919fe31a1c44b8e23a4dcdd02
-  data.tar.gz: c24d0012961c7520f25d3568bb288435dfd5e1e3d3c03b1b8c33f4390ac0d2be
+  metadata.gz: 4ffc13ccc5cc54a852ba48b245a1f4e470696d622fe499aa5fbce8221e77fa5d
+  data.tar.gz: 6e78ffd141aed55d189bab7c986c11434b8d22fbe4c40b032ddc2074875909fb
 SHA512:
-  metadata.gz: ceb07e5b9f9c16975fa7a7f59e935f6c195ab7b7e208729e3376e26aa2788e01096d570740a134a809076d69a1cb3824cb757a53f265f4105a010140a153f006
-  data.tar.gz: 95f8a35085451562058a5a7795aed4c742d2f104ac382bb94386e26ba82b354f1ab5d37d65822ea8e626da79da2f6cf4287bd80530166f736bb8c03143cca14b
+  metadata.gz: f5457effb587f8f4aeb75b5887cc15c977c736a37459de877ab18c18d8c0fd76e215300f7d46322e56913c398c2e869ec0c461c992aa231ab3b38e3b8bf45b9e
+  data.tar.gz: 4f29dc64c0553db229c009917b2676e9374ddb16b82c79e608588a9be0a655d10e804b2d8ec0566030a6d732a7ccb53c4681e3f53f65a3cb9ba4fcc59e0b3412

data/README.md

@@ -18,15 +18,27 @@ For an overview of available commands, execute:
 pgai -h
 ```
 
-Before usage `pgai config` must be executed and at least an environment must be configured with `pgai env add`
+Before usage `pgai config` must be executed and at least an environment must be configured with `pgai env add`.
 
-Postgres.ai does not provide `dblab` binaries for `ARM` processors(yet?), to work around this:
+An access token will be required and it can be obtained from: https://console.postgres.ai/gitlab/tokens
 
-- clone `https://gitlab.com/postgres-ai/database-lab`
-- change [`GOARCH = amd64`](https://gitlab.com/postgres-ai/database-lab/-/blob/0ad2cdd8f1d851e4beda92e0577bb242c6a8dd7f/engine/Makefile#L6) to `GOARCH = arm64`
-- execute [`make build`](https://gitlab.com/postgres-ai/database-lab/-/blob/0ad2cdd8f1d851e4beda92e0577bb242c6a8dd7f/engine/Makefile#L44-L47), we're interested only about building `CLI_BINARY`, the others could be removed.
-- the `dblab` binary should be available in the `bin` directory
-- run `pgai config --exe /path/to/bin/dblab` to set the path if it's not in `$PATH`.
+Configuring the user and identity file for the proxy must be done using the `~/.ssh/config` file. Example:
+
+```
+Host <subdomain>.postgres.ai
+  IdentityFile ~/.ssh/id_ed25519
+  User <username>
+```
+
+## dblab binary file
+
+This CLI is built around around the [`dblab`](https://postgres.ai/docs/how-to-guides/cli/cli-install-init) CLI and it looks for it at the following locations:
+
+- at the path specified in the config file if specified when running the `pgai config` command
+- in `$PATH`
+- at `~/.dblab/dblab`
+
+If it's not found at any of the specified locations, a copy will be downloaded to `~/.dblab/dblab`.
 
 ## Usage
 

data/lib/pgai/cli/main.rb

@@ -1,10 +1,10 @@
 module Pgai::Cli
   class Main < Base
     desc "config", "Configure CLI options"
-    method_option :prefix, aliases: "-p", desc: "Specify prefix to be used for clones", required: true
-    method_option :dbname, aliases: "-n", desc: "Specify database name to connect to", required: true
+    method_option :prefix, aliases: "-p", desc: "Specify prefix name to be used for clones", required: true
+    method_option :dbname, aliases: "-n", desc: "Specify database name to connect to by default", required: true
     method_option :proxy, aliases: "-x", desc: "Specify proxy host name", required: true
-    method_option :exe, aliases: "-e", desc: "dblab binary executable path", required: true
+    method_option :exe, aliases: "-e", desc: "dblab binary path"
     def config
       token = ask("Access token:", echo: false)
 

data/lib/pgai/clone_manager.rb

@@ -4,10 +4,15 @@ require "shellwords"
 require "socket"
 require "json"
 require "securerandom"
+require "net/http"
+require "pathname"
+require "fileutils"
 
 module Pgai
   class CloneManager
     HOSTNAME = "127.0.0.1"
+    DEFAULT_DBLAB = Pathname.new("~/.dblab/dblab").expand_path
+    DBLAB_BINARY_URL = "https://gitlab.com/api/v4/projects/45068363/jobs/4092515399/artifacts/engine/bin/cli/dblab-%{os}-%{cpu}"
 
     def initialize(environment, config:)
       @environment = environment
@@ -105,14 +110,37 @@ module Pgai
     end
 
     def dblab(*args, raw: false)
-      executable = config.path || "dblab"
-
-      output = `#{args.unshift(executable).shelljoin}`
+      output = `#{args.unshift(dblab_path).shelljoin}`
       return output if raw
 
       JSON.parse(output) unless output.empty?
     end
 
+    def dblab_path
+      return config.path unless config.path.to_s.empty?
+      return "dblab" unless `which dblab`.to_s.empty?
+      return DEFAULT_DBLAB.to_s if DEFAULT_DBLAB.exist?
+
+      download_dblab_to(DEFAULT_DBLAB)
+      File.chmod(0o755, DEFAULT_DBLAB)
+
+      DEFAULT_DBLAB
+    end
+
+    def download_dblab_to(location)
+      platform = Gem::Platform.local
+      uri = URI(DBLAB_BINARY_URL % {os: platform.os, cpu: platform.cpu})
+
+      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+        http.request Net::HTTP::Get.new(uri) do |response|
+          FileUtils.mkdir_p File.dirname(location)
+          File.open(location, "w") do |io|
+            response.read_body { |chunk| io.write chunk }
+          end
+        end
+      end
+    end
+
     def start_port_forward(port)
       return if port_open?(port)
 

data/lib/pgai/version.rb

@@ -1,3 +1,3 @@
 module Pgai
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgai
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marius Bobin