storyboardlint 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cff590128484b450950874dc541b476c2dfdc69e
-  data.tar.gz: a27efee054708381b70b433c31ebb7ef5b68bd7e
+  metadata.gz: 78466ff49fa3a8838f72ad1db1b3d645b3a045e5
+  data.tar.gz: a7f32aef4c9a844a5698228f5d28edfefe669a87
 SHA512:
-  metadata.gz: e9d1b1fc5c6716ad240c41ba662617146cbe1d1efa661125e2dfbfb131a126240d7e13584e1a6f5151358ded9f0a288a273dfb62e56e159dd2f6ae7acdbb4e7c
-  data.tar.gz: 9ca7b267a26383ca59d050716737227de9a567ae3e651137d83bf4f70622079dbd7c205ff9c10dc1467e86830db7fae2dcefdb1a8da518c3258d5f21ef002c24
+  metadata.gz: 2305ec7e69493f5219a51b57a40fb5afb07a953fb799b4bbefbe56cccb04cdf5b33bb8aea1556a9ff58f0bc3fe1308f78d338afcffebd674d6db018a77778658
+  data.tar.gz: 0b14d0b76d1488d11b9234af68bcc71d03593cd7db88e9e07757ad746cf49a1fb097986b055f8e6ab783ddea84d544fbc031c0892f65b683c85d4f575c883562

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.1
+
+- StoryboardList does not choke up on directories that are named like files anymore
+- Added a --additional-sources CLI parameter, see https://github.com/jfahrenkrug/StoryboardLint/issues/3
+
 ## 0.2.0
 
 - XIB files are now also scanned for reuse identifiers

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/storyboardlint.rb

@@ -86,7 +86,7 @@ module StoryboardLint
   end
 
   class SourceScanner    
-    def initialize(src_root, matcher)
+    def initialize(src_root, matcher, additional_sources = nil)
       if !File.directory?(src_root)
         raise ArgumentError, "The directory '#{src_root}' does not exist."
       end
@@ -95,6 +95,7 @@ module StoryboardLint
         raise ArgumentError, "The matcher cannot be nil."
       end
       
+      @additional_sources = additional_sources
       @matcher = matcher
       @src_root = src_root
       @scan_performed = false    
@@ -104,7 +105,33 @@ module StoryboardLint
       return @source_files if @source_files
   
       # find all *.h, *.c, *.m and *.mm files
-      @source_files = Dir.glob(File.join(@src_root, "**/*.{h,c,m,mm}"))
+      match_string = "**/*.{h,c,m,mm}"
+      @source_files = Dir.glob(File.join(@src_root, match_string))
+      
+      if @additional_sources && @additional_sources.size > 0
+        @additional_sources.each do |source_path|
+          absolute_path = ''
+          if source_path.start_with?("/")
+            #absolute path
+            absolute_path = source_path
+          else
+            #relative to src_root
+            absolute_path = File.join(@src_root, source_path)
+          end
+          
+          if File.directory?(absolute_path)
+            @source_files += Dir.glob(File.join(absolute_path, match_string))
+          else
+            puts "warning: additional source directory '#{absolute_path}' does not exist!"
+          end
+        end
+      end
+      
+      if @source_files and @source_files.size > 0
+        @source_files.select! {|sf| File.file?(sf)}
+      end
+      
+      @source_files
     end
     
     def segue_ids
@@ -314,6 +341,10 @@ module StoryboardLint
           options.reuse_suffix = suffix
         end
         
+        opts.on( '--additional-sources /absolute/path,../relative/to/target_directory', Array, "List of additional directories to scan for source files") do |source_paths|
+          options.additional_sources = source_paths
+        end
+        
         # No argument, shows at tail.  This will print an options summary.
         # Try it and see!
         opts.on_tail("-h", "--help", "Show this message") do
@@ -323,7 +354,7 @@ module StoryboardLint
 
         # Another typical switch to print the version.
         opts.on_tail("--version", "Show version") do
-          puts "StoryboardLint v0.2.0"
+          puts "StoryboardLint v0.2.1"
           exit
         end
       end
@@ -337,7 +368,7 @@ module StoryboardLint
 
       matcher = StoryboardLint::Matcher.new(options)
       sb_scanner = StoryboardLint::StoryboardScanner.new(ARGV[0])
-      source_scanner = StoryboardLint::SourceScanner.new(ARGV[0], matcher)
+      source_scanner = StoryboardLint::SourceScanner.new(ARGV[0], matcher, options.additional_sources)
 
       linter = StoryboardLint::Linter.new(sb_scanner, source_scanner, matcher)
       linter.lint

data/spec/fixtures/StoryboardLintTest/Pods/SomePod/Something.h

@@ -0,0 +1,2 @@
+@interface ClassFromCocoaPod : NSObject
+@end

data/spec/fixtures/StoryboardLintTest/StoryboardLintTest/Base.lproj/Main_iPhone.storyboard

@@ -92,7 +92,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Detail view content goes here" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="Lei-5M-9Gs">
+                            <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Detail view content goes here" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="Lei-5M-9Gs" customClass="ClassFromCocoaPod">
                                 <rect key="frame" x="20" y="276" width="280" height="17"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" type="system" size="system"/>

data/spec/fixtures/StoryboardLintTest/StoryboardLintTest/SomeFolder.m/SomeFile.m

@@ -0,0 +1 @@
+/* intentionally left blank */

data/spec/source_scanner_spec.rb

@@ -14,14 +14,14 @@ describe StoryboardLint::SourceScanner do
   
   describe "Default Options" do
     before :all do
-      @src = StoryboardLint::SourceScanner.new(File.join(File.dirname(__FILE__), "fixtures", "StoryboardLintTest"), StoryboardLint::Matcher.new(nil))
+      @src = StoryboardLint::SourceScanner.new(File.join(File.dirname(__FILE__), "fixtures", "StoryboardLintTest", "StoryboardLintTest"), StoryboardLint::Matcher.new(nil), ["../Pods"])
     end
     
     it "should find all source files" do
       file_names = @src.source_files.map {|full_path| File.basename(full_path)}
-      file_names.size.should == 7
+      file_names.size.should == 9
       
-       ["SPWKAppDelegate.h", "SPWKDetailViewController.h", "SPWKMasterViewController.h", "main.m", "SPWKAppDelegate.m", "SPWKDetailViewController.m", "SPWKMasterViewController.m"].each do |fn|
+       ["SPWKAppDelegate.h", "SPWKDetailViewController.h", "SPWKMasterViewController.h", "main.m", "SPWKAppDelegate.m", "SPWKDetailViewController.m", "SPWKMasterViewController.m", "SomeFile.m", "Something.h"].each do |fn|
           file_names.should include(fn)
        end
     end
@@ -54,9 +54,9 @@ describe StoryboardLint::SourceScanner do
     
     it "should find all class names in the project" do
       names = @src.class_names.map {|n| n[:class_name]}
-      names.size.should == 5
+      names.size.should == 6
       
-      ["SPWKAppDelegate", "SPWKDetailViewController", "SPWKMasterViewController", "SPWKDetailViewController", "SPWKMasterViewController"].each do |name|
+      ["SPWKAppDelegate", "SPWKDetailViewController", "SPWKMasterViewController", "SPWKDetailViewController", "SPWKMasterViewController", "ClassFromCocoaPod"].each do |name|
         names.should include(name)
       end
     end

data/spec/storyboard_scanner_spec.rb

@@ -46,11 +46,12 @@ describe StoryboardLint::StoryboardScanner do
   
   it "should return the custom class names" do
     names = @sbs.custom_class_names
-    names.size.should == 5
+    names.size.should == 6
     name_strings = names.map {|item| item[:class_name]}
     name_strings.should include('SPWKMasterViewController')
     name_strings.should include('SPWKDetailViewController')
     name_strings.should include('NonexistentViewController')
+    name_strings.should include('ClassFromCocoaPod')
   end
   
 end

data/storyboardlint.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "storyboardlint"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes Fahrenkrug"]
-  s.date = "2014-02-25"
+  s.date = "2014-03-11"
   s.description = "It's a pain to to keep identifier strings in your UIStoryboard and in your source code in sync. This tool helps you to do just that."
   s.email = "johannes@springenwerk.com"
   s.executables = ["storyboardlint"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/storyboardlint",
     "lib/storyboardlint.rb",
+    "spec/fixtures/StoryboardLintTest/Pods/SomePod/Something.h",
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest.xcodeproj/project.pbxproj",
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata",
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest.xcodeproj/project.xcworkspace/xcshareddata/StoryboardLintTest.xccheckout",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest/SPWKDetailViewController.m",
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest/SPWKMasterViewController.h",
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest/SPWKMasterViewController.m",
+    "spec/fixtures/StoryboardLintTest/StoryboardLintTest/SomeFolder.m/SomeFile.m",
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest/StoryboardLintTest-Info.plist",
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest/StoryboardLintTest-Prefix.pch",
     "spec/fixtures/StoryboardLintTest/StoryboardLintTest/TestView.xib",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storyboardlint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Johannes Fahrenkrug
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -87,6 +87,7 @@ files:
 - VERSION
 - bin/storyboardlint
 - lib/storyboardlint.rb
+- spec/fixtures/StoryboardLintTest/Pods/SomePod/Something.h
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest.xcodeproj/project.pbxproj
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest.xcodeproj/project.xcworkspace/xcshareddata/StoryboardLintTest.xccheckout
@@ -100,6 +101,7 @@ files:
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest/SPWKDetailViewController.m
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest/SPWKMasterViewController.h
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest/SPWKMasterViewController.m
+- spec/fixtures/StoryboardLintTest/StoryboardLintTest/SomeFolder.m/SomeFile.m
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest/StoryboardLintTest-Info.plist
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest/StoryboardLintTest-Prefix.pch
 - spec/fixtures/StoryboardLintTest/StoryboardLintTest/TestView.xib