rails_db_guard 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8a0fc06916b9f01df67d54964524c7e26249314386df6647c679c491ac1dff
-  data.tar.gz: 65bb14cc692568e0596b7d6680ae1a61d4989238524923b00e7cbe480cea4488
+  metadata.gz: 69c7b5793bccce4da21d45f7ea2d88bda6036da8efb4b5df9eda0a398cd1f246
+  data.tar.gz: f65abc85d8389739a642877f69d9e18365ebdde607aa688dfe386da9c3a0f033
 SHA512:
-  metadata.gz: 40862f3e2c43ff178170f08a5442395bc05ad85e20f9bf5bb5ab8de02cae48ca9c7d14fb46dbec4f1dc7474ed0f629443b0269fd832d6479a94f396c4fb6ad30
-  data.tar.gz: d1bdd8d0f397a96d90936d7eead125e3f64b5fa1efa72f53676d2b386c2a784ff47fd3dc81ca5fab3fdff6601dedc570694dae02d7146b1baa0f0839cd73caf5
+  metadata.gz: e0e31cd1823b44ea721581fac1d5717c38d26ce5d90d7cde8c371029f14c32ed95a5a7940e57c3fb01b06240858447abbd697a195a025a8abe56effebe719c90
+  data.tar.gz: a5010994c1ca7b67eeeba83761606c7a8720f6bab1b674060ffa2fd6c942fe7c0a06d5dff911155a8de863ded56d15ff2d87d5c466cf6feeea5d68a77d1aa371

data/.github/workflows/main.yml

@@ -0,0 +1,37 @@
+name: Main workflow
+
+on: [push]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.2
+
+    - name: Install sqlite3
+      run: sudo apt-get install libsqlite3-dev
+
+    - name: Bundle
+      run: |
+        gem install bundler -v 1.17.3
+        bundle install --jobs 4 --retry 3
+
+    - name: Run rubocop
+      run: bundle exec rubocop
+
+    - name: Prepare test app
+      run: |
+        cd test/rails_app
+        RAILS_ENV=test bundle exec rake db:migrate
+        RAILS_ENV=development bundle exec rake db:migrate
+        RAILS_ENV=production bundle exec rake db:migrate
+
+    - name: Run tests
+      run: bundle exec rake test

data/.rubocop.yml

@@ -0,0 +1,33 @@
+AllCops:
+  TargetRubyVersion: 2.6
+  Exclude:
+    - "bin/console"
+    - "test/rails_app/db/schema.rb"
+
+Metrics/AbcSize:
+  Exclude:
+    - "test/**/*"
+
+Metrics/LineLength:
+  AllowHeredoc: true
+  AllowURI: true
+  IgnoreCopDirectives: true
+  Max: 120
+  Exclude:
+    - "authorize_that.gemspec"
+    - "test/**/*"
+
+Metrics/MethodLength:
+  Exclude:
+    - "test/**/*"
+
+Style/ClassAndModuleChildren:
+  Exclude:
+    - "test/**/*"
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/SymbolProc:
+  Exclude:
+    - test/rails_app/db/migrate/20190708175731_create_tables.rb

data/.vimrc

@@ -0,0 +1,4 @@
+if exists('+colorcolumn')
+  highlight ColorColumn  ctermbg=237
+  set colorcolumn=120
+endif

data/Gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in rails_db_guard.gemspec
 gemspec

data/README.md

@@ -1,5 +1,7 @@
 # RailsDbGuard
 
+[![Actions Status](https://wdp9fww0r9.execute-api.us-west-2.amazonaws.com/production/badge/betterdoc-org/rails_db_guard)](https://wdp9fww0r9.execute-api.us-west-2.amazonaws.com/production/results/betterdoc-org/rails_db_guard)
+
 Prevents connecting to protected environments databases from other environments.
 
 Have you ever used `DATABASE_URL` from production in development? If yes, this is a gem for you. If not, some of your colleague has (or will), so this is a gem for you :)
@@ -69,7 +71,6 @@ This also mean you will need to prepare database for each environment.
 * MySQL adapter
 * CI setup (matrix for multiple database adapter and rails versions combinations)
 * Setup Rubocop
-* Add option to skip the check if `DISABLE_DATABASE_ENVIRONMENT_CHECK` environment variable is set
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -7,4 +9,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/lib/rails_db_guard.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 require "rails_db_guard/version"
+require "rails_db_guard/railtie"
 
+# :nodoc:
 module RailsDbGuard
   class Error < StandardError; end
 
@@ -14,11 +18,10 @@ module RailsDbGuard
     end
 
     def guard!(env)
-      return unless (ActiveRecord::Base.protected_environments.include?(env) && Rails.env != env)
+      return if ENV.key?("DISABLE_DATABASE_ENVIRONMENT_CHECK")
+      return unless ActiveRecord::Base.protected_environments.include?(env) && Rails.env != env
 
       raise Error, "You are trying to connect to `#{env}` database from `#{Rails.env}` environment"
     end
   end
 end
-
-require "rails_db_guard/railtie"

data/lib/rails_db_guard/adapters/postgresql.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.set_callback :checkout, :after do
-  begin
-    env = raw_connection.exec(RailsDbGuard::ENV_NAME_SQL).values.flatten.first
-    RailsDbGuard.guard!(env)
-  rescue PG::UndefinedTable => e
-    raise e unless e.message =~ /relation \"ar_internal_metadata\" does not exist/
-  end
+  env = raw_connection.exec(RailsDbGuard::ENV_NAME_SQL).values.flatten.first
+  RailsDbGuard.guard!(env)
+rescue PG::UndefinedTable => e
+  raise e unless e.message =~ /relation \"ar_internal_metadata\" does not exist/
 end

data/lib/rails_db_guard/adapters/sqlite3.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 ActiveRecord::ConnectionAdapters::SQLite3Adapter.set_callback :checkout, :after do
-  begin
-    env = raw_connection.execute(RailsDbGuard::ENV_NAME_SQL).first["value"]
-    RailsDbGuard.guard!(env)
-  rescue SQLite3::SQLException => e
-    raise e unless e.message =~ /no such table\: ar_internal_metadata/
-  end
+  env = raw_connection.execute(RailsDbGuard::ENV_NAME_SQL).first["value"]
+  RailsDbGuard.guard!(env)
+rescue SQLite3::SQLException => e
+  raise e unless e.message =~ /no such table\: ar_internal_metadata/
 end

data/lib/rails_db_guard/railtie.rb

@@ -1,5 +1,10 @@
-class RailsDbGuard::Railtie < Rails::Railtie
-  config.to_prepare do
-    RailsDbGuard.call
+# frozen_string_literal: true
+
+module RailsDbGuard
+  # :nodoc:
+  class Railtie < Rails::Railtie
+    config.to_prepare do
+      RailsDbGuard.call
+    end
   end
 end

data/lib/rails_db_guard/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsDbGuard
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/rails_db_guard.gemspec

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "rails_db_guard/version"
 
@@ -9,13 +10,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["BetterDoc GmbH"]
   spec.email         = ["pirates@betterdoc.org"]
 
-  spec.summary       = %q{Prevents connecting to protected environments databases from other environments}
+  spec.summary       = "Prevents connecting to protected environments databases from other environments"
   spec.homepage      = "https://github.com/betterdoc-org/rails_db_guard"
   spec.license       = "MIT"
 
   # 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.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -25,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails", ">= 5"
 
   spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "climate_control", "~> 0.2.0"
   spec.add_development_dependency "minitest", "~> 5"
   spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency "rubocop", "~> 0.74"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_db_guard
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - BetterDoc GmbH
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: climate_control
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.74'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.74'
 description: 
 email:
 - pirates@betterdoc.org
@@ -73,8 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
+- ".vimrc"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt