rake_fly 2.2.0.pre.2 → 2.2.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8193420614d6427a3febfdf052dab45453755393aa2f59123cb5f1d87d2330ab
-  data.tar.gz: 91f83c140311ef789ddc273e28522e8b1ecfc9c7dcc39fb1c7a9b967b869c367
+  metadata.gz: afb1b3a4898cc6ec6a31aa66e6676c848c3db0a61f1339da535d16e4520323ae
+  data.tar.gz: 86186bf53bfd095a8fa3b9f9a5733f1de176429602a3ceaeacb5aa8cbac4d757
 SHA512:
-  metadata.gz: 4e523ed35af7e983ec3d5c40bb621d925fef84a0328316d9430a87110d93d52bc566ea12cf8c3436d872cc38ba05492ffdf6e214fe3d0964f6923e3303eda3eb
-  data.tar.gz: b1bb8d57e58151397cb3eea555c16baa3ed990b7a38b7b77abaaea38ddcd8c99effd3c11403f1341c14fce42720fa78fe2aea465d77e997ad7f7be6338cc2e19
+  metadata.gz: a6fb482d84fb6ca94580a009652e26df0c327b5a9fa43094f22eebd388028c85c804840b1ac0d5bf170b33d32ee85e641971852da7e5646ced381cac7c0c8338
+  data.tar.gz: 18dd7843beb8ecc31d1c570babbf09beb71b62d546b85cafec6299366f7ede5ad2f676f7e6af9138884af3108d0fb6cb11e07e14d48d7fd599cb35b03b1e5b52

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rake_fly (2.2.0.pre.2)
-      concourse.rb (= 0.3.0.pre.2)
+    rake_fly (2.2.0.pre.7)
+      concourse.rb (>= 0.4)
       rake_dependencies (~> 2, < 3)
       rake_factory (>= 0.29, < 1)
-      ruby_fly (>= 0.23)
+      ruby_fly (>= 0.31)
       semantic (~> 1.6.1)
 
 GEM
@@ -20,7 +20,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colored2 (3.1.2)
-    concourse.rb (0.3.0.pre.2)
+    concourse.rb (0.4.0)
       dry-schema (~> 0.5)
       excon (~> 0.72)
       semantic (~> 1.5)
@@ -123,7 +123,7 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
     ruby2_keywords (0.0.2)
-    ruby_fly (0.23.0)
+    ruby_fly (0.31.0)
       lino (>= 1.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
@@ -132,7 +132,7 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     semantic (1.6.1)
-    simplecov (0.21.0)
+    simplecov (0.21.1)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)

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,11 +8,19 @@ module RakeFly
       class Login < RakeFactory::Task
         class FlyBackend
           def resolve_prerequisites(task)
-            [task.ensure_task_name]
+            [task.fly_ensure_task_name]
           end
 
-          def execute(_)
-
+          def execute(task)
+            RubyFly.login(
+                target: task.target,
+                concourse_url: task.concourse_url,
+                username: task.username,
+                password: task.password,
+                team: task.team,
+                environment: {
+                    "HOME" => task.home_directory
+                })
           end
         end
 
@@ -60,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>'
@@ -18,14 +18,22 @@ module RakeFly
   
         parameter :target, :required => true
         parameter :pipeline, :required => true
-  
-        parameter :ensure_task_name, :default => :'fly:ensure'
+
+        parameter :home_directory,
+            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
+        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}..."
           RubyFly.get_pipeline(
               target: t.target,
-              pipeline: t.pipeline)
+              pipeline: t.pipeline,
+              environment: {
+                  "HOME" => t.home_directory
+              })
         end
       end
     end

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>'
@@ -25,7 +25,12 @@ module RakeFly
         parameter :var_files
         parameter :non_interactive
 
-        parameter :ensure_task_name, :default => :'fly:ensure'
+        parameter :home_directory,
+            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
+        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}..."
@@ -36,7 +41,10 @@ module RakeFly
               config: t.config,
               vars: t.vars,
               var_files: t.var_files,
-              non_interactive: t.non_interactive)
+              non_interactive: t.non_interactive,
+              environment: {
+                  "HOME" => t.home_directory
+              })
         end
       end
     end

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>'
@@ -20,14 +20,22 @@ module RakeFly
         parameter :team
         parameter :pipeline, :required => true
 
-        parameter :ensure_task_name, :default => :'fly:ensure'
+        parameter :home_directory,
+            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
+        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}..."
           RubyFly.unpause_pipeline(
               target: t.target,
               team: t.team,
-              pipeline: t.pipeline)
+              pipeline: t.pipeline,
+              environment: {
+                  "HOME" => t.home_directory
+              })
         end
       end
     end

data/lib/rake_fly/version.rb

@@ -1,3 +1,3 @@
 module RakeFly
-  VERSION = '2.2.0.pre.2'
+  VERSION = '2.2.0.pre.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.2
+  version: 2.2.0.pre.7
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_dependencies
@@ -56,28 +56,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: concourse.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre.2
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre.2
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: semantic
   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