cocoapods-localsource 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d226d2318016e6f6547c22c3f9e8d04eecca659
-  data.tar.gz: 52498570d1b9f13f01837ddc35977ac1a989a9ab
+  metadata.gz: 6d475a0ff9c25be38fc36c5cd9db0bad44464f43
+  data.tar.gz: 1ab25d87ce28d632220a00185853e24e8243138e
 SHA512:
-  metadata.gz: 74516cced935f8f95cfee466303175a8fba44a80da0cdaa8923f69307c3c663cdbb2aea7e4818decde9b73ae62049e6bca91e3c23065cba96eb733fdd141c4c3
-  data.tar.gz: 43de18ec5abe0cdee7e666ba4e5501342b06929430a39b9321b1e20d9d023578f880988c1bd2f727a991ebc98dbce6ab02b9d200741294efe86ac943bbbc668f
+  metadata.gz: 5faf4968e1128d7d43453b524243f34889de98c7d729365af77ccc2aa1c581327b0bbb680b99872089de4f4931fb2006541fb2567100728e234fb01130b054c9
+  data.tar.gz: 9ee6f0b7eb24ddac6b85827e842730b09cab45ff57e125ea75b791886ff5bddf9afee933818e731938f39e22ee6b55dd07b94c996e3dc0ea2c06afa42c13eabb

data/lib/cocoapods-localsource/LocalModuleManager.rb

@@ -1,82 +1,89 @@
-require 'cocoapods-core'
-
-module Pod
-    class Podfile
-      module DSL
-        def local_source(*paths)
-            paths.each do |path|
-                LocalModuleManager.addLocalPath(path)
-            end
-        end
-      end
-    end
-end
+class LocalModuleManager
+  @@all_modules = {}
+  @@resolved_modules = {}
+  @@local_paths = []
 
-class LocalModuleManager 
-    @@all_modules = {}
-    @@resolved_modules = {}
+  def self.all_modules
+    @@all_modules
+  end
+
+  def self.resolved_modules
+    @@resolved_modules
+  end
 
-    def self.all_modules
-      @@all_modules
+  def self.local_paths
+    @@local_paths
+  end
+
+  def self.set_resolved(name)
+    @@resolved_modules[name] = true
+  end
+
+  def self.resolved?(name)
+    @@resolved_modules.key?(name)
+  end
+
+  def self.addLocalPath(path)
+    raise "Trying to add local path '#{path}' twice" unless !@@local_paths.include?(path)
+
+    @@local_paths << path
+    dependencies = findLocalModules(path)
+
+    dependencies.each do |key, value|
+      existingModule = @@all_modules[value.name]
+      raise "Duplicate local module definition for #{value.name} at #{path}. Already defined here: #{existingModule.module_podspec_path}" unless existingModule.nil?
+      @@all_modules[key] = value
     end
+  end
+
+  def self.local?(name)
+    !@@all_modules[name].nil?
+  end
 
-    def self.set_resolved(name)
-      @@resolved_modules[name] = true 
+  def self.findLocalModules(path)
+    modules = {}
+    Dir.chdir(path) do
+      podspec_paths = Dir["*/*.podspec"]
+
+      podspec_paths.each do |p|
+        pathComponents = p.split("/")
+        moduleName = pathComponents[1].split(".podspec")[0]
+        foundModule = LocalModule.new(path, pathComponents[0], moduleName)
+
+        modules[moduleName] = foundModule
+      end
     end
 
-    def self.resolved?(name)
-      @@resolved_modules.key?(name)
-    end 
-
-    def self.addLocalPath(path)
-        dependencies = findLocalModules(path)
-
-        dependencies.each do |key, value|
-            existingModule = @@all_modules[value.name]
-            raise "Duplicate local module definition for #{value.name} at #{path}. Already defined here: #{existingModule.module_podspec_path}" unless existingModule.nil?  
-            @@all_modules[key] = value
-        end
-    end 
-
-    def self.local?(name)
-        !@@all_modules[name].nil?
-    end 
-
-    def self.findLocalModules(path)
-        modules = {}
-        Dir.chdir(path) do
-          podspec_paths = Dir["*/*.podspec"]
-    
-          podspec_paths.each do |p|
-            pathComponents = p.split("/")
-            moduleName = pathComponents[1].split(".podspec")[0]
-            foundModule = LocalModule.new(path, pathComponents[0], moduleName)
-    
-            modules[moduleName] = foundModule
-          end 
-        end 
-    
-        return modules
-    end 
+    return modules
+  end
+
+  def self.clear
+    @@all_modules = {}
+    @@resolved_modules = {}
+    @@local_paths = []
+  end
 end
 
+class LocalModule
+  def initialize(modulesPath, root, name)
+    @modules_path = modulesPath
+    @root = root
+    @name = name
+  end
 
-class LocalModule 
-    def initialize(modulesPath, root, name)    
-      @modules_path = modulesPath
-      @root = root
-      @name = name
-    end
+  attr_reader :modules_path
+  attr_reader :root
+  attr_reader :name
 
-    attr_reader :modules_path
-    attr_reader :root
-    attr_reader :name
-  
-    def module_path
-      "#{@modules_path}/#{@root}"
-    end
-  
-    def module_podspec_path
-      "#{@modules_path}/#{@root}/#{@name}.podspec"
-    end
-end 
+  def module_path
+    "#{@modules_path}/#{@root}"
+  end
+
+  def module_podspec_path
+    "#{@modules_path}/#{@root}/#{@name}.podspec"
+  end
+
+  def ==(anOther)
+    module_podspec_path == anOther.module_podspec_path
+  end
+end

data/lib/cocoapods-localsource/PodSwizzle.rb

@@ -1,78 +1,92 @@
-require 'cocoapods'
-require 'cocoapods-core'
-require_relative 'LocalModuleManager'
+require "cocoapods"
+require "cocoapods-core"
+require_relative "LocalModuleManager"
 
 module Pod
-	class Dependency
-		alias_method :real_initialize, :initialize
-        def initialize(name = nil, *requirements)
-            # adds requirement hash if it's not present
-            requirements << {} unless requirements.last.is_a?(Hash)
-
-			pathComponents = name.split("/")
-    	    baseName = pathComponents[0]
-
-			if LocalModuleManager.all_modules[baseName].present?
-                localModule = LocalModuleManager.all_modules[baseName]
-                # remove version requirement, if local
-                requirements = requirements[1..-1] unless requirements.first.is_a?(Hash)
-                # add path to local dependency
-				requirements.last[:path] = localModule.module_path 
-			end
-
-			real_initialize(name, *requirements)
-		end
-	end
+  class Podfile
+    module DSL
+      def local_source(*paths)
+        paths.each do |path|
+          LocalModuleManager.addLocalPath(path)
+        end
+      end
+    end
+  end
 end
 
 module Pod
-	class Installer
-		class Analyzer
-            def allDependenciesFor(name, localModules = LocalModuleManager.all_modules)
-                if LocalModuleManager.resolved?(name)
-                    # if the local dependency has already been resolved, we don't need to resolve the dependencies again.
-                    return []
-                end
-
-				pathComponents = name.split("/")
-				baseName = pathComponents[0]
-				importingSubspec = pathComponents.length > 1
-			
-				localModule = localModules[baseName]
-				
-				podspec = nil
-                # Position in the modules directory to generate the subspecs correctly
-                Dir.chdir(localModule.module_path) do 
-					podspec = eval File.read("#{baseName}.podspec")
-				end 
-			
-				# Use the subspec if we're importing it
-				if importingSubspec
-					podspec = podspec.subspec_by_name(name)
-				end
-				
-				# Get all local dependencies of the spec/subspec
-				allDependencies = podspec.all_dependencies.select { |d| LocalModuleManager.local?(d.name) }
-				
-				# Get other dependencies recursively
-				allDependencies.each do |dependency|
-					allDependencies += allDependenciesFor(dependency.name, localModules)
-                end
-                
-                LocalModuleManager.set_resolved(name)
-				return allDependencies.uniq
-			end
-
-			alias_method :real_dependencies_to_fetch, :dependencies_to_fetch
-			def dependencies_to_fetch(podfile_state)
-				real_dependencies_to_fetch(podfile_state)
-
-				resolvedLocalDependencies = @deps_to_fetch.map do |key, value|
-					allDependenciesFor(key.name)
-				end.flatten.uniq
-
-				@deps_to_fetch = (@deps_to_fetch | resolvedLocalDependencies).uniq
-            end
-		end
-	end
-end
+  class Dependency
+    alias_method :real_initialize, :initialize
+
+    def initialize(name = nil, *requirements)
+      # adds requirement hash if it's not present
+      requirements << {} unless requirements.last.is_a?(Hash)
+
+      pathComponents = name.split("/")
+      baseName = pathComponents[0]
+
+      if LocalModuleManager.all_modules[baseName].present?
+        localModule = LocalModuleManager.all_modules[baseName]
+        # remove version requirement, if local
+        requirements = requirements[1..-1] unless requirements.first.is_a?(Hash)
+        # add path to local dependency
+        requirements.last[:path] = localModule.module_path
+      end
+
+      real_initialize(name, *requirements)
+    end
+  end
+end
+
+module Pod
+  class Installer
+    class Analyzer
+      def allDependenciesFor(name, localModules = LocalModuleManager.all_modules)
+        if LocalModuleManager.resolved?(name)
+          # if the local dependency has already been resolved, we don't need to resolve the dependencies again.
+          return []
+        end
+
+        pathComponents = name.split("/")
+        baseName = pathComponents[0]
+        importingSubspec = pathComponents.length > 1
+
+        localModule = localModules[baseName]
+
+        podspec = nil
+        # Position in the modules directory to generate the subspecs correctly
+        Dir.chdir(localModule.module_path) do
+          podspec = eval File.read("#{baseName}.podspec")
+        end
+
+        # Use the subspec if we're importing it
+        if importingSubspec
+          podspec = podspec.subspec_by_name(name)
+        end
+
+        # Get all local dependencies of the spec/subspec
+        allDependencies = podspec.all_dependencies.select { |d| LocalModuleManager.local?(d.name) }
+
+        # Get other dependencies recursively
+        allDependencies.each do |dependency|
+          allDependencies += allDependenciesFor(dependency.name, localModules)
+        end
+
+        LocalModuleManager.set_resolved(name)
+        return allDependencies.uniq
+      end
+
+      alias_method :real_dependencies_to_fetch, :dependencies_to_fetch
+
+      def dependencies_to_fetch(podfile_state)
+        real_dependencies_to_fetch(podfile_state)
+
+        resolvedLocalDependencies = @deps_to_fetch.map do |key, value|
+          allDependenciesFor(key.name)
+        end.flatten.uniq
+
+        @deps_to_fetch = (@deps_to_fetch | resolvedLocalDependencies).uniq
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-localsource
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Daniel Peter
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
 description: "  cocoapods-localsource allows to import local development pods without
   specifying a path.\n  In your apps Podfile, require the gem and define the local
   module directory by passing the path to `local_source`.\n  Using this cocoapods