pgai 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b90d7c59fd71a8be56fa44aa2cb5f0852ffd32727d32122623374f55351e91d
-  data.tar.gz: aceb7f2333e5335779f5de61c78a13522e8b3181561f42f72d4f7feb5430ee6c
+  metadata.gz: 00ac038ff78647c4a3569cb87ebe3ae2dd10b9946be720ccffba5b951fc09f26
+  data.tar.gz: b4581834f1c91edfddff07cff3e05bdd658aa8983038a40adc24b3beaaf68158
 SHA512:
-  metadata.gz: cdd32ea51e752bc2430206445dfdd63f99d3102213a5412083750b6b1ec522681fb3ecf4d49e4328a7d84efff543cd7405ebe6b39a7613270d268fbd38f7672b
-  data.tar.gz: f9efad629d63f4094e75d8c79c1a2af85eb7947864437828c42417948b28606a47a5bd09f3545377e72f1e5e9894ee2c06b3f5a3a43529b135a883cc733b1056
+  metadata.gz: 572343b7a247938db90162ed94f44aa835f0dd7078ca6366f78b0b4151e8c82218b2aacd47f45f8ecb21c0d381e093642a5e40f0b61da37a28014c0a104d80a4
+  data.tar.gz: f7fa39825ffcac44f5130b5e2a98f9348d013928382f8ee5ae73d63417f75c1f6cb2dfc85d4ef627c4828656ede3fccee9eea4dcb9efcbdcde9385b44e238ccf

data/lib/pgai/cli/env.rb

@@ -33,10 +33,26 @@ module Pgai::Cli
     desc "list", "List all configured environments"
     def list
       data = Pgai::Resources::Local::Environment.all.map do |env|
-        env.attributes.slice(:id, :alias, :port, :dbname)
+        env.attributes.slice(:id, :alias, :port, :dbname, :snapshot)
       end
 
       say JSON.pretty_generate(data)
     end
+
+    desc "dup env", "Duplicate an environment and override the provided attributes"
+    method_option :alias, aliases: "-a",
+      desc: "This will be used internally for the connect command",
+      required: true
+    method_option :dbname,
+      aliases: "-n",
+      desc: "Specify database name to connect to by default"
+    method_option :snapshot,
+      aliases: "-s",
+      desc: "Specify the snapshot id if you want to create a clone from a specific snapshot"
+    def dup(env)
+      env = Pgai::Resources::Local::Environment.find(env)
+      attrs = env.attributes.merge(options.transform_keys(&:to_sym))
+      Pgai::Resources::Local::Environment.new(attrs).save
+    end
   end
 end

data/lib/pgai/client.rb

@@ -46,6 +46,7 @@ module Pgai
     def parse_reponse(data)
       data = JSON.parse(data)
       transform!(data)
+      handle_unauthorized(data)
       data
     end
 
@@ -65,5 +66,12 @@ module Pgai
         transform_array!(data)
       end
     end
+
+    def handle_unauthorized(data)
+      return unless data.is_a?(Hash)
+      return unless data[:code] == "UNAUTHORIZED"
+
+      raise UnauthorizedError, data[:message]
+    end
   end
 end

data/lib/pgai/create_clone_service.rb

@@ -6,6 +6,7 @@ module Pgai
   class CreateCloneService
     HOSTNAME = "127.0.0.1"
     CLONE_REFRESH_INTERVAL = 0.2
+    PROGRESS_BAR_WIDTH = 80
 
     attr_reader :id, :env, :logger
 
@@ -16,11 +17,15 @@ module Pgai
     end
 
     def execute
+      logger.info("Preparing clone ...")
+      logger.debug { "Expected cloning time: #{env.expected_cloning_time}" }
+      progress_bar.start
+
       create_clone_resource
-      logger.debug(clone_resource.status_message)
-      progress_bar.advance
+
+      logger.debug { clone_resource.status_message }
       wait_for_clone_to_be_ready
-      logger.debug(clone_resource.status_message)
+      logger.debug { clone_resource.status_message }
 
       Resources::Local::Clone.new(cached_clone_attributes).tap(&:save)
     end
@@ -28,7 +33,7 @@ module Pgai
     def create_clone_resource
       @clone_resource = Resources::Remote::Clone.new(id: id).tap do |resource|
         resource.db_object = Resources::Remote::DbObject.new(db_name: env.dbname)
-        resource.snapshot = Resources::Remote::Snapshot.latest
+        resource.snapshot = find_snapshot
         resource.save
       end
     end
@@ -51,10 +56,18 @@ module Pgai
       @clone_resource ||= create_clone_resource
     end
 
+    def find_snapshot
+      if env.snapshot
+        Resources::Remote::Snapshot.find(env.snapshot)
+      else
+        Resources::Remote::Snapshot.latest
+      end
+    end
+
     def wait_for_clone_to_be_ready
       loop do
+        progress_bar.advance(steps)
         clone_resource.refresh
-        progress_bar.advance
         break if clone_resource.ready?
         sleep(CLONE_REFRESH_INTERVAL)
       end
@@ -62,14 +75,11 @@ module Pgai
     end
 
     def progress_bar
-      @progress_bar ||= TTY::ProgressBar.new(
-        "Preparing clone ... [:bar]",
-        total: progress_bar_steps
-      )
+      @progress_bar ||= TTY::ProgressBar.new("[:bar]", total: PROGRESS_BAR_WIDTH)
     end
 
-    def progress_bar_steps
-      (env.expected_cloning_time / CLONE_REFRESH_INTERVAL).ceil + 1
+    def steps
+      @steps ||= (PROGRESS_BAR_WIDTH / env.expected_cloning_time).ceil
     end
   end
 end

data/lib/pgai/resources/attributes.rb

@@ -95,7 +95,6 @@ module Pgai
       def assign_attributes(user_attributes)
         user_attributes.each do |key, value|
           attribute = self.class.attributes.find { |attr| attr.name == key }
-          raise "shit" unless attribute
 
           assign_attribute(attribute, value)
         end

data/lib/pgai/resources/local/environment.rb

@@ -10,6 +10,7 @@ module Pgai
         attribute :dbname, :string
         attribute :access_token, :string
         attribute :clone_prefix, :string
+        attribute :snapshot, :string
 
         def client
           @client ||= Pgai::Client.new(

data/lib/pgai/resources/remote/snapshot.rb

@@ -24,6 +24,12 @@ module Pgai
           def path
             "snapshots"
           end
+
+          def find(id)
+            record = all.find { |snapshot| snapshot.id.to_s == id.to_s }
+            raise Pgai::ResourceNotFound unless record
+            record
+          end
         end
       end
     end

data/lib/pgai/version.rb

@@ -1,3 +1,3 @@
 module Pgai
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/lib/pgai.rb

@@ -5,8 +5,14 @@ require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.setup
 
+require "thor"
+
 module Pgai
   class Error < StandardError; end
 
+  class CliError < ::Thor::Error; end
+
   class ResourceNotFound < Error; end
+
+  class UnauthorizedError < CliError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgai
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Marius Bobin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: CLI wrapper for postgres.ai thin clones