cocoapods-art 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 870aa39f965c0b9299969cfeb721dd7e2a99fb127f8897b6cd4a4625ba4d97a9
-  data.tar.gz: d45dc5116f076aa0e6470398c3f337e7511fee88402ea6965acd8a7c8699220b
+  metadata.gz: 6766dae826818897438c0508ad91862de9ed358fa0ae373c12f321bacd1a9e56
+  data.tar.gz: 64a40d3fcf1774c102b492fff4bd0dbe0c9f83939ffe5be87fef4ffd115ed8f7
 SHA512:
-  metadata.gz: f3d8d53970f76ac2044a709356e96a134305b7782967712a4b46681b8d08537b4397355aa0f5850df8bfaee27a86da724de787e9f7297ccd7b3774c298100447
-  data.tar.gz: 49f413bcae0b4354aff602ab23883126f51741ef5cc01e2f13cdd5b15eb082cad181290801725c2299be9b491fd44debf6b66ba9a23a3042b0f8bf69c8f01acb
+  metadata.gz: 71ef2693733214201065da26895dd4c70f8734172025a43ef424a3fd2550e1b9f5b6ecff38af6cd5d925a87d028ef1d4111441d764522d992c9993722835d110
+  data.tar.gz: 14c9d9a133c9286e2ef159c886813b6b681769f6e2a01252ad475033d2fd30f1a54455e61265bc121885d5b7f351b01589219bb9aaf0b1e05dd25fc872fe595b

data/Gemfile.lock

@@ -0,0 +1,95 @@
+PATH
+  remote: .
+  specs:
+    cocoapods-art (1.0.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.1)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    algoliasearch (1.27.0)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.0.3)
+    cocoapods (1.9.3)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.9.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.6.6)
+      nap (~> 1.0)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.9.3)
+      activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.0)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.4.0)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.4.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.1.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.5)
+    escape (0.0.4)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    minitest (5.12.0)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
+    nap (1.1.0)
+    netrc (0.11.0)
+    rake (0.9.6)
+    ruby-macho (1.4.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    xcodeproj (1.12.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.0.2)
+  claide
+  cocoapods
+  cocoapods-art!
+  cocoapods-core
+  cocoapods-downloader
+  rake (~> 0)
+
+BUNDLED WITH
+   2.0.2

data/README.md

@@ -33,6 +33,20 @@ If your .netrc file is not located in your home directory, you can specify its l
 export COCOAPODS_ART_NETRC_PATH=$HOME/myproject/.netrc
 ```
 
+Alternatively, you can specify a username and password/API key directly from an environment variable rather than utilizing the .netrc file, by setting the value of `COCOAPODS_ART_CREDENTIALS` to your Artifactory username and the password separated by a colon:
+
+```
+export COCOAPODS_ART_CREDENTIALS="admin:password"
+````
+
+If the `COCOAPODS_ART_CREDENTIALS` variable is set, its value will supersede any credentials specified in your .netrc file, causing them to be ignored.
+
+You could set the following environment variable: COCOAPODS_ART_SSL_NO_REVOKE, this will add the flag --ssl-no-revoke to curl command.
+If your are running on an environment where access to CRL isn't available you would still be able to access Artifactory via HTTPS using the cocoapods-art plugin on windows.
+```
+set COCOAPODS_ART_SSL_NO_REVOKE=true
+```
+
 ## Artifactory Configuration
 See the [Artifactory User Guide](https://www.jfrog.com/confluence/display/RTF/CocoaPods+Repositories)
 

data/checkout.sh

@@ -0,0 +1,2 @@
+git fetch origin pull/$1/head:pr-$1
+git checkout pr-$1

data/cocoapods_art.gemspec

@@ -0,0 +1,23 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'cocoapods_art'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'cocoapods-art'
+  spec.version       = CocoaPodsArt::VERSION
+  spec.authors       = ['Dan Feldman']
+  spec.email         = ['art-dev@jfrog.com']
+  spec.description   = %q{Enables you to use Artifactory as your spec repo, as well as a repository for your pods}
+  spec.summary       = %q{Artifactory support for CocoaPods}
+  spec.homepage      = 'https://github.com/JFrogDev/cocoapods-art'
+  spec.license       = 'Apache-2.0'
+
+  spec.files = Dir['lib/**/*.rb']
+  spec.files += Dir['[A-Z]*'] + Dir['test/**/*']
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 2.0.2'
+  spec.add_development_dependency 'rake',    '~> 0'
+end

data/lib/cocoapods_art.rb

@@ -2,5 +2,5 @@
 # The namespace of the CocoaPods Artifactory plugin.
 #
 module CocoaPodsArt
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/lib/cocoapods_plugin.rb

@@ -44,19 +44,35 @@ module Pod
     class Http
       # Force flattening of index downloads with :indexDownload => true
       def self.options
-        [:type, :flatten, :sha1, :sha256, :indexDownload]
+        [:type, :flatten, :sha1, :sha256, :indexDownload, :headers]
       end
 
       alias_method :orig_download_file, :download_file
       alias_method :orig_should_flatten?, :should_flatten?
 
       def download_file(full_filename)
-        curl_options = ["-f", "-L", "-o", full_filename, url, "--create-dirs", "--netrc-optional"]
+        parameters = ["-f", "-L", "-o", full_filename, url, "--create-dirs", "--netrc-optional", '--retry', '2']
+        parameters << user_agent_argument if headers.nil? ||
+            headers.none? { |header| header.casecmp(USER_AGENT_HEADER).zero? }
+
+        ssl_conf = ["--cert", `git config --global http.sslcert`.gsub("\n", ""), "--key", `git config --global http.sslkey`.gsub("\n", "")]
+        parameters.concat(ssl_conf) if !ssl_conf.any?(&:blank?)
 
         netrc_path = ENV["COCOAPODS_ART_NETRC_PATH"]
-        curl_options.concat(["--netrc-file", Pathname.new(netrc_path).expand_path]) if netrc_path
+        parameters.concat(["--netrc-file", Pathname.new(netrc_path).expand_path]) if netrc_path
+
+        art_credentials = ENV["COCOAPODS_ART_CREDENTIALS"]
+        parameters.concat(["--user", art_credentials]) if art_credentials
+	
+        winssl_no_revoke = ENV["COCOAPODS_ART_SSL_NO_REVOKE"]
+        parameters.concat(["--ssl-no-revoke"]) if defined? winssl_no_revoke && "true".casecmp(winssl_no_revoke)
 
-        curl! curl_options
+        headers.each do |h|
+          parameters << '-H'
+          parameters << h
+        end unless headers.nil?
+
+        curl! parameters
       end
 
       # Note that we disabled flattening here for the ENTIRE client to deal with
@@ -103,4 +119,36 @@ module Pod
           end
         end
     end
-  end
+end
+
+module Pod
+    class Source
+        class Manager
+
+          alias_method :orig_source_from_path, :source_from_path
+
+          # @return [Source] The Source at a given path.
+          #
+          # @param [Pathname] path
+          #        The local file path to one podspec repo.
+          #
+          def source_from_path(path)
+            @sources_by_path ||= Hash.new do |hash, key|
+              art_repo = "#{UTIL.get_repos_art_dir()}/#{key.basename}"
+              hash[key] = case
+                          when key.basename.to_s == Pod::TrunkSource::TRUNK_REPO_NAME
+                            TrunkSource.new(key)
+                          when (key + '.url').exist?
+                            CDNSource.new(key)
+                          when File.exist?("#{art_repo}/.artpodrc")
+                            create_source_from_name(key.basename)
+                          else
+                            Source.new(key)
+                          end
+            end
+            @sources_by_path[path]
+          end
+
+        end
+    end
+end

data/lib/pod/command/repo_art/add.rb

@@ -36,7 +36,7 @@ module Pod
           UI.section("Retrieving index from `#{@url}` into local spec repo `#{@name}`") do
             # Check if a repo with the same name under repos/ already exists
             repos_path = "#{Pod::Config.instance.home_dir}/repos"
-            raise Informative, "Path repos_path/#{@name} already exists - remove it first, "\
+            raise Informative, "Path #{repos_path}/#{@name} already exists - remove it first, "\
             "or run 'pod repo-art update #{@name}' to update it" if File.exist?("#{repos_path}/#{@name}") && !@silent
 
             # Check if a repo with the same name under repo-art/ already exists

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-art
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Dan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -47,9 +47,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- checkout.sh
+- cocoapods_art.gemspec
 - lib/art_source.rb
 - lib/cocoapods_art.rb
 - lib/cocoapods_plugin.rb
@@ -81,8 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Artifactory support for CocoaPods