rake_fly 2.2.0.pre.6 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ce54381ac168787e48a8c3e2fd261a7826d8cc027f5778982ed43feceee8ce
-  data.tar.gz: 987c91023498ced68e868ba41da28c4756397301c938cf4bcba8f3f3c2212e6e
+  metadata.gz: e6893b87eb6ab81350235a72ddd89ab4ac1a890c21904c253809a3df0c629f85
+  data.tar.gz: 05ae2c6b6f5f937d8df12302765aa2c030e4ac2f0bfe82d9fee7e3817dbc9ee1
 SHA512:
-  metadata.gz: 3ba09e2e9455333d26fac4e09547808ff782dd1fc9d4009329e2e0299c21dee80c97f62dcf9463251a68c131d5ab6e7ad0b842ff4ac9c1f58207741456140c42
-  data.tar.gz: 72c53e618a15d2bf85ddc1fb689bc05e5046b95cc5f42ebc5e3754bd86ccb823beb6465a6bf193848663e1293a4bed9c9eb69a9cbc0af8d1ff9c58771ac4b612
+  metadata.gz: 354764f4257ac965810e593a7f3851a682a8860863273a7298071cf418d661338a7c4ed79bd745411441bf9619e890c2840a8f05379d7eb1d53f4d0272879255
+  data.tar.gz: d8aa13685742a3392c5e661e2c16d73eb386aa7d455c929ab128fe7e3be97eeefbc7bbd635e74ee65902386b0f9ebcaef75d546762bfc51dc1d2776bbe791082

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_fly (2.2.0.pre.6)
+    rake_fly (2.5.0)
       concourse.rb (>= 0.4)
       rake_dependencies (~> 2, < 3)
       rake_factory (>= 0.29, < 1)

data/lib/rake_fly.rb

@@ -47,22 +47,18 @@ module RakeFly
     RakeDependencies::TaskSets::All.define(task_set_opts)
   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
+  def self.define_authentication_tasks(opts = {}, &block)
+    RakeFly::TaskSets::Authentication.define(opts, &block)
+  end
 
+  def self.define_pipeline_tasks(opts = {}, &block)
     RakeFly::TaskSets::Pipeline.define(opts, &block)
   end
 
+  def self.define_project_tasks(opts = {}, &block)
+    RakeFly::TaskSets::Project.define(opts, &block)
+  end
+
   private
 
   def self.new_format?(version)

data/lib/rake_fly/task_sets.rb

@@ -1 +1,3 @@
+require_relative 'task_sets/authentication'
 require_relative 'task_sets/pipeline'
+require_relative 'task_sets/project'

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/task_sets/project.rb

@@ -0,0 +1,124 @@
+require 'rake_factory'
+
+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'
+require_relative '../tasks/pipeline/push'
+
+module RakeFly
+  module TaskSets
+    class Project < RakeFactory::TaskSet
+      prepend RakeFactory::Namespaceable
+
+      parameter :argument_names, default: []
+
+      parameter :concourse_url, required: true
+      parameter :team, default: 'main'
+      parameter :username
+      parameter :password
+
+      parameter :pipeline, required: true
+      parameter :config, required: true
+
+      parameter :vars
+      parameter :var_files
+      parameter :non_interactive
+
+      parameter :target,
+          default: RakeFactory::DynamicValue.new { |t| t.team }
+
+      parameter :home_directory,
+          default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
+      parameter :authentication_namespace, default: :authentication
+      parameter :authentication_login_task_name, default: :login
+      parameter :authentication_ensure_task_name, default: :ensure
+
+      parameter :pipeline_namespace, default: :pipeline
+      parameter :pipeline_get_task_name, default: :get
+      parameter :pipeline_set_task_name, default: :set
+      parameter :pipeline_unpause_task_name, default: :unpause
+      parameter :pipeline_push_task_name, default: :push
+
+      parameter :fly_ensure_task_name, default: :'fly:ensure'
+
+      task Tasks::Authentication::Login,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.authentication_login_task_name
+          }
+      task Tasks::Authentication::Ensure,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.authentication_ensure_task_name
+          },
+          login_task_name: RakeFactory::DynamicValue.new { |ts|
+            ts.authentication_login_task_name
+          }
+
+      task Tasks::Pipeline::Get,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.pipeline_get_task_name
+          },
+          authentication_ensure_task_name: RakeFactory::DynamicValue.new { |ts|
+            (ts.authentication_namespace.to_s + ":" +
+                ts.authentication_ensure_task_name.to_s)
+                .to_sym
+          }
+      task Tasks::Pipeline::Set,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.pipeline_set_task_name
+          },
+          authentication_ensure_task_name: RakeFactory::DynamicValue.new { |ts|
+            (ts.authentication_namespace.to_s + ":" +
+                ts.authentication_ensure_task_name.to_s)
+                .to_sym
+          }
+      task Tasks::Pipeline::Unpause,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.pipeline_unpause_task_name
+          },
+          authentication_ensure_task_name: RakeFactory::DynamicValue.new { |ts|
+            (ts.authentication_namespace.to_s + ":" +
+                ts.authentication_ensure_task_name.to_s)
+                .to_sym
+          }
+      task Tasks::Pipeline::Push,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.pipeline_push_task_name
+          },
+          get_task_name: RakeFactory::DynamicValue.new { |ts|
+            ts.pipeline_get_task_name
+          },
+          set_task_name: RakeFactory::DynamicValue.new { |ts|
+            ts.pipeline_set_task_name
+          },
+          unpause_task_name: RakeFactory::DynamicValue.new { |ts|
+            ts.pipeline_unpause_task_name
+          }
+
+      def define_on(application)
+        around_define(application) do
+          self.class.tasks.each do |task_definition|
+            task_class = task_definition.klass.to_s
+            ns = case task_class
+            when /Pipeline/
+              pipeline_namespace
+            when /Authentication/
+              authentication_namespace
+            else
+              raise StandardError.new(
+                  "Unexpected task definition: #{task_class}.")
+            end
+
+            application.in_namespace(ns) do
+              task_definition
+                  .for_task_set(self)
+                  .define_on(application)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module RakeFly
       class Ensure < RakeFactory::Task
         default_name :ensure
         default_prerequisites RakeFactory::DynamicValue.new { |t|
-          [t.ensure_task_name]
+          [t.fly_ensure_task_name]
         }
         default_description RakeFactory::DynamicValue.new { |t|
           target = t.target || '<derived>'
@@ -21,7 +21,9 @@ module RakeFly
         parameter :home_directory,
             default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :ensure_task_name, :default => :'fly:ensure'
+        parameter :login_task_name, :default => :login
+
+        parameter :fly_ensure_task_name, :default => :'fly:ensure'
 
         action do |t, args|
           puts "Ensuring target #{t.target} is logged in..."
@@ -34,7 +36,7 @@ module RakeFly
             puts "Already logged in. Continuing..."
           else
             puts "Not logged in. Logging in..."
-            t.application[:login, t.scope].invoke(*args)
+            t.application[t.login_task_name, t.scope].invoke(*args)
           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.6'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.6
+  version: 2.5.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
@@ -307,7 +307,9 @@ 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/task_sets/project.rb
 - lib/rake_fly/tasks.rb
 - lib/rake_fly/tasks/authentication/ensure.rb
 - lib/rake_fly/tasks/authentication/login.rb
@@ -331,9 +333,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: