concourse 0.33.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85989175cc8ec8bb8b3f250544e1eb568b577343e07617db488affd7877ead7
-  data.tar.gz: 8854b8eb32fa8389624bff4f47e41d0e525a0debf378aaeddcd62d139cc48bfe
+  metadata.gz: 4545117f3a9ab7e87861ed9d985f4ce559ef5636ab4c90f9dc72d0415a53f65d
+  data.tar.gz: d15f26777dff8e5f63e0da5ffbab5e036b83381680bb3782039843a323dab64e
 SHA512:
-  metadata.gz: 578cb1e88feb546eca5080b40633225ebab45f97e028fd3bcd989748ac94a67d44aeae5ccd45cd039b3ad9a78acd5d254ff0cab9f8d46606fad4590c23c7ff03
-  data.tar.gz: 8cdc46a9b8ce7594cfa3a624365a48894b5d1686260f21fb0e231257c540bb118df205623656e488ada4da32b9ceefaeecab21ee81db70b4fccb30f8def5e0fb
+  metadata.gz: d3c56b95c58c91946b229e17f46adb1131268354100fc346ac98829db3c17e056c4f2c70ebad9dd8cafc5dd2f8c2b8d2e038e413d0d5404782bc078b4a8d94d7
+  data.tar.gz: fff0b1b7943cb4fc1fbd67a3c2a4360682718eefa0baca151a09f694ccb41882eeeecb58fe6742e32f6e2d1d02a8eef2dfbaeba06137dfa56304467d193543c2

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # concourse-gem changelog
 
+## 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)
+
+
+## v0.34.0 / 2020-08-31
+
+* allow injection of fly command arguments via `fly_args_<command_name>`
+
+
 ## v0.33.0 / 2020-03-31
 
 * add `format` option for formatting final pipeline files with `fly format-pipeline`

data/README.md

@@ -28,8 +28,10 @@ Here's an example pipeline maintained by this gem:
 - [Configuration](#configuration)
   * [`directory`: Concourse subdirectory name](#directory-concourse-subdirectory-name)
   * [`fly_target`: Concourse `fly` target name](#fly_target-concourse-fly-target-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)
+  * [`fly_args_`: fly command arguments](#fly_args_-fly-command-arguments)
 - [Rake Tasks](#rake-tasks)
   * [Manage your Concourse pipeline](#manage-your-concourse-pipeline)
   * [List pipeline tasks](#list-pipeline-tasks)
@@ -257,6 +259,19 @@ Concourse.new("myproject", secrets_filename: "secrets.yml").create_tasks!
 ```
 
 
+### `fly_args_<fly_command>`: fly command arguments
+
+Rarely, you may need to inject additional commandline arguments into `fly` to get the behavior you want. For example, I wanted to inject `--enable-across-step` into my `validate-pipeline` commands when I started exploring matrix builds via [the `across` step](https://github.com/vito/rfcs/blob/spatial-resources/029-across-step/proposal.md).
+
+You can pass in additional keys named `fly_args_<command-name-with-underscores>` like this:
+
+``` ruby
+Concourse.new("myproject", fly_args_validate_pipeline: "--enable-across-step --another-flag")
+```
+
+With the above initializer call, whenever the `concourse` gem invokes `validate-pipeline`, it will inject `--enable-across-step --another-flag`.
+
+
 ## Rake Tasks
 
 

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.4 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"
@@ -25,6 +26,7 @@ class Concourse
   attr_reader :directory
   attr_reader :pipelines
   attr_reader :fly_target
+  attr_reader :fly_args
   attr_reader :secrets_filename
   attr_reader :format
 
@@ -58,6 +60,11 @@ class Concourse
     @directory = options[:directory] || DEFAULT_DIRECTORY
     @fly_target = options[:fly_target] || DEFAULT_FLY_TARGET
     @format = options.has_key?(:format) ? options[:format] : 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]
+      hash
+    end
 
     base_secrets_filename = options[:secrets_filename] || DEFAULT_SECRETS
     @secrets_filename = File.join(@directory, base_secrets_filename)
@@ -91,8 +98,8 @@ class Concourse
     File.open pipeline.filename, "w" do |f|
       f.write erbify_file(pipeline.erb_filename, working_directory: directory)
     end
-    fly "validate-pipeline -c #{pipeline.filename}"
-    fly "format-pipeline -c #{pipeline.filename} -w" if format
+    fly "validate-pipeline", "-c #{pipeline.filename}"
+    fly "format-pipeline", "-c #{pipeline.filename} -w" if format
   end
 
   def ensure_docker_compose_file
@@ -107,7 +114,7 @@ class Concourse
   def rake_concourse_local
     ensure_docker_compose_file
     @fly_target = "local"
-    fly "login -u test -p test -c http://127.0.0.1:8080"
+    fly "login", "-u test -p test -c http://127.0.0.1:8080"
   end
 
   def rake_concourse_local_up
@@ -127,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
@@ -170,7 +175,7 @@ class Concourse
             note "using #{secrets_filename} to resolve template vars in #{pipeline.filename}"
             options << "-l '#{secrets_filename}'"
           end
-          fly "set-pipeline #{options.join(" ")}"
+          fly "set-pipeline", options.join(" ")
         end
       end
 
@@ -181,18 +186,11 @@ class Concourse
         pipelines.each do |pipeline|
           desc "#{command} the #{pipeline.name} pipeline"
           task "#{command}:#{pipeline.name}" do
-            fly "#{command}-pipeline -p #{pipeline.name}"
+            fly "#{command}-pipeline", "-p #{pipeline.name}"
           end
         end
       end
 
-      desc "remove generated pipeline files"
-      task "clean" do
-        pipelines.each do |pipeline|
-          rm_f pipeline.filename
-        end
-      end
-
       #
       #  task commands
       #
@@ -233,7 +231,7 @@ class Concourse
           f.write concourse_task["config"].to_yaml
           f.close
           Bundler.with_unbundled_env do
-            fly "execute #{fly_execute_args} -c #{f.path}"
+            fly "execute", [fly_execute_args, "-c #{f.path}"].compact.join(" ")
           end
         end
       end
@@ -247,7 +245,7 @@ class Concourse
           pipeline_job, build_id, status = *line.split(/\s+/)[1, 3]
           next unless status == "started"
 
-          fly "abort-build -j #{pipeline_job} -b #{build_id}"
+          fly "abort-build", "-j #{pipeline_job} -b #{build_id}"
         end
       end
 
@@ -258,7 +256,7 @@ class Concourse
       task "prune-stalled-workers" do
         `fly -t #{fly_target} workers | fgrep stalled`.each_line do |line|
           worker_id = line.split.first
-          fly "prune-worker -w #{worker_id}"
+          fly "prune-worker", "-w #{worker_id}"
         end
       end
 

data/lib/concourse/util.rb

@@ -18,8 +18,9 @@ class Concourse
       File.open(GITIGNORE_FILE, "a") { |f| f.puts file_glob }
     end
 
-    def fly command
-      sh "fly -t #{fly_target} #{command}"
+    def fly command, args
+      command_args = Array(fly_args[command])
+      sh ["fly -t", fly_target, command, command_args, args].flatten.compact.join(" ")
     end
 
     def docker_compose command

data/lib/concourse/version.rb

@@ -2,5 +2,5 @@ require "rake"
 require "erb"
 
 class Concourse
-  VERSION = "0.33.0"
+  VERSION = "0.38.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concourse
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor