sequelizer 0.3.0 → 0.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequelizer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Duryea
@@ -136,79 +136,81 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.25'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-rails-omakase
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '9'
-  type: :runtime
+        version: '0.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: rubocop-sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '0.4'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: kvcsv
   requirement: !ruby/object:Gem::Requirement
@@ -223,20 +225,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: pp
-  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: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +254,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Easily establish a connection to a database via Sequel gem using options
-  specified in config/database.yml or .env files
+  specified in config/sequelizer.yml or .env files
 email:
 - aguynamedryan@gmail.com
 executables:
@@ -298,10 +286,7 @@ files:
 - lib/sequelizer/cli.rb
 - lib/sequelizer/connection_maker.rb
 - lib/sequelizer/env_config.rb
-- lib/sequelizer/gemfile_modifier.rb
-- lib/sequelizer/monkey_patches/database_in_after_connect.rb
 - lib/sequelizer/options.rb
-- lib/sequelizer/options_hash.rb
 - lib/sequelizer/version.rb
 - lib/sequelizer/yaml_config.rb
 homepage: https://github.com/outcomesinsights/sequelizer
@@ -325,5 +310,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.20
 specification_version: 4
-summary: Sequel database connections via config/database.yml or .env
+summary: Sequel database connections via config/sequelizer.yml or .env
 test_files: []

data/lib/sequelizer/gemfile_modifier.rb

@@ -1,91 +0,0 @@
-require_relative 'options'
-
-module Sequelizer
-  class GemfileModifier
-
-    attr_reader :options
-
-    def initialize(options = {})
-      @options = options
-    end
-
-    def modify
-      check_for_gemfile
-      if gemfile_needs_modification?
-        modify_gemfile
-        run_bundle unless options['skip-bundle']
-      else
-        puts 'Gemfile needs no modification'
-      end
-    end
-
-    private
-
-    def modify_gemfile
-      puts %(Adding "#{gem_line}" to Gemfile)
-      return if options['dry-run']
-
-      File.write(gemfile, modified_lines.join("\n"))
-    end
-
-    def proper_gem
-      opts = Options.new
-      @proper_gem ||= case opts.adapter
-                      when 'postgres'
-                        'pg'
-                      when 'sqlite'
-                        'sqlite3'
-                      when 'mysql'
-                        'mysql2'
-                      when 'tinytds'
-                        'tiny_tds'
-                      when 'oracle'
-                        'ruby-oci8'
-                      when nil
-                        raise 'No database adapter defined in your Sequelizer configuration'
-                      else
-                        raise "Don't know which database gem to use with adapter: #{opts.adapter}"
-                      end
-    end
-
-    def gem_line
-      "gem '#{proper_gem}'"
-    end
-
-    def gem_line_comment
-      '# ADDED BY SEQUELIZER'
-    end
-
-    def full_gem_line
-      [gem_line, gem_line_comment].join(' ')
-    end
-
-    def gemfile_needs_modification?
-      !(gemfile_lines.include?(gem_line) || gemfile_lines.include?(full_gem_line))
-    end
-
-    def gemfile_lines
-      @gemfile_lines ||= File.readlines(gemfile).map(&:chomp)
-    end
-
-    def modified_lines
-      gemfile_lines.grep_v(Regexp.new(gem_line_comment)) + [full_gem_line]
-    end
-
-    def check_for_gemfile
-      return if gemfile.exist?
-
-      raise "Could not find Gemfile in current directory: #{Pathname.pwd}"
-    end
-
-    def run_bundle
-      puts 'Running `bundle install` to update dependencies'
-      system('bundle install')
-    end
-
-    def gemfile
-      @gemfile ||= Pathname.new('Gemfile')
-    end
-
-  end
-end

data/lib/sequelizer/monkey_patches/database_in_after_connect.rb

@@ -1,28 +0,0 @@
-module Sequel
-  class ConnectionPool
-
-    # Return a new connection by calling the connection proc with the given server name,
-    # and checking for connection errors.
-    def make_new(server)
-      begin
-        conn = @db.connect(server)
-        if (ac = @after_connect)
-          case ac.arity
-          when 3
-            ac.call(conn, server, @db)
-          when 2
-            ac.call(conn, server)
-          else
-            ac.call(conn)
-          end
-        end
-      rescue StandardError => e
-        raise Sequel.convert_exception_class(e, Sequel::DatabaseConnectionError)
-      end
-      raise(Sequel::DatabaseConnectionError, 'Connection parameters not valid') unless conn
-
-      conn
-    end
-
-  end
-end

data/lib/sequelizer/options_hash.rb

@@ -1,9 +0,0 @@
-require 'hashie'
-module Sequelizer
-  class OptionsHash < Hash
-
-    include Hashie::Extensions::IndifferentAccess
-    include Hashie::Extensions::MergeInitializer
-
-  end
-end