rake_fly 2.2.0.pre.5 → 2.4.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1553b29769e9089a1c21950076a23e0e5d00baaca2ec765ba4ebe8406ca055a
-  data.tar.gz: 25651a41be01bbf6a8d2a4ae116dfd966b41a6d81616122f8f16d89642ffae52
+  metadata.gz: c6d5cd3c8a380713e13705acd563c9c8c00622428e2e59e0fb6c38cf6eba74d6
+  data.tar.gz: 40fc78d21ba5d9b89fd81fac2f0e682156532cbc4cc251e9ddf587efc0c0882b
 SHA512:
-  metadata.gz: 68ba456621bd07990e2d7d4e72c88f81a4ba0c4b06bbc738c4ff7856e8fda13aa3f9d1e2757ae94719976f2bcfda089bf8a722246f488522108f84f90e727276
-  data.tar.gz: 5927edbe22792ef8580f0441e557828ec0c1d2deefd953e2ac1b44a8139ff156d55a52d7728f71e3a9ff57cfae98c36a0165a6d6c30fc80b64a572541392fdf6
+  metadata.gz: 9ba8c9fd41517ed6d8dbd750c3e92f69c38e59c1beb5e879b34f611364d0386477a3df0ce0f9a3011702da3a75e115a8588b4b486e19a4320beef95610091f76
+  data.tar.gz: 36fa5178f20dd934b248f11fb537b6a0ae74f8e10a95b9db985165b5a817f448c5dd0710e67b7857ae79cc8aa3d0927f18b06062c17604c860f5692136226b66

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rake_fly (2.2.0.pre.5)
+    rake_fly (2.4.0.pre.1)
       concourse.rb (>= 0.4)
       rake_dependencies (~> 2, < 3)
       rake_factory (>= 0.29, < 1)
-      ruby_fly (>= 0.29)
+      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.29.0)
+    ruby_fly (0.31.0)
       lino (>= 1.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)

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.5'
+  VERSION = '2.4.0.pre.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.5
+  version: 2.4.0.pre.1
 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.29'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: concourse.rb
   requirement: !ruby/object:Gem::Requirement
@@ -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