xcode-install 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5f95c1ec6494fb1482c6862a786fd3f149327096468dbfd01886d6a320ab31f
-  data.tar.gz: ef0e89795d7a5169a97adb29467025693644db1a8805e1ae395cd76066ae2569
+  metadata.gz: 04e0e30f2230e52da44a3710cf8277f8d5e82e67d2a18d4dfa98fb9a3f40570e
+  data.tar.gz: 5c058cb7d8adcb3e4f800091cf7531ad8ad2010c243e8e685639df1feb658e04
 SHA512:
-  metadata.gz: 4fa023f63479190d92da8f7a54d9ac0a9556eab534e4e4ea4a784f6bbd10837678910570dd9665d409214d52e47432ebafa99aaae0a9022097bde4540d42390f
-  data.tar.gz: 73c28ae14d7081a62376ce4611cae869987b8e2681325770b20d8d5f3be153abc02c7c0e3b94828c703ab786dd5960a62c6f3b097b162b82be39cf197e031d99
+  metadata.gz: 21b099ccd6dd22bf8e7e652ea6ef8e1084260486784662c5781f8fa5ff169b75ec2d2dfb2cb855ba93de7a0e16519a73d9c0a07596e5b5c1d8eb70a0f2d3aae6
+  data.tar.gz: 5a14cef0170a25cdcc0d8dfd845f21463e0f7c38ae810a5e3328ce5f72a79eaa5fe380a70eee2c470b5395f791bce3e52ad551370491fd742e22718e8ce81626

data/.github/workflows/ci.yml

@@ -6,13 +6,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7"]
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
 
     runs-on: macos-latest
     steps:
     # Setup env
     - uses: actions/checkout@v2
-    - uses: actions/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: "${{ matrix.ruby }}"
 
@@ -26,8 +26,8 @@ jobs:
         echo $HOME
     
     # Prepare
-    - name: Install bundler 2.2.14
-      run: gem install bundler -v "~> 2.2.14"
+    - name: Install bundler 2.2.20
+      run: gem install bundler -v "~> 2.2.20"
     - name: Install ruby dependencies
       run: |
         bundle config --local clean 'true'

data/.rubocop_todo.yml

@@ -1,78 +1,213 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-08-24 11:09:20 +0200 using RuboCop version 0.49.1.
+# on 2021-07-06 16:06:45 UTC using RuboCop version 1.12.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'xcode-install.gemspec'
+
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
+Layout/ClosingHeredocIndentation:
   Exclude:
     - 'lib/xcode/install.rb'
 
 # Offense count: 12
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/xcode/install.rb'
+    - 'lib/xcode/install/cleanup.rb'
+    - 'lib/xcode/install/simulators.rb'
+    - 'lib/xcode/install/uninstall.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Layout/HeredocIndentation:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Lint/BooleanSymbol:
+  Exclude:
+    - 'lib/xcode/install/install.rb'
+    - 'lib/xcode/install/select.rb'
+    - 'lib/xcode/install/uninstall.rb'
+
+# Offense count: 6
+Lint/DuplicateMethods:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 2
+# Configuration parameters: MaximumRangeSize.
+Lint/MissingCopEnableDirective:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/UriRegexp:
+  Exclude:
+    - 'lib/xcode/install/install.rb'
+
+# Offense count: 12
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 44
+  Max: 45
 
-# Offense count: 4
-# Configuration parameters: CountComments, ExcludedMethods.
+# Offense count: 5
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine
 Metrics/BlockLength:
   Max: 76
 
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 246
-
-# Offense count: 3
+# Offense count: 6
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 11
-# Configuration parameters: CountComments.
+# Offense count: 17
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 51
+  Max: 50
 
 # Offense count: 1
-# Configuration parameters: CountKeywordArgs.
+# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 7
 
-# Offense count: 3
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 12
 
 # Offense count: 1
+Security/MarshalLoad:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: separated, grouped
+Style/AccessorGrouping:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 1
+Style/CombinableLoops:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/Encoding:
+  Exclude:
+    - 'xcode-install.gemspec'
+
+# Offense count: 14
 # Cop supports --auto-correct.
-Performance/CompareWithBlock:
+Style/ExpandPathArguments:
+  Exclude:
+    - 'bin/xcversion'
+    - 'bin/🎉'
+    - 'spec/cli_spec.rb'
+    - 'spec/curl_spec.rb'
+    - 'spec/install_spec.rb'
+    - 'spec/installed_spec.rb'
+    - 'spec/installer_spec.rb'
+    - 'spec/json_spec.rb'
+    - 'spec/list_spec.rb'
+    - 'spec/prerelease_spec.rb'
+    - 'spec/spec_helper.rb'
+    - 'spec/uninstall_spec.rb'
+    - 'xcode-install.gemspec'
+
+# Offense count: 28
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 8
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/xcode/install.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: IncludeActiveSupportAliases.
-Performance/DoubleStartEndWith:
+Style/RedundantBegin:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantRegexpEscape:
   Exclude:
     - 'lib/xcode/install.rb'
 
 # Offense count: 1
-Security/MarshalLoad:
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
   Exclude:
     - 'lib/xcode/install.rb'
 
-# Offense count: 15
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: only_raise, only_fail, semantic
 Style/SignalException:
   Exclude:
     - 'lib/xcode/install.rb'
-    - 'lib/xcode/install/cli.rb'
     - 'lib/xcode/install/install.rb'
     - 'lib/xcode/install/select.rb'
     - 'lib/xcode/install/simulators.rb'
     - 'lib/xcode/install/uninstall.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/StderrPuts:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/xcode/install.rb'
+    - 'spec/spec_helper.rb'

data/Gemfile

@@ -8,5 +8,5 @@ group :development do
   gem 'mocha', '~> 0.11.4'
   gem 'mocha-on-bacon'
   gem 'prettybacon'
-  gem 'rubocop', '~> 0.49.1', require: false
+  gem 'rubocop', '~> 1.18', require: false
 end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.8.0'.freeze
 end

data/lib/xcode/install.rb

@@ -710,11 +710,10 @@ HELP
       `touch #{cache_dir}com.apple.dt.Xcode.InstallCheckCache_#{osx_build_version}_#{tools_version}`
     end
 
-    # This method might take a few ms, this could be improved by implementing https://github.com/KrauseFx/xcode-install/issues/273
     def fetch_version
-      output = `DEVELOPER_DIR='' "#{@path}/Contents/Developer/usr/bin/xcodebuild" -version`
+      output = `/usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" "#{@path}/Contents/version.plist"`
       return '0.0' if output.nil? || output.empty? # ¯\_(ツ)_/¯
-      output.split("\n").first.split(' ')[1]
+      output.sub("\n", '')
     end
 
     def verify_integrity

data/spec/installed_spec.rb

@@ -5,13 +5,13 @@ module XcodeInstall
 
   describe InstalledXcode do
     it 'finds the current Xcode version with whitespace chars' do
-      InstalledXcode.any_instance.expects(:`).with("DEVELOPER_DIR='' \"#{xcode_path}/Contents/Developer/usr/bin/xcodebuild\" -version").returns("Xcode 6.3.1\nBuild version 6D1002")
+      InstalledXcode.any_instance.expects(:`).with("/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"#{xcode_path}/Contents/version.plist\"").returns('6.3.1')
       installed = InstalledXcode.new(xcode_path)
       installed.version.should == '6.3.1'
     end
 
     it 'is robust against broken Xcode installations' do
-      InstalledXcode.any_instance.expects(:`).with("DEVELOPER_DIR='' \"#{xcode_path}/Contents/Developer/usr/bin/xcodebuild\" -version").returns(nil)
+      InstalledXcode.any_instance.expects(:`).with("/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"#{xcode_path}/Contents/version.plist\"").returns(nil)
       installed = InstalledXcode.new(xcode_path)
       installed.version.should == '0.0'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.19
 signing_key: 
 specification_version: 4
 summary: Xcode installation manager.