rake_fly 2.2.0.pre.4 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 23eaf922de0635c670d45a20ca22f31cc51ac7d307ffa76d6e6cb8dfd1fb64c3
4
- data.tar.gz: 4a1e1737b410f93b3f2c390a4abd7006e45d3764a2c352359a2621e29c842521
3
+ metadata.gz: 2f64b2459e19b0db9b194647d96f620583be4ac39c8607557ae54c345c826132
4
+ data.tar.gz: f8f6737ef17bf9ebe9306f1eb458ca35e8ac7139d8eda6a10e908f2878de82ef
5
5
  SHA512:
6
- metadata.gz: b79e5d67473266467b04255dfae3b22a5a432373f6f771adda250d3f0ea827b62512cf7dc333fc34fee98d2242ddecf09a3ddfff1a9bac14724a87192d2d629a
7
- data.tar.gz: 7d244c74204f1c3b24d00f21ce5d20f83ce8d5489a8b06d6d0e3958b2057b9f1385a12e864c33eef7296e18ec38f27dc4cc08deed7316ddf76661c5982fe4754
6
+ metadata.gz: 871493e578de86b5bf49b0c7123f8cdaea12dc191f55610b2151bbed2fdfbcb0442fe89253198b5b1f999ae58c7826f6b3022d749c4dc2f969561e76219e77c5
7
+ data.tar.gz: bff4068967ee0809f0b5f947d5e645b38546418b3e0632650e341aea21c23f54cd469c3376cc394ca9b550d0827c1df7270be1393ba2a86f0ecbd185958f3945
@@ -1,11 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rake_fly (2.2.0.pre.4)
4
+ rake_fly (2.3.0)
5
5
  concourse.rb (>= 0.4)
6
6
  rake_dependencies (~> 2, < 3)
7
7
  rake_factory (>= 0.29, < 1)
8
- ruby_fly (>= 0.27)
8
+ ruby_fly (>= 0.31)
9
9
  semantic (~> 1.6.1)
10
10
 
11
11
  GEM
@@ -123,7 +123,7 @@ GEM
123
123
  rspec-support (~> 3.10.0)
124
124
  rspec-support (3.10.1)
125
125
  ruby2_keywords (0.0.2)
126
- ruby_fly (0.27.0)
126
+ ruby_fly (0.31.0)
127
127
  lino (>= 1.5)
128
128
  ruby_gpg2 (0.8.0)
129
129
  lino (>= 1.5)
@@ -48,21 +48,13 @@ module RakeFly
48
48
  end
49
49
 
50
50
  def self.define_pipeline_tasks(opts = {}, &block)
51
- task_names = opts[:task_names]
52
- if task_names
53
- opts[:get_pipeline_task_name] ||=
54
- task_names[:get_pipeline] if task_names[:get_pipeline]
55
- opts[:set_pipeline_task_name] ||=
56
- task_names[:set_pipeline] if task_names[:set_pipeline]
57
- opts[:unpause_pipeline_task_name] ||=
58
- task_names[:unpause_pipeline] if task_names[:unpause_pipeline]
59
- opts[:push_pipeline_task_name] ||=
60
- task_names[:push_pipeline] if task_names[:push_pipeline]
61
- end
62
-
63
51
  RakeFly::TaskSets::Pipeline.define(opts, &block)
64
52
  end
65
53
 
54
+ def self.define_authentication_tasks(opts = {}, &block)
55
+ RakeFly::TaskSets::Authentication.define(opts, &block)
56
+ end
57
+
66
58
  private
67
59
 
68
60
  def self.new_format?(version)
@@ -1 +1,2 @@
1
1
  require_relative 'task_sets/pipeline'
2
+ require_relative 'task_sets/authentication'
@@ -0,0 +1,37 @@
1
+ require 'rake_factory'
2
+
3
+ require_relative '../tasks/authentication/login'
4
+ require_relative '../tasks/authentication/ensure'
5
+
6
+ module RakeFly
7
+ module TaskSets
8
+ class Authentication < RakeFactory::TaskSet
9
+ prepend RakeFactory::Namespaceable
10
+
11
+ parameter :argument_names, default: []
12
+
13
+ parameter :target, required: true
14
+ parameter :concourse_url, required: true
15
+ parameter :team, default: 'main'
16
+ parameter :username
17
+ parameter :password
18
+
19
+ parameter :home_directory,
20
+ default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
21
+
22
+ parameter :login_task_name, default: :login
23
+ parameter :ensure_task_name, default: :ensure
24
+
25
+ parameter :fly_ensure_task_name, default: :'fly:ensure'
26
+
27
+ task Tasks::Authentication::Login,
28
+ name: RakeFactory::DynamicValue.new { |ts|
29
+ ts.login_task_name
30
+ }
31
+ task Tasks::Authentication::Ensure,
32
+ name: RakeFactory::DynamicValue.new { |ts|
33
+ ts.ensure_task_name
34
+ }
35
+ end
36
+ end
37
+ end
@@ -8,12 +8,14 @@ require_relative '../tasks/pipeline/push'
8
8
  module RakeFly
9
9
  module TaskSets
10
10
  class Pipeline < RakeFactory::TaskSet
11
+ prepend RakeFactory::Namespaceable
12
+
11
13
  parameter :argument_names, default: []
12
14
 
13
- parameter :target, :required => true
15
+ parameter :target, required: true
14
16
  parameter :team
15
- parameter :pipeline, :required => true
16
- parameter :config, :required => true
17
+ parameter :pipeline, required: true
18
+ parameter :config, required: true
17
19
 
18
20
  parameter :vars
19
21
  parameter :var_files
@@ -22,10 +24,12 @@ module RakeFly
22
24
  parameter :home_directory,
23
25
  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
24
26
 
25
- parameter :get_task_name, :default => :get
26
- parameter :set_task_name, :default => :set
27
- parameter :unpause_task_name, :default => :unpause
28
- parameter :push_task_name, :default => :push
27
+ parameter :get_task_name, default: :get
28
+ parameter :set_task_name, default: :set
29
+ parameter :unpause_task_name, default: :unpause
30
+ parameter :push_task_name, default: :push
31
+
32
+ parameter :fly_ensure_task_name, default: :'fly:ensure'
29
33
 
30
34
  task Tasks::Pipeline::Get,
31
35
  name: RakeFactory::DynamicValue.new { |ts|
@@ -1,4 +1,5 @@
1
1
  require_relative 'tasks/authentication/login'
2
+ require_relative 'tasks/authentication/ensure'
2
3
  require_relative 'tasks/pipeline/get'
3
4
  require_relative 'tasks/pipeline/set'
4
5
  require_relative 'tasks/pipeline/unpause'
@@ -0,0 +1,43 @@
1
+ require 'ruby_fly'
2
+ require 'rake_factory'
3
+ require 'concourse'
4
+
5
+ module RakeFly
6
+ module Tasks
7
+ module Authentication
8
+ class Ensure < RakeFactory::Task
9
+ default_name :ensure
10
+ default_prerequisites RakeFactory::DynamicValue.new { |t|
11
+ [t.fly_ensure_task_name]
12
+ }
13
+ default_description RakeFactory::DynamicValue.new { |t|
14
+ target = t.target || '<derived>'
15
+
16
+ "Ensure logged in for target #{target}"
17
+ }
18
+
19
+ parameter :target, required: true
20
+
21
+ parameter :home_directory,
22
+ default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
23
+
24
+ parameter :fly_ensure_task_name, :default => :'fly:ensure'
25
+
26
+ action do |t, args|
27
+ puts "Ensuring target #{t.target} is logged in..."
28
+ status = RubyFly.status(
29
+ target: t.target,
30
+ environment: {
31
+ "HOME" => t.home_directory
32
+ })
33
+ if status == :logged_in
34
+ puts "Already logged in. Continuing..."
35
+ else
36
+ puts "Not logged in. Logging in..."
37
+ t.application[:login, t.scope].invoke(*args)
38
+ end
39
+ end
40
+ end
41
+ end
42
+ end
43
+ end
@@ -8,7 +8,7 @@ module RakeFly
8
8
  class Login < RakeFactory::Task
9
9
  class FlyBackend
10
10
  def resolve_prerequisites(task)
11
- [task.ensure_task_name]
11
+ [task.fly_ensure_task_name]
12
12
  end
13
13
 
14
14
  def execute(task)
@@ -68,7 +68,7 @@ module RakeFly
68
68
  parameter :home_directory,
69
69
  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
70
70
 
71
- parameter :ensure_task_name, :default => :'fly:ensure'
71
+ parameter :fly_ensure_task_name, :default => :'fly:ensure'
72
72
 
73
73
  action do |t|
74
74
  puts "Logging in to #{t.concourse_url} as target #{t.target}..."
@@ -7,7 +7,7 @@ module RakeFly
7
7
  class Get < RakeFactory::Task
8
8
  default_name :get
9
9
  default_prerequisites RakeFactory::DynamicValue.new { |t|
10
- [t.ensure_task_name]
10
+ [t.fly_ensure_task_name, t.authentication_ensure_task_name]
11
11
  }
12
12
  default_description RakeFactory::DynamicValue.new { |t|
13
13
  pipeline = t.pipeline || '<derived>'
@@ -22,7 +22,9 @@ module RakeFly
22
22
  parameter :home_directory,
23
23
  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
24
24
 
25
- parameter :ensure_task_name, :default => :'fly:ensure'
25
+ parameter :fly_ensure_task_name, :default => :'fly:ensure'
26
+ parameter :authentication_ensure_task_name,
27
+ :default => :'authentication:ensure'
26
28
 
27
29
  action do |t|
28
30
  puts "Getting pipeline #{t.pipeline} for target #{t.target}..."
@@ -7,7 +7,7 @@ module RakeFly
7
7
  class Set < RakeFactory::Task
8
8
  default_name :set
9
9
  default_prerequisites RakeFactory::DynamicValue.new { |t|
10
- [t.ensure_task_name]
10
+ [t.fly_ensure_task_name, t.authentication_ensure_task_name]
11
11
  }
12
12
  default_description RakeFactory::DynamicValue.new { |t|
13
13
  pipeline = t.pipeline || '<derived>'
@@ -28,7 +28,9 @@ module RakeFly
28
28
  parameter :home_directory,
29
29
  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
30
30
 
31
- parameter :ensure_task_name, :default => :'fly:ensure'
31
+ parameter :fly_ensure_task_name, :default => :'fly:ensure'
32
+ parameter :authentication_ensure_task_name,
33
+ :default => :'authentication:ensure'
32
34
 
33
35
  action do |t|
34
36
  puts "Setting pipeline #{t.pipeline} for target #{t.target}..."
@@ -7,7 +7,7 @@ module RakeFly
7
7
  class Unpause < RakeFactory::Task
8
8
  default_name :unpause
9
9
  default_prerequisites RakeFactory::DynamicValue.new { |t|
10
- [t.ensure_task_name]
10
+ [t.fly_ensure_task_name, t.authentication_ensure_task_name]
11
11
  }
12
12
  default_description RakeFactory::DynamicValue.new { |t|
13
13
  pipeline = t.pipeline || '<derived>'
@@ -23,7 +23,9 @@ module RakeFly
23
23
  parameter :home_directory,
24
24
  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
25
25
 
26
- parameter :ensure_task_name, :default => :'fly:ensure'
26
+ parameter :fly_ensure_task_name, :default => :'fly:ensure'
27
+ parameter :authentication_ensure_task_name,
28
+ :default => :'authentication:ensure'
27
29
 
28
30
  action do |t|
29
31
  puts "Unpausing pipeline #{t.pipeline} for target #{t.target}..."
@@ -1,3 +1,3 @@
1
1
  module RakeFly
2
- VERSION = '2.2.0.pre.4'
2
+ VERSION = '2.3.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rake_fly
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0.pre.4
4
+ version: 2.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Toby Clemson
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-01-05 00:00:00.000000000 Z
11
+ date: 2021-01-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake_dependencies
@@ -56,14 +56,14 @@ dependencies:
56
56
  requirements:
57
57
  - - ">="
58
58
  - !ruby/object:Gem::Version
59
- version: '0.27'
59
+ version: '0.31'
60
60
  type: :runtime
61
61
  prerelease: false
62
62
  version_requirements: !ruby/object:Gem::Requirement
63
63
  requirements:
64
64
  - - ">="
65
65
  - !ruby/object:Gem::Version
66
- version: '0.27'
66
+ version: '0.31'
67
67
  - !ruby/object:Gem::Dependency
68
68
  name: concourse.rb
69
69
  requirement: !ruby/object:Gem::Requirement
@@ -307,8 +307,10 @@ files:
307
307
  - lib/rake_fly.rb
308
308
  - lib/rake_fly/kernel_extensions.rb
309
309
  - lib/rake_fly/task_sets.rb
310
+ - lib/rake_fly/task_sets/authentication.rb
310
311
  - lib/rake_fly/task_sets/pipeline.rb
311
312
  - lib/rake_fly/tasks.rb
313
+ - lib/rake_fly/tasks/authentication/ensure.rb
312
314
  - lib/rake_fly/tasks/authentication/login.rb
313
315
  - lib/rake_fly/tasks/pipeline/get.rb
314
316
  - lib/rake_fly/tasks/pipeline/push.rb
@@ -330,9 +332,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
330
332
  version: '2.6'
331
333
  required_rubygems_version: !ruby/object:Gem::Requirement
332
334
  requirements:
333
- - - ">"
335
+ - - ">="
334
336
  - !ruby/object:Gem::Version
335
- version: 1.3.1
337
+ version: '0'
336
338
  requirements: []
337
339
  rubygems_version: 3.0.1
338
340
  signing_key: