danger-swiftformat 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c9b3279bd74c07c0484451302265163c566fb8cf833ee02f11d19c718452a08
-  data.tar.gz: b36e4a5b90fff935710634fa63d743b9a538b60830df7fd7b0bdf854dc3b461f
+  metadata.gz: 409a285528d5a1dba41e070e91342608f6b84730419d8827800c674826fccbaa
+  data.tar.gz: a85a7068013faac8cfebcd9d6634eb3655bc6c4859e2dff89031b54ccd00bded
 SHA512:
-  metadata.gz: 040feb0a05ffa56ac333620d1a162cfdc660743e0ff3dc26ba6223a437e4fab52b218c23d89c3bc6ff889793887ced05dc45e1f68b411f4184d2df698f58aacf
-  data.tar.gz: 44ab68d8cbd5b545bab694b4463c2232c269a5ab1bb6e5295c59f82d98f9f15445b3993bd96e4323babde11c1acc6b8b160ff44d7b33cf48b013c0b67f22c324
+  metadata.gz: 8b19e8845a690be835165b418def72f025e3b3320d6fcbc30b7c601cd177f80ef6f5b1eb2da85651b5d0f59d9011182cbc57ef580cf0147f3af553e0d9eb2c49
+  data.tar.gz: eab0e48b9b4c8c953ec9fd89a0ed3a3a434ea6ce5041457dee6ceb867b10bf0c0caa9c2980df8f0233c8e1d115ae7a72035060bf2febccd1c0c772e0d86455e5

data/.rubocop.yml

@@ -13,20 +13,16 @@ Style/StringLiterals:
 Style/ClassCheck:
   EnforcedStyle: kind_of?
 
-# It's better to be more explicit about the type
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 # specs sometimes have useless assignments, which is fine
 Lint/UselessAssignment:
   Exclude:
     - '**/spec/**/*'
 
 # We could potentially enable the 2 below:
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 
 # HoundCI doesn't like this rule
@@ -40,6 +36,15 @@ Style/DoubleNegation:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
 # Cop supports --auto-correct.
 Lint/UnusedBlockArgument:
   Enabled: false
@@ -133,7 +138,7 @@ Style/MixinGrouping:
 Naming/FileName:
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
 Style/SpecialGlobalVars:

data/.travis.yml

@@ -7,9 +7,10 @@ before_install:
 
 rvm:
   - 2.3.8
-  - 2.4.4
-  - 2.5.3
-  - 2.6.3
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
 
 script:
     - bundle exec rake spec

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in danger-swiftformat.gemspec
 gemspec
+gem "faraday", "0.15.4"

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    danger-swiftformat (0.6.0)
+    danger-swiftformat (0.7.0)
       danger-plugin-api (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
-    claide (1.0.2)
+    claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
@@ -19,14 +19,14 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (6.0.9)
+    danger (6.2.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
       faraday-http-cache (~> 2.0)
-      git (~> 1.5)
+      git (~> 1.6)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
@@ -39,10 +39,11 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.11.1)
+    ffi (1.12.2)
     formatador (0.2.5)
-    git (1.5.0)
-    guard (2.15.0)
+    git (1.6.0)
+      rchardet (~> 1.8)
+    guard (2.16.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -56,76 +57,79 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.4)
     kramdown (2.1.0)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.4)
     method_source (0.9.2)
     multipart-post (2.1.1)
     nap (1.1.0)
     nenv (0.3.0)
     no_proxy_fix (0.1.2)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.14.0)
+    octokit (4.16.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.3)
     rainbow (3.0.0)
     rake (12.3.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rchardet (1.8.0)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.73.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    ruby_dep (1.5.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     shellany (0.0.1)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
-    unicode-display_width (1.6.0)
-    yard (0.9.20)
+    thor (1.0.1)
+    unicode-display_width (1.6.1)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1)
   danger-swiftformat!
+  faraday (= 0.15.4)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
   listen (~> 3.1)
@@ -136,4 +140,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/README.md

@@ -8,7 +8,9 @@ This plugin is heavily inspired by [danger-swiftlint].
 
 Add this line to your Gemfile:
 
-    gem 'danger-swiftformat'
+```ruby
+gem 'danger-swiftformat'
+```
 
 [SwiftFormat] also needs to be installed before you run Danger.
 
@@ -60,6 +62,16 @@ The `exclude` option takes an array of glob patterns; you can find additional do
 4. Use `bundle exec guard` to automatically have tests run as you make changes.
 5. Make your changes.
 
+## Releasing a new version
+
+Use the release.sh script:
+
+```shell
+./scripts/release.sh
+```
+
+Then bump the gem to the next patch version.
+
 [Danger]: https://danger.systems/ruby/
 [SwiftFormat]: https://github.com/nicklockwood/SwiftFormat
 [danger-swiftlint]: https://github.com/ashfurrow/danger-ruby-swiftlint

data/danger-swiftformat.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{A danger plugin for checking Swift formatting using SwiftFormat.}
   spec.homepage      = 'https://github.com/garriguv/danger-swiftformat'
   spec.license       = 'MIT'
+  spec.metadata      = { "github_repo" => "ssh://github.com/garriguv/danger-ruby-swiftformat" }
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -21,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
 
   # General ruby development
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 12.3'
 
   # Testing support

data/lib/swiftformat/gem_version.rb

@@ -1,3 +1,3 @@
 module Swiftformat
-  VERSION = "0.6.0".freeze
+  VERSION = "0.7.0".freeze
 end

data/lib/swiftformat/swiftformat.rb

@@ -41,7 +41,7 @@ module Danger
       }
     end
 
-    ERRORS_REGEX = /rules applied:(.*)\n.*updated (.*)$/.freeze
+    ERRORS_REGEX = /Formatting\s(.*)\n-- rules applied:(.*)$/.freeze
 
     def errors(output)
       errors = []
@@ -49,14 +49,14 @@ module Danger
         next if match.count < 2
 
         errors << {
-            file: match[1],
-            rules: match[0].split(",").map(&:strip)
+            file: match[0],
+            rules: match[1].split(",").map(&:strip)
         }
       end
       errors
     end
 
-    RUNTIME_REGEX = /.*swiftformat completed.*(.+\..+)s/.freeze
+    RUNTIME_REGEX = /.*SwiftFormat completed.*(.+\..+)s/.freeze
 
     def run_time(output)
       if RUNTIME_REGEX.match(output)

data/scripts/release.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -euo pipefail
+
+version=$(cat lib/swiftformat/gem_version.rb | grep -o "\d\.\d\.\d")
+
+echo "Releasing version ${version}"
+
+echo "Releasing to rubygems.org"
+bundle exec rake release
+
+echo "Releasing to GitHub Package Registry"
+gem push \
+    --key github \
+    --host https://rubygems.pkg.github.com/garriguv \
+    pkg/danger-swiftformat-${version}.gem

data/spec/fixtures/swiftformat_output.txt

@@ -1,9 +1,11 @@
-running swiftformat...
-formatting /Users/garriguv/FirstClass.swift
+Running SwiftFormat...
+(dryrun mode - no files will be changed.)
+Formatting /Users/garriguv/FirstClass.swift
 -- no changes
-formatting /Users/garriguv/FileWithErrors.swift
+Formatting /Users/garriguv/FileWithErrors.swift
 -- no changes
-formatting /Users/garriguv/OtherFile.swift
+Formatting /Users/garriguv/OtherFile.swift
 -- no changes
 
-swiftformat completed. 0/3 files would have been updated in 0.08s
+SwiftFormat completed in 0.08s.
+0/3 files would have been formatted.

data/spec/fixtures/swiftformat_output_with_errors.txt

@@ -1,10 +1,11 @@
-running swiftformat...
-formatting /Users/garriguv/FirstClass.swift
+Running SwiftFormat...
+(dryrun mode - no files will be changed.)
+Formatting /Users/garriguv/FirstClass.swift
 -- no changes
-formatting /Users/garriguv/FileWithErrors.swift
- -- rules applied: consecutiveBlankLines, spaceAroundParens, trailingSpace
-would have updated /Users/garriguv/FileWithErrors.swift
-formatting /Users/garriguv/OtherFile.swift
+Formatting /Users/garriguv/FileWithErrors.swift
+-- rules applied: consecutiveBlankLines, spaceAroundParens, trailingSpace
+Formatting /Users/garriguv/OtherFile.swift
 -- no changes
 
-swiftformat completed. 1/3 files would have been updated in 0.08s
+SwiftFormat completed in 0.08s.
+1/3 files would have been formatted.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftformat
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Vincent Garrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ files:
 - lib/swiftformat/gem_version.rb
 - lib/swiftformat/plugin.rb
 - lib/swiftformat/swiftformat.rb
+- scripts/release.sh
 - spec/fixtures/swiftformat_output.txt
 - spec/fixtures/swiftformat_output_bad.txt
 - spec/fixtures/swiftformat_output_with_errors.txt
@@ -182,7 +183,8 @@ files:
 homepage: https://github.com/garriguv/danger-swiftformat
 licenses:
 - MIT
-metadata: {}
+metadata:
+  github_repo: ssh://github.com/garriguv/danger-ruby-swiftformat
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -198,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A danger plugin for checking Swift formatting using SwiftFormat.