fui 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95461cae3ee31c3d0a45fc8996d12f85e0af00ea
-  data.tar.gz: 3f90ffa5af46eb689930f6029805cea8281efdd1
+  metadata.gz: f54323f18c553e3a577d2356ba9777601fe5b017
+  data.tar.gz: f5b31abaf34393e4c1db738f9a8e34695f8b6b67
 SHA512:
-  metadata.gz: ee27ad841003c4f16beb828ffd048a539bc4039d565e57043895645eaf9e1fa167f7d3af8f5a2a4090bee95f8c6744bc9e73611a99d4f1f226495d936d9b4967
-  data.tar.gz: ab689ab980e1e10f06798c3bc9626c06127397e1bf9dde263c8ae97a4139ce88b02f4bc4816d5ec3930b1d6e1f5b6c88c0ba339594aa529049b2069d02f1edf0
+  metadata.gz: 9d8924cbe968e7554f0cbeaacf6b8c16d29da0d35432bc3a4f571a20a767af8601b4bb28f5dd2dfe6a1f76dd7a0fbe2424e287651bc3591b5df44752a03dd6a8
+  data.tar.gz: 225407e9ee09173fbd0f0ddb5640b2243939b18c37fd926dc25ab2f3be72b25fb2c43161536216aa67012a39508c34f68ff5636c829f55505b52b17e2af9d67b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.4.1 (Next)
+
+* Your contribution here.
+
+### 0.4.0 (5/14/2016)
+
+* [#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)
 
 * [#5](https://github.com/dblock/fui/issues/5): Explicitly require Ruby 1.9.3 or later in .gemspec - [@paulyoung](https://github.com/paulyoung).

data/README.md

@@ -1,7 +1,7 @@
 Fui
 ==========
 
-[![Build Status](https://travis-ci.org/dblock/fui.png)](https://travis-ci.org/dblock/fui)
+[![Build Status](https://travis-ci.org/dblock/fui.svg)](https://travis-ci.org/dblock/fui)
 
 Find unused Objective-C imports.
 
@@ -31,15 +31,27 @@ The `find` command lists all the files that contain unused imports and exits wit
 fui --path=~/source/project/Name find
 ```
 
+#### Find Unused Classes in a Path Skipping 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.
+
+```
+fui -x --path=~/source/project/Name find
+```
+
 #### Delete All Unused Class Files w/ Prompt
 
 ```
 fui --path=~/source/project/Name delete --perform --prompt
 ```
 
+#### XCode Plugin
+
+Use [xcfui](https://github.com/jcavar/xcfui) for integration with XCode.
+
 ## Contributing
 
-There're a [few known issues](https://github.com/dblock/fui/issues), notably around storyboards and .xib files. Please contribute! See [CONTRIBUTING](CONTRIBUTING.md).
+There're [a few feature requests and known issues](https://github.com/dblock/fui/issues). Please contribute! See [CONTRIBUTING](CONTRIBUTING.md).
 
 ## Copyright and License
 

data/bin/fui

@@ -4,26 +4,29 @@ require 'fui'
 
 include GLI::App
 
-program_desc 'Find unused imports in an Objective-C codebase'
+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: 'Verbose', default_value: false
+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
 
 default_command :find
 
-pre do |global_options, command, options, args|
-  $fui = Fui::Finder.new(global_options[:path])
+pre do |global_options, _command, options, _args|
+  options = global_options.dup
+  path = options.delete(:path)
+  $fui = Fui::Finder.new(path, options)
 end
 
-desc "Find unused classes"
+desc 'Find unused classes'
 long_desc "Note: fui's exit code will be the number of unused interfaces found."
 command :find do |c|
-  c.action do |global_options, options, args|
+  c.action do |global_options, _options, _args|
     root = Pathname.new($fui.path)
-    $fui.unused_references { |filename|
+    $fui.unused_references do |filename|
       relative_path = Pathname.new(filename).relative_path_from(root).to_s
       puts "Checking #{relative_path} ..." if global_options[:verbose]
-    }.each do |k, v|
+    end.each do |k, _v|
       relative_path = Pathname.new(k.path).relative_path_from(root).to_s
       if global_options[:verbose]
         puts "Found #{relative_path}"
@@ -35,21 +38,20 @@ command :find do |c|
   end
 end
 
-desc "Delete header and implementation files of unused classes"
+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 [:f, :perform], desc: 'Actually perform deletion', default_value: false, negatable: false
 
-  c.action do |global_options, options, args|
+  c.action do |global_options, options, _args|
     begin
-      system("stty raw -echo")
+      system('stty raw -echo')
 
       root = Pathname.new($fui.path)
-      $fui.unused_references { |filename|
+      $fui.unused_references do |filename|
         relative_path = Pathname.new(filename).relative_path_from(root).to_s
         puts "Checking #{relative_path} ..." if global_options[:verbose]
-      }.each do |k, v|
+      end.each do |k, _v|
         relative_path = Pathname.new(k.path).relative_path_from(root).to_s
         if options[:prompt]
           print "Remove #{relative_path}(.m) [y/N] "
@@ -64,18 +66,17 @@ command :delete do |c|
         end
         File.delete(k.path) if options[:perform]
         impl_path = k.path.gsub(/\.h$/, '.m')
-        if File.exists?(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"
-          else
-            puts "#{relative_path}#{options[:perform] ? '' : ' (simulation)'}\r\n"
-          end
-          File.delete(impl_path) if options[:perform]
+        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"
+        else
+          puts "#{relative_path}#{options[:perform] ? '' : ' (simulation)'}\r\n"
         end
+        File.delete(impl_path) if options[:perform]
       end
     ensure
-      system("stty -raw echo")
+      system('stty -raw echo')
     end
   end
 end

data/lib/fui/finder.rb

@@ -1,10 +1,11 @@
 module Fui
   class Finder
-    attr_reader :path
+    attr_reader :path, :options
 
-    def initialize(path)
+    def initialize(path, options = {})
       @path = File.expand_path(path)
-      raise Errno::ENOENT.new(path) unless Dir.exists?(@path)
+      @options = options
+      raise Errno::ENOENT, path unless Dir.exist?(@path)
     end
 
     def headers
@@ -18,10 +19,10 @@ module Fui
           references[header] = []
         end
         Find.find(path) do |path|
-          next unless File.ftype(path) == "file"
-          if [".m", ".h", ".pch"].include?(File.extname(path))
+          next unless File.ftype(path) == 'file'
+          if ['.m', '.h', '.pch'].include?(File.extname(path))
             process_code references, path, &block
-          elsif [".storyboard", ".xib"].include?(File.extname(path))
+          elsif ['.storyboard', '.xib'].include?(File.extname(path))
             process_xml references, path, &block
           end
         end
@@ -30,21 +31,21 @@ 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 == 0 }
     end
 
     private
 
     # Find all files for which the block yields.
-    def self.find(path, &block)
+    def self.find(path)
       results = []
-      Find.find(path) { |fpath|
+      Find.find(path) do |fpath|
         results << fpath if yield fpath
-      }
+      end
       results
     end
 
-    def process_code(references, path, &block)
+    def process_code(references, path)
       File.open(path) do |file|
         yield path if block_given?
         filename = File.basename(path)
@@ -55,12 +56,12 @@ module Fui
       end
     end
 
-    def process_xml(references, path, &block)
+    def process_xml(references, path)
       File.open(path) do |file|
         yield path if block_given?
         headers.each do |header|
           filename_without_extension = File.basename(path, File.extname(path))
-          references[header] << path if File.read(file).include?("customClass=\"#{header.filename_without_extension}\"")
+          references[header] << path if (!options['ignorexib'] || filename_without_extension != header.filename_without_extension) && File.read(file).include?("customClass=\"#{header.filename_without_extension}\"")
         end
       end
     end

data/lib/fui/header.rb

@@ -3,7 +3,7 @@ module Fui
     attr_accessor :filename, :filename_without_extension, :path
 
     def self.header?(path)
-      File.extname(path) == ".h"
+      File.extname(path) == '.h'
     end
 
     def initialize(path)

data/lib/fui/version.rb

@@ -1,3 +1,3 @@
 module Fui
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fui
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2016-05-14 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: 
@@ -31,15 +31,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/fui
-- lib/fui/finder.rb
-- lib/fui/header.rb
-- lib/fui/version.rb
-- lib/fui.rb
 - CHANGELOG.md
 - CONTRIBUTING.md
 - LICENSE.md
 - README.md
+- bin/fui
+- lib/fui.rb
+- lib/fui/finder.rb
+- lib/fui/header.rb
+- lib/fui/version.rb
 homepage: http://github.com/dblock/fui
 licenses:
 - MIT
@@ -50,17 +50,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.1.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Find unused Objective-C imports.