code-formatter 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd1e2ccc28235296e5b318a547d80f108be3fb4e0f31efcc167680030a129c4
-  data.tar.gz: 3c5da8161f062fe201805689190512634e1f0c6dfda09c0de5f1408301eaa217
+  metadata.gz: 865105745c3f2d3fb50fc610d8f6971159fc4f2fa45bb9c8fac3e3e2c5a3b1e3
+  data.tar.gz: 5aad10ead21110a08016fb61154ecc720ecbcc5c8ad42647a1bc5e1676c0833e
 SHA512:
-  metadata.gz: 92196d4d5c50aac1218ed7b8eefe1ea77b389a51b7d4e733666894388f941a7081b8f11f50d9d52fa4b6f5aceae809c75ba08db0137ec29f74b1eb224b13dd3d
-  data.tar.gz: 50c7c115f88f78ba9c874f78c59b2c81ab2454dd1390decf440b5b5a3ad607e8e8cc1d4431aadff5767fd5e7d9cedcf864e66ab02045c0a6d43121c883b548df
+  metadata.gz: 180aad68a1b54483167924217eda171f1090ddd5c28eccd9043d2a18b73d19aaa6ef1c9913646719f39519ef82b3ac940457fa086d6f67f12909804e1c929a02
+  data.tar.gz: 6d408f0b1cba8c2885b368fdc2334375de5e1cabf7958227288047c93895b1c3aaea6a7e4d597e4736ae3fe224ae57d17725357ffc9b6fe4fb438e5b6bc883f7

data/lib/code_formatter/cli.rb

@@ -1,6 +1,7 @@
 require_relative 'initializer'
 require_relative 'configuration'
 require_relative 'formatters/swift_format_formatter'
+require_relative 'formatters/swift_lint_formatter'
 require 'thor'
 
 module CodeFormatter
@@ -15,7 +16,7 @@ module CodeFormatter
     def format
       config_file = options[:config]
       config = Configuration.load_from(config_file)
-      formatters = [SwiftFormatFormatter.new(config)]
+      formatters = [SwiftFormatFormatter.new(config), SwiftLintFormatter.new(config)]
       formatters.each(&:format)
     end
   end

data/lib/code_formatter/configuration.rb

@@ -2,15 +2,11 @@ module CodeFormatter
   class Configuration
     attr_accessor :included_files
     attr_accessor :excluded_files
-    attr_accessor :included_dirs
-    attr_accessor :excluded_dirs
     attr_accessor :source_file
 
     def initialize
       self.included_files = []
       self.excluded_files = []
-      self.included_dirs = []
-      self.excluded_dirs = []
 
       yield self if block_given?
     end

data/lib/code_formatter/environment.rb

@@ -0,0 +1,7 @@
+module CodeFormatter
+  class Environment
+    def self.exist?(command)
+      !`which #{command}`.empty?
+    end
+  end
+end

data/lib/code_formatter/formatters/formatter.rb

@@ -1,10 +1,15 @@
+require_relative '../environment'
+
 module CodeFormatter
   class Formatter
     attr_reader :config
+    attr_reader :entry_point
 
-    def initialize(config)
+    def initialize(config, entry_point = Dir.pwd)
       raise TypeError unless config.is_a? Configuration
+      raise TypeError unless Dir.exist?(entry_point)
       @config = config
+      @entry_point = entry_point
     end
 
     def format

data/lib/code_formatter/formatters/swift_format_formatter.rb

@@ -1,24 +1,24 @@
-require 'yaml'
 require_relative 'formatter'
+require 'yaml'
 
 module CodeFormatter
   class SwiftFormatFormatter < Formatter
     def format
-      unless exist? 'git'
+      unless Environment.exist? 'git'
         warn 'warning: failed to find git command'
         return
       end
 
-      unless exist? 'swiftformat'
+      unless Environment.exist? 'swiftformat'
         warn "warning: [swiftformat] not found (to install it run 'brew install swiftformat')"
         return
       end
 
       files = files_to_format
       if files.empty?
-        puts 'everything is up-to-date'
+        puts '[swiftformat]: everything is up-to-date'
       else
-        puts "going to format files:\n#{files.join('\n')}"
+        puts "[swiftformat]: going to format files:\n#{files.join('\n')}"
         format_files(files)
       end
     end
@@ -30,11 +30,24 @@ module CodeFormatter
       modified_and_untracked = `git ls-files --others --exclude-standard -m -- #{filter}`
       staged = `git diff --cached --name-only -- #{filter}`
       all_files = modified_and_untracked + staged
-      all_files.lines.uniq.map { |f| File.expand_path f.strip }.select { |f| File.exist? f }
+      all_files.lines.uniq.map { |f| File.expand_path f.strip }.select { |f| format_file? f }
+    end
+
+    def format_file?(file)
+      puts file
+      return false unless File.file?(file) && File.exist?(file)
+      return false if excluded_file?(file)
+      included_file?(file)
+    end
+
+    def included_file?(file)
+      included_files = config.included_files.map { |f| File.expand_path(f, entry_point) }
+      included_files.any? { |f| file.start_with?(f) }
     end
 
-    def exist?(command)
-      !`which #{command}`.empty?
+    def excluded_file?(file)
+      excluded_files = config.excluded_files.map { |f| File.expand_path(f, entry_point) }
+      excluded_files.any? { |f| file.start_with?(f) }
     end
 
     def format_files(files)

data/lib/code_formatter/formatters/swift_lint_formatter.rb

@@ -0,0 +1,40 @@
+require_relative 'formatter'
+require 'yaml'
+require 'tempfile'
+
+module CodeFormatter
+  class SwiftLintFormatter < Formatter
+    def format
+      unless Environment.exist? 'swiftlint'
+        warn "warning: [swiftlint] not found (to install it run 'brew install swiftlint')"
+        return
+      end
+
+      create_config do |file|
+        `swiftlint autocorrect --config #{file.path}`
+        `swiftlint --config #{file.path}`
+      end
+    end
+
+    private
+
+    def create_config
+      file = Tempfile.new(%w[swiftlint .yml])
+      begin
+        file.write(swiftlint_config)
+        file.close
+        yield file if block_given?
+      ensure
+        file.unlink
+      end
+    end
+
+    def swiftlint_config
+      rules_file = File.expand_path('../../resources/swiftlint.yml', __FILE__)
+      yaml_hash = YAML.load_file(rules_file)
+      yaml_hash['included'] = config.included_files
+      yaml_hash['excluded'] = config.excluded_files
+      yaml_hash.to_yaml
+    end
+  end
+end

data/lib/code_formatter/resources/sample_config.config

@@ -1,6 +1,4 @@
 CodeFormatter::Configuration.new do |c|
   c.included_files = ['path/to/included/file.ext']
   c.excluded_files = ['path/to/excluded/file.ext']
-  c.included_dirs = ['path/to/included/dir']
-  c.excluded_dirs = ['path/to/excluded/dir']
 end

data/lib/code_formatter/resources/swiftlint.yml

@@ -0,0 +1,21 @@
+disabled_rules:
+  - line_length
+  - type_body_length
+  - identifier_name
+  - type_name
+  - weak_delegate
+  - redundant_string_enum_value
+  - notification_center_detachment
+  - unused_closure_parameter
+  - function_parameter_count
+  - cyclomatic_complexity
+
+force_cast: warning
+
+file_length:
+  warning: 500
+  error: 1000
+
+function_body_length:
+  warning: 70
+  error: 100

data/lib/code_formatter/version.rb

@@ -1,3 +1,3 @@
 module CodeFormatter
-  VERSION = '0.0.12'.freeze
+  VERSION = '0.0.13'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - sroik
@@ -106,11 +106,14 @@ files:
 - lib/code_formatter.rb
 - lib/code_formatter/cli.rb
 - lib/code_formatter/configuration.rb
+- lib/code_formatter/environment.rb
 - lib/code_formatter/formatters/formatter.rb
 - lib/code_formatter/formatters/swift_format_formatter.rb
+- lib/code_formatter/formatters/swift_lint_formatter.rb
 - lib/code_formatter/initializer.rb
 - lib/code_formatter/resources/sample_config.config
 - lib/code_formatter/resources/swiftformat_rules.yml
+- lib/code_formatter/resources/swiftlint.yml
 - lib/code_formatter/version.rb
 homepage: https://github.com/app-craft/code-formatter
 licenses: