cocoapods-deploy 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848abbd9996c26ac01f3f2db4bb916fbe01ca423
-  data.tar.gz: f06ca063d50a5765f375eb34fe622f6abbd7b1c3
+  metadata.gz: 23f72e7976f12eea154d47725abec6817f285477
+  data.tar.gz: 35c215104c85952786895b18b2388e5dbd2213b6
 SHA512:
-  metadata.gz: 707c57134eecedb0337869cb33afaecb318aca8f2b524e5f0d1f6f7cf2ca371a2be9af0cdce1940d793eec32beb54b3962af58c29ac7cca1c927231e817bd76a
-  data.tar.gz: bdbe7a768450629ad2ed0f4a57f39bc075561ee4e50e8d28e55d34d9f7c10e9f22378df4c1b325b0a6cba0bcddac21704e47dd1fb38cabe1b17fffffe932ce55
+  metadata.gz: c33fc62c642222dcbab9b68215f4170bb3657c2061eb46a6e798fe6de708f1a1767b3a9eb52fe8f1a8a73a1b001d05412015f24cba91818f091b55308e4669c2
+  data.tar.gz: 6cec03f1019d8ad175c3a797d60ee95e2d817b0c8c7eb5ad3bc905b61d96506358b2298fdd7e38bd968579c25174b4d0131595e808c66da14115f0ea2df983c1

data/cocoapods-deploy.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: cocoapods-deploy 0.0.9 ruby lib
+# stub: cocoapods-deploy 0.0.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cocoapods-deploy"
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   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/deploy_transformer.rb", "lib/cocoapods-deploy/deploy_analyzer.rb", "lib/cocoapods-deploy/deploy_downloader.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_downloader.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", "lib/cocoapods-deploy/patches/write_lockfile_patch.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,3 +1,5 @@
+# - Patch Lockfile to store URLs
+# - Use the data in deploy
 module Pod
   class Command
     class Deploy < Command
@@ -43,7 +45,6 @@ module Pod
       # 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
 
@@ -77,28 +78,27 @@ module Pod
           end
         end
       end
-      
+
       # Applies patch to external sources to add a no_validate option which
       # can be used to disable validation of downloaded podspecs. A normal install
       # doesn't validate the podspecs of non-external pods even though certain
       # podspecs are not entirely valid (for example an invalid license file type).
       # This would mean the normal install command can install certain pods that deploy
-      # doesn't because of the validation. This patch makes sure validation doesn't 
+      # doesn't because of the validation. This patch makes sure validation doesn't
       # happen when deploy is being used.
       #
-      # TODO: BDD      
       def apply_external_sources_patch
         ExternalSources::AbstractExternalSource.class_eval do
           attr_accessor :no_validate
-              
+
           old_validate_podspec = instance_method(:validate_podspec)
-              
+
           def validate_podspec(podspec)
             return if no_validate
             old_validate_podspec(podspec)
           end
         end
-      end      
+      end
 
       # Installs required sources for lockfile - TODO: Simplify code
       def install_sources_for_lockfile
@@ -119,15 +119,15 @@ module Pod
       # Triggers the CocoaPods install process
       def install(podfile)
         installer = DeployInstaller.new(config.sandbox, podfile, nil)
-        
+
         # Disable updating of the CocoaPods Repo since we are directly
         # deploying using Podspecs
         installer.repo_update = false
 
         # Disable cleaning of the source file since we are deploying
         # and we don't need to keep things clean.
-        installer.installation_options.clean = false        
-        
+        installer.installation_options.clean = false
+
         installer.install!
       end
 
@@ -135,7 +135,6 @@ module Pod
         setup_environment
         verify_environment
 
-        # TODO: BDD Patch
         apply_resolver_patch
         apply_external_sources_patch
 

data/lib/cocoapods-deploy/deploy_transformer.rb

@@ -3,10 +3,12 @@ module Pod
 
     attr_accessor :lockfile
     attr_accessor :sandbox
+    attr_accessor :metadata
 
     def initialize(lockfile, sandbox)
       @lockfile = lockfile
       @sandbox = sandbox
+      @metadata = Source::Metadata.new({'prefix_lengths' => [1, 1, 1]})
     end
 
     def transform_podfile(podfile)
@@ -64,7 +66,8 @@ module Pod
     end
 
     def podspec_url(pod, version)
-      "{root-url}/#{pod}/#{version}/#{pod}"
+      path_fragment = metadata.path_fragment(pod)
+      "{root-url}/#{path_fragment}/#{version}/#{pod}"
     end
 
     def collect_podspec_dependencies(name_or_hash)

data/lib/cocoapods-deploy/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsDeploy
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/cocoapods-deploy/patches/write_lockfile_patch.rb

@@ -0,0 +1,87 @@
+module Pod
+
+    # - Apply patch to sandbox
+    # - Both work together to record URI of ext pod
+    # - deploy transformer should use this data
+    # - Help people upgrade to 0.1 of cocoapods-deploy
+
+    Sandbox.class_eval do
+
+        def external_podspecs
+            @external_podspecs
+        end
+
+        def store_external_podspec(name, url)
+            UI.message("store #{name} and #{url}")
+            @external_podspecs ||= {}
+            @external_podspecs[name] = url
+        end
+    end
+
+    Installer.class_eval do
+
+        def apply_lockfile_patch
+
+            ExternalSources::DownloaderSource.class_eval do
+                def pre_download(sandbox)
+
+                    # - Call original and just apply the store section afterwards
+
+                    strategy = Downloader.strategy_from_options(params)
+                    options = params.dup
+                    url = options.delete(strategy)
+
+                    title = "Pre-downloading: `#{name}` #{description}"
+                    UI.titled_section(title,  :verbose_prefix => '-> ') do
+                      target = sandbox.pod_dir(name)
+                      download_result = Downloader.download(download_request, target, :can_cache => can_cache)
+                      spec = download_result.spec
+
+                      raise Informative, "Unable to find a specification for '#{name}'." unless spec
+
+                      store_podspec(sandbox, spec)
+                      sandbox.store_external_podspec(name, url)
+                      sandbox.store_pre_downloaded_pod(name)
+                      sandbox.store_checkout_source(name, download_result.checkout_options)
+                    end
+              end
+            end
+
+            Lockfile.class_eval do
+                def self.generate(podfile, specs, checkout_options, podspecs)
+                    hash = {
+                      'PODS'             => generate_pods_data(specs),
+                      'DEPENDENCIES'     => generate_dependencies_data(podfile),
+                      'EXTERNAL SOURCES' => generate_external_sources_data(podfile),
+                      'CHECKOUT OPTIONS' => checkout_options,
+                      'SPEC CHECKSUMS'   => generate_checksums(specs),
+                      'PODFILE CHECKSUM' => podfile.checksum,
+                      'EXTERNAL PODSPECS' => podspecs,
+                      'COCOAPODS'        => CORE_VERSION,
+                      'COCOAPODS DEPLOY' => '0.0.11' # - Get from cocoapods version
+                    }
+                    Lockfile.new(hash)
+                end
+            end
+        end
+
+        def write_lockfiles
+         apply_lockfile_patch
+
+         # How do we get URL for podspec on download that we can put here ?
+         external_source_pods = podfile.dependencies.select(&:external_source).map(&:root_name).uniq
+         checkout_options = sandbox.checkout_sources.select { |root_name, _| external_source_pods.include? root_name }
+         @lockfile = Lockfile.generate(podfile, analysis_result.specifications, checkout_options, sandbox.external_podspecs)
+
+         UI.message "- Writing Lockfile in #{UI.path config.lockfile_path}" do
+           @lockfile.write_to_disk(config.lockfile_path)
+         end
+
+         UI.message "- Writing Manifest in #{UI.path sandbox.manifest_path}" do
+           sandbox.manifest_path.open('w') do |f|
+             f.write config.lockfile_path.read
+           end
+         end
+       end
+    end
+end

data/lib/cocoapods_plugin.rb

@@ -3,3 +3,4 @@ require 'cocoapods-deploy/deploy_downloader'
 require 'cocoapods-deploy/deploy_installer'
 require 'cocoapods-deploy/deploy_transformer'
 require 'cocoapods-deploy/command'
+require 'cocoapods-deploy/patches/write_lockfile_patch'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - James Campbell
@@ -61,6 +61,7 @@ files:
 - lib/cocoapods-deploy.rb
 - lib/cocoapods_plugin.rb
 - spec/spec_helper.rb
+- lib/cocoapods-deploy/patches/write_lockfile_patch.rb
 - spec/command/deploy_spec.rb
 homepage: https://github.com/jcampbell05/cocoapods-deploy
 licenses: