prick 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285b5f300185bd9b00e975ab4a4bdffc46a5db68606325b77dfa025ba2ce23d7
-  data.tar.gz: 0b569c4d26020f1d29be322ff94a2f80ae2461dc4422a989850415a04166d614
+  metadata.gz: b81d387c058ac6fc795be670066afa602c818d70668ad6fcb34e5fccab9860dd
+  data.tar.gz: 2d49b6f26b4b3a38a5d5969f97b545014257a16c3844100561ca3d96404eaa3f
 SHA512:
-  metadata.gz: '02196f54ea306130af2dc43337e4cb2408a7ce2872df6e0aa355cfb141a5067e5d0fb71f4e9650882be086c856c28ed1438704343f8177225cea676f6705d072'
-  data.tar.gz: 4f6288490ad69c85e5638c0b22dd973673b27ec204b6366efbdd00bb4228f7d1e2a3c8d741bedb2f07df6b723b57901c2a5e24168d9195490ad04f3ba2527c8c
+  metadata.gz: 1edeeee6725fb7f8c2826a5e8cdb5a574c64689200ae7b19f7b6e466b201823eb6a76d119787484eff9d5080eeafe0b64015502fe19d88c26bd5a867cb40f209
+  data.tar.gz: 4bc01bb60d5a034457a40a766534c11755bb4471c315113125d119c2819184e762be82eb63b14a92a423fa8078a7bbbac552c7d4873cc49d09a59ed1ccb63bae

data/exe/prick

@@ -273,47 +273,59 @@ def parse_database_args(state, args)
   [username, database, environment]
 end
 
+require_relative '../lib/prick-command.rb'
+include Prick
+
 begin
   # Parse command line
   opts, args = ShellOpts.process(SPEC, ARGV, exception: true)
 
+  # Expect a sub-command. TODO: Make this a built-in in ShellOpts#subcommand!
+  cmd = opts.subcommand! or Prick.error "Subcomand expected"
+
+  # Setup verbose and quiet
+  $verbose = opts.verbose?
+  $quiet = opts.quiet?
+
   # Honor -C option
   begin
-    Dir.chdir(opts.directory) if opts.directory?
+    if opts.directory?
+      Dir.chdir(opts.directory)
+    end
   rescue Errno::ENOENT
     raise ShellOpts::Error, "Can't cd to '#{opts.directory}'"
   end
-rescue ShellOpts::Error => ex
-  ShellOpts.error(ex.message)
-end
-
-# Require prick only after -C directory option because some constants depends
-# on the current directory
-require_relative '../lib/prick-command.rb'
-include Prick
-
-begin
-  # Handle verbose and quiet
-  $verbose = opts.verbose?
-  $quiet = opts.quiet?
-
-  # Expect a sub-command. TODO: Make this a built-in in ShellOpts#subcommand!
-  cmd = opts.subcommand! or Prick.error "Subcomand expected"
-
-  # Handle -p, -e, and -c. TODO: Take -C into account for relative paths. Low-hanging fruit
-  project_file = opts.project_file || PRICK_PROJECT_PATH
-  environment_file = opts.environment_file || PRICK_ENVIRONMENT_PATH
-  reflections_file = opts.reflections_file || REFLECTIONS_PATH
-  state_file = opts.state_file || PRICK_STATE_PATH
-  fox_state_file = opts.fox_state_file || FOX_STATE_PATH
 
   # Process init command and exit
   if opts.subcommand == :init!
-    dir, name = Prick::SubCommand.init(project_file, args.expect(0..1), cmd.name, cmd.title)
+    # Set project directory before loading constants.rb to prevent it from
+    # searching in vain for the yet-to-be-created project directory
+    Prick.const_set("PRICK_DIR", args.expect(0..1) || ".")
+
+    # Load remaining constants that may depend on PRICK_DIR
+    require_relative '../lib/prick/constants.rb'
+
+    # Initialize project
+    dir, name = Prick::SubCommand.init(PRICK_PROJECT_FILE, PRICK_DIR, cmd.name, cmd.title)
     Prick.mesg "Initialized Prick project '#{name}' in #{File.absolute_path(dir)}/"
+
+    # Exit
     exit
   end
 
+  # Find project directory and initialize constants
+  require_relative '../lib/prick/constants.rb'
+
+  # Switch to project directory
+  Dir.chdir PRICK_DIR
+
+  # Handle -p, -e, and -c. TODO: Take -C into account for relative paths. Low-hanging fruit
+  project_path = opts.project_file || PRICK_PROJECT_PATH
+  environment_path = opts.environment_file || PRICK_ENVIRONMENT_PATH
+  reflections_path = opts.reflections_file || REFLECTIONS_PATH
+  state_path = opts.state_file || PRICK_STATE_PATH
+  fox_state_path = opts.fox_state_file || FOX_STATE_PATH
+
   # Check for prick project
   if ![:teardown!, :clean!].include?(opts.subcommand) || args.size == 0
     # We test for the presense of the schema directory to verify we're in a
@@ -321,11 +333,11 @@ begin
     # they can be placed elsewhere. TODO: This require us to check for project file manually
 #   File.directory? "schema" or Prick.error "Not in a prick project directory"
     File.directory?(SCHEMA_DIR) or Prick.error "Not in a prick project directory"
-    File.exist?(project_file) or Prick.error "Can't find project file '#{project_file}'"
+    File.exist?(project_path) or Prick.error "Can't find project file '#{project_path}'"
   end
 
   # Load state
-  state = Prick.state = State.new(project_file, environment_file, reflections_file, state_file, fox_state_file)
+  state = Prick.state = State.new(project_path, environment_path, reflections_file, state_path, fox_state_path)
 
   # Lazyness
   database = state.database
@@ -338,7 +350,7 @@ begin
 
     when :setup!
       clean_pg_meta_cache
-      state.project_loaded? or Prick.error "No #{project_file} found"
+      state.project_loaded? or Prick.error "No #{project_path} found"
       username, database, environment = parse_database_args(state, args)
       require_db(database, exist: false)
       Prick::SubCommand.setup(database, username, environment)

data/lib/prick/constants.rb

@@ -10,7 +10,7 @@ module Prick
   SHARE_PATH = "#{File.dirname(File.dirname(__dir__))}/lib/prick/share"
   LIBEXEC_PATH = "#{File.dirname(File.dirname(__dir__))}/lib/prick/libexec"
 
-  # Project directories
+  # Project directories (relative to PRICK_DIR)
   DIRS = [
     MIGRATION_DIR = "migration",
     SCHEMA_DIR = "schema",
@@ -26,33 +26,48 @@ module Prick
     SPEC_DIR = "spec"
   ]
 
-  # Prick project root directory
-  PRICK_DIR = Dir.getwd
-
   # Search path for executables
 # PRICK_PATH = "#{ENV['PATH']}:#{PRICK_DIR}/#{BIN_DIR}:#{PRICK_DIR}/#{LIBEXEC_DIR}"
 
-  # Project file
+  # Project filename
   PRICK_PROJECT_FILE = "prick.yml"
-  PRICK_PROJECT_PATH = PRICK_PROJECT_FILE
+
+  # Project root directory. nil when running rspec
+  if !defined?(PRICK_DIR)
+    PRICK_DIR = begin
+      dir = Dir.getwd
+      while dir != "/" && !File.exist?("#{dir}/prick.yml")
+        dir = File.dirname(dir)
+      end
+      if dir == "/"
+        defined?(RSpec) or raise ArgumentError, "Can't find prick project directory"
+        dir = ""
+      end
+      dir
+    end
+  end
+
+  # Project file path
+  PRICK_PROJECT_PATH = File.join(PRICK_DIR, PRICK_PROJECT_FILE)
 
   # Environment file
   PRICK_ENVIRONMENT_FILE = "prick.environment.yml"
-  PRICK_ENVIRONMENT_PATH = PRICK_ENVIRONMENT_FILE
+  PRICK_ENVIRONMENT_PATH = File.join(PRICK_DIR, PRICK_ENVIRONMENT_FILE)
+
 
   # TODO: Move to var/cache
 
   # State file
   PRICK_STATE_FILE = ".prick.state.yml"
-  PRICK_STATE_PATH = PRICK_STATE_FILE
+  PRICK_STATE_PATH = File.join(PRICK_DIR, PRICK_STATE_FILE)
 
   # Fox state file (contains anchors and table sizes)
   FOX_STATE_FILE = ".fox-state.yml"
-  FOX_STATE_PATH = FOX_STATE_FILE
+  FOX_STATE_PATH = File.join(PRICK_DIR, FOX_STATE_FILE)
 
   # PgMeta snapshot. Is deleted at the start of each build
   PG_META_STATE_FILE = ".pg_meta-state.yml"
-  PG_META_STATE_PATH = PG_META_STATE_FILE
+  PG_META_STATE_PATH = File.join(PRICK_DIR, PG_META_STATE_FILE)
 
   # Reflections file
   REFLECTIONS_FILE = "reflections.yml"
@@ -66,7 +81,6 @@ module Prick
   SPEC_TMP_DIR = "spec"
   SPEC_TMP_PATH = File.join(TMP_DIR, SPEC_TMP_DIR)
 
-
   # Migration diff files
   DIFF_FILE = "diff.sql"
   DIFF_FILES = [
@@ -82,7 +96,7 @@ module Prick
 
   # The project state file
   PROJECT_STATE_FILE = ".prick-project"
-  PROJECT_STATE_PATH = PROJECT_STATE_FILE
+  PROJECT_STATE_PATH = File.join(PRICK_DIR, PROJECT_STATE_FILE)
 
   # The the .prick-migration file
   PRICK_MIGRATION_FILE = ".prick-migration"

data/lib/prick/state.rb

@@ -1,5 +1,6 @@
 
 require 'yaml'
+require_relative './prick_version.rb'
 
 module Prick
   # There is only one State object: Prick.state
@@ -317,10 +318,8 @@ module Prick
       }
     end
 
-  private
-    # YAML helper methods
-
-    def read_yaml(file)
+    # To give lib/prick.rb access
+    def self.read_yaml(file)
       begin
         YAML.load File.read(file).sub(/^__END__\n.*/m, "")
       rescue Errno::ENOENT
@@ -328,7 +327,8 @@ module Prick
       end
     end
 
-    def load_yaml(file, mandatory_keys, optional_keys =  [])
+    # To give lib/prick.rb access
+    def self.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) or Prick.error "Not a valid YAML file - #{file}"
@@ -340,6 +340,15 @@ module Prick
       hash
     end
 
+  private
+    # YAML helper methods
+
+    def read_yaml(file) self.class.read_yaml(file) end
+
+    def load_yaml(file, mandatory_keys, optional_keys =  [])
+      self.class.load_yaml(file, mandatory_keys, optional_keys)
+    end
+
     def save_yaml(file, hash)
       self.class.save_yaml(file, hash)
     end

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

@@ -1,6 +1,7 @@
 require 'fileutils'
 
 module Prick::SubCommand
+  # FIXME: Ignores -p, -e, -s, -f options
   def self.init(project_file, dir, name, title) # dir, name, and title can be nil
     cwd = Dir.getwd
     if dir

data/lib/prick/version.rb

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

data/lib/prick-command.rb

@@ -18,7 +18,6 @@ module Prick
   class Failure < RuntimeError; end
 end
 
-require_relative 'prick/constants.rb'
 require_relative 'prick/ext/expand_variables.rb'
 
 require_relative 'prick/local/command.rb'

data/lib/prick.rb

@@ -1,17 +1,11 @@
 
 require 'pg_conn'
+require 'yaml'
 
-# Find project root dir and set load path to include ./lib
-dir = Dir.getwd
-while dir != "/" && !File.exist?("#{dir}/prick.yml")
-  dir = File.dirname(dir)
-end
+require_relative 'prick/constants.rb'
+require_relative 'prick/state.rb'
 
-if dir == "/"
-  defined?(RSpec) or raise ArgumentError, "Can't find prick project directory"
-else
-  $LOAD_PATH.unshift("#{dir}/lib")
-end
+$LOAD_PATH.unshift(File.join Prick::PRICK_DIR, "lib")
 
 # Create a new database connection or an existing connection. The connection
 # exists when the script is run by prick as a subprocess using fork
@@ -19,9 +13,14 @@ module Prick
   def self.conn(database, username = nil)
     if self.respond_to?(:owner_conn)
       self.owner_conn
-    else
-      !database.nil? or raise ArgumentError, "No database given"
+    elsif database
       PgConn.new(database, username || database)
+    elsif File.exist?(Prick::PRICK_STATE_PATH)
+      hash = State.load_yaml(Prick::PRICK_STATE_PATH, %w(database username), %w(environment))
+      PgConn.new(hash["database"], hash["username"])
+    else
+      raise ArgumentError, "No database given"
     end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Claus Rasmussen