rake_fly 2.2.0.pre.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23eaf922de0635c670d45a20ca22f31cc51ac7d307ffa76d6e6cb8dfd1fb64c3
-  data.tar.gz: 4a1e1737b410f93b3f2c390a4abd7006e45d3764a2c352359a2621e29c842521
+  metadata.gz: 2f64b2459e19b0db9b194647d96f620583be4ac39c8607557ae54c345c826132
+  data.tar.gz: f8f6737ef17bf9ebe9306f1eb458ca35e8ac7139d8eda6a10e908f2878de82ef
 SHA512:
-  metadata.gz: b79e5d67473266467b04255dfae3b22a5a432373f6f771adda250d3f0ea827b62512cf7dc333fc34fee98d2242ddecf09a3ddfff1a9bac14724a87192d2d629a
-  data.tar.gz: 7d244c74204f1c3b24d00f21ce5d20f83ce8d5489a8b06d6d0e3958b2057b9f1385a12e864c33eef7296e18ec38f27dc4cc08deed7316ddf76661c5982fe4754
+  metadata.gz: 871493e578de86b5bf49b0c7123f8cdaea12dc191f55610b2151bbed2fdfbcb0442fe89253198b5b1f999ae58c7826f6b3022d749c4dc2f969561e76219e77c5
+  data.tar.gz: bff4068967ee0809f0b5f947d5e645b38546418b3e0632650e341aea21c23f54cd469c3376cc394ca9b550d0827c1df7270be1393ba2a86f0ecbd185958f3945

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rake_fly (2.2.0.pre.4)
+    rake_fly (2.3.0)
       concourse.rb (>= 0.4)
       rake_dependencies (~> 2, < 3)
       rake_factory (>= 0.29, < 1)
-      ruby_fly (>= 0.27)
+      ruby_fly (>= 0.31)
       semantic (~> 1.6.1)
 
 GEM
@@ -123,7 +123,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
     ruby2_keywords (0.0.2)
-    ruby_fly (0.27.0)
+    ruby_fly (0.31.0)
       lino (>= 1.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)

data/lib/rake_fly.rb

@@ -48,21 +48,13 @@ module RakeFly
   end
 
   def self.define_pipeline_tasks(opts = {}, &block)
-    task_names = opts[:task_names]
-    if task_names
-      opts[:get_pipeline_task_name] ||=
-          task_names[:get_pipeline] if task_names[:get_pipeline]
-      opts[:set_pipeline_task_name] ||=
-          task_names[:set_pipeline] if task_names[:set_pipeline]
-      opts[:unpause_pipeline_task_name] ||=
-          task_names[:unpause_pipeline] if task_names[:unpause_pipeline]
-      opts[:push_pipeline_task_name] ||=
-          task_names[:push_pipeline] if task_names[:push_pipeline]
-    end
-
     RakeFly::TaskSets::Pipeline.define(opts, &block)
   end
 
+  def self.define_authentication_tasks(opts = {}, &block)
+    RakeFly::TaskSets::Authentication.define(opts, &block)
+  end
+
   private
 
   def self.new_format?(version)

data/lib/rake_fly/task_sets.rb

@@ -1 +1,2 @@
 require_relative 'task_sets/pipeline'
+require_relative 'task_sets/authentication'

data/lib/rake_fly/task_sets/authentication.rb

@@ -0,0 +1,37 @@
+require 'rake_factory'
+
+require_relative '../tasks/authentication/login'
+require_relative '../tasks/authentication/ensure'
+
+module RakeFly
+  module TaskSets
+    class Authentication < RakeFactory::TaskSet
+      prepend RakeFactory::Namespaceable
+
+      parameter :argument_names, default: []
+
+      parameter :target, required: true
+      parameter :concourse_url, required: true
+      parameter :team, default: 'main'
+      parameter :username
+      parameter :password
+
+      parameter :home_directory,
+          default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
+      parameter :login_task_name, default: :login
+      parameter :ensure_task_name, default: :ensure
+
+      parameter :fly_ensure_task_name, default: :'fly:ensure'
+
+      task Tasks::Authentication::Login,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.login_task_name
+          }
+      task Tasks::Authentication::Ensure,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.ensure_task_name
+          }
+    end
+  end
+end

data/lib/rake_fly/task_sets/pipeline.rb

@@ -8,12 +8,14 @@ require_relative '../tasks/pipeline/push'
 module RakeFly
   module TaskSets
     class Pipeline < RakeFactory::TaskSet
+      prepend RakeFactory::Namespaceable
+
       parameter :argument_names, default: []
 
-      parameter :target, :required => true
+      parameter :target, required: true
       parameter :team
-      parameter :pipeline, :required => true
-      parameter :config, :required => true
+      parameter :pipeline, required: true
+      parameter :config, required: true
 
       parameter :vars
       parameter :var_files
@@ -22,10 +24,12 @@ module RakeFly
       parameter :home_directory,
           default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-      parameter :get_task_name, :default => :get
-      parameter :set_task_name, :default => :set
-      parameter :unpause_task_name, :default => :unpause
-      parameter :push_task_name, :default => :push
+      parameter :get_task_name, default: :get
+      parameter :set_task_name, default: :set
+      parameter :unpause_task_name, default: :unpause
+      parameter :push_task_name, default: :push
+
+      parameter :fly_ensure_task_name, default: :'fly:ensure'
 
       task Tasks::Pipeline::Get,
           name: RakeFactory::DynamicValue.new { |ts|

data/lib/rake_fly/tasks.rb

@@ -1,4 +1,5 @@
 require_relative 'tasks/authentication/login'
+require_relative 'tasks/authentication/ensure'
 require_relative 'tasks/pipeline/get'
 require_relative 'tasks/pipeline/set'
 require_relative 'tasks/pipeline/unpause'

data/lib/rake_fly/tasks/authentication/ensure.rb

@@ -0,0 +1,43 @@
+require 'ruby_fly'
+require 'rake_factory'
+require 'concourse'
+
+module RakeFly
+  module Tasks
+    module Authentication
+      class Ensure < RakeFactory::Task
+        default_name :ensure
+        default_prerequisites RakeFactory::DynamicValue.new { |t|
+          [t.fly_ensure_task_name]
+        }
+        default_description RakeFactory::DynamicValue.new { |t|
+          target = t.target || '<derived>'
+
+          "Ensure logged in for target #{target}"
+        }
+
+        parameter :target, required: true
+
+        parameter :home_directory,
+            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
+        parameter :fly_ensure_task_name, :default => :'fly:ensure'
+
+        action do |t, args|
+          puts "Ensuring target #{t.target} is logged in..."
+          status = RubyFly.status(
+              target: t.target,
+              environment: {
+                  "HOME" => t.home_directory
+              })
+          if status == :logged_in
+            puts "Already logged in. Continuing..."
+          else
+            puts "Not logged in. Logging in..."
+            t.application[:login, t.scope].invoke(*args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rake_fly/tasks/authentication/login.rb

@@ -8,7 +8,7 @@ module RakeFly
       class Login < RakeFactory::Task
         class FlyBackend
           def resolve_prerequisites(task)
-            [task.ensure_task_name]
+            [task.fly_ensure_task_name]
           end
 
           def execute(task)
@@ -68,7 +68,7 @@ module RakeFly
         parameter :home_directory,
             default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :ensure_task_name, :default => :'fly:ensure'
+        parameter :fly_ensure_task_name, :default => :'fly:ensure'
 
         action do |t|
           puts "Logging in to #{t.concourse_url} as target #{t.target}..."

data/lib/rake_fly/tasks/pipeline/get.rb

@@ -7,7 +7,7 @@ module RakeFly
       class Get < RakeFactory::Task
         default_name :get
         default_prerequisites RakeFactory::DynamicValue.new { |t|
-          [t.ensure_task_name]
+          [t.fly_ensure_task_name, t.authentication_ensure_task_name]
         }
         default_description RakeFactory::DynamicValue.new { |t|
           pipeline = t.pipeline || '<derived>'
@@ -22,7 +22,9 @@ module RakeFly
         parameter :home_directory,
             default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :ensure_task_name, :default => :'fly:ensure'
+        parameter :fly_ensure_task_name, :default => :'fly:ensure'
+        parameter :authentication_ensure_task_name,
+            :default => :'authentication:ensure'
   
         action do |t|
           puts "Getting pipeline #{t.pipeline} for target #{t.target}..."

data/lib/rake_fly/tasks/pipeline/set.rb

@@ -7,7 +7,7 @@ module RakeFly
       class Set < RakeFactory::Task
         default_name :set
         default_prerequisites RakeFactory::DynamicValue.new { |t|
-          [t.ensure_task_name]
+          [t.fly_ensure_task_name, t.authentication_ensure_task_name]
         }
         default_description RakeFactory::DynamicValue.new { |t|
           pipeline = t.pipeline || '<derived>'
@@ -28,7 +28,9 @@ module RakeFly
         parameter :home_directory,
             default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :ensure_task_name, :default => :'fly:ensure'
+        parameter :fly_ensure_task_name, :default => :'fly:ensure'
+        parameter :authentication_ensure_task_name,
+            :default => :'authentication:ensure'
 
         action do |t|
           puts "Setting pipeline #{t.pipeline} for target #{t.target}..."

data/lib/rake_fly/tasks/pipeline/unpause.rb

@@ -7,7 +7,7 @@ module RakeFly
       class Unpause < RakeFactory::Task
         default_name :unpause
         default_prerequisites RakeFactory::DynamicValue.new { |t|
-          [t.ensure_task_name]
+          [t.fly_ensure_task_name, t.authentication_ensure_task_name]
         }
         default_description RakeFactory::DynamicValue.new { |t|
           pipeline = t.pipeline || '<derived>'
@@ -23,7 +23,9 @@ module RakeFly
         parameter :home_directory,
             default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :ensure_task_name, :default => :'fly:ensure'
+        parameter :fly_ensure_task_name, :default => :'fly:ensure'
+        parameter :authentication_ensure_task_name,
+            :default => :'authentication:ensure'
 
         action do |t|
           puts "Unpausing pipeline #{t.pipeline} for target #{t.target}..."

data/lib/rake_fly/version.rb

@@ -1,3 +1,3 @@
 module RakeFly
-  VERSION = '2.2.0.pre.4'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_dependencies
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: concourse.rb
   requirement: !ruby/object:Gem::Requirement
@@ -307,8 +307,10 @@ files:
 - lib/rake_fly.rb
 - lib/rake_fly/kernel_extensions.rb
 - lib/rake_fly/task_sets.rb
+- lib/rake_fly/task_sets/authentication.rb
 - lib/rake_fly/task_sets/pipeline.rb
 - lib/rake_fly/tasks.rb
+- lib/rake_fly/tasks/authentication/ensure.rb
 - lib/rake_fly/tasks/authentication/login.rb
 - lib/rake_fly/tasks/pipeline/get.rb
 - lib/rake_fly/tasks/pipeline/push.rb
@@ -330,9 +332,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
 signing_key: