rake_fly 1.16.0.pre.1 → 2.2.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321c3fd2c61f35465e4fc5c50299471c1fa137e887b8bb2818b88529ae9fd66c
-  data.tar.gz: 17bf35766d7aa6769e246da9cf99d4428ebf8e93a248c9fe38c9af391756ce70
+  metadata.gz: 8193420614d6427a3febfdf052dab45453755393aa2f59123cb5f1d87d2330ab
+  data.tar.gz: 91f83c140311ef789ddc273e28522e8b1ecfc9c7dcc39fb1c7a9b967b869c367
 SHA512:
-  metadata.gz: 3077def7165aa491514648c716ba798b5706a7df666391d78c979bbdee38264198f077d86c9204a02db4954cd21d922124336bbfaf046993c01cd8be995376c0
-  data.tar.gz: 8389d41b61b1a8dda9f7ff7701c03a132b7da21f4153ae2d22a3939ce4db5fab4722a9ae9e4d881f2f7955c7d3e368f5bb64dfb136b98f607b08a6061dafa812
+  metadata.gz: 4e523ed35af7e983ec3d5c40bb621d925fef84a0328316d9430a87110d93d52bc566ea12cf8c3436d872cc38ba05492ffdf6e214fe3d0964f6923e3303eda3eb
+  data.tar.gz: b1bb8d57e58151397cb3eea555c16baa3ed990b7a38b7b77abaaea38ddcd8c99effd3c11403f1341c14fce42720fa78fe2aea465d77e997ad7f7be6338cc2e19

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    rake_fly (1.16.0.pre.1)
+    rake_fly (2.2.0.pre.2)
+      concourse.rb (= 0.3.0.pre.2)
       rake_dependencies (~> 2, < 3)
-      rake_factory (>= 0.23, < 1)
-      ruby_fly (>= 0.19)
+      rake_factory (>= 0.29, < 1)
+      ruby_fly (>= 0.23)
       semantic (~> 1.6.1)
 
 GEM
@@ -19,11 +20,46 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colored2 (3.1.2)
+    concourse.rb (0.3.0.pre.2)
+      dry-schema (~> 0.5)
+      excon (~> 0.72)
+      semantic (~> 1.5)
     concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
     docile (1.3.4)
+    dry-configurable (0.12.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5.0)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.5.0)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-initializer (3.0.4)
+    dry-logic (1.1.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-schema (0.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.8, >= 0.8.0)
+      dry-core (~> 0.4)
+      dry-equalizer (~> 0.2)
+      dry-initializer (~> 3.0)
+      dry-logic (~> 1.0)
+      dry-types (~> 1.0)
+    dry-types (1.4.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
     excon (0.78.1)
     fakefs (0.20.1)
+    faker (2.15.1)
+      i18n (>= 1.6, < 2)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
@@ -32,8 +68,9 @@ GEM
     gem-release (2.2.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.6)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
+    jwt (2.2.2)
     lino (1.7.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
@@ -44,6 +81,7 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    openssl (2.2.0)
     public_suffix (4.0.6)
     rake (13.0.3)
     rake_circle_ci (0.9.0)
@@ -56,18 +94,18 @@ GEM
       minitar (~> 0.9)
       rake_factory (~> 0.23)
       rubyzip (>= 1.3)
-    rake_factory (0.27.0)
+    rake_factory (0.29.0)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_github (0.5.0)
+    rake_github (0.7.0)
       colored2 (~> 3.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_gpg (0.12.0)
+    rake_gpg (0.14.0)
       rake_factory (>= 0.23, < 1)
       ruby_gpg2 (>= 0.6, < 1)
-    rake_ssh (0.4.0)
+    rake_ssh (0.6.0)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
@@ -85,16 +123,16 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
     ruby2_keywords (0.0.2)
-    ruby_fly (0.19.0)
+    ruby_fly (0.23.0)
       lino (>= 1.5)
-    ruby_gpg2 (0.6.0)
+    ruby_gpg2 (0.8.0)
       lino (>= 1.5)
     rubyzip (2.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     semantic (1.6.1)
-    simplecov (0.20.0)
+    simplecov (0.21.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -113,7 +151,10 @@ DEPENDENCIES
   activesupport (>= 4)
   bundler (~> 2.1)
   fakefs (~> 0.18)
+  faker (~> 2.15)
   gem-release (~> 2.0)
+  jwt (~> 2.2)
+  openssl (~> 2.2)
   rake (~> 13.0)
   rake_circle_ci (~> 0.9)
   rake_fly!

data/lib/rake_fly/task_sets/pipeline.rb

@@ -1,8 +1,9 @@
 require 'rake_factory'
 
-require_relative '../tasks/get_pipeline'
-require_relative '../tasks/set_pipeline'
-require_relative '../tasks/unpause_pipeline'
+require_relative '../tasks/pipeline/get'
+require_relative '../tasks/pipeline/set'
+require_relative '../tasks/pipeline/unpause'
+require_relative '../tasks/pipeline/push'
 
 module RakeFly
   module TaskSets
@@ -18,26 +19,26 @@ module RakeFly
       parameter :var_files
       parameter :non_interactive
 
-      parameter :get_pipeline_task_name, :default => :get_pipeline
-      parameter :set_pipeline_task_name, :default => :set_pipeline
-      parameter :unpause_pipeline_task_name, :default => :unpause_pipeline
-      parameter :push_pipeline_task_name, :default => :push_pipeline
+      parameter :get_task_name, :default => :get
+      parameter :set_task_name, :default => :set
+      parameter :unpause_task_name, :default => :unpause
+      parameter :push_task_name, :default => :push
 
-      task Tasks::GetPipeline,
+      task Tasks::Pipeline::Get,
           name: RakeFactory::DynamicValue.new { |ts|
-            ts.get_pipeline_task_name
+            ts.get_task_name
           }
-      task Tasks::SetPipeline,
+      task Tasks::Pipeline::Set,
           name: RakeFactory::DynamicValue.new { |ts|
-            ts.set_pipeline_task_name
+            ts.set_task_name
           }
-      task Tasks::UnpausePipeline,
+      task Tasks::Pipeline::Unpause,
           name: RakeFactory::DynamicValue.new { |ts|
-            ts.unpause_pipeline_task_name
+            ts.unpause_task_name
           }
-      task Tasks::PushPipeline,
+      task Tasks::Pipeline::Push,
           name: RakeFactory::DynamicValue.new { |ts|
-            ts.push_pipeline_task_name
+            ts.push_task_name
           }
     end
   end

data/lib/rake_fly/tasks.rb

@@ -1,4 +1,5 @@
-require_relative 'tasks/get_pipeline'
-require_relative 'tasks/set_pipeline'
-require_relative 'tasks/unpause_pipeline'
-require_relative 'tasks/push_pipeline'
+require_relative 'tasks/authentication/login'
+require_relative 'tasks/pipeline/get'
+require_relative 'tasks/pipeline/set'
+require_relative 'tasks/pipeline/unpause'
+require_relative 'tasks/pipeline/push'

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

@@ -0,0 +1,72 @@
+require 'ruby_fly'
+require 'rake_factory'
+require 'concourse'
+
+module RakeFly
+  module Tasks
+    module Authentication
+      class Login < RakeFactory::Task
+        class FlyBackend
+          def resolve_prerequisites(task)
+            [task.ensure_task_name]
+          end
+
+          def execute(_)
+
+          end
+        end
+
+        class ApiBackend
+          def resolve_prerequisites(_)
+            []
+          end
+
+          def execute(task)
+            client = Concourse::Client.new(
+                url: task.concourse_url)
+            token = client.for_skymarshal.create_token(
+                username: task.username,
+                password: task.password)
+
+            rc = RubyFly::RC.load(home: task.home_directory)
+            rc.add_or_update_target(task.target) do |target|
+              target.api = task.concourse_url
+              target.team = task.team
+              target.bearer_token = token.access_token
+            end
+            rc.write!
+          end
+        end
+
+        default_name :login
+        default_prerequisites RakeFactory::DynamicValue.new { |t|
+          t.backend.new.resolve_prerequisites(t)
+        }
+        default_description RakeFactory::DynamicValue.new { |t|
+          concourse_url = t.concourse_url || '<derived>'
+          target = t.target || '<derived>'
+
+          "Login to #{concourse_url} as target #{target}"
+        }
+
+        parameter :concourse_url, required: true
+        parameter :team, default: 'main'
+        parameter :target, required: true
+        parameter :username
+        parameter :password
+
+        parameter :backend, default: ApiBackend
+
+        parameter :home_directory,
+            default: RakeFactory::DynamicValue.new { |_| ENV['HOME'] }
+
+        parameter :ensure_task_name, :default => :'fly:ensure'
+
+        action do |t|
+          puts "Logging in to #{t.concourse_url} as target #{t.target}..."
+          t.backend.new.execute(t)
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,35 @@
+require 'ruby_fly'
+require 'rake_factory'
+
+module RakeFly
+  module Tasks
+    module Pipeline
+      class Push < RakeFactory::Task
+        default_name :push
+        default_description RakeFactory::DynamicValue.new { |t|
+          pipeline = t.pipeline || '<derived>'
+          target = t.target || '<derived>'
+
+          "Push pipeline #{pipeline} to target #{target}"
+        }
+
+        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
+
+        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]
+          ].each do |task|
+            task.invoke(*args)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+require 'ruby_fly'
+require 'rake_factory'
+
+module RakeFly
+  module Tasks
+    module Pipeline
+      class Set < RakeFactory::Task
+        default_name :set
+        default_prerequisites RakeFactory::DynamicValue.new { |t|
+          [t.ensure_task_name]
+        }
+        default_description RakeFactory::DynamicValue.new { |t|
+          pipeline = t.pipeline || '<derived>'
+          target = t.target || '<derived>'
+
+          "Set pipeline #{pipeline} for target #{target}"
+        }
+
+        parameter :target, :required => true
+        parameter :team
+        parameter :pipeline, :required => true
+        parameter :config, :required => true
+
+        parameter :vars
+        parameter :var_files
+        parameter :non_interactive
+
+        parameter :ensure_task_name, :default => :'fly:ensure'
+
+        action do |t|
+          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)
+        end
+      end
+    end
+  end
+end

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

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

data/lib/rake_fly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 1.16.0.pre.1
+  version: 2.2.0.pre.2
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_dependencies
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.29'
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.29'
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -56,14 +56,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.23'
+- !ruby/object:Gem::Dependency
+  name: concourse.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0.pre.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0.pre.2
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +232,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -253,10 +309,11 @@ files:
 - lib/rake_fly/task_sets.rb
 - lib/rake_fly/task_sets/pipeline.rb
 - lib/rake_fly/tasks.rb
-- lib/rake_fly/tasks/get_pipeline.rb
-- lib/rake_fly/tasks/push_pipeline.rb
-- lib/rake_fly/tasks/set_pipeline.rb
-- lib/rake_fly/tasks/unpause_pipeline.rb
+- lib/rake_fly/tasks/authentication/login.rb
+- lib/rake_fly/tasks/pipeline/get.rb
+- lib/rake_fly/tasks/pipeline/push.rb
+- lib/rake_fly/tasks/pipeline/set.rb
+- lib/rake_fly/tasks/pipeline/unpause.rb
 - lib/rake_fly/version.rb
 homepage: https://github.com/tobyclemson/rake_fly
 licenses:

data/lib/rake_fly/tasks/get_pipeline.rb

@@ -1,31 +0,0 @@
-require 'ruby_fly'
-require 'rake_factory'
-
-module RakeFly
-  module Tasks
-    class GetPipeline < RakeFactory::Task
-      default_name :get_pipeline
-      default_prerequisites RakeFactory::DynamicValue.new { |t|
-        [t.ensure_task_name]
-      }
-      default_description RakeFactory::DynamicValue.new { |t|
-        pipeline = t.pipeline || '<derived>'
-        target = t.target || '<derived>'
-
-        "Get pipeline #{pipeline} for target #{target}"
-      }
-
-      parameter :target, :required => true
-      parameter :pipeline, :required => true
-
-      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)
-      end
-    end
-  end
-end

data/lib/rake_fly/tasks/push_pipeline.rb

@@ -1,34 +0,0 @@
-require 'ruby_fly'
-require 'rake_factory'
-
-module RakeFly
-  module Tasks
-    class PushPipeline < RakeFactory::Task
-      default_name :push_pipeline
-      default_description RakeFactory::DynamicValue.new { |t|
-        pipeline = t.pipeline || '<derived>'
-        target = t.target || '<derived>'
-
-        "Push pipeline #{pipeline} to target #{target}"
-      }
-
-      parameter :target, :required => true
-      parameter :pipeline, :required => true
-
-      parameter :get_pipeline_task_name, :default => :get_pipeline
-      parameter :set_pipeline_task_name, :default => :set_pipeline
-      parameter :unpause_pipeline_task_name, :default => :unpause_pipeline
-
-      action do |t, args|
-        [
-            Rake::Task[t.scope.path_with_task_name(t.set_pipeline_task_name)],
-            Rake::Task[t.scope.path_with_task_name(t.get_pipeline_task_name)],
-            Rake::Task[t.scope.path_with_task_name(
-                t.unpause_pipeline_task_name)]
-        ].each do |task|
-          task.invoke(*args)
-        end
-      end
-    end
-  end
-end

data/lib/rake_fly/tasks/set_pipeline.rb

@@ -1,42 +0,0 @@
-require 'ruby_fly'
-require 'rake_factory'
-
-module RakeFly
-  module Tasks
-    class SetPipeline < RakeFactory::Task
-      default_name :set_pipeline
-      default_prerequisites RakeFactory::DynamicValue.new { |t|
-        [t.ensure_task_name]
-      }
-      default_description RakeFactory::DynamicValue.new { |t|
-        pipeline = t.pipeline || '<derived>'
-        target = t.target || '<derived>'
-
-        "Set pipeline #{pipeline} for target #{target}"
-      }
-
-      parameter :target, :required => true
-      parameter :team
-      parameter :pipeline, :required => true
-      parameter :config, :required => true
-
-      parameter :vars
-      parameter :var_files
-      parameter :non_interactive
-
-      parameter :ensure_task_name, :default => :'fly:ensure'
-
-      action do |t|
-        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)
-      end
-    end
-  end
-end

data/lib/rake_fly/tasks/unpause_pipeline.rb

@@ -1,33 +0,0 @@
-require 'ruby_fly'
-require 'rake_factory'
-
-module RakeFly
-  module Tasks
-    class UnpausePipeline < RakeFactory::Task
-      default_name :unpause_pipeline
-      default_prerequisites RakeFactory::DynamicValue.new { |t|
-        [t.ensure_task_name]
-      }
-      default_description RakeFactory::DynamicValue.new { |t|
-        pipeline = t.pipeline || '<derived>'
-        target = t.target || '<derived>'
-
-        "Unpause pipeline #{pipeline} for target #{target}"
-      }
-
-      parameter :target, :required => true
-      parameter :team
-      parameter :pipeline, :required => true
-
-      parameter :ensure_task_name, :default => :'fly: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)
-      end
-    end
-  end
-end