Skip to content
This repository has been archived by the owner on Sep 17, 2018. It is now read-only.

Commit

Permalink
Merge pull request #11 from yahoo/remove-require-relative
Browse files Browse the repository at this point in the history
Remove use of require_relative so that publishing to rubygems works
  • Loading branch information
jcouball committed Jun 29, 2015
2 parents 570b795 + 4a48253 commit d2e37e0
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
18 changes: 9 additions & 9 deletions lib/mysql_expectations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# Copyrights licensed under the New BSD License.
# See the accompanying LICENSE file for terms.

require_relative 'mysql_expectations/array_refinements'
require_relative 'mysql_expectations/mysql'
require_relative 'mysql_expectations/database'
require_relative 'mysql_expectations/table'
require_relative 'mysql_expectations/field'
require_relative 'mysql_expectations/key'
require_relative 'mysql_expectations/key_field'
require_relative 'mysql_expectations/matchers'
require_relative 'mysql_expectations/version'
require 'mysql_expectations/array_refinements'
require 'mysql_expectations/mysql'
require 'mysql_expectations/database'
require 'mysql_expectations/table'
require 'mysql_expectations/field'
require 'mysql_expectations/key'
require 'mysql_expectations/key_field'
require 'mysql_expectations/matchers'
require 'mysql_expectations/version'

require 'rspec'

Expand Down
2 changes: 1 addition & 1 deletion lib/mysql_expectations/database.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyrights licensed under the New BSD License.
# See the accompanying LICENSE file for terms.

require_relative 'table'
require 'mysql_expectations/table'

module MySQLExpectations
# Allows assertions on a database
Expand Down
2 changes: 1 addition & 1 deletion lib/mysql_expectations/key.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyrights licensed under the New BSD License.
# See the accompanying LICENSE file for terms.

require_relative 'key_field'
require 'mysql_expectations/key_field'

module MySQLExpectations
# An table key has a name and a sequence of index fields.
Expand Down
12 changes: 6 additions & 6 deletions lib/mysql_expectations/matchers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# Copyrights licensed under the New BSD License.
# See the accompanying LICENSE file for terms.

require_relative 'matchers/database_have_table'
require_relative 'matchers/database_only_have_tables'
require_relative 'matchers/table_have_collation'
require_relative 'matchers/table_have_engine_type'
require_relative 'matchers/table_have_field'
require_relative 'matchers/table_have_key'
require 'mysql_expectations/matchers/database_have_table'
require 'mysql_expectations/matchers/database_only_have_tables'
require 'mysql_expectations/matchers/table_have_collation'
require 'mysql_expectations/matchers/table_have_engine_type'
require 'mysql_expectations/matchers/table_have_field'
require 'mysql_expectations/matchers/table_have_key'

# rubocop:disable Style/PredicateName

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyrights licensed under the New BSD License.
# See the accompanying LICENSE file for terms.

require_relative '../array_refinements'
require 'mysql_expectations/array_refinements'

module MySQLExpectations
module Matchers
Expand Down
2 changes: 1 addition & 1 deletion lib/mysql_expectations/mysql.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# See the accompanying LICENSE file for terms.

require 'rexml/document'
require_relative 'database'
require 'mysql_expectations/database'

module MySQLExpectations
# The database_structure_file should be an XML file resulting from the
Expand Down
4 changes: 2 additions & 2 deletions lib/mysql_expectations/table.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Copyrights licensed under the New BSD License.
# See the accompanying LICENSE file for terms.

require_relative 'field'
require_relative 'key'
require 'mysql_expectations/field'
require 'mysql_expectations/key'

module MySQLExpectations
# Allows assertions on a table
Expand Down
2 changes: 1 addition & 1 deletion mysql_expectations.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

lib = File.expand_path('../lib/', __FILE__)
$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
require_relative 'lib/mysql_expectations/version'
require 'mysql_expectations/version'

Gem::Specification.new do |s|
s.name = 'mysql_expectations'
Expand Down

0 comments on commit d2e37e0

Please sign in to comment.