danger-swiftlint 0.29.0 → 0.29.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89b230420b8fc4ed137f2f810f90ecfe1a2b5b21462f1b0e76182fe31cecbab6
-  data.tar.gz: c52458c295da590c900b304cf20f81550a9c582eddc1222dd00cd37335057b3a
+  metadata.gz: '09f08823f729e2d57b4149feb6a5464ba21ca96f7bc0f07d8e156b0c21a90321'
+  data.tar.gz: 91fdc081552de5d57997b820c7bdffd6c63a4776f0db5d7358507676b6a58971
 SHA512:
-  metadata.gz: 6f9c281be0a79eb84b0b0bcaf0d3db12aefa058edcf6f6a376011d1ce339fe811107ccbee8ffcb7e95a08b412e884f9f43e57c5740809bcbbce4bd5be7dc1cf0
-  data.tar.gz: 602daf0375c26ed2de38ce0724e74ebf70287b24901b7eea6071dd722fdc8cc3d519654fc677053330c4397205351ce17b596b23e3c1283aa61215dea531e007
+  metadata.gz: cd93c164498ca997aab3c43928a4224c221b9124cda9b1af7a345139625677dd7622ca0d1d003416dbfce07a8e8a04b96c59528850d7c37bd99fa5e897e986ea
+  data.tar.gz: b78f4534c8f9882fe81b7a2cbd73d63de101dd3074b91525f72a766b7bbb0565421c913bac521e981e63260fab21eb76ff53a4fe3a1ba3ab6a367893a24bb035

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 "./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.0'
+  VERSION = '0.29.4'
   SWIFTLINT_VERSION = '0.43.1'
   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.0
+  version: 0.29.4
 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: 2021-09-15 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