cocoapods-deploy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e393bffd3f9f720bb14107de16e6416afcedf96
-  data.tar.gz: 7c5d1553e864ceba8b972deb89ed3267559d6ad8
+  metadata.gz: b70cac794d9f1c7862a1a4644a649e081c2f1aac
+  data.tar.gz: 8f211a9467688033e5fa7e1af318eb452f46e532
 SHA512:
-  metadata.gz: ef4d929e745cb8747cce8989110da15d1769b682c12213d4dac27edc095333fd3b16557f9e980c32789c6bf732683404f5d6bf876a2334c0cf5d5d553b4c349b
-  data.tar.gz: 93852374b9c64cb900be51b2b6affaff18e18c081f3b38c0d9286dbc3dfc77af8adca9751a168589a17dc1290b58ec39f2ff16ab9b2ff1a92dbddbd27876aeb7
+  metadata.gz: 7746f4b0a171776a8903db8aff4c1874cb84c59085271ca3bb2f6a1eb012a5ec5eaa42a565f6ce150f74029e66a9d79ff1b25e845a2e1f1becd445555c57c96f
+  data.tar.gz: 1f9d932936d28309dd668484597a69e95191bd6ce2e374335728732321943e6e83f633d785281500980f2ee33e391f5576778f6bd5c51ca9260ca131211dd701

data/cocoapods-deploy.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: cocoapods-deploy 0.0.4 ruby lib
+# stub: cocoapods-deploy 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoapods-deploy"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.date = "2016-03-07"
   s.description = "Implement's bundler's --deployment functionality in CocoaPods."
   s.email = ["james@supmenow.com"]
-  s.files = [".gitignore", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "cocoapods-deploy.gemspec", "lib/cocoapods-deploy/command.rb", "lib/cocoapods-deploy/command/deploy.rb", "lib/cocoapods-deploy/dependency.rb", "lib/cocoapods-deploy/deploy_analyzer.rb", "lib/cocoapods-deploy/deploy_installer.rb", "lib/cocoapods-deploy/gem_version.rb", "lib/cocoapods-deploy.rb", "lib/cocoapods_plugin.rb", "spec/spec_helper.rb"]
+  s.files = [".gitignore", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "cocoapods-deploy.gemspec", "lib/cocoapods-deploy/command.rb", "lib/cocoapods-deploy/command/deploy.rb", "lib/cocoapods-deploy/deploy_transformer.rb", "lib/cocoapods-deploy/deploy_analyzer.rb", "lib/cocoapods-deploy/deploy_installer.rb", "lib/cocoapods-deploy/gem_version.rb", "lib/cocoapods-deploy.rb", "lib/cocoapods_plugin.rb", "spec/spec_helper.rb"]
   s.homepage = "https://github.com/jcampbell05/cocoapods-deploy"
   s.licenses = ["MIT"]
   s.rubygems_version = "2.4.8"

data/lib/cocoapods-deploy/command/deploy.rb

@@ -1,36 +1,5 @@
-def podspec_url(pod, version)
-  "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/#{pod}/#{version}/#{pod}.podspec.json"
-end
-
 module Pod
   class Command
-
-    #Hack to help transform target dependencies
-    class DeployTransformer
-
-      def self.lockfile=(lockfile)
-        @@lockfile = lockfile
-      end
-
-      #TODO: Remove Workaround resolver trying to pull down invalid pods
-      def self.in_lockfile(dep)
-        @@lockfile.pod_names.include? dep.root_name
-      end
-
-      #TODO: Remove lockfile modifications
-      def self.transform_dependency_to_sandbox_podspec(dep)
-        unless dep.external_source
-          version = @@lockfile.version(dep)
-          checkout = { :podspec => podspec_url(dep.root_name, version) }
-          dep.external_source = checkout
-          dep.specific_version = nil
-          dep.requirement = Requirement.create(checkout)
-        end
-
-        dep
-      end
-    end
-
     class Deploy < Command
 
       include Project
@@ -41,123 +10,111 @@ module Pod
         Install project dependencies to Podfile.lock versions without pulling down full podspec repo.
       DESC
 
-      #TODO: Remove Hack to transform podfile dependencies to podspec ones - we should find
-      #a way of removing some of these
-      def apply_dependency_patches
-
-        DeployTransformer.lockfile = config.lockfile
-
-        Specification.class_eval do
-
-          alias_method :original_all_dependencies, :all_dependencies
-
-          def all_dependencies(platform = nil)
-            deps = original_all_dependencies(platform = nil).select do |dep|
-              DeployTransformer.in_lockfile(dep)
-            end
+      # This method sets up the environment to be optimised
+      # for CocoaPod Deployment.
+      #
+      # Turning off things like repo cloning, clean-up and statistics.
+      def setup_environment
+        # Disable Cocoapods Stats - Due to
+        # https://github.com/CocoaPods/cocoapods-stats/issues/28
+        ENV['COCOAPODS_DISABLE_STATS'] = "1"
+
+        # Disable updating of the CocoaPods Repo since we are directly
+        # deploying using Podspecs
+        config.skip_repo_update = true
+
+        # Disable cleaning of the source file since we are deploying
+        # and we don't need to keep things clean.
+        config.clean = false
+      end
 
-            deps.map do |dep|
+      # Verify the environment is ready for deployment
+      # i.e Do we have a podfile and lockfile.
+      def verify_environment
+        verify_podfile_exists!
+        verify_lockfile_exists!
+      end
 
-              unless dep.external_source
-                DeployTransformer.transform_dependency_to_sandbox_podspec(dep)
-              else
-                dep
-              end
-            end
-          end
-        end
+      # This prepares the Podfile and Lockfile for deployment
+      # by transforming Repo depedencies to Poddpec based dependencies
+      # and making sure we have eveything we need for Subspecs which
+      # typially don't work with Podspec based depedencies.
+      def transform_podfile
+        transformer = DeployTransformer.new(config.lockfile, config.sandbox)
+        transformer.transform_podfile(config.podfile)
+      end
 
+      # Applies patch to resolver as it needs help being pointed to use the
+      # local podspecs due to limitations in CocoaPods. We may be able to remove
+      # this in the future.
+      #
+      # In the future passing the lockfile into the resolve is hacked
+      # potentially we could have a special deploy subclass.
+      #
+      # TODO: BDD
+      def apply_resolver_patch
         Resolver.class_eval do
 
-          alias_method :original_locked_dependencies, :locked_dependencies
+          def find_cached_set(dependency)
+            name = dependency.root_name
 
-          def dependencies
-            original_locked_dependencies.map do |dep|
-
-              unless dep.external_source
-                DeployTransformer.transform_dependency_to_sandbox_podspec(dep)
-              else
-                dep
+            unless cached_sets[name]
+              spec = sandbox.specification(name)
+              set = Specification::Set::External.new(spec)
+              cached_sets[name] = set
+              unless set
+                raise Molinillo::NoSuchDependencyError.new(dependency) # rubocop:disable Style/RaiseArgs
               end
             end
-          end
-        end
-
-        Podfile::TargetDefinition.class_eval do
 
-          alias_method :original_dependencies, :dependencies
+            cached_sets[name]
+          end
 
-          def dependencies
-            original_dependencies.map do |dep|
+          def dependencies_for(specification)
+            dependencies = specification.all_dependencies.select { |dep|
+              Config.instance.lockfile.version(dep.root_name) != nil
+            }
 
-              unless dep.external_source
-                DeployTransformer.transform_dependency_to_sandbox_podspec(dep)
+            dependencies.map do |dependency|
+              if dependency.root_name == Specification.root_name(specification.name)
+                dependency.dup.tap { |d| d.specific_version = specification.version }
               else
-                dep
+                dependency
               end
             end
           end
         end
       end
 
-      def transform_dependency_and_version_to_remote_podspec(dep, version)
-        unless dep.external_source
-          checkout = { :podspec => podspec_url(dep.root_name, version) }
-          dep.external_source = checkout
-          dep.specific_version = nil
-          dep.requirement = Requirement.create(checkout)
-        end
-
-        dep
-      end
-
-      def dependency_for_pod_and_version(pod, version)
-        dep = config.lockfile.dependencies.detect { |d| d.root_name == pod }
-
-        unless dep
-          dep = Dependency.new(pod, version)
+      # Installs required sources for lockfile - TODO: Simplify code
+      def install_sources_for_lockfile
+        config.lockfile.pod_names.each do |pod|
+          install_sources_for_pod(pod)
         end
-
-        dep
       end
 
-      def download_dependency(dep)
+      # Installs required sources for pod.
+      def install_sources_for_pod(pod)
+        transformer = DeployTransformer.new(config.lockfile, config.sandbox)
+        dep = transformer.transform_dependency_name(pod)
         source = ExternalSources.from_dependency(dep, config.podfile.defined_in_file)
         source.fetch(config.sandbox)
       end
 
-      def transform_pod_and_version(pod, version)
-        dep = dependency_for_pod_and_version(pod, version)
-        transform_dependency_and_version_to_remote_podspec(dep, version)
-        download_dependency(dep)
+      # Triggers the CocoaPods install process
+      def install(podfile)
+        installer = DeployInstaller.new(config.sandbox, podfile, nil)
+        installer.install!
       end
 
       def run
-        verify_podfile_exists!
-        verify_lockfile_exists!
+        setup_environment
+        verify_environment
 
-        UI.puts("- Deploying Pods")
+        apply_resolver_patch
 
-        config.lockfile.pod_names.each do |pod|
-          version = config.lockfile.version(pod)
-          UI.puts("- Deploying #{pod} #{version}")
-          transform_pod_and_version(pod, version)
-        end
-
-        run_install_with_update(false)
-      end
-
-      def run_install_with_update(update)
-        ENV['COCOAPODS_DISABLE_STATS'] = "true" #Disable Cocoapods Stats
-        config.skip_repo_update = true #Force this to be true so it is always skipped
-        config.clean = false #Disable source files from being cleaned
-
-        #TODO: Work out way of transforming dependencies without patch
-        apply_dependency_patches
-
-        installer = DeployInstaller.new(config.sandbox, config.podfile, config.lockfile)
-        installer.update = update
-        installer.install!
+        install_sources_for_lockfile
+        install(transform_podfile)
       end
     end
   end

data/lib/cocoapods-deploy/deploy_transformer.rb

@@ -0,0 +1,103 @@
+module Pod
+  class DeployTransformer
+
+    attr_accessor :lockfile
+    attr_accessor :sandbox
+
+    def initialize(lockfile, sandbox)
+      @lockfile = lockfile
+      @sandbox = sandbox
+    end
+
+    def transform_podfile(podfile)
+      internal_hash = podfile.to_hash
+      new_hash = transform_internal_hash(internal_hash)
+
+      Podfile.from_hash(new_hash, podfile.defined_in_file)
+    end
+
+    def transform_dependency_name(name)
+      dependency_hash = transform_dependency(name)
+      parse_dependency(dependency_hash)
+    end
+
+    private
+
+    def transform_internal_hash(hash)
+      targets = hash["target_definitions"]
+      targets.map do |target|
+        transform_target_definition_hash(target)
+      end if targets
+
+      hash
+    end
+
+    def transform_target_definition_hash(hash)
+      dependencies = hash["dependencies"]
+      hash["dependencies"] = dependencies.map do |dep|
+        transform_dependency(dep)
+      end if dependencies
+
+      #Duplicate this to prevent infinte loop
+      dependencies = hash["dependencies"]
+      dependencies.dup.map do |dep|
+        podspec_dependencies = collect_podspec_dependencies(dep)
+        hash["dependencies"].concat(podspec_dependencies) if podspec_dependencies
+      end if dependencies && @sandbox
+
+      children = hash["children"]
+      hash["children"] = children.map do |target|
+        transform_target_definition_hash(target)
+      end if children
+
+      hash
+    end
+
+    def parse_dependency(name_or_hash)
+      if name_or_hash.is_a?(Hash)
+        name = name_or_hash.keys.first
+        requirements = name_or_hash.values.first
+        Dependency.new(name, *requirements)
+      else
+        Dependency.new(name_or_hash)
+      end
+    end
+
+    def podspec_url(pod, version)
+      "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/#{pod}/#{version}/#{pod}.podspec.json"
+    end
+
+    def collect_podspec_dependencies(name_or_hash)
+      dependency = parse_dependency(name_or_hash)
+      specification = @sandbox.specification(dependency.root_name)
+
+      dependencies = specification.dependencies.map do |dep|
+        begin
+          transform_dependency(dep.name)
+        rescue Informative
+          nil
+        end
+      end if specification
+
+      dependencies.select { |dep|
+        dep != nil
+      }
+    end
+
+    def transform_dependency(name_or_hash)
+      dependency = parse_dependency(name_or_hash)
+      pod = dependency.name
+      checkout_options = @lockfile.checkout_options_for_pod_named(pod)
+
+      unless checkout_options
+        root_pod = dependency.root_name
+        version = @lockfile.version(pod)
+        raise Informative, "Missing dependency \"#{pod}\" in Lockfile please run `pod install` or `pod update`." unless version
+
+        ({ "#{pod}" => [{ :podspec => podspec_url(root_pod, version) }] })
+      else
+        ({ "#{pod}" => [checkout_options] })
+      end
+    end
+  end
+end

data/lib/cocoapods-deploy/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsDeploy
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/cocoapods_plugin.rb

@@ -1,4 +1,4 @@
-require 'cocoapods-deploy/dependency'
 require 'cocoapods-deploy/deploy_analyzer'
 require 'cocoapods-deploy/deploy_installer'
+require 'cocoapods-deploy/deploy_transformer'
 require 'cocoapods-deploy/command'

data/spec/command/deploy_spec.rb

@@ -1,11 +1,151 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
+class MockExternalSource
+  def initialize
+  end
+
+  def fetch
+  end
+end
+
 module Pod
   describe Command::Deploy do
+
+    before do
+      @command = Command.parse(%w{ deploy })
+      @command.stubs(:verify_lockfile_exists!)
+      @command.stubs(:verify_podfile_exists!)
+
+      @podfile = Podfile.new
+      Config.instance.stubs(:podfile).returns(@podfile)
+
+      @lockfile = Lockfile.new({
+        "PODS" => [
+          "Google/Analytics (1.0)",
+          "Mixpanel (1.0)"
+        ]
+      })
+      Config.instance.stubs(:lockfile).returns(@lockfile)
+    end
+
     describe 'CLAide' do
       it 'registers it self' do
-        Command.parse(%w{ deploy }).should.be.instance_of Command::Deploy
+        @command.should.be.instance_of Command::Deploy
+      end
+    end
+
+    describe 'setting up enviroment' do
+
+      before do
+        @command.stubs(:transform_podfile)
+        @command.stubs(:install_sources_for_lockfile)
+        @command.stubs(:install)
+      end
+
+      it 'should disable cocoapods-stats' do
+        ENV.expects(:[]=).with("COCOAPODS_DISABLE_STATS", "1")
+        @command.run
+      end
+
+      it 'should skip repo update' do
+        Config.instance.expects(:skip_repo_update=).with(true)
+        @command.run
+      end
+
+      it 'should skip source file clean' do
+        Config.instance.expects(:clean=).with(false)
+        @command.run
+      end
+
+      it 'should verify podfile' do
+        @command.expects(:verify_lockfile_exists!)
+        @command.run
+      end
+
+      it 'should verify lockfile' do
+        @command.expects(:verify_podfile_exists!)
+        @command.run
+      end
+    end
+
+    describe 'converting podfile dependencies' do
+
+      before do
+        @command.stubs(:install_sources_for_lockfile)
+        @command.stubs(:install)
+
+        @transformer = DeployTransformer.new(nil, nil)
       end
+
+      it 'should create transformer with lockfile' do
+        DeployTransformer.expects(:new).with(@lockfile, Config.instance.sandbox).returns(@transformer)
+        @command.run
+      end
+
+      it 'should create transform podfile' do
+        @transformer.expects(:transform_podfile).with(@podfile)
+
+        DeployTransformer.stubs(:new).returns(@transformer)
+        @command.run
+      end
+    end
+
+    describe 'when installing' do
+
+      before do
+        @command.stubs(:install_sources_for_lockfile)
+        @command.stubs(:transform_podfile).returns(@podfile)
+
+        @installer = DeployInstaller.new(@sandbox, @podfile, nil)
+        @installer.stubs(:install!)
+        DeployInstaller.stubs(:new).returns(@installer)
+      end
+
+      it 'should create new installer' do
+        DeployInstaller.expects(:new).with(Config.instance.sandbox, @podfile, nil).returns(@installer)
+        @command.run
+      end
+
+      it 'should invoke installer' do
+        @installer.expects(:install!)
+        @command.run
+      end
+    end
+
+    describe 'when downloading pod sources' do
+
+      before do
+        @dependency = Dependency.new("Google/Analytics")
+        @lockfile.stubs(:pod_names).returns(["Google/Analytics"])
+
+        @transformer = DeployTransformer.new(nil, nil)
+        @transformer.stubs(:transform_dependency_name).with("Google/Analytics").returns(@dependency)
+        DeployTransformer.stubs(:new).returns(@transformer)
+
+        @source = MockExternalSource.new
+        @command.stubs(:transform_podfile).returns(@podfile)
+        @command.stubs(:install)
+      end
+
+      it 'should create new external source' do
+        ExternalSources.expects(:from_dependency).with(@dependency, @podfile.defined_in_file).returns(@source)
+        @source.stubs(:fetch)
+        @command.run
+      end
+
+      it 'should fetch source' do
+        ExternalSources.stubs(:from_dependency).returns(@source)
+        @source.expects(:fetch)
+        @command.run
+      end
+
+      # TODO: Reducing duplicates
+
+      # TODO: Patches
+
+      # Figure out how to test external source here.
+
+      # Figure out how to handle location
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - James Campbell
@@ -54,9 +54,9 @@ files:
 - lib/cocoapods-deploy.rb
 - lib/cocoapods-deploy/command.rb
 - lib/cocoapods-deploy/command/deploy.rb
-- lib/cocoapods-deploy/dependency.rb
 - lib/cocoapods-deploy/deploy_analyzer.rb
 - lib/cocoapods-deploy/deploy_installer.rb
+- lib/cocoapods-deploy/deploy_transformer.rb
 - lib/cocoapods-deploy/gem_version.rb
 - lib/cocoapods_plugin.rb
 - spec/command/deploy_spec.rb

data/lib/cocoapods-deploy/dependency.rb

@@ -1,11 +0,0 @@
-module Pod
-  class Dependency
-    def requirement=(requirement)
-      @requirement = requirement
-    end
-
-    def external_source=(external_source)
-      @external_source = external_source
-    end
-  end
-end