cocoapods-art 1.0.5 → 1.1.1

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: f0ff219d0ac2f827dc85d6511ac50ccfb1d00a9167fc4c66d059ed35771743f5
4
+ data.tar.gz: a4e1d1a9b398bbb0e6c314f81f2acc38df05c90eb54716dd69cb49b40bc19a15
5
5
  SHA512:
6
- metadata.gz: 8f2e23338d648172375e2611c6f13b404bf9a868fd265707b2624c453fbca62fe510bd1b5cb8a069e55d36ebeb866d38f2f56be61210535959e4dd8b3a739264
7
- data.tar.gz: 9427dab4fc839d1c7d6d0fe6ee32b17aeb3e9e88a8e82360b0aea6b71ce0fff10e607dc3877c8589903c52c0fbc90d2e387dd0afafec77509ae54f8e1e52eca8
6
+ metadata.gz: 90bc4a6827af83a8e995485f5dcabf90a1d3ca44e225d40f6a3c0099e4fccac6b03bb10ad39acf1f370682d596dfacd438377c0f5ddb71d7424045dc81e896aa
7
+ data.tar.gz: 7c0d69d31007bc0fd636b4e11ecbfe11ee08d11a91d70339644ebe6bcc661d06c66316b7de2fa357e21840d38a71d13e9f57147c4414146fa1b5f20e3b4846db
data/Gemfile.lock CHANGED
@@ -1,89 +1,101 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cocoapods-art (1.0.4)
4
+ cocoapods-art (1.1.1)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
8
8
  specs:
9
- CFPropertyList (3.0.1)
10
- activesupport (4.2.11.1)
11
- i18n (~> 0.7)
12
- minitest (~> 5.1)
13
- thread_safe (~> 0.3, >= 0.3.4)
14
- tzinfo (~> 1.1)
15
- algoliasearch (1.27.0)
9
+ CFPropertyList (3.0.6)
10
+ rexml
11
+ activesupport (7.0.7.2)
12
+ concurrent-ruby (~> 1.0, >= 1.0.2)
13
+ i18n (>= 1.6, < 2)
14
+ minitest (>= 5.1)
15
+ tzinfo (~> 2.0)
16
+ addressable (2.8.5)
17
+ public_suffix (>= 2.0.2, < 6.0)
18
+ algoliasearch (1.27.5)
16
19
  httpclient (~> 2.8, >= 2.8.3)
17
20
  json (>= 1.5.1)
18
21
  atomos (0.1.3)
19
- claide (1.0.3)
20
- cocoapods (1.9.3)
21
- activesupport (>= 4.0.2, < 5)
22
+ claide (1.1.0)
23
+ cocoapods (1.12.1)
24
+ addressable (~> 2.8)
22
25
  claide (>= 1.0.2, < 2.0)
23
- cocoapods-core (= 1.9.3)
26
+ cocoapods-core (= 1.12.1)
24
27
  cocoapods-deintegrate (>= 1.0.3, < 2.0)
25
- cocoapods-downloader (>= 1.2.2, < 2.0)
28
+ cocoapods-downloader (>= 1.6.0, < 2.0)
26
29
  cocoapods-plugins (>= 1.0.0, < 2.0)
27
30
  cocoapods-search (>= 1.0.0, < 2.0)
28
- cocoapods-stats (>= 1.0.0, < 2.0)
29
- cocoapods-trunk (>= 1.4.0, < 2.0)
31
+ cocoapods-trunk (>= 1.6.0, < 2.0)
30
32
  cocoapods-try (>= 1.1.0, < 2.0)
31
33
  colored2 (~> 3.1)
32
34
  escape (~> 0.0.4)
33
35
  fourflusher (>= 2.3.0, < 3.0)
34
36
  gh_inspector (~> 1.0)
35
- molinillo (~> 0.6.6)
37
+ molinillo (~> 0.8.0)
36
38
  nap (~> 1.0)
37
- ruby-macho (~> 1.4)
38
- xcodeproj (>= 1.11.1, < 2.0)
39
- cocoapods-core (1.9.3)
40
- activesupport (>= 4.0.2, < 6)
39
+ ruby-macho (>= 2.3.0, < 3.0)
40
+ xcodeproj (>= 1.21.0, < 2.0)
41
+ cocoapods-core (1.12.1)
42
+ activesupport (>= 5.0, < 8)
43
+ addressable (~> 2.8)
41
44
  algoliasearch (~> 1.0)
42
- concurrent-ruby (~> 1.0)
45
+ concurrent-ruby (~> 1.1)
43
46
  fuzzy_match (~> 2.0.4)
44
47
  nap (~> 1.0)
45
- cocoapods-deintegrate (1.0.4)
46
- cocoapods-downloader (1.4.0)
48
+ netrc (~> 0.11)
49
+ public_suffix (~> 4.0)
50
+ typhoeus (~> 1.0)
51
+ cocoapods-deintegrate (1.0.5)
52
+ cocoapods-downloader (1.6.3)
47
53
  cocoapods-plugins (1.0.0)
48
54
  nap
49
- cocoapods-search (1.0.0)
50
- cocoapods-stats (1.1.0)
51
- cocoapods-trunk (1.4.0)
55
+ cocoapods-search (1.0.1)
56
+ cocoapods-trunk (1.6.0)
52
57
  nap (>= 0.8, < 2.0)
53
58
  netrc (~> 0.11)
54
- cocoapods-try (1.1.0)
59
+ cocoapods-try (1.2.0)
55
60
  colored2 (3.1.2)
56
- concurrent-ruby (1.1.5)
61
+ concurrent-ruby (1.2.2)
57
62
  escape (0.0.4)
63
+ ethon (0.16.0)
64
+ ffi (>= 1.15.0)
65
+ ffi (1.15.5)
58
66
  fourflusher (2.3.1)
59
67
  fuzzy_match (2.0.4)
60
68
  gh_inspector (1.1.3)
61
69
  httpclient (2.8.3)
62
- i18n (0.9.5)
70
+ i18n (1.14.1)
63
71
  concurrent-ruby (~> 1.0)
64
- json (2.2.0)
65
- minitest (5.12.0)
66
- molinillo (0.6.6)
67
- nanaimo (0.2.6)
72
+ json (2.6.3)
73
+ minitest (5.19.0)
74
+ molinillo (0.8.0)
75
+ nanaimo (0.3.0)
68
76
  nap (1.1.0)
69
77
  netrc (0.11.0)
78
+ public_suffix (4.0.7)
70
79
  rake (0.9.6)
71
- ruby-macho (1.4.0)
72
- thread_safe (0.3.6)
73
- tzinfo (1.2.5)
74
- thread_safe (~> 0.1)
75
- xcodeproj (1.12.0)
80
+ rexml (3.2.6)
81
+ ruby-macho (2.5.1)
82
+ typhoeus (1.4.0)
83
+ ethon (>= 0.9.0)
84
+ tzinfo (2.0.6)
85
+ concurrent-ruby (~> 1.0)
86
+ xcodeproj (1.22.0)
76
87
  CFPropertyList (>= 2.3.3, < 4.0)
77
88
  atomos (~> 0.1.3)
78
89
  claide (>= 1.0.2, < 2.0)
79
90
  colored2 (~> 3.1)
80
- nanaimo (~> 0.2.6)
91
+ nanaimo (~> 0.3.0)
92
+ rexml (~> 3.2.4)
81
93
 
82
94
  PLATFORMS
83
95
  ruby
84
96
 
85
97
  DEPENDENCIES
86
- bundler (~> 2.0.2)
98
+ bundler (~> 2.4.19)
87
99
  claide
88
100
  cocoapods
89
101
  cocoapods-art!
@@ -92,4 +104,4 @@ DEPENDENCIES
92
104
  rake (~> 0)
93
105
 
94
106
  BUNDLED WITH
95
- 2.0.2
107
+ 2.4.19
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
 
Binary file
@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ['lib']
20
20
 
21
- spec.add_development_dependency 'bundler', '~> 2.0.2'
21
+ spec.add_development_dependency 'bundler', '~> 2.4.19'
22
22
  spec.add_development_dependency 'rake', '~> 0'
23
23
  end
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.1'
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.1
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: 2023-10-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.0.2
19
+ version: 2.4.19
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.0.2
26
+ version: 2.4.19
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,7 @@ files:
52
52
  - README.md
53
53
  - Rakefile
54
54
  - checkout.sh
55
+ - cocoapods-art-1.1.0.gem
55
56
  - cocoapods_art.gemspec
56
57
  - lib/art_source.rb
57
58
  - lib/cocoapods_art.rb
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
84
85
  - !ruby/object:Gem::Version
85
86
  version: '0'
86
87
  requirements: []
87
- rubygems_version: 3.0.3
88
+ rubygems_version: 3.0.3.1
88
89
  signing_key:
89
90
  specification_version: 4
90
91
  summary: Artifactory support for CocoaPods