fui 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3004280a95452a6d9d564a749e4e4401d141018b
-  data.tar.gz: 7833b104af4e870cb65df25671a0dc11f3985f1c
+SHA256:
+  metadata.gz: ca2369b75631de675a012aa298db4edc1976fba82ca689411be60347be016525
+  data.tar.gz: 179e9195e0ededab573b0dee845cb4c60b766ce3e64cf001bf86d6be8a937c8e
 SHA512:
-  metadata.gz: 348e74f6fe709c2eb3cf15c50f4665431b5a39654c4daea299461329c22b696cff75dfd62c0d3a8374bcbe68d0cec06f2075bd3585b377ad8de3988872186695
-  data.tar.gz: 1193c75c6bb5cd05f82732179f6e3cc6b5bbcd9a5fd654e65174e3be10efb15edcc0a9837b8f0967feb1719e1a39e63db9a3bc5801336a695dce35a426b976ac
+  metadata.gz: 8f2b6927e03089fee397a11ea73ce511c88ddbbe15652e106e4f1801fc677351f10f90cb39734bb2279cdda003e8c577108c9efab324a3dfe848b90c01133745
+  data.tar.gz: 2039608e5a2394039f3d576838da7e7324cdd8588bdca12cb15570a3d729446885568d2e1e3d05fd7777a9e9313d3f500c775368eb77a667a3495c470e5928cf

data/CHANGELOG.md

@@ -1,29 +1,35 @@
-### 0.4.2 (Next)
+### 0.5.0 (2018/12/19)
 
-* Your contribution here.
+* [#29](https://github.com/dblock/fui/pull/29): Added support for ignoring paths through `-i`, `--ignore-path` - [@jeffctown](https://github.com/jeffctown).
+* [#28](https://github.com/dblock/fui/pull/28): Added support for finding global imports (bracket notation) - [@jeffctown](https://github.com/jeffctown).
+* [#28](https://github.com/dblock/fui/pull/28): Added ability to turn off global or local import checks through `-g`, `--ignore-global-imports` or `-l`, `--ignore-local-imports` - [@jeffctown](https://github.com/jeffctown).
+* [#28](https://github.com/dblock/fui/pull/28): The `--ignorexib` option has been renamed to `--ignore-xib-files` - [@jeffctown](https://github.com/jeffctown).
+* [#31](https://github.com/dblock/fui/pull/31): Added Danger, PR linter and a README TOC - [@jeffctown](https://github.com/jeffctown).
+* [#32](https://github.com/dblock/fui/pull/32): Added support for ignoring bridging headers - [@jeffctown](https://github.com/jeffctown).
+* [#33](https://github.com/dblock/fui/pull/33): Added RELEASING.md to document release process - [@jeffctown](https://github.com/jeffctown).
 
-### 0.4.1 (8/16/2017)
+### 0.4.1 (2017/8/16)
 
 * [#24](https://github.com/dblock/fui/pull/24): Support .mm files - [@shachlan](https://github.com/Shachlan).
 
-### 0.4.0 (5/14/2016)
+### 0.4.0 (2016/5/14)
 
 * [#20](https://github.com/dblock/fui/pull/20): Added `-x`, `--ignorexib`, find unused classes referenced from its own XIB - [@Ezor](https://github.com/Ezor).
 
-### 0.3.0 (2/7/2014)
+### 0.3.0 (2014/2/7)
 
 * [#5](https://github.com/dblock/fui/issues/5): Explicitly require Ruby 1.9.3 or later in .gemspec - [@paulyoung](https://github.com/paulyoung).
 * [#4](https://github.com/dblock/fui/issues/4): Added support for .storyboard and .xib `customClass` references - [@dblock](https://github.com/dblock).
 
-### 0.2.0 (1/23/2014)
+### 0.2.0 (2014/1/23)
 
 * By default will display "(simulation)" because no actual files are being deleted - [@dblock](https://github.com/dblock).
 * Fui's exit code with `find` will be the number of unused references found - [@dblock](https://github.com/dblock).
 
-### 0.1.1 (1/22/2014)
+### 0.1.1 (2014/1/22)
 
 * Fix: properly handle .pch includes - [@dblock](https://github.com/dblock).
 
-### 0.1.0 (1/22/2014)
+### 0.1.0 (2014/1/22)
 
 * Initial public release, based on code by [@dstnbrkr](https://github.com/dstnbrkr) - [@dblock](https://github.com/dblock).

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2013 Daniel Doubrovkine.
+Copyright (c) 2014-2018 Daniel Doubrovkine.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -6,19 +6,35 @@ Fui
 
 Find unused Objective-C imports.
 
+# Table of Contents
+
+- [Usage](#usage)
+  - [Get Help](#get-help)
+  - [Find Unused Classes in the Current Directory](#find-unused-classes-in-the-current-directory)
+  - [Find Unused Classes in any Path](#find-unused-classes-in-any-path)
+  - [Skip Interface Builder (.xib) Files](#skip-interface-builder-xib-files)
+  - [Ignore Local Imports](#ignore-local-imports)
+  - [Ignore Global Imports](#ignore-global-imports)
+  - [Ignore a Path](#ignore-a-path)
+  - [Ignore Multiple Paths](#ignore-multiple-paths)
+  - [Delete All Unused Class Files with Prompt](#delete-all-unused-class-files-with-prompt)
+- [Xcode Plugin](#xcode-plugin)
+- [Contributing](#contributing)
+- [Copyright and License](#copyright-and-license)
+
 ## Usage
 
 ```
 gem install fui
 ```
 
-#### Get Help
+### Get Help
 
 ```
 fui help
 ```
 
-#### Find Unused Classes in the Current Directory
+### Find Unused Classes in the Current Directory
 
 ```
 fui find
@@ -26,27 +42,59 @@ fui find
 
 The `find` command lists all the files that contain unused imports and exits with the number of files found.
 
-#### Find Unused Classes in a Path
+### Find Unused Classes in any Path
 
 ```
 fui --path=~/source/project/Name find
 ```
 
-#### Find Unused Classes in a Path Skipping Interface Builder (.xib) Files
+### Skip Interface Builder (.xib) Files
 
-ForRunning `fui` with `-x` (or `--ignorexib`) will, for example, mark `Foo.h` as unused when `Foo.xib` holds a reference to the `Foo` class and no other references to Foo.h exist.
+Running `fui` with `-x` (or `--ignore-xib-files`) will, for example, mark `Foo.h` as unused when `Foo.xib` holds a reference to the `Foo` class and no other references to Foo.h exist.
 
 ```
 fui -x --path=~/source/project/Name find
 ```
 
-#### Delete All Unused Class Files w/ Prompt
+### Ignore Local Imports
+
+Running `fui` with `-l` (or `--ignore-local-imports`) will, for example, mark `Foo.h` as unused when `Bar.h` contains a local (quotation syntax) import of `Foo.h` (eg. `#import Foo.h`).
+
+```
+fui -l --path=~/source/project/Name find
+```
+
+### Ignore Global Imports
+
+Running `fui` with `-g` (or `--ignore-global-imports`) will, for example, mark `Foo.h` as unused when `Bar.h` contains a global (bracket syntax) import of `Foo.h` (eg. `#import <Framework/Foo.h>`).
+
+```
+fui -g --path=~/source/project/Name find
+```
+
+### Ignore a Path
+
+Running `fui` with `-i` (or `--ignore-path`) will, for example, ignore a `Pods` folder when searching for headers or referencing files.
+
+```
+fui --path=~/source/project/Name --ignore-path=Pods find
+```
+
+### Ignore Multiple Paths
+
+Running `fui` with `-i` (or `--ignore-path`) can ignore multiple folders when searching for headers or referencing files.
+
+```
+fui --path=~/source/project/Name --ignore-path=Pods --ignore-path=Libraries find
+```
+
+### Delete All Unused Class Files with Prompt
 
 ```
 fui --path=~/source/project/Name delete --perform --prompt
 ```
 
-#### Xcode Plugin
+## Xcode Plugin
 
 Use [xcfui](https://github.com/jcavar/xcfui) for integration with Xcode.
 
@@ -56,6 +104,6 @@ There're [a few feature requests and known issues](https://github.com/dblock/fui
 
 ## Copyright and License
 
-Copyright (c) 2014, Daniel Doubrovkine, [Artsy](http://artsy.github.io), based on code by [Dustin Barker](https://github.com/dstnbrkr).
+Copyright (c) 2014-2018, Daniel Doubrovkine, [Artsy](http://artsy.github.io), based on code by [Dustin Barker](https://github.com/dstnbrkr).
 
 This project is licensed under the [MIT License](LICENSE.md).

data/RELEASING.md

@@ -0,0 +1,61 @@
+# Releasing fui
+
+There are no hard rules about when to release fui. Release bug fixes frequently, features not so frequently, and breaking changes rarely.
+
+### Release
+
+Run tests, check that all tests succeed locally.
+
+```
+bundle install
+rake
+```
+
+Check that the last build succeeded in [Travis CI](https://travis-ci.org/dblock/fui).
+
+Change "Next" in [CHANGELOG.md](CHANGELOG.md) to the current date.
+
+```
+### 0.4.0 (2016/5/14)
+```
+
+Remove the line with "Your contribution here.", since there will be no more contributions to this release.
+
+Commit your changes.
+
+```
+git add CHANGELOG.md
+git commit -m "Preparing for release, 0.4.0."
+git push origin master
+```
+
+Release.
+
+```
+$ rake release
+
+fui 0.4.0 built to pkg/fui-0.4.0.gem.
+Tagged v0.4.0.
+Pushed git commits and tags.
+Pushed fui 0.4.0 to rubygems.org.
+```
+
+### Prepare for the Next Version
+
+Add the next release to [CHANGELOG.md](CHANGELOG.md).
+
+```
+### 0.4.1 (Next)
+
+* Your contribution here.
+```
+
+Increment the third version number in [lib/fui/version.rb](lib/fui/version.rb).
+
+Commit your changes.
+
+```
+git add CHANGELOG.md lib/fui/version.rb
+git commit -m "Preparing for next development iteration, 0.4.1."
+git push origin master
+```

data/bin/fui

@@ -6,13 +6,16 @@ include GLI::App
 
 program_desc 'Find unused imports in an Objective-C codebase.'
 
-flag [:p, :path], desc: 'Path to search.', default_value: Dir.pwd
-switch [:v, :verbose], desc: 'Produce verbose output.', default_value: false
-switch [:x, :ignorexib], desc: 'Ignore interface builder (.xib) files.', default_value: false
+flag %i[p path], desc: 'Path to search.', default_value: Dir.pwd
+flag %i[i ignore-path], desc: 'Path to ignore.', default_value: nil, multiple: true
+switch %i[v verbose], desc: 'Produce verbose output.', default_value: false
+switch %i[x ignore-xib-files], desc: 'Ignore interface builder (.xib) files.', default_value: false
+switch %i[g ignore-global-imports], desc: 'Ignores imports using a global (angle bracket) format.', default_value: false
+switch %i[l ignore-local-imports], desc: 'Ignores imports using a local (quote) format.', default_value: false
 
 default_command :find
 
-pre do |global_options, _command, options, _args|
+pre do |global_options, _command, _options, _args|
   options = global_options.dup
   path = options.delete(:path)
   $fui = Fui::Finder.new(path, options)
@@ -40,8 +43,8 @@ end
 
 desc 'Delete header and implementation files of unused classes'
 command :delete do |c|
-  c.switch [:t, :prompt], desc: 'Prompt on delete', default_value: true
-  c.switch [:f, :perform], desc: 'Actually perform deletion', default_value: false, negatable: false
+  c.switch %i[t prompt], desc: 'Prompt on delete', default_value: true
+  c.switch %i[f perform], desc: 'Actually perform deletion', default_value: false, negatable: false
 
   c.action do |global_options, options, _args|
     begin
@@ -67,6 +70,7 @@ command :delete do |c|
         File.delete(k.path) if options[:perform]
         impl_path = k.path.gsub(/\.h$/, '.m')
         next unless File.exist?(impl_path)
+
         relative_path = Pathname.new(impl_path).relative_path_from(root).to_s
         if global_options[:verbose]
           puts "Removing #{relative_path}#{options[:perform] ? '' : ' (simulation)'}\r\n"

data/lib/fui.rb

@@ -4,3 +4,4 @@ require 'pathname'
 require 'fui/version'
 require 'fui/header'
 require 'fui/finder'
+require 'fui/project'

data/lib/fui/finder.rb

@@ -1,4 +1,5 @@
 module Fui
+  # A class to find various things in an Objective C project.
   class Finder
     attr_reader :path, :options
 
@@ -9,7 +10,21 @@ module Fui
     end
 
     def headers
-      @headers ||= Finder.find(path) { |path| Header.header?(path) }.collect { |path| Header.new(path) }
+      @headers ||= find(path) { |path| Header.header?(path) }.collect { |path| Header.new(path) }
+    end
+
+    def bridging_headers
+      @bridging_headers ||= find(path) { |path| Project.project?(path) }.collect { |path| Project.new(path).bridging_headers(options[:verbose]) }
+    end
+
+    def ignores
+      return unless options['ignore-path']
+
+      @ignores ||= options['ignore-path'].map do |i|
+        raise Errno::ENOENT, i unless Dir.exist?(i)
+
+        Pathname(i)
+      end
     end
 
     def references(&block)
@@ -19,7 +34,6 @@ module Fui
           references[header] = []
         end
         Find.find(path) do |path|
-          next unless File.ftype(path) == 'file'
           if ['.m', '.mm', '.h', '.pch'].include?(File.extname(path))
             process_code references, path, &block
           elsif ['.storyboard', '.xib'].include?(File.extname(path))
@@ -31,27 +45,53 @@ module Fui
     end
 
     def unused_references(&block)
-      @unused_references ||= references(&block).select { |_k, v| v.count == 0 }
+      @unused_references ||= references(&block).select { |k, v| v.count.zero? && !bridging_headers.include?(k.filename) }
     end
 
     private
 
     # Find all files for which the block yields.
-    def self.find(path)
+    def find(path)
       results = []
       Find.find(path) do |fpath|
+        if FileTest.directory?(fpath)
+          next unless ignores
+
+          ignores.each do |ignore|
+            next unless fpath.include?(ignore.realpath.to_s)
+
+            puts "Ignoring Directory: #{fpath}" if options[:verbose]
+            Find.prune
+          end
+        end
         results << fpath if yield fpath
       end
       results
     end
 
+    def local_imported(file_contents, header)
+      return false if options['ignore-local-imports']
+
+      file_contents.include?("#import \"#{header.filename}\"")
+    end
+
+    def global_imported(file_contents, header)
+      return false if options['ignore-global-imports']
+
+      escaped_header = Regexp.quote(header.filename)
+      regex = '(#import\s{1}<.+\/' + escaped_header + '>)'
+      file_contents.match(regex)
+    end
+
     def process_code(references, path)
       File.open(path) do |file|
         yield path if block_given?
-        filename = File.basename(path)
         headers.each do |header|
           filename_without_extension = File.basename(path, File.extname(path))
-          references[header] << path if filename_without_extension != header.filename_without_extension && File.read(file).include?("#import \"#{header.filename}\"")
+          file_contents = File.read(file)
+          global_import_exists = global_imported(file_contents, header)
+          local_import_exists = local_imported(file_contents, header)
+          references[header] << path if filename_without_extension != header.filename_without_extension && (local_import_exists || global_import_exists)
         end
       end
     end
@@ -61,7 +101,8 @@ module Fui
         yield path if block_given?
         headers.each do |header|
           filename_without_extension = File.basename(path, File.extname(path))
-          references[header] << path if (!options['ignorexib'] || filename_without_extension != header.filename_without_extension) && File.read(file).include?("customClass=\"#{header.filename_without_extension}\"")
+          check_xibs = !options['ignore-xib-files']
+          references[header] << path if (check_xibs || filename_without_extension != header.filename_without_extension) && File.read(file).include?("customClass=\"#{header.filename_without_extension}\"")
         end
       end
     end

data/lib/fui/header.rb

@@ -1,4 +1,5 @@
 module Fui
+  # Represents a Header (.h) file
   class Header
     attr_accessor :filename, :filename_without_extension, :path
 

data/lib/fui/project.rb

@@ -0,0 +1,32 @@
+module Fui
+  # Represents an Xcode Project pbxproj file
+  class Project
+    attr_accessor :filename, :bridging_header, :path
+
+    def self.project?(path)
+      File.extname(path) == '.pbxproj'
+    end
+
+    def initialize(path)
+      @path = path
+      @filename = File.basename(path)
+    end
+
+    def bridging_headers(verbose)
+      @bridging_headers ||= begin
+        regex = /(SWIFT_OBJC_BRIDGING_HEADER) = \".+\"/
+        bridging_headers = []
+        File.new(path).grep regex do |result|
+          tokens = result.split('"')
+          next if tokens.length < 2
+
+          path_tokens = tokens[1].split('/')
+          bridging_header = path_tokens[path_tokens.length - 1]
+          puts "Bridging Header Found: #{bridging_header} in #{project_path}." if verbose
+          bridging_headers << bridging_header
+        end
+        bridging_headers.uniq
+      end
+    end
+  end
+end

data/lib/fui/version.rb

@@ -1,3 +1,3 @@
 module Fui
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fui
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -35,10 +35,12 @@ files:
 - CONTRIBUTING.md
 - LICENSE.md
 - README.md
+- RELEASING.md
 - bin/fui
 - lib/fui.rb
 - lib/fui/finder.rb
 - lib/fui/header.rb
+- lib/fui/project.rb
 - lib/fui/version.rb
 homepage: http://github.com/dblock/fui
 licenses:
@@ -50,17 +52,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Find unused Objective-C imports.