sequel_tools 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbc03d963faeda496049e1e3a8cc111bb68a18eeca2986b9b18a872280c6520a
-  data.tar.gz: c498ec036d519fcc585e39c7dd32af341884138b108bf0baf08e7f5da73cd0bb
+  metadata.gz: 1b6264c7fe1b4a594f3a9a46941c6911e9e8fff7adfa4d666018a2ef788964cd
+  data.tar.gz: 04a24489253cc82f8cc181b98651ed3b106f1f179f9323b69395bbf8a5afd597
 SHA512:
-  metadata.gz: 65dc15bc47c0eba4f5fa067bc8ee521bebe3926a7e423e3dd9d1b7b5bda0ea65ea2cb925edc41ceac8e9e762df276873f92ce00a0687638e0e42b347b7c4d076
-  data.tar.gz: 84a43de92472aaca2c48814b2a92f8305711103bc4c402d31e8ddc5fd3e6047ec1b11e3a70f408fae2f1a10e7d0665befaba7ec346db1b9ae5c9dc330bdc32ca
+  metadata.gz: 05520ffcf91642c38dfe000c1f307a50de32737c6e5cb9279fa7b3a6bf5b8feff98a91cc3fc1b7a81214509f1d3f1ab2b9c07180061894f5cfd75ed2f6ba41fd
+  data.tar.gz: 1302a8a08dfc0bb6cc73fa4b70d79fce6ca248b3e3a7b15b3b306dd2e61e58252dc0cdd51c97f4cf5511836b934ec7fc8baa1cb9c1d6754bde81f9714913a56c

data/README.md

@@ -127,7 +127,7 @@ PGPASSWORD=$DBPASSWORD
 psql
 ```
 
-Then you may pass `shell_command: '~/bin/opensql'` to `SequelTools.base_config`.
+Then you may set `shell_command: '~/bin/opensql'` in config.
 
 Alternatively you can define the `shell_#{dbadapter}` action if you prefer. Take a look at
 the implementation for `shell_postgres` to see how to do that. If you want to share that action

data/lib/sequel_tools/actions/schema_dump_postgres.rb

@@ -9,7 +9,7 @@ class SequelTools::ActionsManager
     pg_dump = c[:pg_dump]
     schema_location = c[:schema_location]
 
-    stdout, stderr, success = PgHelper.run_pg_command c, "#{pg_dump} -s"
+    stdout, _stderr, success = PgHelper.run_pg_command c, "#{pg_dump} -s"
     return unless success
     content = stdout
     migrations_table = c[:migrations_table]
@@ -20,13 +20,14 @@ class SequelTools::ActionsManager
       extra_tables = c[:extra_tables_in_dump]
       include_tables.concat extra_tables if extra_tables
       table_options = include_tables.map{|t| "-t #{t}"}.join(' ')
-      stdout, stderr, success =
+      stdout, _stderr, success =
         PgHelper.run_pg_command c, "#{pg_dump} -a #{table_options} --inserts"
       unless success
         puts 'failed to dump data for schema_migrations and schema_info. Aborting.'
         exit 1
       end
-      content = [content, stdout].join "\n\n"
+      content = [content, stdout].join("\n\n")
+        .gsub(/^\\(un)?restrict [A-Za-z0-9]+$/m, "")
     end
     require 'fileutils'
     FileUtils.mkdir_p File.dirname schema_location

data/lib/sequel_tools/actions/shell_postgres.rb

@@ -8,8 +8,8 @@ class SequelTools::ActionsManager
     psql = c[:psql]
     env = {
       'PGDATABASE' => c[:dbname],
-      'PGHOST' => c[:dbhost],
-      'PGPORT' => c[:dbport].to_s,
+      'PGHOST' => c[:dbhost] || 'localhost',
+      'PGPORT' => (c[:dbport] || 5432).to_s,
       'PGUSER' => c[:username],
       'PGPASSWORD' => c[:password].to_s,
     }

data/lib/sequel_tools/actions_manager.rb

@@ -9,9 +9,14 @@ module SequelTools
       uri_parts = []
       uri_parts << 'jdbc:' if RUBY_PLATFORM == 'java'
       uri_parts << "#{c[:jdbc_adapter] || c[:dbadapter]}://"
-      uri_parts << c[:dbhost]
-      uri_parts << ':' << c[:dbport] if c[:dbport]
-      uri_parts << '/' << dbname
+      host = c[:dbhost]
+      host ||= 'localhost' unless (c[:dbadapter] == 'sqlite') || c[:no_dbhost]
+      if host
+        uri_parts << host
+        uri_parts << ':' << c[:dbport] if c[:dbport]
+        uri_parts << '/'
+      end
+      uri_parts << dbname
       if user = c[:username]
         uri_parts << '?user=' << user
         uri_parts << '&password=' << c[:password] if c[:password]

data/lib/sequel_tools/pg_helper.rb

@@ -7,12 +7,14 @@ class PgHelper
     Tempfile.open 'pgpass' do |file|
       c = config
       file.chmod 0600
-      file.write "#{c[:dbhost]}:#{c[:dbport]}:#{c[:dbname]}:#{c[:username]}:#{c[:password]}"
+      host = c[:dbhost] || 'localhost'
+      port = c[:dbport] || '5432'
+      file.write "#{host}:#{port}:#{c[:dbname]}:#{c[:username]}:#{c[:password]}"
       file.close
       env = {
         'PGDATABASE' => connect_database || c[:dbname],
-        'PGHOST' => c[:dbhost],
-        'PGPORT' => c[:dbport].to_s,
+        'PGHOST' => host,
+        'PGPORT' => port.to_s,
         'PGUSER' => c[:username],
         'PGPASSFILE' => file.path
       }

data/lib/sequel_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen-string-literal: true
 
 module SequelTools
-  VERSION = '0.1.13'
+  VERSION = '0.2.0'
 end

data/lib/sequel_tools.rb

@@ -12,7 +12,7 @@ module SequelTools
     schema_location: 'db/migrations/schema.sql',
     seeds_location: 'db/seeds.rb',
     dbname: nil,
-    dbhost: 'localhost',
+    dbhost: nil,
     dbadapter: 'postgres',
     dbport: nil,
     username: nil,
@@ -24,7 +24,7 @@ module SequelTools
     extra_tables_in_dump: nil,
   } # unfrozen on purpose so that one might want to update the defaults
 
-  REQUIRED_KEYS = [ :dbadapter, :dbname, :username ]
+  REQUIRED_KEYS = [ :dbadapter, :dbname ]
   class MissingConfigError < StandardError; end
   def self.base_config(extra_config = {})
     config = DEFAULT_CONFIG.merge extra_config

data/sequel_tools.gemspec

@@ -32,9 +32,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'sequel'
+  spec.add_runtime_dependency 'logger'
+  spec.add_runtime_dependency 'irb'
   spec.add_development_dependency 'pg' unless RUBY_PLATFORM == 'java'
   spec.add_development_dependency 'jdbc-postgres' if RUBY_PLATFORM == 'java'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+
+  spec.add_development_dependency 'benchmark'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sequel_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - Rodrigo Rosenfeld Rosas
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -24,6 +23,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  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'
 description: |
   Offer tooling for common database operations, such as running Sequel migrations, store and
   load from the database schema, rollback, redo some migration, rerun all migrations, display
@@ -140,7 +181,6 @@ homepage: https://github.com/rosenfeld/sequel_tools
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,8 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 4.0.13
 specification_version: 4
 summary: Add Rake tasks to manage Sequel migrations
 test_files: []