cocoapods-links 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f6dfa8e827e6e802fd332318988367826582abc
-  data.tar.gz: 41177f411fcf5d1e58fbded0a49d036beb7720d1
+  metadata.gz: 0defda2414869d041a19060d7b9c9193f1849003
+  data.tar.gz: 1f415a1613a482f2133e1ef24ac186c02f9a280a
 SHA512:
-  metadata.gz: e0176b4d5c15d542e87cb81886865c59798a00ac0b013a2834558f573d31e1f0e423d905f4715929ddeb6dc027ff2d37f8953939ebfc2720d7d8a8b4a434ad9d
-  data.tar.gz: b45cc452c2d3047c3d41e7543cba9ae4da3ae824e336fdfcf477a0afa0fdb3d9e8406471b2f4d01b3d0e6c49fdf3122d8d16bbb2df3339a2a39359d4c96f1024
+  metadata.gz: 62a21ae117b79564ceaabfdb6118eef8b46837541fa0103752ed32bd4fc6c1ffe99bd349965f66a5d87fcdd7536b3ac75167f1bba4d67aa5bb236b5685e9f607
+  data.tar.gz: 9c01e974e73845a2bace2d40825fc5a7021121c3d64530e50a31f497620b030b1e71615c1665f646234f9992f198d523c92a82def2d4a0d6c764e293ca7ba7f2

data/Gemfile.lock

@@ -1,67 +1,70 @@
 PATH
   remote: .
   specs:
-    cocoapods-links (0.1.0)
+    cocoapods-links (0.2.0)
       cocoapods (~> 0.35)
       json (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     bacon (1.2.0)
-    claide (0.7.0)
-    cocoapods (0.35.0)
-      activesupport (>= 3.2.15)
-      claide (~> 0.7.0)
-      cocoapods-core (= 0.35.0)
-      cocoapods-downloader (~> 0.8.0)
-      cocoapods-plugins (~> 0.3.1)
-      cocoapods-trunk (~> 0.4.1)
-      cocoapods-try (~> 0.4.2)
+    claide (0.9.1)
+    cocoapods (0.39.0)
+      activesupport (>= 4.0.2)
+      claide (~> 0.9.1)
+      cocoapods-core (= 0.39.0)
+      cocoapods-downloader (~> 0.9.3)
+      cocoapods-plugins (~> 0.4.2)
+      cocoapods-search (~> 0.1.0)
+      cocoapods-stats (~> 0.6.2)
+      cocoapods-trunk (~> 0.6.4)
+      cocoapods-try (~> 0.5.1)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.1.2)
-      nap (~> 0.8)
-      open4 (~> 1.3)
-      xcodeproj (~> 0.20.2)
-    cocoapods-core (0.35.0)
-      activesupport (>= 3.2.15)
+      molinillo (~> 0.4.0)
+      nap (~> 1.0)
+      xcodeproj (~> 0.28.2)
+    cocoapods-core (0.39.0)
+      activesupport (>= 4.0.2)
       fuzzy_match (~> 2.0.4)
-      nap (~> 0.8.0)
-    cocoapods-downloader (0.8.1)
-    cocoapods-plugins (0.3.2)
+      nap (~> 1.0)
+    cocoapods-downloader (0.9.3)
+    cocoapods-plugins (0.4.2)
       nap
-    cocoapods-trunk (0.4.1)
-      nap (>= 0.8)
+    cocoapods-search (0.1.0)
+    cocoapods-stats (0.6.2)
+    cocoapods-trunk (0.6.4)
+      nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (0.4.3)
+    cocoapods-try (0.5.1)
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
     i18n (0.7.0)
-    json (1.8.2)
+    json (1.8.3)
     metaclass (0.0.4)
-    minitest (5.5.1)
+    minitest (5.8.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.1.2)
-    nap (0.8.0)
+    molinillo (0.4.1)
+    nap (1.0.0)
     netrc (0.7.8)
-    open4 (1.3.4)
     rake (10.4.2)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (0.20.2)
+    xcodeproj (0.28.2)
       activesupport (>= 3)
+      claide (~> 0.9.1)
       colored (~> 1.2)
 
 PLATFORMS
@@ -74,3 +77,6 @@ DEPENDENCIES
   mocha
   mocha-on-bacon
   rake
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -23,21 +23,24 @@ you modify your `Podfile`:
 ```ruby
 pod 'Bar', :path => "/path/to/bar/checkout"
 ```
-The problem with this you have to make a temporary change to your `Podfile`
+This development flow requires you to make a temporary change to your `Podfile`
 that is managed by source control. Wouldn't it be great if CocoaPods offered a means to manage 
 development pods without having to alter files under source control? 
 
 Enter cocoapods-links.
 
-Wtth cocoapods-links link functionality allows developers to easily test their pods.
+With cocoapods-links, developers can easily test their pods using the provided link functionality.
 Linking is a two-step process:
 
-Using `pod link` in a project folder will register a global link. Then, in some other pod, 
-`pod link <name>` will create a link to the registered pod as a Development pod.
+Using `pod link` in a project folder will register a global link. Then, in another pod, 
+`pod link <name>` will create a link to the registered pod as a development pod.
 
-This allows to easily test a pod because changes will be reflected immediately.
+This allows developers to easily test a pod because changes will be reflected immediately.
 When the link is no longer necessary, simply remove it with `pod unlink <name>`.
 
+**NOTE:** Although the `Podfile` and `Podfile.lock` will not be updated using links, the Pods xcodeproj will be updated. If you check in the contents of your Pods directory then you must make sure
+to unlink your development pods prior to committing any changes.
+
 ## Usage
 
 #### Register

data/lib/cocoapods_links.rb

@@ -1,3 +1,3 @@
 module CocoapodsLinks
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/cocoapods_plugin.rb

@@ -1,4 +1,5 @@
 require 'pod/pod'
+require 'pod/lockfile'
 require 'pod/command/link'
 require 'pod/command/unlink'
 require 'pod/command/list'

data/lib/pod/links.rb

@@ -146,6 +146,21 @@ module Pod
         end
       end
 
+      #
+      # Get list of pods that are linked for the current pod project
+      # 
+      # @return an array of installed links
+      # 
+      def self.installed_links
+        installed = []
+        self.linked_pods.each do |pod|
+          unless self.get_registered_link(pod).nil?
+            installed.append(pod)
+          end
+        end
+        return installed
+      end
+
       #
       # Prints a formatted message with the Pod Links prefix
       # 

data/lib/pod/lockfile.rb

@@ -0,0 +1,244 @@
+require 'pod/links'
+
+#
+# Logic:
+# Override of the Lockfile generation to filter out linked pods in favor of their previously
+# installed state (e.g. the state reflected from the Podfile). This is somewhat brittle as it
+# depends on the format of the Lockfile hash contents. If the format changes, then this will also
+# need to be changed. It would be far better to integrate the link filtering elsewhere but this 
+# works "for now"
+# 
+
+module Pod
+  class Lockfile
+
+    PODFILE_LOCK = "Podfile.lock"
+
+    alias_method :real_write_to_disk, :write_to_disk
+
+    #
+    # Hook the Podfile.lock file generation to allow us to filter out the links added to the
+    # Podfile.lock. The logic here is to replace the new Podfile.lock link content with what existed
+    # before the link was added. Currently, this is called for both Podfile.lock and Manifest.lock
+    # file so we only want to alter the Podfile.lock
+    # 
+    # @param path path to write the .lock file to
+    # 
+    def write_to_disk(path)
+      
+      # code here mimics the original method but with link filtering
+      filename = File.basename(path)
+      path.dirname.mkpath unless path.dirname.exist?
+      yaml = to_link_yaml
+      File.open(path, 'w') { |f| f.write(yaml) }
+      self.defined_in_file = path
+    end
+
+    #
+    # Will create pretty print YAML stringfrom the links hash that is to be dumped to a Podfile.lock
+    # 
+    # This code is identical to `to_yaml` except we pass the `to_link_hash` instead of the `to_hash`
+    # 
+    # @returns the YAML string content to dump to a Podfile.lock without link content
+    # 
+    def to_link_yaml
+      keys_hint = [
+        'PODS',
+        'DEPENDENCIES',
+        'EXTERNAL SOURCES',
+        'CHECKOUT OPTIONS',
+        'SPEC CHECKSUMS',
+        'COCOAPODS',
+      ]
+      YAMLHelper.convert_hash(to_link_hash, keys_hint, "\n\n")
+    end
+
+    #
+    # Will get the Podfile.lock contents hash after replacing the linked content with its previous
+    # Podfile.lock information keeping the Podfile and Podfile.lock in sync and clear of any link
+    # data
+    # 
+    # @returns hash that is to be dumped to the Podfile.lock file without link content
+    # 
+    def to_link_hash
+
+      # retrieve the lock contents with links
+      after_hash = to_hash
+
+      unless File.exists?(PODFILE_LOCK)
+        return after_hash
+      end
+
+      # retrieve the lock content before the links
+      before_hash = YAML.load(File.read(PODFILE_LOCK))
+
+      # retrieve installed links
+      links = Pod::Command::Links.installed_links
+
+      #
+      # Logic:
+      # Here we will replace anything that changed in the contents that will be dumped in the
+      # Podfile.lock due to links with the data that previously exists in the Podfile.lock. This
+      # allows the Podfile.lock with the dependency trees to remain unchanged when linking
+      # developement pods. The Podfile.lock contains several keys, but we only need to alter the
+      # following:
+      # 
+      #  - PODS
+      #  - DEPENDENCIES
+      #  - EXTERNAL SOURCES
+      #  - CHECKOUT OPTIONS
+      #  - SPEC CHECKSUMS
+      # 
+      after_hash['PODS'] = 
+        merge_pods links, before_hash['PODS'], after_hash['PODS'] 
+      
+      after_hash['DEPENDENCIES'] = 
+        merge_dependencies links, before_hash['DEPENDENCIES'], after_hash['DEPENDENCIES']
+
+      after_hash['EXTERNAL SOURCES'] = 
+        merge_hashes links, before_hash['EXTERNAL SOURCES'], after_hash['EXTERNAL SOURCES']
+
+      after_hash['CHECKOUT OPTIONS'] = 
+        merge_hashes links, before_hash['CHECKOUT OPTIONS'], after_hash['CHECKOUT OPTIONS']
+
+      after_hash['SPEC CHECKSUMS'] = 
+        merge_hashes links, before_hash['SPEC CHECKSUMS'], after_hash['SPEC CHECKSUMS']
+
+      return after_hash
+    end
+
+    def merge_pods(links, before, after)
+      links.each do |link|
+        before_index = find_pod_index before, link
+        after_index = find_pod_index after, link
+        unless before_index.nil? || after_index.nil?
+          
+          # get previous value
+          after_value = after[after_index]
+
+          # update new value
+          after[after_index] = before[before_index]
+
+          # iterate and update all dependencies of previous value
+          if after_value.is_a?(Hash)
+
+            # clean all deps that may have been added as new deps
+            after_value[after_value.keys[0]].each do |key|
+              # key: CocoaLumberjack/Core or CocoaLumberjack/Extensions (= 1.9.2)
+              key_desc = key.split(" (", 2)[0]
+
+              inner_after_index = find_pod_index after, key_desc
+              inner_before_index = find_pod_index before, key_desc
+              
+              unless inner_before_index.nil? && inner_after_index.nil?
+                after[inner_after_index] = before[inner_before_index]
+              else 
+                # if it was removed in the new deps
+                unless before_index.nil?
+                  after.insert(before_index, before[before_index])
+                end
+              end   
+            end
+          end
+        end
+      end
+      return after
+    end
+
+    #
+    # Will merge the DEPENDENCIES of the Podfile.lock before a link and after a link
+    # 
+    # @param links the installed links
+    # @param before the DEPENDENCIES in the Podfile.lock before the link occurs
+    # @param after the DEPENDENCIES after the link (includes new link that we want to filter out)
+    # 
+    # @returns the merged DEPENDENCIES replacing any links that were added with their previous value
+    #
+    def merge_dependencies(links, before, after)
+      links.each do |link|
+        before_index = find_dependency_index before, link
+        after_index = find_dependency_index after, link
+        unless before_index.nil? || after_index.nil?
+          after[after_index] = before[before_index]
+        end
+      end
+      return after
+    end
+
+    #
+    # Will merge the hashes of the Podfile.lock before a link and after a link
+    # 
+    # @param links the installed links
+    # @param before the hash in the Podfile.lock before the link occurs
+    # @param after the hash after the link (includes new link that we want to filter out)
+    # 
+    # @returns the merged hash replacing any links that were added with their previous value
+    # 
+    def merge_hashes(links, before, after)
+      if before.nil?
+        return after
+      end
+      links.each do |link|
+        if before.has_key?(link)
+          after[link] = before[link]
+        else
+          if after.has_key?(link)
+            after.delete(link)
+          end
+        end
+      end
+      return after
+    end
+
+  private
+
+    #
+    # Find the index in the pod array based on the link name. The pod array
+    # also contains version/path information so we need to massage the pod value 
+    # for comparison. Pods are in the following format:
+    # 
+    # Name (requirements)
+    # 
+    # Example:
+    # Alamofire (= 1.1.3)
+    # 
+    # @param pods the array to search
+    # @param name the name of the pod to find
+    # 
+    # NOTE: the pods in the array can be strings or hashes, so we will check for both
+    # 
+    # @return the index of nil
+    # 
+    def find_pod_index(pods, name)
+      pods.index { |pod|
+        desc = pod
+        if pod.is_a?(Hash)
+          desc = pod.keys[0]
+        end
+        desc.split(" (", 2)[0] == name
+      }
+    end
+
+    #
+    # Find the index in the dependency array based on the link name. The dependency array
+    # also contains version/path information so we need to massage the dependency value 
+    # for comparison. Dependencies are in the following format:
+    # 
+    # Name (requirements)
+    # 
+    # Example:
+    # Alamofire (= 1.1.3)
+    # Quick (from `https://github.com/Quick/Quick`, tag `v0.2.2`)
+    # 
+    # @param dependencies the array to search
+    # @param name the name of the dependency to find
+    # 
+    # @returns the index of nil
+    # 
+    def find_dependency_index(dependencies, name)
+      dependencies.index { |dependency| 
+        dependency.split(" (", 2)[0] == name
+      }
+    end
+  end
+end

data/lib/pod/pod.rb

@@ -15,7 +15,13 @@ module Pod
         # via the link instead of the provided requirements (e.g. it will setup local pod development
         # for the link). If the link does not exist, then the pod will be installed normally
         # 
-        link = Pod::Command::Links.get_link(name)
+        
+        # handle subspec link
+        linked_name = name
+        if name.include? "/"
+          linked_name = name.split("/")[0]
+        end
+        link = Pod::Command::Links.get_link(linked_name)
         unless link.nil?
           Pod::Command::Links.print "Using link '#{name}' > #{link['path']}"
           real_pod(name, :path => link['path'], &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-links
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Owens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -90,6 +90,7 @@ files:
 - lib/pod/command/list.rb
 - lib/pod/command/unlink.rb
 - lib/pod/links.rb
+- lib/pod/lockfile.rb
 - lib/pod/pod.rb
 - spec/command/link_spec.rb
 - spec/command/list_spec.rb