prick 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22544dd4510ae8e2ca01c940e3020dab601ac8661429be316fa549576f54ab1
-  data.tar.gz: f94264fb4beea7ede50dd57ede3902e6128ced4230177c6a6a5bbb84662b7f67
+  metadata.gz: da40d1823b2163a2ce84de52d2a41aa222ae87afc6bb7cbe22e2d5045a162fba
+  data.tar.gz: cee09b71589069b2dbe386afec271ef1677980e0e6d6735462a8c087338e71d9
 SHA512:
-  metadata.gz: d1f1b9222fd94b4fdf66137f307c19efe64cdbcc301b00a5904ce7013eedb7652aaf3a5dbabbe0defad7b9f8d7e396a1efbc73fe568d83f46e5c4ef79b9b6760
-  data.tar.gz: 7eaeb1c2923ed69188e51c071097cca27a1c66d90226f26e99ff26d9e4c7540912ed62be74fda30006d914077faa70e9d384dc02bdbd9e4d0b9753f08f66af92
+  metadata.gz: 1b8f5f478092b60b5745983d911f37e516b24957bcdd978157e97263d97c65857e71b1335dc10a7f38fdd742f27c62f4cd28071e4ff31f53cca4f51e88f55557
+  data.tar.gz: 7a3efb1a894edfa8b5ca82688b4820126f2898f2448a92d84af49e611b9156bfbf20f34e62deb605ca50cb9fbb57691d6e2ceae2d604fbb6bb6dc3166e751213

data/exe/prick

@@ -195,6 +195,13 @@ begin
     exit 0
   end
 
+  # Change to parent directory containing the Prick version file if not found
+  # in the current directory
+  program.current_directory = Dir.getwd
+  while !Dir.getwd != "/" && !File.exist?(PRICK_VERSION_FILE)
+    Dir.chdir("..")
+  end
+
   # Check prick version
   file = PrickVersion.new
   file.exist? or raise Prick::Error, "Can't find prick version file '#{file.path}'"

data/lib/prick/program.rb

@@ -10,8 +10,10 @@ module Prick
 
     attr_accessor :quiet
     attr_accessor :verbose
+    attr_accessor :current_directory # Path to the directory where prick was called from
 
-    def initialize(quiet: false, verbose: false)
+    def initialize(current_directory = Dir.getwd, quiet: false, verbose: false)
+      @current_directory = current_directory
       @quiet = quiet
       @verbose = verbose
     end
@@ -95,8 +97,9 @@ module Prick
         database = database ? Database.new(database, project.user) : project.database(version)
         project.load(database, version: version)
         mesg "Loaded v#{version}", into_mesg, "from cache"
-      else file = file_or_version
-        project.load(database, file: file)
+      else 
+        file = file_or_version
+        project.load(database, file: norm_path(file))
         mesg "Loaded #{File.basename(file)}", into_mesg
       end
     end
@@ -104,9 +107,8 @@ module Prick
     def save(version, file)
       database = project.database(version)
       database.exist? or raise "Can't find database '#{database}'"
-      subj_mesg = file ? file : "cache"
-      project.save(database, file: file)
-      mesg "Saved #{database} to #{subj_mesg}"
+      project.save(database, file: norm_path(file))
+      mesg "Saved #{database} to #{file || 'cache'}"
     end
 
     def drop(database, all)
@@ -230,15 +232,16 @@ module Prick
 
     # TODO: Create a Backup class and a Project#backup_store object
     def backup(file = nil) 
-      file = file || File.join(SPOOL_DIR, "#{project.name}-#{Time.now.utc.strftime("%Y%m%d-%H%M%S")}.sql.gz")
-      project.save(file: file) 
+      path = norm_path(file) || 
+          File.join(SPOOL_DIR, "#{project.name}-#{Time.now.utc.strftime("%Y%m%d-%H%M%S")}.sql.gz")
+      project.save(file: path) 
       mesg "Backed-up database to #{file}"
     end
 
-    def restore(file_arg = nil)
-      file = file_arg || Dir.glob(File.join(SPOOL_DIR, "#{name}-*.sql.gz")).sort.last
-      File.exist?(file) or raise Error, "Can't find #{file_arg || "any backup file"}"
-      project.load(file: file)
+    def restore(file = nil)
+      path =  norm_path(file) || Dir.glob(File.join(SPOOL_DIR, "#{name}-*.sql.gz")).sort.last
+      File.exist?(path) or raise Error, "Can't find #{file || "any backup file"}"
+      project.load(file: path)
       mesg "Restored database from #{file}"
     end
 
@@ -249,6 +252,16 @@ module Prick
       project_name == project.name or raise Error, "Database not owned by this prick project: #{database}"
     end
 
+    # Expand relative path with respect to the directory where prick was called
+    # from. Return nil if file is nil
+    def norm_path(file)
+      if file && !file.start_with?("/")
+        File.join(current_directory, file)
+      else
+        file
+      end
+    end
+
     def mesg(*args) puts args.compact.grep(/\S/).join(' ') if !quiet end
     def verb(*args) puts args.compact.grep(/\S/).join(' ') if verbose end
   end

data/lib/prick/version.rb

@@ -4,7 +4,7 @@
 
 # Required by gem
 module Prick
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end
 
 # Project related code starts here

metadata

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