prick 0.20.1 → 0.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2abdd6978f9dce4cf9570d2ad5165fef65541ed5e69bd6150086a30b232498a5
-  data.tar.gz: bb1accf8f541d7197c73b14407401d91d5e3b9475b205bad46bea8851d2825c6
+  metadata.gz: 546c5ddee2590544bc4d77eeac96db85cbe2bcf1f752a310ead0623bd02af69c
+  data.tar.gz: fe5ea7a76834b33d4e50664fa379d617b7820b89b82907613fa9d7e4be9d81b4
 SHA512:
-  metadata.gz: 951dee9f87d7ba9475bf70512b35d29720a30ec5371e2c03c00575c21a94163f3aa43bf28bfbb6a5fe80e0da63cb1154bd84f29ae671651b7aa54de0e45630e2
-  data.tar.gz: cc5ef462d6c9ae5e1add6bb9fc53ffc4a6684c64020d24fad39327cd80218f01c031060f7c2e14a125a94caad305c658994e2ea53845f211909a4764a72f8d75
+  metadata.gz: f7c3c32abf035d32c787df578b7ba9a6b9f87cac4b76afb37f3293621a4dc3c7b098bf102e64fe0c9959cca75559d0b8f5273833067b76101b82f3439598bad9
+  data.tar.gz: b7628d68390952963b185e68bdcb8431fa86a1bc7e847ba546eaed57525ac748dedc951f6619c202dc192fe5bd03e841699d75f4e10746b013a86a44f4a79ed3

data/Gemfile

@@ -4,12 +4,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in prick_build.gemspec
 gemspec
-
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
-
-gem 'shellopts', :github => 'clrgit/shellopts', branch: "master"
-gem 'pg_graph', :github => 'clrgit/pg_graph', branch: "master"
-gem 'pg_meta', :github => 'clrgit/pg_meta', branch: "master"
-gem 'pg_conn', :github => 'clrgit/pg_conn', branch: "master"
-

data/exe/prick

@@ -82,7 +82,7 @@ SPEC = %(
 
       Checks file timestamps against the time of the last build and only
       rebuild affected parts of the project. KIND can be 'nodes', 'allnodes' or
-      'batches'
+      'batches' (the default)
 
   fox! -- FILE...
       Load fox file data. Data are reset to their initial state after build
@@ -178,11 +178,11 @@ begin
       end
 
     when :build!
-      dump = cmd.dump("batches")&.to_sym
+      dump = cmd.dump? ? cmd.dump("batches").to_sym : nil
       Prick::SubCommand.build(database, username, args.expect(0..1), timer: cmd.time?, dump: dump)
 
     when :make!
-      dump = cmd.dump("batches")&.to_sym
+      dump = cmd.dump? ? cmd.dump("batches").to_sym : nil
       Prick::SubCommand.make(database, username, args.expect(0..1), timer: cmd.time?, dump: dump)
 
     when :fox!
@@ -222,7 +222,7 @@ begin
         when :data, :schema, :database
           raise NotImplementedError
       else
-        raise Prick::Error, "Unknown subject: #{subject}"
+        raise Prick::Error, "Unknown subject: #{subject.inspect}"
       end
 
     else

data/lib/prick/version.rb

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

data/lib/subcommand/prick-drop.rb

@@ -4,18 +4,18 @@ require 'builder/builder.rb'
 
 module Prick::SubCommand
   def self.drop_users(database)
-    PgConn.new(database) { |conn|
+    PgConn.new(postgres) { |conn|
       users = conn.role.list(database: database)
       conn.role.drop(users, cascade: true)
     }
   end
 
   def self.drop_database(database)
-    PgConn.new { |conn| conn.rdbms.drop database }
+    PgConn.new(postgres) { |conn| conn.rdbms.drop database }
   end
 
   def self.drop_all(database)
-    PgConn.new { |conn|
+    PgConn.new(postgres) { |conn|
       users = conn.role.list(database: database)
       PgConn.new(database) { |db| db.role.drop(users, cascade: true) }
       conn.rdbms.drop database

data/lib/subcommand/prick-make.rb

@@ -87,116 +87,3 @@ module Prick::SubCommand
   end
 end
 
-__END__
-require 'prick_build.rb'
-
-require 'pg_conn'
-
-require 'ruby-prof'
-
-DATABASE = "mikras"
-USERNAME = "mikras"
-
-#PROFILE = true
-PROFILE = false
-TIME = true
-#TIME = false
-
-EPOCH = Time.at(0).utc
-
-schema = ARGV.first
-
-time "Program" do
-  RubyProf.start if PROFILE
-  begin
-    conn = nil
-    builder = nil
-    built_at = EPOCH
-    clean = false
-    create_schema = true
-
-    time "Load build object" do
-      PgConn.new { |super_conn|
-        if super_conn.rdbms.exist? DATABASE
-          conn = PgConn.new(DATABASE)
-          if conn.schema.exist_table? "prick", "versions"
-            built_at = conn.value("select built_at from prick.versions")
-          end
-        else
-          super_conn.rdbms.create DATABASE, owner: USERNAME
-          conn = PgConn.new(DATABASE)
-          clean = true
-        end
-      }
-
-      builder = Prick::Build::Builder.new(conn, "schema", clean)
-
-      if schema
-        builder.pool.after_schema(schema).each { |schema|
-          conn.schema.drop(schema, cascade: true)
-          builder.pool.delete_schema(schema)
-        }
-      end
-
-      touched_nodes = builder.nodes.select { |node| File.mtime(node.path) > built_at }
-      touched_phases = touched_nodes.map(&:phase).uniq.compact
-      touched_schema = touched_nodes.first&.schema
-      missing_schema = builder.schemas.find { |schema| !conn.schema.exist?(schema) }
-      build_schema = builder.schemas.find { |schema| [touched_schema, missing_schema].include? schema }
-
-#     puts "touched_nodes : #{touched_nodes.size} nodes"
-#     puts "touched_phases: #{touched_phases.inspect}"
-#     puts "touched_schema: #{touched_schema.inspect}"
-#     puts "missing_schema: #{missing_schema.inspect}"
-#     puts "build_schema  : #{build_schema.inspect}"
-
-#     builder.pool.dump
-
-      if build_schema.nil?
-        puts "#{DATABASE} is up to date"
-        exit
-      end
-
-      if touched_phases.include?(:decl) || touched_phases.empty?
-        schemas = [build_schema] + builder.pool.after_schema(build_schema)
-        schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
-        builder.pool.delete_schema(builder.pool.before_schema(build_schema))
-      elsif touched_phases.include?(:init) || touched_phases.include?(:term)
-        builder.pool.clear(:decl, :seed)
-        create_schema = false
-      elsif touched_phases.include?(:seed)
-        builder.pool.clear(:init, :decl, :term)
-        create_schema = false
-      end
-
-#     builder.pool.dump
-      builder.group
-    end
-
-#   builder.dump
-#   p builder.schemas
-#   exit
-
-    time "Execute build object" do
-      builder.execute(conn, create_schema: create_schema)
-    end
-
-  rescue Prick::Build::Error => ex
-    $stderr.puts ex.message
-    exit 1
-
-  rescue Command::Error => ex
-    $stderr.puts ex.message
-    exit 1
-  end
-end
-
-if PROFILE
-  profile = RubyProf.stop
-# printer = RubyProf::GraphHtmlPrinter.new(profile)
-  printer = RubyProf::CallStackPrinter.new(profile)
-  File.open("t.html", "w") { |file|
-    printer.print(file, :min_percent => 2)
-  }
-end
-

data/lib/subcommand/prick-teardown.rb

@@ -4,7 +4,7 @@ require 'builder/builder.rb'
 
 module Prick::SubCommand
   def self.teardown(database, username)
-    conn = PgConn.new # Superuser connection
+    conn = PgConn.new "postgres" # Superuser connection
     if conn.rdbms.exist? database
       conn.rdbms.drop database
     end

data/prick.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |spec|
   spec.summary       = "A release control and management system for postgresql"
   spec.description   = "A release control and management system for postgresql"
   spec.homepage      = "http://www.nowhere.com/"
-# spec.required_ruby_version = "~> 2.7.1"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -30,34 +29,16 @@ Gem::Specification.new do |spec|
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 
-  # Add your production dependencies here
-  # spec.add_dependency GEM [, VERSION]
   spec.add_dependency "semantic"
-
   spec.add_dependency "indented_io"
   spec.add_dependency "constrain"
   spec.add_dependency "forward_to"
   spec.add_dependency "bootsnap"
-
-  # Add your development dependencies here
-  # spec.add_development_dependency GEM [, VERSION]
-  spec.add_development_dependency "ruby-prof"
-
-  # Remove when fox goes a gem
-  spec.add_dependency "pg"
-  spec.add_dependency "dry-inflector"
-  spec.add_dependency "boolean"
-  spec.add_dependency "developer_exceptions"
+  spec.add_dependency "fixture_fox"
+  spec.add_dependency "postspec"
   spec.add_dependency "shellopts", "~> 2.0.23"
 
-  # In development mode override load paths for gems whose source are located
-  # as siblings of this project directory
-  if File.directory?("#{__dir__}/.git")
-    local_projects = Dir["../*"].select { |path|
-      File.directory?(path) && File.exist?("#{path}/Gemfile")
-    }.map { |relpath| "#{File.absolute_path(relpath)}/lib" }
-    $LOAD_PATH.unshift *local_projects
-  end
+  spec.add_development_dependency "ruby-prof"
 
   # Also un-comment in spec/spec_helper to use simplecov
   # spec.add_development_dependency "simplecov"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.5
 platform: ruby
 authors:
 - Claus Rasmussen
@@ -81,21 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
+  name: fixture_fox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: postspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,47 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: boolean
+  name: shellopts
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.23
 - !ruby/object:Gem::Dependency
-  name: developer_exceptions
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shellopts
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.23
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.23
 description: A release control and management system for postgresql
 email:
 - claus.l.rasmussen@gmail.com