cocoapods-azure-universal-packages 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e051ebb86ce103f034a0f2f2fbe5f8594933c7561c0c8c39abda6b4c27172e28
-  data.tar.gz: ca0ec59da4f7844774c6e4c962d8887619455e1889a3c6f1e6412705d8d59ed0
+  metadata.gz: ca06f2fa1acb83909c756ba68cad5e3e4d150c3dd9e19cc48f2e0411e2a75146
+  data.tar.gz: 293193c33ad6c5ab0965d376f8f4186ebb1d20c1154cd69f90bd5ac63d18786f
 SHA512:
-  metadata.gz: e36296b576a1f5cdc4a5af2daf7ed5c33666ee338b44b04547eabff1e15131af7b6833605352a962fa584e38c7edcba070cbf7ac0a68e1a6c4823ea80d774e10
-  data.tar.gz: b147236832cfbd6a9f7038f472c25abecd5089c1ef16abe370bc16693f42384fbeb40667c9b804bf933f1ac7de3ec9c1cef72629af8dae7debde16bcd673a4e0
+  metadata.gz: 11a6165328795b41d91fc765baae5050a42daf7e26a47647c96b8895fb034407c00602246fa1b3858987bf89df93e3fba0e8750d4824a0237f5632e35a98e5f9
+  data.tar.gz: 49308552fd05e90fe50c935ee085cf7c86cc045435c1dc8ac0ba8297f96a86919535e343dd9384898e60115d01be32d9d3818d054bc44297f51b0719d6c5caa2

data/README.md

@@ -30,22 +30,21 @@ _Note:_ The plugin will install the Azure CLI [DevOps extension](https://github.
 Add to your Podfile
 ```Ruby
 plugin 'cocoapods-azure-universal-packages', {
-    :base_url => '{{BASE_URL}}'
+    :organization => '{{ORGANIZATION_URL}}'
 }
 ```
-replacing `{{BASE_URL}}` with the base URL of your Azure Artifacts feed (for example, `https://pkgs.dev.azure.com/`).
+replacing `{{ORGANIZATION_URL}}` with the base URL of your Azure Artifacts feed (for example: `https://pkgs.dev.azure.com/myorg`).
 
 Then, in your podspec set the pod's source to
 ```Ruby
 # For project scoped feeds:
-spec.source = { :http => '{{BASE_URL}}/{{ORGANIZATION}}/{{PROJECT}}/_apis/packaging/feeds/{{FEED}}/upack/packages/{{PACKAGE}}/versions/{{VERSION}}' }
+spec.source = { :http => '{{ORGANIZATION_URL}}/{{PROJECT}}/_apis/packaging/feeds/{{FEED}}/upack/packages/{{PACKAGE}}/versions/{{VERSION}}' }
 
 # For organization scoped feeds:
-spec.source = { :http => '{{BASE_URL}}/{{ORGANIZATION}}/_apis/packaging/feeds/{{FEED}}/upack/packages/{{PACKAGE}}/versions/{{VERSION}}' }
+spec.source = { :http => '{{ORGANIZATION_URL}}/_apis/packaging/feeds/{{FEED}}/upack/packages/{{PACKAGE}}/versions/{{VERSION}}' }
 ```
 where:
-- `{{BASE_URL}}` is the base URL you chose above
-- `{{ORGANIZATION}}` is the name of your feed's organization
+- `{{ORGANIZATION_URL}}` is the URL of your feed's organization
 - `{{PROJECT}}` is the name of your feed's project (you must specify this only if your feed is a project scoped feed)
 - `{{PACKAGE}}` is the name of your universal package
 - `{{VERSION}}` is the version of your universal package
@@ -54,8 +53,8 @@ where:
 
 | Parameter | Description |
 | --------- | ----------- |
-| `base_url` | The base URL of the Azure Artifacts feed. Required unless `base_urls` is specified. |
-| `base_urls` | An array of base URLs of possible Azure Artifacts feeds. Required unless `base_url` is specified. |
+| `organization` | The URL of the Azure Artifacts feed's orgnization. Required unless `organizations` is specified. |
+| `organizations` | An array of URLs of possible Azure Artifacts feeds' organizations. Required unless `organization` is specified. |
 | `update_cli_extension` | Whether to update the Azure CLI DevOps extensions automatically. Default to `false`. |
 
 ## Run tests for this plugin

data/lib/cocoapods-azure-universal-packages/azure_universal_package_downloader.rb

@@ -5,10 +5,10 @@ require 'cocoapods-downloader'
 module Pod
   module Downloader
 
-    @azure_base_urls = []
+    @azure_organizations = []
 
     class << self
-      attr_accessor :azure_base_urls
+      attr_accessor :azure_organizations
     end
 
     class Http
@@ -20,39 +20,49 @@ module Pod
       executable :az
 
       def download!
-        aup_uri_template = Addressable::Template.new(
-          '{scheme}://{host}/{organization}{/project}/_apis/packaging/feeds/{feed}/upack/packages/{package}/versions/{version}'
-        )
-        uri = Addressable::URI.parse(url)
-        aup_uri_components = aup_uri_template.extract(uri)
+        # Check if the url matches any known Azure organization
+        organization = Downloader.azure_organizations.find { |org| url.to_s.start_with?(org) }
 
-        if !aup_uri_components.nil? && Downloader.azure_base_urls.include?("#{aup_uri_components['scheme']}://#{aup_uri_components['host']}")
-          download_azure_universal_package!(aup_uri_components)
+        if organization.nil?
+          aliased_download!
+        else
+          # Parse the url
+          organization.delete_suffix!('/')
+          aup_uri_template = Addressable::Template.new(
+            "#{organization}{/project}/_apis/packaging/feeds/{feed}/upack/packages/{package}/versions/{version}"
+          )
+          uri = Addressable::URI.parse(url)
+          aup_uri_components = aup_uri_template.extract(uri)
 
-          # Extract the file if it's the only one in the package
-          package_files = target_path.glob('*')
-          if package_files.count == 1 && package_files.first.file?
-            file = package_files.first
-            file_type = begin
-              case file.to_s
-              when /\.zip$/
-                :zip
-              when /\.(tgz|tar\.gz)$/
-                :tgz
-              when /\.tar$/
-                :tar
-              when /\.(tbz|tar\.bz2)$/
-                :tbz
-              when /\.(txz|tar\.xz)$/
-                :txz
-              when /\.dmg$/
-                :dmg
+          if !aup_uri_components.nil?
+            download_azure_universal_package!(aup_uri_components.merge({ 'organization' => organization }))
+  
+            # Extract the file if it's the only one in the package
+            package_files = target_path.glob('*')
+            if package_files.count == 1 && package_files.first.file?
+              file = package_files.first
+              file_type = begin
+                case file.to_s
+                when /\.zip$/
+                  :zip
+                when /\.(tgz|tar\.gz)$/
+                  :tgz
+                when /\.tar$/
+                  :tar
+                when /\.(tbz|tar\.bz2)$/
+                  :tbz
+                when /\.(txz|tar\.xz)$/
+                  :txz
+                when /\.dmg$/
+                  :dmg
+                end
               end
+              extract_with_type(file, file_type) unless file_type.nil?
             end
-            extract_with_type(file, file_type) unless file_type.nil?
+          else
+            Pod::UserInterface.warn("#{url} looks like a Azure artifact feed but it's malformed")
+            aliased_download!
           end
-        else
-          aliased_download!
         end
       end
 
@@ -62,7 +72,7 @@ module Pod
             'artifacts',
             'universal',
             'download',
-            '--organization', "#{params['scheme']}://#{params['host']}/#{params['organization']}/",
+            '--organization', params['organization'],
             '--feed', params['feed'],
             '--name', params['package'],
             '--version', params['version'],

data/lib/cocoapods-azure-universal-packages/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAzureUniversalPackages
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/cocoapods-azure-universal-packages/pre_install.rb

@@ -18,11 +18,11 @@ module CocoapodsAzureUniversalPackages
       end
 
       # Now we can configure the downloader to use the Azure CLI for downloading pods from the given hosts
-      azure_base_urls = options[:base_url] || options[:base_urls]
-      raise Pod::Informative, 'You must configure at least one Azure base url' unless azure_base_urls
+      azure_organizations = options[:organization] || options[:organizations]
+      raise Pod::Informative, 'You must configure at least one Azure organization' unless azure_organizations
 
-      Pod::Downloader.azure_base_urls = ([] << azure_base_urls).flatten.map { |url| url.delete_suffix('/') }
-      raise Pod::Informative, 'You must configure at least one Azure base url' if Pod::Downloader.azure_base_urls.empty?
+      Pod::Downloader.azure_organizations = ([] << azure_organizations).flatten.map { |url| url.delete_suffix('/') }
+      raise Pod::Informative, 'You must configure at least one Azure organization' if Pod::Downloader.azure_organizations.empty?
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-azure-universal-packages
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A CocoaPods plugin for downloading Universal Packages from Azure Artifacts