rake_fly 2.2.0.pre.1 → 2.2.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c67ea906461f3be457e179bc40ff830f143dd4c3c9e7de817704c5919f26db
-  data.tar.gz: 66000a2e914938cd6aa9124353150c1ee3a05479de15d514569255818700e9b2
+  metadata.gz: 34ce54381ac168787e48a8c3e2fd261a7826d8cc027f5778982ed43feceee8ce
+  data.tar.gz: 987c91023498ced68e868ba41da28c4756397301c938cf4bcba8f3f3c2212e6e
 SHA512:
-  metadata.gz: d9b11f89a341914b885d53043270b62532efd6c3d65f5655e37f1e01d70ff6bdf5db0316067bde44323e85136c4616671d0982e48f3f5a1451e0fa8cf461abff
-  data.tar.gz: bb817431a4713fc705e2f75e86e52bfbab3d26c6d28e56e8ef811cb8a08342423eec7563af14fdb32f93e42e7d1eb90860be1db317f99fd73f6af89f12c24138
+  metadata.gz: 3ba09e2e9455333d26fac4e09547808ff782dd1fc9d4009329e2e0299c21dee80c97f62dcf9463251a68c131d5ab6e7ad0b842ff4ac9c1f58207741456140c42
+  data.tar.gz: 72c53e618a15d2bf85ddc1fb689bc05e5046b95cc5f42ebc5e3754bd86ccb823beb6465a6bf193848663e1293a4bed9c9eb69a9cbc0af8d1ff9c58771ac4b612

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rake_fly (2.2.0.pre.1)
-      concourse.rb (= 0.3.0.pre.1)
+    rake_fly (2.2.0.pre.6)
+      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.1)
+    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/pipeline.rb

@@ -19,6 +19,9 @@ module RakeFly
       parameter :var_files
       parameter :non_interactive
 
+      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

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.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 :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

@@ -11,8 +11,16 @@ module RakeFly
             [task.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
 

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

@@ -18,14 +18,20 @@ module RakeFly
   
         parameter :target, :required => true
         parameter :pipeline, :required => true
-  
+
+        parameter :home_directory,
+            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
         parameter :ensure_task_name, :default => :'fly: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

@@ -25,6 +25,9 @@ module RakeFly
         parameter :var_files
         parameter :non_interactive
 
+        parameter :home_directory,
+            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
         parameter :ensure_task_name, :default => :'fly:ensure'
 
         action do |t|
@@ -36,7 +39,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

@@ -20,6 +20,9 @@ module RakeFly
         parameter :team
         parameter :pipeline, :required => true
 
+        parameter :home_directory,
+            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
         parameter :ensure_task_name, :default => :'fly:ensure'
 
         action do |t|
@@ -27,7 +30,10 @@ module RakeFly
           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.1'
+  VERSION = '2.2.0.pre.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre.1
+  version: 2.2.0.pre.6
 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.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0.pre.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +309,7 @@ files:
 - lib/rake_fly/task_sets.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