gitlab-exporter 12.0.1 → 12.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/Gemfile +0 -2
  4. data/Gemfile.lock +7 -7
  5. data/gitlab-exporter.gemspec +1 -0
  6. data/lib/gitlab_exporter/database/row_count.rb +0 -14
  7. data/lib/gitlab_exporter/version.rb +1 -1
  8. metadata +15 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 10750ec2de43b0651c18fe3babdff54837e6e69b9efb921fd48bfda67d287bb6
4
- data.tar.gz: bfcf564c0092a85b12f126772d06e5c04710088c6251252d69e2caf605cd1c9d
3
+ metadata.gz: f94ff4332c26d23722a980cda4185e84dcecf96e01ce58bf5794d73523efdb2e
4
+ data.tar.gz: 5b650ba2d57d2a445cd077f0d93daaf4f635815579339281be70698215a67f87
5
5
  SHA512:
6
- metadata.gz: ab38e15c3fd76461f508921d1c960a0029b84afa673e30f7f95d57bd20d3c110232eff726723c3e7c69e154acd0b7d844fd10d960181d8de161e571423a4c151
7
- data.tar.gz: 389adc0b2611a4e235b07ef72b92c77f2669db4092b624f0d5d0486fb18d894420090c172890625558cbc8f65b2a82c1906670bdf46a98a685667b757f2690d0
6
+ metadata.gz: ed42fc0e5869f7c7be443f29ded7bb4ded2242a1612042f8212baba438aeafbd3019f1011c5b46cc246cb94a8ca7887508b2c100baf05bebc8b3b2b4d9afca60
7
+ data.tar.gz: bac63ad5e89bfaaeb20d7483e27c89bdfa9945494f3f1a44e1daf023f1d0ee43d57b4e42e9110656f898f8806a341a9d51cc6ef5afdf1905c14a2a5640f87414
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 2.7.6
1
+ 2.7.7
data/Gemfile CHANGED
@@ -2,8 +2,6 @@ source "https://rubygems.org"
2
2
 
3
3
  gemspec
4
4
 
5
- gem "webrick", "~> 1.7"
6
-
7
5
  group :test do
8
6
  gem "rspec", "~>3.5"
9
7
  gem "rubocop", "~>0.42"
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gitlab-exporter (12.0.1)
4
+ gitlab-exporter (12.1.1)
5
5
  connection_pool (= 2.2.5)
6
6
  faraday (~> 1.8.0)
7
7
  pg (= 1.2.3)
@@ -11,6 +11,7 @@ PATH
11
11
  redis-namespace (= 1.9.0)
12
12
  sidekiq (= 6.4.0)
13
13
  sinatra (~> 2.2.0)
14
+ webrick (~> 1.7)
14
15
 
15
16
  GEM
16
17
  remote: https://rubygems.org/
@@ -48,8 +49,8 @@ GEM
48
49
  puma (5.6.5)
49
50
  nio4r (~> 2.0)
50
51
  quantile (0.2.1)
51
- rack (2.2.4)
52
- rack-protection (2.2.2)
52
+ rack (2.2.5)
53
+ rack-protection (2.2.4)
53
54
  rack
54
55
  rainbow (3.0.0)
55
56
  redis (4.4.0)
@@ -87,10 +88,10 @@ GEM
87
88
  connection_pool (>= 2.2.2)
88
89
  rack (~> 2.0)
89
90
  redis (>= 4.2.0)
90
- sinatra (2.2.2)
91
+ sinatra (2.2.4)
91
92
  mustermann (~> 2.0)
92
93
  rack (~> 2.2)
93
- rack-protection (= 2.2.2)
94
+ rack-protection (= 2.2.4)
94
95
  tilt (~> 2.0)
95
96
  tilt (2.0.11)
96
97
  unicode-display_width (1.7.0)
@@ -104,7 +105,6 @@ DEPENDENCIES
104
105
  rspec (~> 3.5)
105
106
  rspec-expectations (~> 3.7.0)
106
107
  rubocop (~> 0.42)
107
- webrick (~> 1.7)
108
108
 
109
109
  BUNDLED WITH
110
- 2.2.22
110
+ 2.4.5
data/gitlab-exporter.gemspec CHANGED
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
29
29
  s.add_runtime_dependency "redis-namespace", "1.9.0"
30
30
  s.add_runtime_dependency "sidekiq", "6.4.0"
31
31
  s.add_runtime_dependency "sinatra", "~> 2.2.0"
32
+ s.add_runtime_dependency "webrick", "~> 1.7"
32
33
 
33
34
  s.add_development_dependency "rspec", "~> 3.7.0"
34
35
  s.add_development_dependency "rspec-expectations", "~> 3.7.0"
data/lib/gitlab_exporter/database/row_count.rb CHANGED
@@ -19,11 +19,6 @@ module GitLab
19
19
  projects.mirror = true
20
20
  AND projects.archived = false
21
21
  AND project_mirror_data.retry_count <= 14
22
- AND (
23
- (projects.visibility_level = 20 AND root_namespaces.visibility_level = 20)
24
- OR
25
- plans.name IN ('early_adopter', 'bronze', 'silver', 'gold')
26
- )
27
22
  AND project_mirror_data.next_execution_timestamp > '2020-03-28'
28
23
  SQL
29
24
 
@@ -31,15 +26,6 @@ module GitLab
31
26
  select: :projects,
32
27
  joins: <<~SQL,
33
28
  INNER JOIN project_mirror_data ON project_mirror_data.project_id = projects.id
34
- INNER JOIN namespaces AS root_namespaces ON root_namespaces.id = (
35
- WITH RECURSIVE "base_and_ancestors" AS (
36
- (SELECT "namespaces".* FROM "namespaces" WHERE "namespaces"."id" = projects.namespace_id)
37
- UNION
38
- (SELECT "namespaces".* FROM "namespaces", "base_and_ancestors" WHERE "namespaces"."id" = "base_and_ancestors"."parent_id")
39
- ) SELECT "namespaces".id FROM "base_and_ancestors" AS "namespaces" WHERE "namespaces"."parent_id" IS NULL
40
- )
41
- LEFT JOIN gitlab_subscriptions ON gitlab_subscriptions.namespace_id = root_namespaces.id
42
- LEFT JOIN plans ON plans.id = gitlab_subscriptions.hosted_plan_id
43
29
  SQL
44
30
  check: "SELECT 1 FROM information_schema.tables WHERE table_name='plans'"
45
31
  }.freeze
data/lib/gitlab_exporter/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module GitLab
2
2
  module Exporter
3
- VERSION = "12.0.1".freeze
3
+ VERSION = "12.1.1".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlab-exporter
3
3
  version: !ruby/object:Gem::Version
4
- version: 12.0.1
4
+ version: 12.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pablo Carranza
@@ -136,6 +136,20 @@ dependencies:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: 2.2.0
139
+ - !ruby/object:Gem::Dependency
140
+ name: webrick
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - "~>"
144
+ - !ruby/object:Gem::Version
145
+ version: '1.7'
146
+ type: :runtime
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - "~>"
151
+ - !ruby/object:Gem::Version
152
+ version: '1.7'
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: rspec
141
155
  requirement: !ruby/object:Gem::Requirement