xcmv 0.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 2ec7f0a82d4f04cfe7fa5139d44b6a76956bf33a5c1f956dbe57a56e4d63d1b7
-  data.tar.gz: 4c3daaf0db05a66544caf04edb17b812e668c93ece61783c24f485316e46154b
+SHA1:
+  metadata.gz: 456870dbe3e27ce5b5a643e968015b80d9e4db00
+  data.tar.gz: 3afa9566039e0b74f5bf2781540e6012aedd8963
 SHA512:
-  metadata.gz: 4a60864ae7c5a0e86b707a1227818e83f8e899340839dca9a7014424d57583920b0aa07d441e2eca6fa73c6b3a6969d72b663cc643360a93131560d57f3fd509
-  data.tar.gz: 413984587827cedc8350cd9179fdd3a23392a162896ba44ec624d9fe64fc577421a13d452fa81b7fbf1b63acba1319c942203f7af4911378ecafe036c7fd35f8
+  metadata.gz: 29d8ca18f07edebe74a993404eb291c07cfd0c34d56290f0f0a4b153f11d748fcb072be3a84f3687b235de352d8e6b05d614dc47513f2042d88d8868130178d6
+  data.tar.gz: 7725808f9f589869d8d262db3d7ec6d17e843a7a98f3819932e71448ba9c1322b7fa1c1d41f2fae1e9c26d773872984222950c2136ca090b9c89867b5b9088bb

data/bin/xcmv

@@ -50,14 +50,12 @@ ARGV.map!{ |a| Pathname.new(a) }
 dst = ARGV.pop
 if dst.directory?
   ARGV.each do |src|
-    dst_file = dst + src.basename
-    XcodeMove.mv(XcodeMove::File.new(src), XcodeMove::File.new(dst_file), options)
+    XcodeMove.mv(src, dst, options)
   end
 else
-  if ARGV.count > 2
+  if ARGV.count > 2 || ARGV[0].directory?
     abort "Error: moving more than one file to #{dst}\n" + parser.help
   end
   src = ARGV[0]
-  XcodeMove.mv(XcodeMove::File.new(src), XcodeMove::File.new(dst), options)
-end
-
+  XcodeMove.mv(src, dst, options)
+end

data/lib/xcmv/file.rb

@@ -5,7 +5,7 @@ module XcodeMove
 
     def initialize(path)
       path = Pathname.new path
-      @path = path.realdirpath
+      @path = path.expand_path
     end
 
     def project
@@ -19,11 +19,15 @@ module XcodeMove
     def header?
       path.extname == '.h'
     end
-    
+
+    def with_dirname(root_path)
+      new_path = root_path + path.basename
+      self.class.new(new_path) # want to return the same kind of object
+    end
 
     # Traverses up from the `path` to enumerate over xcodeproj directories
     def reachable_projects
-      path.ascend.find_all{ |p| p.directory? }.flat_map do |dir|
+      path.ascend.find_all{ |p| p.exist? and p.directory? }.flat_map do |dir|
         dir.children.select{ |p| p.extname == '.xcodeproj' }
       end
     end
@@ -95,4 +99,27 @@ module XcodeMove
       @pbx_file = project.files.find{ |f| f.real_path == path }
     end
   end
+
+  class Group < File
+    def initialize(path)
+      path = Pathname.new path
+      @path = path.expand_path
+    end
+
+    def remove_from_project
+      if not pbx_file.nil?
+        pbx_file.children.each do | c |
+          c.remove_from_project
+        end
+        pbx_file.remove_from_project
+        @pbx_file = nil
+      end
+    end
+
+    private
+
+    def pbx_load
+      @pbx_file = project.main_group.recursive_children.find { |g| g.respond_to?(:real_path) and g.real_path == path }
+    end
+  end
 end

data/lib/xcmv/version.rb

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

data/lib/xcmv.rb

@@ -7,35 +7,58 @@ require_relative 'xcmv/version'
 
 module XcodeMove
 
-  # Moves from one `XcodeMove::File` to another
+  # Moves from one `Pathname` to another
   def self.mv(src, dst, options)
-    puts("#{src.path} => #{dst.path}")
+    src_file = src.directory? ? Group.new(src) : File.new(src) 
+    dst_file = src_file.with_dirname(dst)
 
-    # Remove files from xcodeproj (including dst if the file is being overwritten)
-    if src.pbx_file
-      src.remove_from_project
+    puts("#{src_file.path} => #{dst_file.path}")
+
+    project_mv(src_file, dst_file, options)
+    disk_mv(src_file, dst_file, options)
+    save(src_file, dst_file)
+  end
+
+  private
+
+  # Prepare the project file(s) for the move
+  def self.project_mv(src_file, dst_file, options)
+    if src_file.path.directory?
+      # Process all children first
+      children = src_file.path.children.map { |c| c.directory? ? Group.new(c) : File.new(c) }
+      children.each do | src_child |
+        dst_child = src_child.with_dirname(dst_file.path)
+        project_mv(src_child, dst_child, options)
+      end
     else
-      warn("warning: #{src.path.basename} not found in #{src.project.path.basename}. moving anyway...")
-    end
-    if dst.pbx_file
-      dst.remove_from_project
-    end
+      # Remove old destination file reference if it exists
+      if dst_file.pbx_file
+        dst_file.remove_from_project
+      end
 
-    # Add to the new xcodeproj
-    dst.create_file_reference
-    dst.add_to_targets(options[:targets], options[:headers])
+      # Add new destination file reference to the new xcodeproj
+      dst_file.create_file_reference 
+      dst_file.add_to_targets(options[:targets], options[:headers])
+    end
 
-    # Move the actual file
-    if options[:git]
-      mover = "git mv"
-    else 
-      mover = "mv"
+    # Remove original directory/file from xcodeproj
+    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...")
     end
-    command = "#{mover} '#{src.path}' '#{dst.path}'"
+  end
+
+  # Move the src_file to the dst_file on disk
+  def self.disk_mv(src_file, dst_file, options)
+    mover = options[:git] ? "git mv" : "mv"
+    command = "#{mover} '#{src_file.path}' '#{dst_file.path}'"
     system(command) || abort
+  end
 
-    # Save
-    src.save_and_close
-    dst.save_and_close
+  # Save the src_file and dst_file project files to disk
+  def self.save(src_file, dst_file)
+    src_file.save_and_close
+    dst_file.save_and_close
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcmv
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Elliott Williams
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Xcode Move