rake_fly 2.2.0.pre.7 → 2.6.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb1b3a4898cc6ec6a31aa66e6676c848c3db0a61f1339da535d16e4520323ae
-  data.tar.gz: 86186bf53bfd095a8fa3b9f9a5733f1de176429602a3ceaeacb5aa8cbac4d757
+  metadata.gz: ed8cc98dcf4d5767c0b1c02812d9a3731bd6cd458e9f1c4ef5a2d72d1d3d6892
+  data.tar.gz: e9a3c25e1eb48e7118d2c57e533c18c2d3b881361e819e31c158773dab19dd63
 SHA512:
-  metadata.gz: a6fb482d84fb6ca94580a009652e26df0c327b5a9fa43094f22eebd388028c85c804840b1ac0d5bf170b33d32ee85e641971852da7e5646ced381cac7c0c8338
-  data.tar.gz: 18dd7843beb8ecc31d1c570babbf09beb71b62d546b85cafec6299366f7ede5ad2f676f7e6af9138884af3108d0fb6cb11e07e14d48d7fd599cb35b03b1e5b52
+  metadata.gz: f6fb485ebeb5f973b9a271bcddfbb424c240d23b385cc525efe427291da303bfa0d3608466b55771917a1ecc0e756c42d9cd0e327874f9e0491a50ceeb0d71a7
+  data.tar.gz: 9b8ef0f149ba50e18109d8f642b1e739c976d94493e853497f4f993c073135595d314f2717d375b7d051d5eae925a701c5240f01b7dd87e677c703b72a75a1ea

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    rake_fly (2.2.0.pre.7)
+    rake_fly (2.6.0.pre.1)
       concourse.rb (>= 0.4)
       rake_dependencies (~> 2, < 3)
       rake_factory (>= 0.29, < 1)
-      ruby_fly (>= 0.31)
+      ruby_fly (>= 0.35)
       semantic (~> 1.6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.0)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -24,9 +24,9 @@ GEM
       dry-schema (~> 0.5)
       excon (~> 0.72)
       semantic (~> 1.5)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    docile (1.3.4)
+    docile (1.3.5)
     dry-configurable (0.12.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
@@ -49,11 +49,10 @@ GEM
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
       dry-types (~> 1.0)
-    dry-types (1.4.0)
+    dry-types (1.5.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     excon (0.78.1)
@@ -64,8 +63,8 @@ GEM
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
-    faraday-net_http (1.0.0)
-    gem-release (2.2.0)
+    faraday-net_http (1.0.1)
+    gem-release (2.2.1)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     i18n (1.8.7)
@@ -75,7 +74,7 @@ GEM
       hamster (~> 3.0)
       open4 (~> 1.3)
     minitar (0.9)
-    minitest (5.14.2)
+    minitest (5.14.3)
     multipart-post (2.1.1)
     octokit (4.20.0)
       faraday (>= 0.9)
@@ -122,8 +121,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
-    ruby2_keywords (0.0.2)
-    ruby_fly (0.31.0)
+    ruby2_keywords (0.0.4)
+    ruby_fly (0.35.0)
       lino (>= 1.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
@@ -132,7 +131,7 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     semantic (1.6.1)
-    simplecov (0.21.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -165,4 +164,4 @@ DEPENDENCIES
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   2.2.4
+   2.2.7

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,2 +1,3 @@
-require_relative 'task_sets/pipeline'
 require_relative 'task_sets/authentication'
+require_relative 'task_sets/pipeline'
+require_relative 'task_sets/project'

data/lib/rake_fly/task_sets/pipeline.rb

@@ -28,6 +28,7 @@ module RakeFly
       parameter :set_task_name, default: :set
       parameter :unpause_task_name, default: :unpause
       parameter :push_task_name, default: :push
+      parameter :destroy_task_name, default: :destroy
 
       parameter :fly_ensure_task_name, default: :'fly:ensure'
 
@@ -47,6 +48,10 @@ module RakeFly
           name: RakeFactory::DynamicValue.new { |ts|
             ts.push_task_name
           }
+      task Tasks::Pipeline::Destroy,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.destroy_task_name
+          }
     end
   end
 end

data/lib/rake_fly/task_sets/project.rb

@@ -0,0 +1,134 @@
+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 :pipeline_destroy_task_name, default: :destroy
+
+      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
+          }
+      task Tasks::Pipeline::Destroy,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.pipeline_destroy_task_name
+          },
+          authentication_ensure_task_name: RakeFactory::DynamicValue.new { |ts|
+            (ts.authentication_namespace.to_s + ":" +
+                ts.authentication_ensure_task_name.to_s)
+                .to_sym
+          }
+
+      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.rb

@@ -4,3 +4,4 @@ require_relative 'tasks/pipeline/get'
 require_relative 'tasks/pipeline/set'
 require_relative 'tasks/pipeline/unpause'
 require_relative 'tasks/pipeline/push'
+require_relative 'tasks/pipeline/destroy'

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

@@ -21,6 +21,8 @@ module RakeFly
         parameter :home_directory,
             default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
 
+        parameter :login_task_name, :default => :login
+
         parameter :fly_ensure_task_name, :default => :'fly:ensure'
 
         action do |t, args|
@@ -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/pipeline/destroy.rb

@@ -0,0 +1,46 @@
+require 'ruby_fly'
+require 'rake_factory'
+
+module RakeFly
+  module Tasks
+    module Pipeline
+      class Destroy < RakeFactory::Task
+        default_name :destroy
+        default_prerequisites RakeFactory::DynamicValue.new { |t|
+          [t.fly_ensure_task_name, t.authentication_ensure_task_name]
+        }
+        default_description RakeFactory::DynamicValue.new { |t|
+          pipeline = t.pipeline || '<derived>'
+          target = t.target || '<derived>'
+  
+          "Destroy pipeline #{pipeline} for target #{target}"
+        }
+  
+        parameter :target, :required => true
+        parameter :team
+        parameter :pipeline, :required => true
+
+        parameter :non_interactive
+
+        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 "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
+              })
+        end
+      end
+    end
+  end
+end

data/lib/rake_fly/version.rb

@@ -1,3 +1,3 @@
 module RakeFly
-  VERSION = '2.2.0.pre.7'
+  VERSION = '2.6.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.7
+  version: 2.6.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-27 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.31'
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.35'
 - !ruby/object:Gem::Dependency
   name: concourse.rb
   requirement: !ruby/object:Gem::Requirement
@@ -309,9 +309,11 @@ files:
 - 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
+- lib/rake_fly/tasks/pipeline/destroy.rb
 - lib/rake_fly/tasks/pipeline/get.rb
 - lib/rake_fly/tasks/pipeline/push.rb
 - lib/rake_fly/tasks/pipeline/set.rb