xcmv 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 456870dbe3e27ce5b5a643e968015b80d9e4db00
-  data.tar.gz: 3afa9566039e0b74f5bf2781540e6012aedd8963
+  metadata.gz: 4b1211a94c5f7daff4383d3aa05a5c20a65c66da
+  data.tar.gz: add87d0f05d8d163d14543b75fc131b0f49f9995
 SHA512:
-  metadata.gz: 29d8ca18f07edebe74a993404eb291c07cfd0c34d56290f0f0a4b153f11d748fcb072be3a84f3687b235de352d8e6b05d614dc47513f2042d88d8868130178d6
-  data.tar.gz: 7725808f9f589869d8d262db3d7ec6d17e843a7a98f3819932e71448ba9c1322b7fa1c1d41f2fae1e9c26d773872984222950c2136ca090b9c89867b5b9088bb
+  metadata.gz: 786a56f236c0f476ca80987dba5da88ca67a420e22fa614fe03a6599d8edc95f9a1b6b71eb77e1d2a62c82d49ccadd4b8f1e9014b317101fd2dc70dec4972292
+  data.tar.gz: 5042a1ac63777486ee675d0f8e1439636c8a0fc255c847e85579638d9c4a4180cf020b32d49302d1121f84a2f22e6150d1373a370c5fb74558b7f56fd468e143

data/lib/xcmv/file.rb

@@ -57,11 +57,19 @@ module XcodeMove
     def add_to_targets(target_names, header_visibility)
       unless target_names
         group = GroupMembership.new(pbx_file.parent)
-        targets = group.sibling_targets
+        targets = group.inferred_targets
+
+        if targets.empty?
+          # fallback: if we can't infer any target membership,
+          # we just assign the first target of the project and emit a warning
+          fallback_target = project.targets.select{ |t| t.respond_to?(:source_build_phase) }[0] 
+          targets = [fallback_target]
+          warn "⚠️  Warning: Unable to infer target membership of #{path} -- assigning to #{fallback_target.name}."
+        end
       else
         name_set = target_names.to_set
         targets = project.targets.select{ |t| name_set.include?(t.name) }
-        abort "No targets found in #{target_names}" if targets.empty?
+        abort "🛑  Error: No targets found in #{target_names}." if targets.empty?
       end
 
       targets.each do |target|

data/lib/xcmv/group_membership.rb

@@ -1,18 +1,34 @@
+class Xcodeproj::Project::Object::PBXGroup
+  # Returns an array of targets that have build files in `group`.
+  def sibling_targets
+    siblings = children.to_set
+    compiled_targets = project.targets.select{ |t| t.respond_to?(:source_build_phase) }
+    compiled_targets.select{ |t| t.source_build_phase.files_references.any?{ |f| siblings.include?(f) } }
+  end
+end
 
 module XcodeMove
   class GroupMembership
+    attr_reader :group, :project
     def initialize(group)
       @group = group
       @project = group.project
       @siblings = @group.children.to_set
     end
 
-    # Returns an array of targets that have build files in `group`.
-    def sibling_targets
-      compiled_targets = @project.targets.select{ |t| t.respond_to?(:source_build_phase) }
-      compiled_targets.select{ |t| t.source_build_phase.files_references.any?{ |f| @siblings.include?(f) } }
+    # Returns an array of targets that the `group` should reasonably
+    # belong to -- either based on `sibling_targets` or the `sibling_targets`
+    # of some ancestor group.
+    def inferred_targets
+      target_group = self.group
+      targets = []
+      while targets.empty? and target_group.respond_to?(:sibling_targets) do
+        targets += target_group.sibling_targets
+        target_group = target_group.parent
+      end
+      targets
     end
-
+        
     def max_header_visibility(target)
       sibling_headers = target.headers_build_phase.files.filter{ |f| @siblings.include?(file_ref) }
       sibling_headers.map{ |f| HeaderVisibility.from_file_settings(f.settings) }.max

data/lib/xcmv/version.rb

@@ -1,4 +1,4 @@
 
 module XcodeMove
-  VERSION = '1.2.0' 
+  VERSION = '1.3.0' 
 end

data/lib/xcmv.rb

@@ -10,7 +10,7 @@ module XcodeMove
   # Moves from one `Pathname` to another
   def self.mv(src, dst, options)
     src_file = src.directory? ? Group.new(src) : File.new(src) 
-    dst_file = src_file.with_dirname(dst)
+    dst_file = src_file.with_dirname(dst.dirname)
 
     puts("#{src_file.path} => #{dst_file.path}")
 
@@ -45,7 +45,7 @@ module XcodeMove
     if src_file.pbx_file
       src_file.remove_from_project
     else
-      warn("warning: #{src_file.path.realdirpath} not found in #{src_file.project.path.basename}. moving anyway...")
+      warn("⚠️  Warning: #{src.path.basename} not found in #{src.project.path.basename}, moving anyway...")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcmv
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Elliott Williams