Skip to content

Commit

Permalink
trying to get CI work
Browse files Browse the repository at this point in the history
  • Loading branch information
sufleR committed Aug 4, 2020
1 parent f8477d0 commit 2124f42
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 25 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: ruby
cache: bundler
before_install: gem update bundler
before_install:
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v '< 2'

gemfile:
- gemfiles/3.2.gemfile
Expand Down
8 changes: 5 additions & 3 deletions gemfiles/3.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"
source 'https://rubygems.org'

gem "activerecord", "~> 3.2.21"
gem 'activerecord', '~> 3.2.21'

gemspec :path => "../"
gemspec path: '../'
8 changes: 5 additions & 3 deletions gemfiles/4.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"
source 'https://rubygems.org'

gem "activerecord", "~> 4.0.0"
gem 'activerecord', '~> 4.0.0'

gemspec :path => "../"
gemspec path: '../'
8 changes: 5 additions & 3 deletions gemfiles/4.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"
source 'https://rubygems.org'

gem "activerecord", "~> 4.1.0"
gem 'activerecord', '~> 4.1.0'

gemspec :path => "../"
gemspec path: '../'
8 changes: 5 additions & 3 deletions gemfiles/4.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"
source 'https://rubygems.org'

gem "activerecord", "~> 4.2.0"
gem 'activerecord', '~> 4.2.0'

gemspec :path => "../"
gemspec path: '../'
8 changes: 5 additions & 3 deletions gemfiles/5.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source "https://rubygems.org"
source 'https://rubygems.org'

gem "activerecord", "~> 5.0.0"
gem 'activerecord', '~> 5.0.0'

gemspec :path => "../"
gemspec path: '../'
4 changes: 3 additions & 1 deletion lib/sql_query.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def initialize(file_name, options = {})
unless file_name.is_a?(String) || file_name.is_a?(Symbol)
raise ArgumentError, 'SQL file name should be String or Symbol'
end

@sql_filename = file_name
@options = options
@connection = options.try(:delete, :db_connection) ||
Expand All @@ -35,7 +36,7 @@ def pretty_sql
pretty(sql.dup)
end

def quote(value) # rubocop:disable Rails/Delegate
def quote(value)
connection.quote(value)
end

Expand Down Expand Up @@ -90,6 +91,7 @@ def value.inspect

def prepare_variables
return if @options.blank?

@options.each do |k, v|
instance_variable_set("@#{k}", v)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

require 'active_record'
require 'sql_query'
require 'pry'
#require 'pry'

SqlQuery.configure do |config|
config.path = '/spec/sql_queries'
Expand Down
12 changes: 5 additions & 7 deletions sql_query.gemspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# coding: utf-8
# 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)

Gem::Specification.new do |spec|
Expand All @@ -24,14 +23,13 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 1.9.3'

spec.add_dependency 'activerecord', '>= 3.2'
spec.add_dependency 'activerecord', '>= 3.2', '< 6.0'
spec.add_development_dependency 'bundler', '~> 1.13'
spec.add_development_dependency 'pg', '~> 0.18'
spec.add_development_dependency 'rake', '~> 11.3'
spec.add_development_dependency 'rspec', '~> 3.4'
spec.add_development_dependency 'pg', '~> 0.18'
spec.add_development_dependency 'pry', '~> 0.10'
spec.add_development_dependency 'with_model', '~> 1.2'
spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
spec.add_development_dependency 'appraisal'
spec.add_development_dependency 'rubocop'
spec.add_development_dependency 'rubocop', '<= 0.81'
spec.add_development_dependency 'simplecov'
end

0 comments on commit 2124f42

Please sign in to comment.