concourse 0.32.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec26345e6d3bbe338f8ab1a929b3d9d4c7e89ed9dcdc64dcf797a50ba4d6181
-  data.tar.gz: cf538c9f7a1d71f807ad85e8d1615943885e9e9f2c18cca7bf602e203f57b506
+  metadata.gz: d56283201553e044aa85a5681ee7ab3f5a1e17c07e7e96dea4bf642efc3384d2
+  data.tar.gz: 49f894a4644b08acdb40b8dc2ffd7236d91399bb2e47fe3e141338a03e5fe1a7
 SHA512:
-  metadata.gz: 57724dde7a7129da027b654f2144afa5188f0027420e826ff717a855540829b343e2df25deb8171cc8345eae7cdf1b408f7e0c8f524735744bab132c679474b1
-  data.tar.gz: 37e8bebb2a38853b7338eea83c98e830542b94507d3818a8512ad9b613a24bcc783300e6c16bd37fb683a0044bf06eacfc09bf73f69c451cb9143a51e8b514a4
+  metadata.gz: c49b5a1d841e718219cc808459562b8ddcbcb15b91b34e38336ecd177e87a74f458a00b62efebd30aaf769c99a7d1c5f302501d31dcb0b7e633bb6e70b45d94b
+  data.tar.gz: 8178487b108398fc87b00bd4ea735e09abf9e363801dbe7c687cb5e98900aec892ed7b2d109b6cc53d9493eb8c1c6346e2ef3b22e767472841ded07d0b3df5c5

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # concourse-gem changelog
 
+## 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`
+
+
 ## v0.32.0 / 2020-03-29
 
 * avoid deprecation warning for `Bundler.with_clean_env`

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)
@@ -225,6 +227,17 @@ Concourse.new("myproject", fly_target: "myci").create_tasks! # `fly -t myci <com
 ```
 
 
+### `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!
+
+``` ruby
+Concourse.new("myproject", format: true).create_tasks!
+```
+
+This might be useful if you're heavily refactoring your template, and want to make sure there aren't unexpected changes to the pipeline.
+
+
 ### `pipeline_erb_filename`: Pipeline filename
 
 By default the pipeline file will be named `<myproject>.yml`, but can be set to something else:
@@ -246,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

@@ -15,6 +15,7 @@ class Concourse
     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,7 +26,9 @@ class Concourse
   attr_reader :directory
   attr_reader :pipelines
   attr_reader :fly_target
+  attr_reader :fly_args
   attr_reader :secrets_filename
+  attr_reader :format
 
   CONCOURSE_DOCKER_COMPOSE = "docker-compose.yml"
 
@@ -56,6 +59,12 @@ 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)
@@ -89,7 +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 "validate-pipeline", "-c #{pipeline.filename}"
+    fly "format-pipeline", "-c #{pipeline.filename} -w" if format
   end
 
   def ensure_docker_compose_file
@@ -104,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
@@ -124,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
@@ -167,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
 
@@ -178,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
       #
@@ -230,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
@@ -244,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
 
@@ -255,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.32.0"
+  VERSION = "0.37.0"
 end

metadata

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