code-formatter 0.0.1 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d073f21ef467d1c15daf8df14c8101d1f1f86fc10a5d48b34d8c6e8cb1083f4e
-  data.tar.gz: b173a0c4824441c58c6638ce4cceab78d099c0f906a29ef34d00b0c72d3eaf7d
+  metadata.gz: 8a2186a81c09f3674da9c86a60cc548f3728776e23b9900f587dad55a3c68cf2
+  data.tar.gz: 0abdf79e3bdd980077a69a6bbd6469bb30f1fe0bb914fe3918d71a0eb93822b2
 SHA512:
-  metadata.gz: 014f52f8bca01e78a28a04989166bc618010d1cf36cccd4611802848c312fa7629a392b0d249c05c1a5d3d0fbbdff850ee123f970fa67ce465ee90d33e49200f
-  data.tar.gz: 6992e1abac564527d8d0c8133bc7c304d849e4363dd04b5412cf16f5409e16a56d4fcf95d6cf9535de99a33d6800779627619fbacaf24542951b093b4f02f203
+  metadata.gz: 4a732d54f59a621462f90cd0df8598621579837d810598f6bcba94d369722ae51bf8b84418799307bf108c706af9e784fc8999a1faa91db5d2ab6775637141ae
+  data.tar.gz: d83247af31e3f4a254c801e44ae11381ebf33c8e479159d672187ebe08f1a325a0e65dcb40760c9687825539c0bc51b2652083da58f21df090918d1dab97bc3c

data/lib/code_formatter.rb

@@ -1,2 +1 @@
-require_relative 'src/cli'
-require_relative 'src/initializer'
+require_relative 'code_formatter/cli'

data/lib/code_formatter/cli.rb

@@ -0,0 +1,22 @@
+require_relative 'initializer'
+require_relative 'configuration'
+require_relative 'formatters/swift_format_formatter'
+require 'thor'
+
+module CodeFormatter
+  class CLI < Thor
+    desc 'init', 'initialize config'
+    def init
+      Initializer.init
+    end
+
+    desc 'format', 'format code with configuration'
+    option :config, default: Initializer.initialized_config, aliases: '-c', type: :string, desc: 'configuration file'
+    def format
+      config_file = options[:config]
+      config = Configuration.load_from(config_file)
+      formatters = [SwiftFormatFormatter.new(config)]
+      formatters.each(&:format)
+    end
+  end
+end

data/lib/{src → code_formatter}/configuration.rb

@@ -4,8 +4,7 @@ module CodeFormatter
     attr_accessor :excluded_files
     attr_accessor :included_dirs
     attr_accessor :excluded_dirs
-
-    attr_reader :source_file
+    attr_accessor :source_file
 
     def initialize
       self.included_files = []
@@ -24,19 +23,12 @@ module CodeFormatter
       begin
         config = eval(File.read(file), binding, 'config loading problem')
         config.source_file = file
-        return config if config.is_a? Config
+        return config if config.is_a? Configuration
 
         warn "[#{file}] isn't a CodeFormatter::Configuration, but #{config.class}."
       rescue SyntaxError, StandardError => e
         warn "Invalid configuration in [#{file}]: #{e}"
       end
     end
-
-    private
-
-    def source_file=(file)
-      return unless file || File.file?(file)
-      @source_file = file
-    end
   end
 end

data/lib/code_formatter/formatters/formatter.rb

@@ -0,0 +1,14 @@
+module CodeFormatter
+  class Formatter
+    attr_reader :config
+
+    def initialize(config)
+      raise TypeError unless config.is_a? Configuration
+      @config = config
+    end
+
+    def format
+      raise NotImplementedError
+    end
+  end
+end

data/lib/code_formatter/formatters/swift_format_formatter.rb

@@ -0,0 +1,61 @@
+require 'yaml'
+require_relative 'formatter'
+
+module CodeFormatter
+  class SwiftFormatFormatter < Formatter
+    def format
+      unless exist? 'git'
+        warn 'warning: failed to find git command'
+        return
+      end
+
+      unless 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'
+      else
+        puts "going to format files:\n#{files.join('\n')}"
+        format_files(files)
+      end
+    end
+
+    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| File.exist? f }
+    end
+
+    def exist?(command)
+      !`which #{command}`.empty?
+    end
+
+    def format_files(files)
+      disabled = disabled_rules.join(',')
+      enabled = enabled_rules.join(',')
+      `swiftformat #{files.join(' ')} --disable #{disabled} --enable #{enabled}`
+    end
+
+    # @return [[String]] enabled rules
+    def enabled_rules
+      rules_config['enabled_rules'].map(&:strip)
+    end
+
+    # @return [[String]] disabled rules
+    def disabled_rules
+      rules_config['disabled_rules'].map(&:strip)
+    end
+
+    def rules_config
+      rules_file = File.expand_path('../../resources/swiftformat_rules.yml', __FILE__)
+      YAML.load_file(rules_file)
+    end
+  end
+end

data/lib/code_formatter/resources/swiftformat_rules.yml

@@ -0,0 +1,46 @@
+enabled_rules:
+  - blankLinesAtEndOfScope
+  - blankLinesBetweenScopes
+  - braces
+  - consecutiveBlankLines
+  - consecutiveSpaces
+  - elseOnSameLine
+  - fileHeader
+  - hoistPatternLet
+  - indent
+  - linebreakAtEndOfFile
+  - linebreaks
+  - numberFormatting
+  - ranges
+  - semicolons
+  - spaceAroundBraces
+  - spaceAroundBrackets
+  - spaceAroundComments
+  - spaceAroundGenerics
+  - spaceAroundOperators
+  - spaceAroundParens
+  - spaceInsideBraces
+  - spaceInsideBrackets
+  - spaceInsideComments
+  - spaceInsideGenerics
+  - spaceInsideParens
+  - specifiers
+  - todos
+  - trailingSpace
+  - wrapArguments
+  - redundantNilInit
+  - redundantParens
+
+disabled_rules:
+  - void
+  - unusedArguments
+  - redundantBackticks
+  - redundantGet
+  - redundantLet
+  - redundantPattern
+  - redundantRawValues
+  - redundantReturn
+  - redundantSelf
+  - redundantVoidReturnType
+  - trailingCommas
+  - trailingClosures

data/lib/code_formatter/version.rb

@@ -0,0 +1,3 @@
+module CodeFormatter
+  VERSION = '0.0.11'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.11
 platform: ruby
 authors:
 - sroik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,56 +28,70 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.52'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.52'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 description: swift code formatter
@@ -90,10 +104,14 @@ extra_rdoc_files: []
 files:
 - bin/code_formatter
 - lib/code_formatter.rb
-- lib/src/cli.rb
-- lib/src/configuration.rb
-- lib/src/initializer.rb
-- lib/src/resources/sample_config.config
+- lib/code_formatter/cli.rb
+- lib/code_formatter/configuration.rb
+- lib/code_formatter/formatters/formatter.rb
+- lib/code_formatter/formatters/swift_format_formatter.rb
+- lib/code_formatter/initializer.rb
+- lib/code_formatter/resources/sample_config.config
+- lib/code_formatter/resources/swiftformat_rules.yml
+- lib/code_formatter/version.rb
 homepage: https://github.com/app-craft/code-formatter
 licenses:
 - MIT
@@ -117,5 +135,5 @@ rubyforge_project:
 rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: src
+summary: code formatter
 test_files: []

data/lib/src/cli.rb

@@ -1,17 +0,0 @@
-require_relative 'initializer'
-require 'thor'
-
-module CodeFormatter
-  class CLI < Thor
-    desc 'init', 'create sample config'
-    def init
-      Initializer.init
-    end
-
-    desc 'format', 'description goes here'
-    option :config, default: Initializer.initialized_config, aliases: '-c', type: :string, desc: 'configuration file'
-    def format
-      puts 'Run Forrest! Ruuun!'
-    end
-  end
-end