prick 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7302ba57c3bed137c90862b29e2a2b14938395963a3521aa10a2b096d516696f
-  data.tar.gz: f7d7e31e0f24c4346bffff6d03d104c7f8e9e9f2605bde0a6f67f48a16736499
+  metadata.gz: 71425ed90edd4de504fc95a6d270a5659c0ff206710db81c4994b03af76931e9
+  data.tar.gz: 3c5454cc8052d994257dba637285088352196f7bb522dd16fb19e4d43cafe3b8
 SHA512:
-  metadata.gz: 3e1fb9a5b8a9befdd1367b6653dd46dc0df0ca17ce94a15153f4d590390b1341c5930ffbc2a5608cdf906b0d22e56aaf1782c96c01ea3ffdbbbf85dc5c097f98
-  data.tar.gz: c79a6ecd5bd77169517c6b70dca2363da933fc3f73550e390297c991a2aed4c8ac0d6887855b93112fcac2d32818f3ee5e93609d1dfedae913e53f8dc6d8d187
+  metadata.gz: f59c9a5ac1284eeb006327370308630ec24b3dc30dfa9af10f0695f6b0501bcfe207750b78893315f2478364eee576f780a65662d6827aa77fe2b654f5b38a8a
+  data.tar.gz: 7958f8d49c73c5c1b2de604fb671367c2704ef3d373c0847ae9861378f719b2e6e9d02661c8b3c36ce91541e8adb71875f3d233f7151277c64d51439087203ad

data/exe/prick

@@ -51,7 +51,8 @@ SPEC = %(
   teardown! -- [DATABASE...] @ Remove database and owner
       Drop database, database users, and database owner if possible and not the
       current user. DATABASE defaults to the current database in which case the
-      state file is also removed
+      state file is also removed. If the --force option is present, the
+      database is dropped even if it is not a Prick database
 
   clean! -- [DATABASE] @ Empty database and remove users
       Empty the database and drop related users except the database owner and
@@ -96,27 +97,28 @@ SPEC = %(
   create.all!
       TODO
 
-  drop.schema! -- [SCHEMA...]
-      @ Drop schemas
-
-      Drops the given schemas or all schemas if called without arguments
-
-  drop.users!
+  drop.users! -- [DATABASE]
       @ Drop database users
 
       Drops all database users except the database owner
 
+  drop.owner! -- [DATABASE]
+      Drop database owner
+
+  drop.database! -- [DATABASE]
+      Drop database
+
+  drop.schema! -- [DATABASE] [SCHEMA...]
+      @ Drop schemas
+
+      Drops the given schemas or all schemas if called without arguments. The
+      'prick' schema is only deleted if named explicity
+
   drop.data!
       @ Drop data
 
       TODO
 
-  drop.owner!
-      Drop database owner
-
-  drop.database!
-      Drop database
-
   build! -f,force -t,time --dump=KIND? -- [SCHEMA]
       Build the project. If SCHEMA is defined, later schemas are excluded.
       KIND can be 'nodes', 'allnodes' or 'batches' (the default)
@@ -182,6 +184,8 @@ SPEC = %(
           read name title <<< $(prick dump value PRICK_NAME PRICK_TITLE)
 
   dump.node!
+      Dump build nodes
+
   dump.build!
   dump.data! @ TODO
   dump.schema! @ TODO
@@ -194,7 +198,7 @@ def require_db(database = Prick.state&.database, exist: true)
   dba = State.connection
   if exist
     dba.rdbms.exist?(database) or Prick.error "Can't find database '#{database}'"
-    if Prick.state&.conn&.name == database
+    if Prick.state&.connection&.name == database
       close_conn = false
       conn = Prick.state.conn
     else
@@ -358,24 +362,24 @@ begin
       Prick::SubCommand.fox(database, username, args)
 
     when :drop!
-      require_db if cmd.subcommand != :owner!
-      if cmd.subcommand == :schema!
-        schemas = args.to_a
-      else
-        args.expect(0)
-      end
       case cmd.subcommand
-        when :all!
-          Prick::SubCommand.drop_all(database, username)
         when :users!
+          # Should set state.username to owner of database
+          database = state.database = args.expect(0..1) || database
+          username = state.username = State.connection.rdbms.owner(database)
+          require_db(database)
           Prick::SubCommand.drop_users(database)
         when :owner!
-          Prick::SubCommand.drop_owner(username)
+          owner = args.expect(0..1) || username
+          Prick::SubCommand.drop_owner(owner)
         when :database!
+          database = args.expect(0..1) || database
           Prick::SubCommand.drop_database(database)
         when :data!
           raise NotImplementedError
         when :schema!
+          require_db
+          schemas = args.to_a
           Prick::SubCommand.drop_schema(database, schemas)
       else
         Prick.error "Unknown subject: #{subject}"
@@ -393,7 +397,7 @@ begin
       Prick::SubCommand.migrate(database, username, file: cmd.file)
 
     when :list!
-      format = (cmd.subcommand!.long? ? :long : :short) if cmd.subcommand != :users!
+      format = (cmd.subcommand!.long? ? :long : :short) if cmd.subcommand && cmd.subcommand != :users!
       case cmd.subcommand
         when :environments!; Prick::SubCommand.list_environments(format: format)
         when :databases!; Prick::SubCommand.list_databases(format: format)
@@ -403,7 +407,7 @@ begin
         when :users!; Prick::SubCommand.list_users
         when :owners!; Prick::SubCommand.list_owners(format: format)
       else
-        Prick.error "Unknown subcommand: #{cmd.subcommand}"
+        Prick.error "Unknown subcommand '#{cmd.subcommand || args.first }'"
       end
 
     when :dump!
@@ -439,15 +443,14 @@ begin
                 Prick.error "Conflicting options - --export and --local"
               end
           puts state.bash_source(args.first ? args : nil, scope: scope)
-          exit
         when :value!
           puts args.expect(1..).map { |var| Array(state.bash_environment[var]).join(' ') }
       else
         object = args.extract(1) # Fails if object is absent
         Prick.error "Unknown dump object: #{object}"
       end
-    else
-      Prick.failure "Internal error: Unhandled command - #{opts.subcommand.inspect}"
+  else
+    Prick.failure "Internal error: Unhandled command - #{opts.subcommand.inspect}"
   end
 
 rescue Prick::Build::PostgresError => ex

data/idea.txt

@@ -0,0 +1,38 @@
+
+Build spec
+  Custom variables
+    variables VAR...
+
+  Variables
+    graph # old 'standard'
+    schema
+    rebuild
+    refresh
+    require 
+
+  Code
+    build
+    rebuild
+    refresh
+    import
+    export
+
+  Special code functions
+    super
+    build file-or-directory       # makes sure not to load a file twice
+    sql "sql statement"
+    use sql-file                  # makes sure not to load a file twice
+    load dump-files               # makes sure not to load a file twice
+
+    build_ENVIRONMENT   # eg. 'build_app_registry_backend'
+    rebuild_ENVIRONMENT
+    refresh_ENVIRONMENT
+
+  Environment variables
+    PRICK_ENVIRONMENTS # all environments included in the current environment
+
+  Helper functions
+    # Consults PRICK_ENVIRONMENTS to check if the given environment is include
+    # in the current environment
+    has_environment ENVIRONMENT
+

data/lib/prick/environment.rb

@@ -90,13 +90,18 @@ module Prick
     @@SORTED_ENVIRONMENTS = []
 
     def self.yaml_to_array(value)
-      !value.nil? && Array(value).flatten.compact.map(&:to_s).map(&:split).flatten
+      case value
+        when /\n/; [value.split("\n")]
+        when nil ; []
+        when String; value.split
+        else [value.to_s]
+      end
+#     !value.nil? && Array(value).flatten.compact.map(&:to_s).map(&:split).flatten
     end
 
     def self.parse(hash)
       hash = hash.dup
-      @@VARIABLES = [:parents, :comment] + (yaml_to_array(hash.delete("variables") || []).map(&:to_sym) || [])
-
+      @@VARIABLES = [:parents, :comment] + yaml_to_array(hash.delete("variables") || "").map(&:to_sym)
       for environment, settings in hash
         env = Environment.new(environment)
         settings ||= {}

data/lib/prick/state.rb

@@ -106,13 +106,13 @@ module Prick
     # Project user (owner) connection. Memoized to connect only once. 
     # TODO Rename. Also rename self.connection
     def connection(database: nil, username: nil, environment: nil, &block)
-      database ||= self.database
-      username ||= self.username
-      environment ||= self.environment
-      !database.nil? or Prick.error "Can't connect to Postgres - no database specified"
-#     exist_database_environment? or Prick.error "Database '#{database}' is not initialized"
-
       if @connection.nil?
+        database ||= self.database
+        username ||= self.username
+        environment ||= self.environment
+        !database.nil? or Prick.error "Can't connect to Postgres - no database specified"
+#       exist_database_environment? or Prick.error "Database '#{database}' is not initialized"
+
         @connection = PgConn.new(database, username)
 
         # Set database_version/environment/prick members
@@ -193,7 +193,7 @@ module Prick
         })
 
         # PRICK_ENVIRONMENT_* variables
-        hash.merge! (Prick.state.environment.nil? ? {} : Environment[Prick.state.environment].bash_env)
+        hash.merge! (Prick.state.environment.nil? ? {} : Environment[Prick.state.environment]&.bash_env || {})
       end
     end
 
@@ -210,7 +210,14 @@ module Prick
 
       (vars || bash_environment.keys).map { |var|
         val = bash_environment[var]
-        "#{prefix}#{var}=\"#{Array(val).join(' ')}\"\n" 
+        if val.is_a?(Array)
+          if val.first.is_a?(Array)
+            val = val.map { |v| v.join("\n") }.join("\n")
+          else
+            val = val.join(" ")
+          end
+        end
+        "#{prefix}#{var}=\"#{val}\"\n" 
       }.join
     end
 
@@ -243,7 +250,7 @@ module Prick
             "prick.builds",
             name: name,
             version: version.to_s, prick: prick_version, 
-            branch: branch, rev: rev(:short), clean: clean?,
+            branch: branch, rev: rev(kind: :short), clean: clean?,
             environment: environment)
       end
     end
@@ -257,7 +264,7 @@ module Prick
             "prick.builds",
             name: name,
             version: version.to_s, prick: prick_version, 
-            branch: branch, rev: rev(:short), clean: clean?,
+            branch: branch, rev: rev(kind: :short), clean: clean?,
             environment: environment,
             success: success, duration: duration, prick_duration: dt)
       end
@@ -290,7 +297,7 @@ module Prick
     def load_yaml(file, mandatory_keys, optional_keys =  [])
       mandatory_keys = mandatory_keys.map(&:to_s)
       optional_keys = optional_keys.map(&:to_s)
-      hash = read_yaml(file)
+      hash = read_yaml(file) or Prick.error "Not a valid YAML file - #{file}"
       for key in mandatory_keys
         !hash[key].to_s.empty? or Prick.error "Can't find '#{key}' in #{file}"
       end

data/lib/prick/subcommand/prick-build.rb

@@ -18,7 +18,7 @@ module Prick::SubCommand
         conn = nil
         builder = nil
 
-        constrain super_conn.rdbms.exist?, true
+        constrain super_conn.rdbms.exist?(database), true # FIXME Same problem as below
 
         Timer.time "Load build object" do
           if super_conn.rdbms.exist? database # FIXME Why create database? Setup should have done this

data/lib/prick/subcommand/prick-create.rb

@@ -88,7 +88,7 @@ module Prick
             }
             !diff.same? or Prick.failure "No changes"
           ensure
-            drop_all(from_db)
+            drop_all(from_db) # FIXME This will fail, maybe use teardown instead?
             drop_all(to_db)
           end
         end

data/lib/prick/subcommand/prick-drop.rb

@@ -29,6 +29,8 @@ module Prick::SubCommand
       end
     else
       # We don't terminate sessions because we assume one-database-users
+      # FIXME: users is undefined
+      raise NotImpementedError
       conn.role.drop(users, cascade: true) # Fails if the users owns objects in other databases
     end
   end
@@ -44,30 +46,12 @@ module Prick::SubCommand
     constrain database, String
     constrain schemas, [String]
     if schemas.empty?
-      State.connection { |conn| conn.rdbms.empty!(database) }
+      State.connection { |conn| conn.rdbms.empty!(database, exclude: "prick") }
     else
       Prick.state.connection { |conn|
         schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
       }
     end
   end
-
-  # Drop database and its users including the owner if possible and not the
-  # current user
-  def self.drop_all(database, username = nil)
-    constrain database, String
-    State.connection { |conn|
-      if username.nil? && conn.rdbms.exist?(database)
-        owner = State.connection.rdbms.owner(database)
-      else
-        owner = username || database
-      end
-      if conn.rdbms.exist? database
-        drop_users(database) 
-        drop_database(database)
-      end
-      drop_owner(owner) if owner != ENV['USER']
-    }
-  end
 end
 

data/lib/prick/subcommand/prick-list.rb

@@ -12,7 +12,7 @@ module Prick::SubCommand
 
   def self.list_variables(format: :long, all: false)
     if format == :short
-      puts Prick.state.bash_environment.keys
+      puts Prick.state.bash_environment(all: all).keys
     else
       headers = %w(variable value)
       vars = Prick.state.bash_environment(all: all).reject { |k,v| k == "PATH" }

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.30.0"
+  VERSION = "0.31.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Claus Rasmussen
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-23 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -182,6 +182,7 @@ files:
 - bin/setup
 - doc/build-yml.txt
 - exe/prick
+- idea.txt
 - lib/prick.rb
 - lib/prick/builder/batch.rb
 - lib/prick/builder/builder.rb
@@ -237,7 +238,7 @@ files:
 homepage: http://www.nowhere.com/
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -252,8 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: A release control and management system for postgresql
 test_files: []