danger-apple_swift_format 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef06d222edf6945a8e98b8163f95a0d815ea55529ddacb20513a27ba5a94330
-  data.tar.gz: 978a1a67f625aae479d3d0217e1569d2229f4c6b9a045b81c899e4eb3943773f
+  metadata.gz: 12f6813d86d9cd91182c4614e60c3501126bec35be44a9ba9a48fcde9b58cd55
+  data.tar.gz: ed3d2db8cb3bf73a8858ae4ff854fe90cd0d326ba328ba4b8415b70a09f46776
 SHA512:
-  metadata.gz: c00be54edc36a103fd0b6ff8b5f7732a091a25aae24182ed24a176c12d6008167ce7ee32750efc9a692c5bcfceea4ca7926f8f4ca7f8635f4c3b8ff1a32990f8
-  data.tar.gz: e82b7fdfb9c7fddd3a3c81267fa602e163dd007d26186a5ca19be24aa5ba59b7a9f9200404e1c265aff3b8cea405ba3e9feedf23bdebc15fea35f204365170a5
+  metadata.gz: e459f94dad96741abf74607b55e8134e31680acc3d8f9d97c9d67f00bcac9876df434ee36a381fcbe72c4ebbb394a81c52a11adfe76992b5889017977ccd4ab9
+  data.tar.gz: c62f534ef0fe819653d63e182b27743e4bccc66598ff4585b35331dbccdddd0213862955cc0d2aa8cdcd6129a425e308b54f6faea179cc642d749b9479d0e6ab

data/.ruby-version

@@ -0,0 +1 @@
+2.6.6

data/Dangerfile

@@ -1,3 +1,4 @@
 swift_format.binary_path = ".build/x86_64-apple-macosx/release/swift-format"
 swift_format.configuration = "swift-format.json"
-swift_format.lint("example/example.swift")
+swift_format.lint(["example/example.swift", "Dangerfile"])
+swift_format.format(["example/example.swift", "Dangerfile"])

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-apple_swift_format (0.0.2)
+    danger-apple_swift_format (0.0.7)
       danger-plugin-api (~> 1.0)
 
 GEM
@@ -19,7 +19,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.0.4)
+    danger (8.0.5)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -27,7 +27,7 @@ GEM
       faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
       git (~> 1.7)
-      kramdown (~> 2.0)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
@@ -83,7 +83,7 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (10.5.0)
     rb-fsevent (0.10.4)

data/lib/swift_format/gem_version.rb

@@ -1,3 +1,3 @@
 module SwiftFormat
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.7".freeze
 end

data/lib/swift_format/plugin.rb

@@ -29,7 +29,10 @@ module Danger
     # @return   [Array<String>]
     #
     def lint(files)
-      o, e, s = Open3.capture3("#{binary_path} lint -r --configuration #{configuration} #{files}")
+      target = target_file(files)
+      return if target.empty?
+
+      o, e, s = Open3.capture3("#{binary_path} lint -r --configuration #{configuration} #{target}")
       return if e == ''
       warn e
     end
@@ -37,12 +40,26 @@ module Danger
     # run swift-format format
     # @return   [Array<String>]
     #
-    def format(files, in_place = false)
-      in_place_option = "-i"
-      in_place_option = '' if !in_place
-      o, e, s = Open3.capture3("#{binary_path} format -r #{in_place_option} --configuration #{configuration} #{files}")
-      return if e == ''
-      warn e
+    def format(files)
+      target = target_file(files)
+      return if target.empty?
+
+      `#{binary_path} format -r  -i --configuration #{configuration} #{target}`
+      o, e, s = Open3.capture3("git diff #{target}")
+      return if o == ''
+      warn o
+    end
+
+    def target_file(files)
+      target_files = []
+      
+      if files.instance_of?(String)
+        target_files = files.split(' ')
+      else
+        target_files = files
+      end
+
+      target_files.select { |f| f.include? '.swift' } .join(' ')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-apple_swift_format
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - kaito watanabe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -159,6 +159,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Dangerfile
 - Gemfile
@@ -182,7 +183,7 @@ homepage: https://github.com/marumemomo/danger-swift_format
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: danger plugin for apple/swift-format.
 test_files: