Skip to content

Commit 8f1e3bb

Browse files
jcouballjcouball
committed
fix: result of running rake rubocop:autocorrect
1 parent a04297d commit 8f1e3bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+749
-821
lines changed

‎bin/command_line_test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class CommandLineParser
8585
def define_options
8686
option_parser.banner = "Usage:\n#{command_template}"
8787
option_parser.separator ''
88-
option_parser.separator "Both --stdout and --stderr can be given."
88+
option_parser.separator 'Both --stdout and --stderr can be given.'
8989
option_parser.separator 'If --signal is given, --exitstatus is ignored.'
9090
option_parser.separator 'If nothing is given, the script will exit with exitstatus 0.'
9191
option_parser.separator ''
@@ -211,7 +211,7 @@ end
211211
options = CommandLineParser.new.parse(*ARGV)
212212

213213
STDOUT.puts options.stdout if options.stdout
214-
STDERR.puts options.stderr if options.stderr
214+
warn options.stderr if options.stderr
215215
sleep options.duration unless options.duration.zero?
216216
Process.kill(options.signal, Process.pid) if options.signal
217217
exit(options.exitstatus) if options.exitstatus

‎git.gemspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
1+
$LOAD_PATH.unshift File.expand_path('lib', __dir__)
22
require 'git/version'
33

44
Gem::Specification.new do |spec|
@@ -17,20 +17,20 @@ Gem::Specification.new do |spec|
1717
DESCRIPTION
1818
spec.version = Git::VERSION
1919

20-
2120
spec.metadata['homepage_uri'] = spec.homepage
2221
spec.metadata['source_code_uri'] = spec.homepage
2322
spec.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}/file/CHANGELOG.md"
2423
spec.metadata['documentation_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}"
24+
spec.metadata['rubygems_mfa_required'] = 'true'
2525

2626
spec.require_paths = ['lib']
2727
spec.required_ruby_version = '>= 3.2.0'
2828
spec.requirements = ['git 2.28.0 or greater']
2929

30-
spec.add_runtime_dependency 'activesupport', '>= 5.0'
31-
spec.add_runtime_dependency 'addressable', '~> 2.8'
32-
spec.add_runtime_dependency 'process_executer', '~> 4.0'
33-
spec.add_runtime_dependency 'rchardet', '~> 1.9'
30+
spec.add_dependency 'activesupport', '>= 5.0'
31+
spec.add_dependency 'addressable', '~> 2.8'
32+
spec.add_dependency 'process_executer', '~> 4.0'
33+
spec.add_dependency 'rchardet', '~> 1.9'
3434

3535
spec.add_development_dependency 'create_github_release', '~> 2.1'
3636
spec.add_development_dependency 'main_branch_shared_rubocop_config', '~> 0.1'

‎lib/git.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ module Git
4242
# @author Scott Chacon (mailto:schacon@gmail.com)
4343
#
4444
module Git
45-
#g.config('user.name', 'Scott Chacon') # sets value
46-
#g.config('user.email', 'email@email.com') # sets value
47-
#g.config('user.name') # returns 'Scott Chacon'
48-
#g.config # returns whole config hash
45+
# g.config('user.name', 'Scott Chacon') # sets value
46+
# g.config('user.email', 'email@email.com') # sets value
47+
# g.config('user.name') # returns 'Scott Chacon'
48+
# g.config # returns whole config hash
4949
def config(name = nil, value = nil)
5050
lib = Git::Lib.new
51-
if(name && value)
51+
if name && value
5252
# set value
5353
lib.config_set(name, value)
54-
elsif (name)
54+
elsif name
5555
# return value
5656
lib.config_get(name)
5757
else
@@ -245,23 +245,23 @@ def self.default_branch(repository, options = {})
245245
# remote, 'origin.'
246246
def self.export(repository, name, options = {})
247247
options.delete(:remote)
248-
repo = clone(repository, name, {:depth => 1}.merge(options))
248+
repo = clone(repository, name, { depth: 1 }.merge(options))
249249
repo.checkout("origin/#{options[:branch]}") if options[:branch]
250250
FileUtils.rm_r File.join(repo.dir.to_s, '.git')
251251
end
252252

253253
# Same as g.config, but forces it to be at the global level
254254
#
255-
#g.config('user.name', 'Scott Chacon') # sets value
256-
#g.config('user.email', 'email@email.com') # sets value
257-
#g.config('user.name') # returns 'Scott Chacon'
258-
#g.config # returns whole config hash
255+
# g.config('user.name', 'Scott Chacon') # sets value
256+
# g.config('user.email', 'email@email.com') # sets value
257+
# g.config('user.name') # returns 'Scott Chacon'
258+
# g.config # returns whole config hash
259259
def self.global_config(name = nil, value = nil)
260260
lib = Git::Lib.new(nil, nil)
261-
if(name && value)
261+
if name && value
262262
# set value
263263
lib.global_config_set(name, value)
264-
elsif (name)
264+
elsif name
265265
# return value
266266
lib.global_config_get(name)
267267
else

‎lib/git/author.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ class Author
55
attr_accessor :name, :email, :date
66

77
def initialize(author_string)
8-
if m = /(.*?) <(.*?)> (\d+) (.*)/.match(author_string)
9-
@name = m[1]
10-
@email = m[2]
11-
@date = Time.at(m[3].to_i)
12-
end
8+
return unless m = /(.*?) <(.*?)> (\d+) (.*)/.match(author_string)
9+
10+
@name = m[1]
11+
@email = m[2]
12+
@date = Time.at(m[3].to_i)
1313
end
1414
end
1515
end

0 commit comments

Comments
 (0)