code-formatter 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e67231f2c92f4cacfe14a9b4365973f243afcf889f7e39d57f7478241460286
-  data.tar.gz: 05edaeeb2af2dc1b4edcfbc89fcaad5a7a17560fdbb2a04a45f5bd4f656bba94
+  metadata.gz: d4c7b0f3c7297e02c389288c3d100ff1c016b2918a0d279ca933ebef96173333
+  data.tar.gz: 5749cdbdd67817ec0ecebd120821fb711d0a13f8535437b8594942743cf147ef
 SHA512:
-  metadata.gz: edced0376cedeeac2142113b58949ce6248dc748fd0b2445db3563b146e4712c5df24d56f799fe1afb040bf79c8968516984f694ba1fdbf2a5194d63b7a1b09a
-  data.tar.gz: 510a3083c3a036f024c0b5eccf397c5a35f3a521ce00ef027d31ee176c53254c103ec29d732681f816c68b37963740c9bd1ba34ce00d937cd5da50934a9bceaf
+  metadata.gz: 1d6dcd3ca58b9c1911079893d3ea222a787261bd20fa409090af00d9892963ccd7a024f9a55bd182f3282280b498ffb12034cb9c070e4057416a71c9df30c2df
+  data.tar.gz: 0aa865fe99d78f72de31a88aa4021d9c66a4c127ba796d5bb0b256c49c4ecccac55514c45d16c2149630352e878bb69299eebbac35a3ee7ad91e836330d33320

data/bin/code-formatter

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require File.expand_path('../../lib/code_formatter', __FILE__)
 CodeFormatter::CLI.start(ARGV)

data/lib/code_formatter.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'code_formatter/cli'

data/lib/code_formatter/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'initializer'
 require_relative 'configuration'
 require_relative 'formatters/swift_format_formatter'
@@ -14,11 +16,13 @@ module CodeFormatter
     desc 'format', 'format code with configuration'
     option :config, default: Initializer.initialized_config, aliases: '-c', type: :string, desc: 'configuration file'
     option :path, default: Dir.pwd, aliases: '-p', type: :string, desc: 'destination path'
+    option :force_all, default: false, aliases: '-fa', type: :boolean, desc: 'force all files to format'
     def format
       config = Configuration.load_from(options[:config])
+      force_all = options[:force_all]
       path = options[:path]
       formatters = [SwiftFormatFormatter.new(config, path), SwiftLintFormatter.new(config, path)]
-      formatters.each(&:format)
+      formatters.each { |f| f&.format(force_all) }
     end
   end
 end

data/lib/code_formatter/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CodeFormatter
   class Configuration
     attr_accessor :included_files

data/lib/code_formatter/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CodeFormatter
   class Environment
     def self.exist?(command)

data/lib/code_formatter/formatters/formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../environment'
 
 module CodeFormatter
@@ -12,7 +14,7 @@ module CodeFormatter
       @path = path
     end
 
-    def format
+    def format(*)
       raise NotImplementedError
     end
   end

data/lib/code_formatter/formatters/swift_format_formatter.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require_relative 'formatter'
 require 'yaml'
 
 module CodeFormatter
   class SwiftFormatFormatter < Formatter
-    def format
+    def format(force_all = false)
       unless Environment.exist? 'git'
         warn 'warning: failed to find git command'
         return
@@ -14,7 +16,7 @@ module CodeFormatter
         return
       end
 
-      files = files_to_format
+      files = files_to_format(force_all)
       if files.empty?
         puts '[swiftformat]: everything is up-to-date'
       else
@@ -25,12 +27,23 @@ module CodeFormatter
 
     private
 
-    def files_to_format
-      filter = "'*.swift'"
-      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| format_file? f }
+    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 files_filter
+      "'*.swift'"
     end
 
     def format_file?(file)

data/lib/code_formatter/formatters/swift_lint_formatter.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require_relative 'formatter'
 require 'yaml'
 require 'tempfile'
 
 module CodeFormatter
   class SwiftLintFormatter < Formatter
-    def format
+    def format(*)
       unless Environment.exist? 'swiftlint'
         warn "warning: [swiftlint] not found (to install it run 'brew install swiftlint')"
         return

data/lib/code_formatter/initializer.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module CodeFormatter
-  SAMPLE_CONFIG_DIR = './'.freeze
-  SAMPLE_CONFIG_FILE = 'code_formatter.config'.freeze
+  SAMPLE_CONFIG_DIR = './'
+  SAMPLE_CONFIG_FILE = 'code_formatter.config'
 
   class Initializer
     def self.init

data/lib/code_formatter/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CodeFormatter
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-formatter
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - sroik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor