diff --git a/bin/crew b/bin/crew index 6b8a5dca0..d36b4040d 100755 --- a/bin/crew +++ b/bin/crew @@ -1625,8 +1625,6 @@ def copy_package(pkg_name, prompt_msg = '') if PackageUtils.installed?('ruby_rubocop') puts "Using rubocop to sanitize #{pkg_file} .".orange system 'gem install rubocop' unless Kernel.system('rubocop --help 2>/dev/null', %i[out err] => File::NULL) - # Don't forget to install our personal rubocop extension. - system 'gem install rubocop-chromebrew' unless Kernel.system('rubocop --require rubocop-chromebrew --help 2>/dev/null', %i[out err] => File::NULL) system "rubocop -c #{File.join(CREW_LOCAL_REPO_ROOT, '.rubocop.yml')} -A #{pkg_file}", exception: true else puts 'Package '.lightred + 'ruby_rubocop'.orange + " is not installed. Rubocop will not be used to sanitize #{pkg_file} . 😔 You may try this: ".lightred + 'crew install ruby_rubocop'.lightblue diff --git a/lib/const.rb b/lib/const.rb index b7d5d6f5e..b1c3a544a 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -3,7 +3,7 @@ require 'etc' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.57.0' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.57.1' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine] diff --git a/packages/ruby_rubocop.rb b/packages/ruby_rubocop.rb index 7ea1006ce..1ae614b4a 100644 --- a/packages/ruby_rubocop.rb +++ b/packages/ruby_rubocop.rb @@ -21,6 +21,7 @@ class Ruby_rubocop < RUBY depends_on 'ruby_regexp_parser' # R depends_on 'ruby_rubocop' # R depends_on 'ruby_rubocop_ast' # R + depends_on 'ruby_rubocop_chromebrew' # R depends_on 'ruby_ruby_progressbar' # R depends_on 'ruby_unicode_display_width' # R depends_on 'xdg_base' # L diff --git a/packages/ruby_rubocop_chromebrew.rb b/packages/ruby_rubocop_chromebrew.rb index 3b6b046ae..5490ae962 100644 --- a/packages/ruby_rubocop_chromebrew.rb +++ b/packages/ruby_rubocop_chromebrew.rb @@ -1,9 +1,9 @@ require 'buildsystems/ruby' class Ruby_rubocop_chromebrew < RUBY - description "A RuboCop extension to enforce Chromebrew-specific practices." + description 'A RuboCop extension to enforce Chromebrew-specific practices.' homepage 'https://github.com/chromebrew/rubocop-chromebrew' - version "0.0.2-#{CREW_RUBY_VER}" + version "0.0.3-#{CREW_RUBY_VER}" license 'GPL-3.0-or-later' compatibility 'all' source_url 'SKIP'