Skip to content

Commit 3ba8c74

Browse files
committed
remove dependency on its-it
1 parent 7fcd37b commit 3ba8c74

5 files changed

Lines changed: 18 additions & 10 deletions

File tree

lib/schema_dev/config.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
require 'active_support/core_ext/hash'
22
require 'enumerator'
3-
require 'its-it'
43
require 'pathname'
54
require 'yaml'
65

@@ -58,7 +57,7 @@ def matrix(quick: false, ruby: nil, activerecord: nil, db: nil, excluded: nil)
5857

5958
m = use_ruby.product(use_activerecord, use_db)
6059
m = m.map { |_ruby, _activerecord, _db| Tuple.new(ruby: _ruby, activerecord: _activerecord, db: _db) }.compact
61-
m = m.reject(&it.match_any?(@exclude)) unless excluded == :none
60+
m = m.reject { |r| r.match_any?(@exclude) } unless excluded == :none
6261
m = m.map(&:to_hash)
6362

6463
if excluded == :only

lib/schema_dev/gem.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ def get_binding
4343
def self.schema_plus_core_version
4444
@core_version ||= begin
4545
gems = JSON.parse Faraday.get('https://rubygems.org/api/v1/versions/schema_plus_core.json').body
46-
gems.reject(&it["prerelease"]).sort_by(&it["number"].split('.')).last["number"]
46+
gems.reject { |e| e["prerelease"] }
47+
.sort_by { |e| e["number"].split('.') }
48+
.last["number"]
4749
end
4850
end
4951

@@ -163,7 +165,11 @@ def freshen
163165
def git_init
164166
Dir.chdir gem_name do
165167
system "git init"
166-
system "git add #{gem_root.find.select(&:exist?).reject(&it.basename.to_s == 'Gemfile.local').join(' ')}"
168+
add_param = gem_root.find
169+
.select(&:exist?)
170+
.reject { |e| e.basename.to_s == 'Gemfile.local' }
171+
.join(' ')
172+
system "git add #{add_param}"
167173
system "git commit -m 'Initial skeleton generated by `schema_dev gem #{gem_name}`'"
168174
end
169175
end

lib/schema_dev/readme.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def sub_matrix(lines)
2929
replace_block(lines, %r{^\s*<!-- SCHEMA_DEV: MATRIX}) do |contents|
3030
contents << "<!-- SCHEMA_DEV: MATRIX - begin -->\n"
3131
contents << "<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->\n"
32-
self.matrix.group_by(&it.slice(:ruby, :activerecord)).each do |pair, items|
32+
self.matrix.group_by {|e| e.slice(:ruby, :activerecord) }.each do |pair, items|
3333
contents << "* ruby **#{pair[:ruby]}** with activerecord **#{pair[:activerecord]}**, using #{items.map{|item| "**#{item[:db]}**"}.to_sentence(last_word_connector: ' or ')}\n"
3434
end
3535
contents << "\n"
@@ -57,9 +57,9 @@ def sub_template(template, lines)
5757
end
5858

5959
def replace_block(lines, pattern)
60-
before = lines.take_while(&it !~ pattern)
60+
before = lines.take_while { |e| e !~ pattern }
6161
return lines if before == lines
62-
after = lines.reverse.take_while(&it !~ pattern).reverse
62+
after = lines.reverse.take_while { |e| e !~ pattern }.reverse
6363
contents = []
6464
yield contents
6565
before + contents + after

lib/schema_dev/ruby_selector.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@ class Chruby < ManagerBase
2121
CORE_COMMAND = "chruby-exec"
2222

2323
def initialize
24-
@rubies = Pathname.new(ENV['HOME']).join(".rubies").entries().map(&its.basename.to_s)
24+
@rubies = Pathname.new(ENV['HOME'])
25+
.join(".rubies")
26+
.entries()
27+
.map { |e| e.basename.to_s }
2528
end
2629
def command(ruby)
2730
bash = Which.which 'bash' || abort("no bash shell found")
28-
ruby = @rubies.select(&it =~ /^(ruby-)?#{ruby}(-p.*)?$/).last || ruby
31+
ruby = @rubies.select { |e| e =~ /^(ruby-)?#{ruby}(-p.*)?$/ }
32+
.last || ruby
2933
"SHELL=#{bash} #{CORE_COMMAND} #{ruby} --"
3034
end
3135
end

schema_dev.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Gem::Specification.new do |gem|
2323
gem.add_dependency "activesupport", ">= 5.2", "< 6.2"
2424
gem.add_dependency "coveralls_reborn", "~> 0.23"
2525
gem.add_dependency "faraday", "~> 1.0"
26-
gem.add_dependency "its-it", "~> 1.3"
2726
gem.add_dependency "thor", '>= 0.19', '< 2.0'
2827
gem.add_dependency "which_works", "~> 1.0"
2928

0 commit comments

Comments
 (0)