rake_fly 2.2.0.pre.3 → 2.2.0.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e86475d438002c5983ab66a8ecc0bb1bf9240846f5cdc135aa6066716b1c70
-  data.tar.gz: a510e1412c4cc47bb0d756741bf108bdc4e10935f16634c3ce7795a6c53ce20a
+  metadata.gz: 4ef9b72eb45183697e29cc9a7c4628411bb975ebd6b1032366f4003ddbb7ee2c
+  data.tar.gz: 4c94f6c41ed35ebcd1d6e69f862564a9138baffeef23a5fd0e1193dce93e7612
 SHA512:
-  metadata.gz: e094b9bf233483fc73557a4a2e9f713e755464e0e0743f243e55b05d18a29cf25d695206750aa987e2a2143c19a767bbd9ba05ab4758d9de733f1b51becb5cf5
-  data.tar.gz: 4ffd45cc8fcc588ee12fae2b401124dd385e9d985b0353365d052b57208203303c65807b37f2cea9054e150fb21419859b8e8d3412d12d25f96ffa806490ec0f
+  metadata.gz: ae305edef270ab6407e8174c82ecc639bd7f7427c802771d728041fd2a129faae9e557fdcbbfeffbe61c20e0df90837c1b939118991b5acdc8ca6573956b3bf3
+  data.tar.gz: 998a5987e1c31301bd7fdf01ee6cf358f38688769e1d9275a89c82ec301b08a21d658dbfe278cc88dad858d2c7a7dd057899fa382efdb76860d2d144c3190978

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rake_fly (2.2.0.pre.3)
+    rake_fly (2.2.0.pre.8)
       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,21 +8,28 @@ 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
       parameter :non_interactive
 
-      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 :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 :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.3'
+  VERSION = '2.2.0.pre.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.3
+  version: 2.2.0.pre.8
 platform: ruby
 authors:
 - Toby Clemson
@@ -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