Skip to content

Commit 4a457a3

Browse files
Rename gem
So we can push it to rubygems
1 parent 562bfd2 commit 4a457a3

8 files changed

+16
-16
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ source "https://rubygems.org"
22

33
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
44

5-
# Specify your gem's dependencies in git-merge-structure-sql.gemspec
5+
# Specify your gem's dependencies in tt-git-merge-structure-sql.gemspec
66
gemspec

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# git-merge-structure-sql
1+
# tt-git-merge-structure-sql
22

33
This is a merge driver for Git that resolves typical merge conflicts
44
in a `db/structure.sql` file of Rails.
@@ -19,12 +19,12 @@ supported.
1919

2020
Run this:
2121

22-
$ gem install git-merge-structure-sql
22+
$ gem install tt-git-merge-structure-sql
2323

2424
And enable it yourself in your Git configuration, or let it do that
2525
for you by this command:
2626

27-
$ git-merge-structure-sql --install
27+
$ tt-git-merge-structure-sql --install
2828

2929
This adds necessary settings to your `~/.gitconfig` or
3030
`$XDG_CONFIG_HOME/git/config` and the default gitattributes(5) file to
@@ -33,7 +33,7 @@ enable the merge driver for structure.sql files.
3333
If you want to enable this driver only in the current git directory,
3434
run this:
3535

36-
$ git-merge-structure-sql --install=local
36+
$ tt-git-merge-structure-sql --install=local
3737

3838
## Usage
3939

bin/console

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env ruby
22

33
require "bundler/setup"
4-
require "git-merge-structure-sql"
4+
require "tt-git-merge-structure-sql"
55

66
# You can add fixtures and/or initialization code here to make experimenting
77
# with your gem easier. You can also use a different console, if you like.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env ruby
22

3-
require "git-merge-structure-sql"
3+
require "tt-git-merge-structure-sql"
44

55
StructureSqlMergeDriver.new.main(*ARGV)

lib/git-merge-structure-sql.rb renamed to lib/tt-git-merge-structure-sql.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env ruby
22
# frozen_string_literal: true
33
#
4-
# git-merge-structure-sql - git merge driver for db/structure.sql in a Rails project
4+
# tt-git-merge-structure-sql - git merge driver for db/structure.sql in a Rails project
55
#
66
# How to use:
7-
# $ git-merge-structure-sql --install
7+
# $ tt-git-merge-structure-sql --install
88
#
99
# Copyright (c) 2018-2021 Akinori MUSHA
1010
#

spec/git-merge-structure-sql_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_merge(name)
2020

2121
expect(
2222
system(
23-
File.realpath('../exe/git-merge-structure-sql', __dir__),
23+
File.realpath('../exe/tt-git-merge-structure-sql', __dir__),
2424
File.join(dir, 'ours'),
2525
File.join(dir, 'base'),
2626
File.join(dir, 'theirs')

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require "bundler/setup"
2-
require "git-merge-structure-sql"
2+
require "tt-git-merge-structure-sql"
33

44
RSpec.configure do |config|
55
# Enable flags like --only-failures and --next-failure

git-merge-structure-sql.gemspec renamed to tt-git-merge-structure-sql.gemspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11

22
lib = File.expand_path("../lib", __FILE__)
33
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4-
require "git-merge-structure-sql"
4+
require "tt-git-merge-structure-sql"
55

66
Gem::Specification.new do |spec|
7-
spec.name = "git-merge-structure-sql"
7+
spec.name = "tt-git-merge-structure-sql"
88
spec.version = StructureSqlMergeDriver::VERSION
9-
spec.authors = ["Akinori MUSHA"]
9+
spec.authors = ["Akinori MUSHA", "Jonas Brusman"]
1010
spec.email = ["[email protected]"]
1111
spec.license = "BSD-2-Clause"
1212

1313
spec.summary = %q{git merge driver for db/structure.sql in a Rails project}
14-
spec.homepage = "https://github.com/knu/git-merge-structure-sql"
14+
spec.homepage = "https://github.com/teamtailor/git-merge-structure-sql"
1515

1616
if spec.respond_to?(:metadata)
1717
spec.metadata["homepage_uri"] = spec.homepage
1818
spec.metadata["source_code_uri"] = spec.homepage
19-
spec.metadata["changelog_uri"] = "https://github.com/knu/git-merge-structure-sql/blob/master/CHANGELOG.md"
19+
spec.metadata["changelog_uri"] = "https://github.com/teamtailor/git-merge-structure-sql/blob/master/CHANGELOG.md"
2020
end
2121

2222
# Specify which files should be added to the gem when it is released.

0 commit comments

Comments
 (0)