cocoapods-art 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a57ec3a1f2bfe311aef6d7d2ca1537a326b4b3a
-  data.tar.gz: 1c3c40007939b2d37af8c309460213a702bd32f4
+SHA256:
+  metadata.gz: 1938e90af52017a5a970f6d3aafc76e84f1764d98aecf128d33f468a360813ac
+  data.tar.gz: 736d4629bc9a42782df8a7b1c362562d46819ebe1016156e1ef85de69f1c8fe0
 SHA512:
-  metadata.gz: e1b189c95eeecc33a00b769790a9574d4d606c7003816c2846b824d390ece83626be84e0900b3336a1a580eb73e8bc964b4dafcc1cde713d4ad57df6d8d13197
-  data.tar.gz: 23a95dc96bb0770e854b20ddd189e5a2900e8c53ee3c29d3d6eaa29af76d11525aa824d3708c2f9f03d2d5c5a66511956c3a3c4a397da34c3d2c366bc00c6cc8
+  metadata.gz: 8f2e23338d648172375e2611c6f13b404bf9a868fd265707b2624c453fbca62fe510bd1b5cb8a069e55d36ebeb866d38f2f56be61210535959e4dd8b3a739264
+  data.tar.gz: 9427dab4fc839d1c7d6d0fe6ee32b17aeb3e9e88a8e82360b0aea6b71ce0fff10e607dc3877c8589903c52c0fbc90d2e387dd0afafec77509ae54f8e1e52eca8

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

@@ -15,8 +15,8 @@ pod repo-art add artifactory-local http://art-prod.company.com:8081/artifactory/
 To use 'myRepo' to resolve pods when installing you must add the following to your Podfile:
 ```ruby
 plugin 'cocoapods-art', :sources => [
-        '<local_specs_repo_name>'    
-    ] 
+  '<local_specs_repo_name>'    
+] 
 ```
 More than one source can be included, separated by commas.
 
@@ -28,6 +28,11 @@ password password
 ```
 You can also use an encrypted Artifactory password or your API key
 
+If your .netrc file is not located in your home directory, you can specify its location in the environmental variable:
+```
+export COCOAPODS_ART_NETRC_PATH=$HOME/myproject/.netrc
+```
+
 ## 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/art_source.rb

@@ -23,5 +23,9 @@ module Pod
         File.read("#{repo}/.artpodrc") if File.exist?("#{dir}/.artpodrc")
       end
     end
+
+    def git?
+      false
+    end
   end
 end

data/lib/cocoapods_art.rb

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

data/lib/cocoapods_plugin.rb

@@ -44,14 +44,29 @@ 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! '-n', '-f', '-L', '-o', full_filename, url, '--create-dirs'
+        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"]
+        parameters.concat(["--netrc-file", Pathname.new(netrc_path).expand_path]) if netrc_path
+
+        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
@@ -98,4 +113,33 @@ 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] = if key.basename.to_s == Pod::TrunkSource::TRUNK_REPO_NAME
+                            TrunkSource.new(key)
+                          elsif 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

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-art
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Dan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Enables you to use Artifactory as your spec repo, as well as a repository
@@ -46,22 +46,25 @@ executables: []
 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
 - lib/pod/artifactory_repo.rb
+- lib/pod/command/repo_art.rb
 - lib/pod/command/repo_art/add.rb
 - lib/pod/command/repo_art/lint.rb
 - lib/pod/command/repo_art/list.rb
 - lib/pod/command/repo_art/push.rb
 - lib/pod/command/repo_art/remove.rb
 - lib/pod/command/repo_art/update.rb
-- lib/pod/command/repo_art.rb
 - lib/util/repo_util.rb
-- Gemfile
-- LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/JFrogDev/cocoapods-art
 licenses:
 - Apache-2.0
@@ -72,17 +75,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Artifactory support for CocoaPods