concourse 0.35.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e735d8ab6d592e3bc060b06f9b4e26dcef1312d05289910fa310658edd1f1e
-  data.tar.gz: 6011194849c21c817ac5e089c350bac9adbff6179b3f5de7449748c45b7df474
+  metadata.gz: d7a68a94db3a3d48f5cb12aaa4425f0b6d7f10eb9064d6baa4142096b5845b0c
+  data.tar.gz: a5ea2a78272347f1dd3a3f47c41ebb7762eebaaada5243816a08b39742e31d66
 SHA512:
-  metadata.gz: ab27e018c417be11f6a5f11cddb7f7ddfb93cf55186f9a331f974ecc789dd3f0f749132faec345933d04fe52bd4b618a3e33e3b015429dce86f72a42b2a947ba
-  data.tar.gz: 90daa7b65136f480da999018e97d5b9f344b940faa7df7308541c1ae7e5de1f34abcdbf05c6fe143c46cd93a9d8674801eb5c9b227e27beda9b1ccfc7c9593d8
+  metadata.gz: acbba3ce3c68a8ffc965be062b04c032357e168386a0d266023f43ec5c4fe77c4f9057c8026e31423bbb310485e345b926ae942fb65f5f21202800fa1cb0ca74
+  data.tar.gz: 82707abc4ac5c9faea068b1076b1ffd820a9e0a4c928ca2bc80d4a49f8694da2c397c3206af2a4e867070686a60f82f4198f6121a98f57bb9fa15da9ed1632bd

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # concourse-gem changelog
 
+## v0.40.0 / 2020-12-19
+
+* remove ruby 2.4, which has reached EOL
+
+
+## v0.39.0 / 2020-11-16
+
+* add support for [YTT](https://get-ytt.io/) pipeline templates
+
+
+## v0.38.0 / 2020-10-01
+
+* add ruby 3.0-rc
+
+
+## v0.37.0 / 2020-10-01
+
+* add TruffleRuby ("truffle") as a known Ruby
+
+
+## v0.36.0 / 2020-09-07
+
+* remove generated pipelines from rake's "CLOBBER" global (generated pipelines have been recommended for checkin to source control since v0.26.0)
+
+
 ## v0.35.0 / 2020-09-07
 
 * remove "clean" rake task (generated pipelines have been recommended for checkin to source control since v0.26.0)

data/README.md

@@ -22,12 +22,14 @@ Here's an example pipeline maintained by this gem:
 - [Real-world Examples](#real-world-examples)
 - [Concourse pipeline configuration](#concourse-pipeline-configuration)
   * [ERB Templating](#erb-templating)
-  * [`RUBIES`](#rubies)
+  * [YTT Templating](#ytt-templating)
+  * [Mixing ERB and YTT Templating](#mixing-erb-and-ytt-templating)
   * [Secrets](#secrets)
   * [Multiple pipelines](#multiple-pipelines)
 - [Configuration](#configuration)
   * [`directory`: Concourse subdirectory name](#directory-concourse-subdirectory-name)
   * [`fly_target`: Concourse `fly` target name](#fly_target-concourse-fly-target-name)
+  * [`ytt`: boolean, or a YTT configuration directory name](#ytt-boolean-or-a-ytt-configuration-directory-name)
   * [`format`: Emit the final pipelines in `fly format-pipeline` canonical format](#format-emit-the-final-pipelines-in-fly-format-pipeline-canonical-format)
   * [`pipeline_erb_filename`: Pipeline filename](#pipeline_erb_filename-pipeline-filename)
   * [`secrets_filename`: Secrets filename](#secrets_filename-secrets-filename)
@@ -122,17 +124,18 @@ resources:
 (If you're unfamiliar with ERB and how you can mix Ruby into the document, you can [read about it here](https://www.stuartellis.name/articles/erb/).)
 
 
-### `RUBIES`
+#### `RUBIES`
 
 The ruby variable `RUBIES` is defined in the ERB binding during pipeline file generation. This variable looks like:
 
 ``` ruby
   # these numbers/names align with public docker image names
   RUBIES = {
-    mri:     %w[2.3 2.4 2.5 2.6], # docker repository: "ruby"
-    jruby:   %w[9.1 9.2],     # docker repository: "jruby"
-    rbx:     %w[latest],      # docker repository: "rubinius/docker"
-    windows: %w[2.3 2.4 2.5 2.6]  # windows-ruby-dev-tools-release
+    mri: %w[2.5 2.6 2.7 3.0-rc], # docker repository: "ruby"
+    jruby: %w[9.2], # docker repository: "jruby"
+    rbx: %w[latest], # docker repository: "rubinius/docker"
+    windows: %w[2.3 2.4 2.5 2.6], # windows-ruby-dev-tools-release
+    truffle: %w[stable nightly] # docker repository: flavorjones/truffleruby
   }
 ```
 
@@ -158,6 +161,71 @@ jobs:
 Note that the `windows` rubies are not Docker images, since Concourse's Houdini backend doesn't use Docker. Instead, these are implicitly referring to the supported ruby versions installed by the BOSH release at https://github.com/flavorjones/windows-ruby-dev-tools-release
 
 
+### YTT Templating
+
+As of v0.39.0, YTT templates are also supported. It's off by default, but you can enable it by passing `ytt: true` to the `Concourse.new` or `Concourse#add_pipeline` calls in your Rakefile (see below for more context).
+
+Your Concourse pipeline configuration file, `<myproject>.yml` (or whatever you've configured with the `:pipeline_erb_filename` parameter), will be treated like a YTT template.
+
+You can optionally specify a directory containing your YTT configuration files (`.star` files and `.yml` templates) so that you can inject project-specific logic.
+
+(If you're unfamiliar with YTT, you can [read about it here](https://get-ytt.io/).)
+
+
+#### Rubies
+
+These YTT variables are defined by the gem, and can be used in your template:
+
+```starlark
+#! ruby.star
+cruby_versions = {
+    "out_of_support": ["2.4", "2.3", "2.2", "2.1", "2.0.0"],
+    "supported": ["2.5", "2.6", "2.7"],
+    "beta": ["3.0-rc"]
+}
+jruby_versions = {
+    "out_of_support": ["9.1"],
+    "supported": ["9.2"],
+    "beta": []
+}
+truffleruby_versions = {
+    "supported": ["stable"],
+    "out_of_support": [],
+    "beta": ["nightly"]
+}
+```
+
+Here's a simple example:
+
+``` yaml
+# myproject.yml
+
+#@ load("ruby.star", "cruby_versions")
+
+---
+jobs:
+#@ for ruby_version in cruby_versions["supported"]:
+  - name: #@ "ruby-{}".format(ruby_version)
+    plan:
+      ...
+      - task: rake-test
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source:
+              repository: "ruby"
+              tag: #@ "mri-{}".format(ruby_version)
+    ...
+#@ end
+```
+
+
+### Mixing ERB and YTT Templating
+
+Why would you do this? Well, if you really want to, I'll tell you a secret: we treat the YTT templates as though they're *also* ERB templates. So go crazy.
+
+
 ### Secrets
 
 You can use a separate file to keep your pipeline variables secret. By default, `concourse/private.yml` will be used. This filename can also be configured (see below)
@@ -206,6 +274,10 @@ Note that when you use the block form:
 * it's not necessary to explicitly call `#create_tasks!`
 * only the pipelines declared via `#add_pipeline` will be managed
 
+Note also that `Concourse#add_pipeline` takes additional options:
+
+* `ytt`: same as the global `ytt` configuration below
+
 
 ## Configuration
 
@@ -227,6 +299,15 @@ Concourse.new("myproject", fly_target: "myci").create_tasks! # `fly -t myci <com
 ```
 
 
+### `ytt`: Enable YTT templating
+
+By default, this option is `false` and pipelines are treated as ERB templates.
+
+Setting this to `true` will run the file through first ERB (which will be a no-op if you're not using ERB) and then through YTT.
+
+Setting this to a `String` argument containing a directory path will cause YTT to be invoked with a `-f` option loading that directory.
+
+
 ### `format`: Emit the final pipelines in `fly format-pipeline` canonical format
 
 If you'd prefer to have your final pipeline files in `fly`'s "canonical format" (via `format-pipeline`), then set this to true!
@@ -349,7 +430,7 @@ rake concourse:task[job_task,fly_execute_args]  # fly execute the specified task
 
 where:
 
-* _required_: `job_task` is formatted as `job-name/task-name`, for example, `ruby-2.4/rake-test`. (See `concourse:tasks` for a list of all available task names.)
+* _required_: `job_task` is formatted as `job-name/task-name`, for example, `ruby-2.7/rake-test`. (See `concourse:tasks` for a list of all available task names.)
 * _optional_: `fly_execute_args` will default to map the project directory to a resource with the project name, e.g. `--input=myproject=.`, so your pipeline must name the input resource appropriately in order to use the default.
 
 
@@ -390,7 +471,7 @@ You can view that Concourse deployment at `http://127.0.0.1:8080` using the cred
 To target that local cluster, simply prepend the `concourse:local` task on the command line. For example, to `fly execute` a task on the local cluster:
 
 ``` sh
-rake concourse:local concourse:task[ruby-2.4/rake-task]
+rake concourse:local concourse:task[ruby-2.7/rake-task]
 ```
 
 Or to push your pipelines to that local cluster:

data/lib/concourse.rb

@@ -11,10 +11,11 @@ class Concourse
 
   # these numbers/names align with public docker image names
   RUBIES = {
-    mri: %w[2.4 2.5 2.6 2.7], # docker repository: "ruby"
+    mri: %w[2.5 2.6 2.7 3.0-rc], # docker repository: "ruby"
     jruby: %w[9.2], # docker repository: "jruby"
     rbx: %w[latest], # docker repository: "rubinius/docker"
     windows: %w[2.3 2.4 2.5 2.6], # windows-ruby-dev-tools-release
+    truffle: %w[stable nightly] # docker repository: flavorjones/truffleruby
   }
 
   DEFAULT_DIRECTORY = "concourse"
@@ -28,6 +29,7 @@ class Concourse
   attr_reader :fly_args
   attr_reader :secrets_filename
   attr_reader :format
+  attr_reader :ytt
 
   CONCOURSE_DOCKER_COMPOSE = "docker-compose.yml"
 
@@ -59,6 +61,7 @@ class Concourse
     @directory = options[:directory] || DEFAULT_DIRECTORY
     @fly_target = options[:fly_target] || DEFAULT_FLY_TARGET
     @format = options.has_key?(:format) ? options[:format] : false
+    @ytt = options.has_key?(:ytt) ? options[:ytt] : false
     @fly_args = options.keys.grep(/^fly_args_/).inject({}) do |hash, key|
       fly_command = key.to_s.gsub(/^fly_args_/, "").gsub("_", "-")
       hash[fly_command] = options[key]
@@ -73,12 +76,12 @@ class Concourse
       block.call(self)
       create_tasks!
     else
-      add_pipeline(@project_name, (options[:pipeline_erb_filename] || "#{project_name}.yml"))
+      add_pipeline(@project_name, (options[:pipeline_erb_filename] || "#{project_name}.yml"), {ytt: ytt})
     end
   end
 
-  def add_pipeline(name, erb_filename)
-    @pipelines << Concourse::Pipeline.new(name, @directory, erb_filename)
+  def add_pipeline(name, erb_filename, options={})
+    @pipelines << Concourse::Pipeline.new(name, @directory, erb_filename, options)
   end
 
   def pipeline_subcommands(command)
@@ -94,9 +97,7 @@ class Concourse
   end
 
   def rake_pipeline_generate(pipeline)
-    File.open pipeline.filename, "w" do |f|
-      f.write erbify_file(pipeline.erb_filename, working_directory: directory)
-    end
+    pipeline.generate
     fly "validate-pipeline", "-c #{pipeline.filename}"
     fly "format-pipeline", "-c #{pipeline.filename} -w" if format
   end
@@ -133,8 +134,6 @@ class Concourse
     end
 
     pipelines.each do |pipeline|
-      CLOBBER.include pipeline.filename if defined?(CLOBBER)
-
       unless File.exist? pipeline.erb_filename
         warn "WARNING: concourse template #{pipeline.erb_filename.inspect} does not exist, run `rake concourse:init`"
       end

data/lib/concourse/pipeline.rb

@@ -1,12 +1,31 @@
 class Concourse
   class Pipeline
-    attr_reader :name, :directory, :erb_filename, :filename
+    include Concourse::Util
 
-    def initialize name, directory, erb_filename
+    attr_reader :name, :directory, :erb_filename, :filename, :ytt
+
+    def initialize name, directory, erb_filename, options={}
       @name = name
       @directory = directory
       @erb_filename = File.join(@directory, erb_filename)
       @filename = File.join(@directory, erb_filename + ".generated")
+      @ytt = options.key?(:ytt) ? options[:ytt] : false
+    end
+
+    def generate
+      Tempfile.create(["pipeline", ".yml"]) do |f|
+        f.write erbify_file(erb_filename, working_directory: directory)
+        f.close
+
+        if ytt
+          ytt_args = ["-f #{f.path}"]
+          ytt_args << "-f #{File.expand_path(File.join(File.dirname(__FILE__), "ytt"))}"
+          ytt_args << "-f #{File.join(directory, ytt)}" if ytt.is_a?(String)
+          sh ["ytt", ytt_args, "> #{filename}"].flatten.join(" ")
+        else
+          FileUtils.mv f.path, filename, force: true
+        end
+      end
     end
   end
 end

data/lib/concourse/version.rb

@@ -2,5 +2,5 @@ require "rake"
 require "erb"
 
 class Concourse
-  VERSION = "0.35.0"
+  VERSION = "0.40.0"
 end

data/lib/concourse/ytt/ruby.star

@@ -0,0 +1,15 @@
+cruby_versions = {
+    "out_of_support": ["2.4", "2.3", "2.2", "2.1", "2.0.0"],
+    "supported": ["2.5", "2.6", "2.7"],
+    "beta": ["3.0-rc"]
+}
+jruby_versions = {
+    "out_of_support": ["9.1"],
+    "supported": ["9.2"],
+    "beta": []
+}
+truffleruby_versions = {
+    "supported": ["stable"],
+    "out_of_support": [],
+    "beta": ["nightly"]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concourse
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -88,6 +88,7 @@ files:
 - lib/concourse/pipeline.rb
 - lib/concourse/util.rb
 - lib/concourse/version.rb
+- lib/concourse/ytt/ruby.star
 homepage: https://github.com/flavorjones/concourse-gem
 licenses:
 - MIT
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Rake tasks for Concourse pipelines.