danger-swiftlint 0.29.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d720b57c16c8aff2cce79424d89a1842fa8b75429b76ffd9ec8996dbad156165
-  data.tar.gz: f31202cd4c98f1060bbe1ea0e533f4dc97796ec6eff28f27baf806f77fa1944a
+  metadata.gz: 9fa52887f31bab6965b197dd6c9db017de701059dc53cb869ef6b995c1d5e8b8
+  data.tar.gz: 20fb5fe8b9837f15394d629e4556da56e851d14f41b8b7d4478602638e5bc10e
 SHA512:
-  metadata.gz: ca97ce0a8f2c819dd0dda81b68bb7ef7244ac0f454b9f7769eb927c9ed85944c185cfb641d8b3517c0b0b7972991de058cf953fc450404c2d37532b47ddcf1fe
-  data.tar.gz: 6ed0689373d2fe221abbd1f9be170d1b8a1e8087e53640a3b157273c9b63ca391125b40241b5e17e27c4217531424e0759ff562ad934e57097f67d2001d0e0df
+  metadata.gz: 97ac4fd4183005accf2dcec0df94e2de34563cea7b16924a7adb90f93f1924eab734a374d328d78707ecc2fb4fe54bcaaf0cee3b8d5cc8be5c59e292b03149e0
+  data.tar.gz: eb785108b4887f040842302f7771b90c11674f23e21ef90c0975a4b66f6c85fd3871a8602ce693e76397c95e5e6d9d8051d243e82bbffa644cfa3578c13bcbfb

data/ext/swiftlint/Rakefile

@@ -12,10 +12,11 @@ namespace :swiftlint do
     ASSET = 'portable_swiftlint.zip'
     URL = "#{REPO}/releases/download/#{VERSION}/#{ASSET}"
     DESTINATION = File.expand_path(File.join(File.dirname(__FILE__), 'bin'))
+    SCRIPT_PATH = File.expand_path(File.join(File.dirname(__FILE__)))
     SWIFTLINT_MD5_HASH = DangerSwiftlint::SWIFTLINT_HASH
 
     puts "Downloading swiftlint@#{VERSION}"
-    sh "sh downloadSwiftlint.sh -u #{URL} -d #{DESTINATION} -a #{ASSET} -dh #{SWIFTLINT_MD5_HASH}"
+    sh "#{SCRIPT_PATH}/downloadSwiftlint.sh -u #{URL} -d #{DESTINATION} -a #{ASSET} -dh #{SWIFTLINT_MD5_HASH}"
   end
 end
 

data/ext/swiftlint/downloadSwiftlint.sh

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+### Load arguments
+while [[ $# > 0 ]]
+do
+    case "$1" in
+        -u|--url)
+            url="$2"
+            shift;;
+
+        -d|--destination)
+            destination="$2"
+            shift;;
+
+        -a|--asset)
+            asset="$2"
+            shift;;
+
+        -dh|--default_hash)
+            default_hash="$2"
+            shift;;
+
+        --help|*)
+            echo "Usage:"
+            echo ' -u --url: URL for SwiftLint version to download'
+            echo ' -d --destination: Folder where SwiftLint will be downloaded'
+            echo " -a --asset: Temporary name for the zip file"
+            echo " -dh --default_hash: Default SwiftLint md5 hash to check for if no version specified"
+            exit 1;;
+    esac
+    shift
+done
+
+### Download
+mkdir -p "${destination}"
+curl -s -L "${url}" -o "${asset}"
+
+# If macOS
+if [[ "$OSTYPE" == "darwin"* ]]; then
+   resulting_hash=`md5 -q ${asset}`
+# Default to linux
+else
+   resulting_hash=`md5sum ${asset} | awk '{ print $1 }'`
+fi
+
+if [[ ! -z "${SWIFTLINT_VERSION}" || "$resulting_hash" == "${default_hash}" ]]; then
+  # if another version is set || our hardcoded hash is correct
+  unzip -o -q "${asset}" -d "${destination}"
+else
+  echo "Zip was corrupted, try again later."
+fi
+rm "${asset}"

data/lib/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.29.1'
-  SWIFTLINT_VERSION = '0.43.1'
+  VERSION = '0.30.0'
+  SWIFTLINT_VERSION = '0.46.2'
   SWIFTLINT_HASH = '4eaeabbb43b308975d16e3d9869880dc'
 end

data/spec/danger_plugin_spec.rb

@@ -220,6 +220,7 @@ module Danger
         end
 
         it 'crashes if renamed_files is not configured properly' do
+          allow_any_instance_of(Swiftlint).to receive(:lint).and_return('')
           allow(@swiftlint.git).to receive(:modified_files).and_return([
                                                                          'spec/fixtures/SwiftFileThatWasRenamedToSomethingElse.swift'
                                                                        ])
@@ -227,6 +228,7 @@ module Danger
         end
 
         it 'does not crash if a modified file was renamed' do
+          allow_any_instance_of(Swiftlint).to receive(:lint).and_return('')
           allow(@swiftlint.git).to receive(:modified_files).and_return([
                                                                          'spec/fixtures/SwiftFileThatWasRenamedToSomethingElse.swift'
                                                                        ])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -155,6 +155,7 @@ extra_rdoc_files: []
 files:
 - bin/danger-swiftlint
 - ext/swiftlint/Rakefile
+- ext/swiftlint/downloadSwiftlint.sh
 - ext/swiftlint/swiftlint.rb
 - lib/danger_plugin.rb
 - lib/version.rb
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.