fus 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfcacd9d75754dbe979b47f6c6499be68711dc6c
-  data.tar.gz: 08a9509df0f86f9a604d269430d501f7f257af2d
+  metadata.gz: 2211fee7ba4155f7183f876fff63b1cdfdd4af98
+  data.tar.gz: 7a6218ae68c1e9f76f850d084498e3f875399826
 SHA512:
-  metadata.gz: 384a22d13e0350ec977e6c3725cb38d90aea0fba0bee6be28c991a6a5f69d6d8416a95ebcd3182b8120bd8bf2e3dda488137dbbc803dad0ef9173ab6cc5eb0b1
-  data.tar.gz: 043cec1b9e239c2febbef1b32aeda5b193635309dec175220cd1025617d63aad28eb72a36a2db18f8caaa8224b46bd6a70a72a658811d9b3fb336e69df738425
+  metadata.gz: 1d2d1cc6e88f76ba76994f4cbd3407201fef1c496674ee8bfd952ca07bf9254df5899a6b93ff342ae33e9ec49af4b7df4dceb275784eff32cc1178c005ef11b2
+  data.tar.gz: 4c0a9f30d994e57e0b8ca3cd3acc1d98191cc02fc9c8e04ed30355ce73c55cb92bc88cea5411880ee41880ca03f5864badbf620ea4c80a71e4b149d8aae2f643

data/lib/fus/finder.rb

@@ -9,6 +9,7 @@ module Fus
       @swift_paths = Dir
           .glob("#{path}/**/*.swift")
           .select {|path| path.scan(/\/Pods\//).empty? }
+          .select {|path| path.scan(/\/Carthage\//).empty? }
       @obj_c_paths = Dir.glob("#{path}/**/*.m") + Dir.glob("#{path}/**/*.h")
         .select {|path| path.scan(/-Swift.h/).empty? }
       @ib_paths = (Dir.glob("#{path}/**/*.xib") + 
@@ -51,7 +52,7 @@ module Fus
     # Given some text, identify Swift classes
     def find(swift_text)
       swift_text
-        .scan(/class\s+([^func][^var][a-zA-Z_]+)\s*:?\s[a-zA-Z_]*\b?\s*{/)
+        .scan(/class\s+([^func][^var][a-zA-Z_]+)(?:<.+>)?\s*:?\s[a-zA-Z_<>]*\b?\s*{/)
         .flatten
     end
 

data/lib/fus/swift_class.rb

@@ -3,7 +3,7 @@ module Fus
   class SwiftClass
     attr_reader :name
     def initialize(name)
-      @name = name
+      @name = name.sub(/<.+>/, "")
     end
     
     # Is this class a test class
@@ -28,7 +28,7 @@ module Fus
     
     # Is this class used in this Swift text
     def used_in_swift?(text)
-      text.match(/(\b#{name}.?[.:(])|([:].?#{name})|((typealias|associatedType)\s+.*=.+#{name})/)
+      text.match(/(\b#{name}(<.+>)?.?[.(])|([:].?#{name})|((typealias|associatedType)\s+.*=.+#{name})/)
     end
   end
 end

data/lib/fus/version.rb

@@ -1,3 +1,3 @@
 module Fus
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - tsabend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor