rake_fly 2.10.0.pre.2 → 2.10.0.pre.3

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_fly'
 require 'rake_factory'
 require 'concourse'
@@ -13,14 +15,15 @@ module RakeFly
 
           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
-                })
+              target: task.target,
+              concourse_url: task.concourse_url,
+              username: task.username,
+              password: task.password,
+              team: task.team,
+              environment: {
+                'HOME' => task.home_directory
+              }
+            )
           end
         end
 
@@ -30,12 +33,22 @@ module RakeFly
           end
 
           def execute(task)
-            client = Concourse::Client.new(
-                url: task.concourse_url)
-            token = client.for_skymarshal.create_token(
+            save_target(task, fetch_token(task))
+          end
+
+          private
+
+          def fetch_token(task)
+            Concourse::Client
+              .new(url: task.concourse_url)
+              .for_skymarshal
+              .create_token(
                 username: task.username,
-                password: task.password)
+                password: task.password
+              )
+          end
 
+          def save_target(task, token)
             rc = RubyFly::RC.load(home: task.home_directory)
             rc.add_or_update_target(task.target) do |target|
               target.api = task.concourse_url
@@ -47,15 +60,15 @@ module RakeFly
         end
 
         default_name :login
-        default_prerequisites RakeFactory::DynamicValue.new { |t|
+        default_prerequisites(RakeFactory::DynamicValue.new do |t|
           t.backend.new.resolve_prerequisites(t)
-        }
-        default_description RakeFactory::DynamicValue.new { |t|
+        end)
+        default_description(RakeFactory::DynamicValue.new do |t|
           concourse_url = t.concourse_url || '<derived>'
           target = t.target || '<derived>'
 
           "Login to #{concourse_url} as target #{target}"
-        }
+        end)
 
         parameter :concourse_url, required: true
         parameter :team, default: 'main'
@@ -66,15 +79,17 @@ module RakeFly
         parameter :backend, default: ApiBackend
 
         parameter :home_directory,
-            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+                  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :fly_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}..."
+          $stdout.puts(
+            "Logging in to #{t.concourse_url} as target #{t.target}..."
+          )
           t.backend.new.execute(t)
         end
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_fly'
 require 'rake_factory'
 
@@ -6,41 +8,44 @@ module RakeFly
     module Pipeline
       class Destroy < RakeFactory::Task
         default_name :destroy
-        default_prerequisites RakeFactory::DynamicValue.new { |t|
+        default_prerequisites(RakeFactory::DynamicValue.new do |t|
           [t.fly_ensure_task_name, t.authentication_ensure_task_name]
-        }
-        default_description RakeFactory::DynamicValue.new { |t|
+        end)
+        default_description(RakeFactory::DynamicValue.new do |t|
           pipeline = t.pipeline || '<derived>'
           target = t.target || '<derived>'
-  
+
           "Destroy pipeline #{pipeline} for target #{target}"
-        }
-  
-        parameter :target, :required => true
+        end)
+
+        parameter :target, required: true
         parameter :team
-        parameter :pipeline, :required => true
+        parameter :pipeline, required: true
 
         parameter :non_interactive
 
         parameter :home_directory,
-            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+                  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :fly_ensure_task_name, :default => :'fly:ensure'
+        parameter :fly_ensure_task_name, default: :'fly:ensure'
         parameter :authentication_ensure_task_name,
-            :default => :'authentication:ensure'
-  
+                  default: :'authentication:ensure'
+
         action do |t|
-          puts "Destroying pipeline #{t.pipeline} for target #{t.target}..."
+          $stdout.puts(
+            "Destroying pipeline #{t.pipeline} for target #{t.target}..."
+          )
           RubyFly.destroy_pipeline(
-              target: t.target,
-              team: t.team,
-              pipeline: t.pipeline,
-              non_interactive: t.non_interactive,
-              environment: {
-                  "HOME" => t.home_directory
-              })
+            target: t.target,
+            team: t.team,
+            pipeline: t.pipeline,
+            non_interactive: t.non_interactive,
+            environment: {
+              'HOME' => t.home_directory
+            }
+          )
         end
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_fly'
 require 'rake_factory'
 
@@ -6,36 +8,39 @@ module RakeFly
     module Pipeline
       class Get < RakeFactory::Task
         default_name :get
-        default_prerequisites RakeFactory::DynamicValue.new { |t|
+        default_prerequisites(RakeFactory::DynamicValue.new do |t|
           [t.fly_ensure_task_name, t.authentication_ensure_task_name]
-        }
-        default_description RakeFactory::DynamicValue.new { |t|
+        end)
+        default_description(RakeFactory::DynamicValue.new do |t|
           pipeline = t.pipeline || '<derived>'
           target = t.target || '<derived>'
-  
+
           "Get pipeline #{pipeline} for target #{target}"
-        }
-  
-        parameter :target, :required => true
-        parameter :pipeline, :required => true
+        end)
+
+        parameter :target, required: true
+        parameter :pipeline, required: true
 
         parameter :home_directory,
-            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+                  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :fly_ensure_task_name, :default => :'fly:ensure'
+        parameter :fly_ensure_task_name, default: :'fly:ensure'
         parameter :authentication_ensure_task_name,
-            :default => :'authentication:ensure'
-  
+                  default: :'authentication:ensure'
+
         action do |t|
-          puts "Getting pipeline #{t.pipeline} for target #{t.target}..."
+          $stdout.puts(
+            "Getting pipeline #{t.pipeline} for target #{t.target}..."
+          )
           RubyFly.get_pipeline(
-              target: t.target,
-              pipeline: t.pipeline,
-              environment: {
-                  "HOME" => t.home_directory
-              })
+            target: t.target,
+            pipeline: t.pipeline,
+            environment: {
+              'HOME' => t.home_directory
+            }
+          )
         end
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_fly'
 require 'rake_factory'
 
@@ -6,25 +8,25 @@ module RakeFly
     module Pipeline
       class Push < RakeFactory::Task
         default_name :push
-        default_description RakeFactory::DynamicValue.new { |t|
+        default_description(RakeFactory::DynamicValue.new do |t|
           pipeline = t.pipeline || '<derived>'
           target = t.target || '<derived>'
 
           "Push pipeline #{pipeline} to target #{target}"
-        }
+        end)
 
-        parameter :target, :required => true
-        parameter :pipeline, :required => true
+        parameter :target, required: true
+        parameter :pipeline, required: true
 
-        parameter :get_task_name, :default => :get
-        parameter :set_task_name, :default => :set
-        parameter :unpause_task_name, :default => :unpause
+        parameter :get_task_name, default: :get
+        parameter :set_task_name, default: :set
+        parameter :unpause_task_name, default: :unpause
 
         action do |t, args|
           [
-              t.application[t.set_task_name, t.scope],
-              t.application[t.get_task_name, t.scope],
-              t.application[t.unpause_task_name, t.scope]
+            t.application[t.set_task_name, t.scope],
+            t.application[t.get_task_name, t.scope],
+            t.application[t.unpause_task_name, t.scope]
           ].each do |task|
             task.invoke(*args)
           end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_fly'
 require 'rake_factory'
 
@@ -6,45 +8,48 @@ module RakeFly
     module Pipeline
       class Set < RakeFactory::Task
         default_name :set
-        default_prerequisites RakeFactory::DynamicValue.new { |t|
+        default_prerequisites(RakeFactory::DynamicValue.new do |t|
           [t.fly_ensure_task_name, t.authentication_ensure_task_name]
-        }
-        default_description RakeFactory::DynamicValue.new { |t|
+        end)
+        default_description(RakeFactory::DynamicValue.new do |t|
           pipeline = t.pipeline || '<derived>'
           target = t.target || '<derived>'
 
           "Set pipeline #{pipeline} for target #{target}"
-        }
+        end)
 
-        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 :home_directory,
-            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+                  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :fly_ensure_task_name, :default => :'fly:ensure'
+        parameter :fly_ensure_task_name, default: :'fly:ensure'
         parameter :authentication_ensure_task_name,
-            :default => :'authentication:ensure'
+                  default: :'authentication:ensure'
 
         action do |t|
-          puts "Setting pipeline #{t.pipeline} for target #{t.target}..."
+          $stdout.puts(
+            "Setting pipeline #{t.pipeline} for target #{t.target}..."
+          )
           RubyFly.set_pipeline(
-              target: t.target,
-              team: t.team,
-              pipeline: t.pipeline,
-              config: t.config,
-              vars: t.vars,
-              var_files: t.var_files,
-              non_interactive: t.non_interactive,
-              environment: {
-                  "HOME" => t.home_directory
-              })
+            target: t.target,
+            team: t.team,
+            pipeline: t.pipeline,
+            config: t.config,
+            vars: t.vars,
+            var_files: t.var_files,
+            non_interactive: t.non_interactive,
+            environment: {
+              'HOME' => t.home_directory
+            }
+          )
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_fly'
 require 'rake_factory'
 
@@ -6,36 +8,39 @@ module RakeFly
     module Pipeline
       class Unpause < RakeFactory::Task
         default_name :unpause
-        default_prerequisites RakeFactory::DynamicValue.new { |t|
+        default_prerequisites(RakeFactory::DynamicValue.new do |t|
           [t.fly_ensure_task_name, t.authentication_ensure_task_name]
-        }
-        default_description RakeFactory::DynamicValue.new { |t|
+        end)
+        default_description(RakeFactory::DynamicValue.new do |t|
           pipeline = t.pipeline || '<derived>'
           target = t.target || '<derived>'
 
           "Unpause pipeline #{pipeline} for target #{target}"
-        }
+        end)
 
-        parameter :target, :required => true
+        parameter :target, required: true
         parameter :team
-        parameter :pipeline, :required => true
+        parameter :pipeline, required: true
 
         parameter :home_directory,
-            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+                  default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
-        parameter :fly_ensure_task_name, :default => :'fly:ensure'
+        parameter :fly_ensure_task_name, default: :'fly:ensure'
         parameter :authentication_ensure_task_name,
-            :default => :'authentication:ensure'
+                  default: :'authentication:ensure'
 
         action do |t|
-          puts "Unpausing pipeline #{t.pipeline} for target #{t.target}..."
+          $stdout.puts(
+            "Unpausing pipeline #{t.pipeline} for target #{t.target}..."
+          )
           RubyFly.unpause_pipeline(
-              target: t.target,
-              team: t.team,
-              pipeline: t.pipeline,
-              environment: {
-                  "HOME" => t.home_directory
-              })
+            target: t.target,
+            team: t.team,
+            pipeline: t.pipeline,
+            environment: {
+              'HOME' => t.home_directory
+            }
+          )
         end
       end
     end

data/lib/rake_fly/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'tasks/authentication/login'
 require_relative 'tasks/authentication/ensure'
 require_relative 'tasks/pipeline/get'

data/lib/rake_fly/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeFly
-  VERSION = '2.10.0.pre.2'
+  VERSION = '2.10.0.pre.3'
 end

data/lib/rake_fly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'semantic'
 require 'rake_dependencies'
 require 'ruby_fly'
@@ -11,42 +13,15 @@ module RakeFly
   ARTIFACT_FORMAT_CHANGE_VERSION = '5.0.0'
 
   def self.define_installation_tasks(opts = {})
-    namespace = opts[:namespace] || :fly
-    version = opts[:version] || '2.7.0'
-    path = opts[:path] || File.join('vendor', 'fly')
-
-    type = self.type(version)
-    uri_template = self.uri_template(version)
-    file_name_template = self.file_name_template(version)
-    new_format = self.new_format?(version)
-
-    task_set_opts = {
-        namespace: namespace,
-        dependency: 'fly',
-        version: version,
-        path: path,
-        type: type,
-        platform_os_names: {darwin: 'darwin', linux: 'linux'},
-        uri_template: uri_template,
-        file_name_template: file_name_template,
-        needs_fetch: lambda { |t|
-          fly_binary = File.join(t.path, t.binary_directory, 'fly')
-
-          !(File.exist?(fly_binary) && RubyFly.version == version)
-        }}
-
-    unless new_format
-      task_set_opts[:source_binary_name_template] =
-        "fly_<%= @platform_os_name %>_amd64"
-      task_set_opts[:target_binary_name_template] =
-        "fly"
-    end
+    option_resolver = OptionResolver.new(opts)
 
     RubyFly.configure do |c|
-      c.binary = File.join(path, 'bin', 'fly')
+      c.binary = option_resolver.fly_binary_path
     end
 
-    RakeDependencies::TaskSets::All.define(task_set_opts)
+    RakeDependencies::TaskSets::All.define(
+      option_resolver.installation_task_set_options
+    )
   end
 
   def self.define_authentication_tasks(opts = {}, &block)
@@ -61,37 +36,108 @@ module RakeFly
     RakeFly::TaskSets::Project.define(opts, &block)
   end
 
-  private
+  class OptionResolver
+    attr_reader :opts
 
-  def self.new_format?(version)
-    Semantic::Version.new(version) >=
-        Semantic::Version.new(ARTIFACT_FORMAT_CHANGE_VERSION)
-  end
+    def initialize(opts)
+      @opts = opts
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def installation_task_set_options
+      task_set_opts = {
+        namespace: namespace,
+        dependency: dependency,
+        version: version,
+        path: path,
+        type: type,
+        platform_os_names: platform_os_names,
+        uri_template: uri_template,
+        file_name_template: file_name_template,
+        needs_fetch: needs_fetch_check_lambda
+      }
 
-  def self.type(version)
-    if self.new_format?(version)
-      :tgz
-    else
-      :uncompressed
+      unless new_format?
+        task_set_opts[:source_binary_name_template] =
+          source_binary_name_template
+        task_set_opts[:target_binary_name_template] =
+          target_binary_name_template
+      end
+
+      task_set_opts
     end
-  end
+    # rubocop:enable Metrics/MethodLength
 
-  def self.uri_template(version)
-    if new_format?(version)
-      "https://github.com/concourse/concourse/releases/download" +
-          "/v<%= @version %>" +
-          "/fly-<%= @version %>-<%= @platform_os_name %>-amd64<%= @ext %>"
-    else
-      "https://github.com/concourse/concourse/releases/" +
-          "download/v<%= @version %>/fly_<%= @platform_os_name %>_amd64"
+    def fly_binary_path
+      File.join(path, 'bin', 'fly')
     end
-  end
 
-  def self.file_name_template(version)
-    if new_format?(version)
-      "fly-<%= @version %>-<%= @platform_os_name %>-amd64<%= @ext %>"
-    else
-      "fly_<%= @platform_os_name %>_amd64"
+    def namespace
+      opts[:namespace] || :fly
+    end
+
+    def dependency
+      'fly'
+    end
+
+    def version
+      opts[:version] || '2.7.0'
+    end
+
+    def path
+      opts[:path] || File.join('vendor', 'fly')
+    end
+
+    def type
+      if new_format?
+        :tgz
+      else
+        :uncompressed
+      end
+    end
+
+    def platform_os_names
+      { darwin: 'darwin', linux: 'linux' }
+    end
+
+    def uri_template
+      if new_format?
+        'https://github.com/concourse/concourse/releases/download' \
+          '/v<%= @version %>' \
+          '/fly-<%= @version %>-<%= @platform_os_name %>-amd64<%= @ext %>'
+      else
+        'https://github.com/concourse/concourse/releases/' \
+          'download/v<%= @version %>/fly_<%= @platform_os_name %>_amd64'
+      end
+    end
+
+    def file_name_template
+      if new_format?
+        'fly-<%= @version %>-<%= @platform_os_name %>-amd64<%= @ext %>'
+      else
+        'fly_<%= @platform_os_name %>_amd64'
+      end
+    end
+
+    def target_binary_name_template
+      'fly'
+    end
+
+    def source_binary_name_template
+      'fly_<%= @platform_os_name %>_amd64'
+    end
+
+    def needs_fetch_check_lambda
+      lambda { |t|
+        fly_binary = File.join(t.path, t.binary_directory, 'fly')
+
+        !(File.exist?(fly_binary) && RubyFly.version == version)
+      }
+    end
+
+    def new_format?
+      Semantic::Version.new(version) >=
+        Semantic::Version.new(ARTIFACT_FORMAT_CHANGE_VERSION)
     end
   end
 end