cocoapods-art 1.0.5 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1938e90af52017a5a970f6d3aafc76e84f1764d98aecf128d33f468a360813ac
4
- data.tar.gz: 736d4629bc9a42782df8a7b1c362562d46819ebe1016156e1ef85de69f1c8fe0
3
+ metadata.gz: 6766dae826818897438c0508ad91862de9ed358fa0ae373c12f321bacd1a9e56
4
+ data.tar.gz: 64a40d3fcf1774c102b492fff4bd0dbe0c9f83939ffe5be87fef4ffd115ed8f7
5
5
  SHA512:
6
- metadata.gz: 8f2e23338d648172375e2611c6f13b404bf9a868fd265707b2624c453fbca62fe510bd1b5cb8a069e55d36ebeb866d38f2f56be61210535959e4dd8b3a739264
7
- data.tar.gz: 9427dab4fc839d1c7d6d0fe6ee32b17aeb3e9e88a8e82360b0aea6b71ce0fff10e607dc3877c8589903c52c0fbc90d2e387dd0afafec77509ae54f8e1e52eca8
6
+ metadata.gz: 71ef2693733214201065da26895dd4c70f8734172025a43ef424a3fd2550e1b9f5b6ecff38af6cd5d925a87d028ef1d4111441d764522d992c9993722835d110
7
+ data.tar.gz: 14c9d9a133c9286e2ef159c886813b6b681769f6e2a01252ad475033d2fd30f1a54455e61265bc121885d5b7f351b01589219bb9aaf0b1e05dd25fc872fe595b
data/README.md CHANGED
@@ -33,6 +33,20 @@ If your .netrc file is not located in your home directory, you can specify its l
33
33
  export COCOAPODS_ART_NETRC_PATH=$HOME/myproject/.netrc
34
34
  ```
35
35
 
36
+ 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:
37
+
38
+ ```
39
+ export COCOAPODS_ART_CREDENTIALS="admin:password"
40
+ ````
41
+
42
+ If the `COCOAPODS_ART_CREDENTIALS` variable is set, its value will supersede any credentials specified in your .netrc file, causing them to be ignored.
43
+
44
+ You could set the following environment variable: COCOAPODS_ART_SSL_NO_REVOKE, this will add the flag --ssl-no-revoke to curl command.
45
+ 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.
46
+ ```
47
+ set COCOAPODS_ART_SSL_NO_REVOKE=true
48
+ ```
49
+
36
50
  ## Artifactory Configuration
37
51
  See the [Artifactory User Guide](https://www.jfrog.com/confluence/display/RTF/CocoaPods+Repositories)
38
52
 
data/lib/cocoapods_art.rb CHANGED
@@ -2,5 +2,5 @@
2
2
  # The namespace of the CocoaPods Artifactory plugin.
3
3
  #
4
4
  module CocoaPodsArt
5
- VERSION = '1.0.5'
5
+ VERSION = '1.1.0'
6
6
  end
@@ -61,6 +61,12 @@ module Pod
61
61
  netrc_path = ENV["COCOAPODS_ART_NETRC_PATH"]
62
62
  parameters.concat(["--netrc-file", Pathname.new(netrc_path).expand_path]) if netrc_path
63
63
 
64
+ art_credentials = ENV["COCOAPODS_ART_CREDENTIALS"]
65
+ parameters.concat(["--user", art_credentials]) if art_credentials
66
+
67
+ winssl_no_revoke = ENV["COCOAPODS_ART_SSL_NO_REVOKE"]
68
+ parameters.concat(["--ssl-no-revoke"]) if defined? winssl_no_revoke && "true".casecmp(winssl_no_revoke)
69
+
64
70
  headers.each do |h|
65
71
  parameters << '-H'
66
72
  parameters << h
@@ -129,9 +135,12 @@ module Pod
129
135
  def source_from_path(path)
130
136
  @sources_by_path ||= Hash.new do |hash, key|
131
137
  art_repo = "#{UTIL.get_repos_art_dir()}/#{key.basename}"
132
- hash[key] = if key.basename.to_s == Pod::TrunkSource::TRUNK_REPO_NAME
138
+ hash[key] = case
139
+ when key.basename.to_s == Pod::TrunkSource::TRUNK_REPO_NAME
133
140
  TrunkSource.new(key)
134
- elsif File.exist?("#{art_repo}/.artpodrc")
141
+ when (key + '.url').exist?
142
+ CDNSource.new(key)
143
+ when File.exist?("#{art_repo}/.artpodrc")
135
144
  create_source_from_name(key.basename)
136
145
  else
137
146
  Source.new(key)
@@ -36,7 +36,7 @@ module Pod
36
36
  UI.section("Retrieving index from `#{@url}` into local spec repo `#{@name}`") do
37
37
  # Check if a repo with the same name under repos/ already exists
38
38
  repos_path = "#{Pod::Config.instance.home_dir}/repos"
39
- raise Informative, "Path repos_path/#{@name} already exists - remove it first, "\
39
+ raise Informative, "Path #{repos_path}/#{@name} already exists - remove it first, "\
40
40
  "or run 'pod repo-art update #{@name}' to update it" if File.exist?("#{repos_path}/#{@name}") && !@silent
41
41
 
42
42
  # Check if a repo with the same name under repo-art/ already exists
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-art
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.5
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dan Feldman
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-11-03 00:00:00.000000000 Z
11
+ date: 2021-08-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler