code-formatter 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c7b0f3c7297e02c389288c3d100ff1c016b2918a0d279ca933ebef96173333
-  data.tar.gz: 5749cdbdd67817ec0ecebd120821fb711d0a13f8535437b8594942743cf147ef
+  metadata.gz: 5657be24135ba626de8738ccf7348eb048eee38f937234491bcbdba18a5a24e9
+  data.tar.gz: 52a9238dec5aa5187273f473388f9d7595aee49066ae3bbf2d3743b8a3b4e636
 SHA512:
-  metadata.gz: 1d6dcd3ca58b9c1911079893d3ea222a787261bd20fa409090af00d9892963ccd7a024f9a55bd182f3282280b498ffb12034cb9c070e4057416a71c9df30c2df
-  data.tar.gz: 0aa865fe99d78f72de31a88aa4021d9c66a4c127ba796d5bb0b256c49c4ecccac55514c45d16c2149630352e878bb69299eebbac35a3ee7ad91e836330d33320
+  metadata.gz: 48bb4d1682ac1fb8f89ef27584347b65f658a9801ed8b6df6464384b22b085fba6483fcd45f44c3f6c4b70880930acc30e3c5d73ab4e9a05dbf85f5efc64a781
+  data.tar.gz: 8ef5f4598e212fb5cc0086440aff0d4ce9f51154317c7412835fd6e62c96d94194e2fc6ae8baf1dbe835de787ea8c01a25a85ade7f14f49f52b1f9896650e395

data/lib/code_formatter/cli.rb

@@ -4,6 +4,7 @@ require_relative 'initializer'
 require_relative 'configuration'
 require_relative 'formatters/swift_format_formatter'
 require_relative 'formatters/swift_lint_formatter'
+require_relative 'formatters/clang_format_formatter'
 require 'thor'
 
 module CodeFormatter
@@ -21,7 +22,11 @@ module CodeFormatter
       config = Configuration.load_from(options[:config])
       force_all = options[:force_all]
       path = options[:path]
-      formatters = [SwiftFormatFormatter.new(config, path), SwiftLintFormatter.new(config, path)]
+      formatters = [
+        SwiftFormatFormatter.new(config, path),
+        SwiftLintFormatter.new(config, path),
+        ClangFormatFormatter.new(config, path)
+      ]
       formatters.each { |f| f&.format(force_all) }
     end
   end

data/lib/code_formatter/formatters/clang_format_formatter.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative 'formatter'
+require 'yaml'
+
+module CodeFormatter
+  class ClangFormatFormatter < Formatter
+    def format_files(files)
+      `clang-format -i -style="#{style_dump}" #{files.join(' ')}`
+    end
+
+    def shell_command
+      'clang-format'
+    end
+
+    def files_filter
+      "'*.h' '*.m' '*.mm' '*.c' '*.cpp'"
+    end
+
+    private
+
+    def style_dump
+      style_yaml.to_s.gsub('=>', ' : ')
+    end
+
+    def style_yaml
+      file = File.expand_path('../../resources/clang_format_style.yml', __FILE__)
+      YAML.load_file(file)
+    end
+  end
+end

data/lib/code_formatter/formatters/formatter.rb

@@ -14,8 +14,73 @@ module CodeFormatter
       @path = path
     end
 
-    def format(*)
+    def format(force_all = false)
+      return unless commands_exist?
+
+      files = files_to_format(force_all)
+      if files.empty?
+        puts "[#{shell_command}]: everything is up-to-date"
+      else
+        puts "[#{shell_command}]: going to format files:\n#{files.join('\n')}"
+        format_files(files)
+      end
+    end
+
+    def format_files(*)
       raise NotImplementedError
     end
+
+    def shell_command
+      raise NotImplementedError
+    end
+
+    def files_filter
+      raise NotImplementedError
+    end
+
+    def commands_exist?
+      unless Environment.exist? 'git'
+        warn 'warning: failed to find git command'
+        return false
+      end
+
+      unless Environment.exist? shell_command
+        warn "warning: [#{shell_command}] not found (to install it run 'brew install #{shell_command}')"
+        return false
+      end
+
+      true
+    end
+
+    def files_to_format(force_all)
+      files = force_all ? all_files : modified_and_staged_files
+      files.lines.uniq.map { |f| File.expand_path f.strip }.select { |f| format_file? f }
+    end
+
+    def all_files
+      `git ls-files -- #{files_filter}`
+    end
+
+    def modified_and_staged_files
+      modified_and_untracked = `git ls-files --others --exclude-standard -m -- #{files_filter}`
+      staged = `git diff --cached --name-only -- #{files_filter}`
+      modified_and_untracked + staged
+    end
+
+    def format_file?(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, path) }
+      included_files.any? { |f| file.start_with?(f) }
+    end
+
+    def excluded_file?(file)
+      excluded_files = config.excluded_files.map { |f| File.expand_path(f, path) }
+      excluded_files.any? { |f| file.start_with?(f) }
+    end
   end
 end

data/lib/code_formatter/formatters/swift_format_formatter.rb

@@ -5,68 +5,21 @@ require 'yaml'
 
 module CodeFormatter
   class SwiftFormatFormatter < Formatter
-    def format(force_all = false)
-      unless Environment.exist? 'git'
-        warn 'warning: failed to find git command'
-        return
-      end
-
-      unless Environment.exist? 'swiftformat'
-        warn "warning: [swiftformat] not found (to install it run 'brew install swiftformat')"
-        return
-      end
-
-      files = files_to_format(force_all)
-      if files.empty?
-        puts '[swiftformat]: everything is up-to-date'
-      else
-        puts "[swiftformat]: going to format files:\n#{files.join('\n')}"
-        format_files(files)
-      end
-    end
-
-    private
-
-    def files_to_format(force_all)
-      files = force_all ? all_files : modified_and_staged_files
-      files.lines.uniq.map { |f| File.expand_path f.strip }.select { |f| format_file? f }
-    end
-
-    def all_files
-      `git ls-files -- #{files_filter}`
+    def format_files(files)
+      disabled = disabled_rules.join(',')
+      enabled = enabled_rules.join(',')
+      `swiftformat #{files.join(' ')} --disable #{disabled} --enable #{enabled}`
     end
 
-    def modified_and_staged_files
-      modified_and_untracked = `git ls-files --others --exclude-standard -m -- #{files_filter}`
-      staged = `git diff --cached --name-only -- #{files_filter}`
-      modified_and_untracked + staged
+    def shell_command
+      'swiftformat'
     end
 
     def files_filter
       "'*.swift'"
     end
 
-    def format_file?(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, path) }
-      included_files.any? { |f| file.start_with?(f) }
-    end
-
-    def excluded_file?(file)
-      excluded_files = config.excluded_files.map { |f| File.expand_path(f, path) }
-      excluded_files.any? { |f| file.start_with?(f) }
-    end
-
-    def format_files(files)
-      disabled = disabled_rules.join(',')
-      enabled = enabled_rules.join(',')
-      `swiftformat #{files.join(' ')} --disable #{disabled} --enable #{enabled}`
-    end
+    private
 
     # @return [[String]] enabled rules
     def enabled_rules

data/lib/code_formatter/formatters/swift_lint_formatter.rb

@@ -6,18 +6,21 @@ 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
-
+    def format_files(_)
       create_config do |file|
         system("swiftlint autocorrect --path #{path} --config #{file.path}")
         system("swiftlint --path #{path} --config #{file.path}")
       end
     end
 
+    def shell_command
+      'swiftlint'
+    end
+
+    def files_filter
+      "'*.swift'"
+    end
+
     private
 
     def create_config

data/lib/code_formatter/resources/clang_format_style.yml

@@ -0,0 +1,12 @@
+BasedOnStyle : WebKit
+BreakBeforeBraces : Attach
+BinPackArguments: false
+BinPackParameters: false
+AllowAllParametersOfDeclarationOnNextLine: false
+SpacesInSquareBrackets : false
+PointerAlignment : Right
+PenaltyReturnTypeOnItsOwnLine : 300
+ColumnLimit : 0
+AllowShortBlocksOnASingleLine: true
+AlignTrailingComments: true
+AllowShortFunctionsOnASingleLine: false

data/lib/code_formatter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CodeFormatter
-  VERSION = '1.0.6'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-formatter
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - sroik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -107,10 +107,12 @@ files:
 - lib/code_formatter/cli.rb
 - lib/code_formatter/configuration.rb
 - lib/code_formatter/environment.rb
+- lib/code_formatter/formatters/clang_format_formatter.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/clang_format_style.yml
 - lib/code_formatter/resources/sample_config.config
 - lib/code_formatter/resources/swiftformat_rules.yml
 - lib/code_formatter/resources/swiftlint.yml