concourse 0.29.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a29b14d0135cdcc80ce7bfd4f753268e323a3f278de62cf2675d7feda8786e71
-  data.tar.gz: 5f57861031216b0175311871644eb3ad3599d14cbb9be1f98f6dad8df2fdb1c9
+  metadata.gz: baf385b29c11940d30e629579e3a49cbece674505744784cd76bc2c2ba555a57
+  data.tar.gz: 137a75561ca03dae7bf5d261ead42d23ad529646e4ff88af19210bed13030317
 SHA512:
-  metadata.gz: cee0dae36acf17918b14fcd96f26e3989afab7bcbe15962ad0e585ad5d5259b6859ceac96b77c0c8b5cfa4d10a7baa3169335f010c248b77cb0eaebc1757b5db
-  data.tar.gz: af6f1de325dcab7ca541d9fc7b0c36ce6d2128b6b82c012e5766e1c029afef59e0f4841f2d651feaff1778741e8225fc0c723d48257b934d2bd1465084185430
+  metadata.gz: ccf56e48803d7af6f9cebb66c88982cab01bd879360fe9035ecc86604ff14712f4ab27d4429e25e0540cb13780db30cf43f88e22136a18a29651e70b9de4ce7f
+  data.tar.gz: 14e5a4f401c650605da01391b2892bd636e5a8dc5ec847945a22c9fef8f41806e1c852b42e6a4bc00c014db5b82bfc0b8f020f6bdf50684cf99952ba9c87aad2

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # concourse-gem changelog
 
+## 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`
+
+
+## v0.31.0 / 2020-01-11
+
+* remove jruby 9.1 (which corresponds to ruby 2.3)
+
+
+## v0.30.0 / 2020-01-11
+
+* remove ruby 2.3, which has reached EOL
+* change ruby 2.7-rc to 2.7 (final)
+
+
 ## v0.29.0 / 2019-10-28
 
 * add `2.7-rc` to the set of MRI Rubies

data/README.md

@@ -225,6 +225,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 +257,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/concourse.gemspec

@@ -1,29 +1,29 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'concourse/version'
+require "concourse/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "concourse"
-  spec.version       = Concourse::VERSION
-  spec.authors       = ["Mike Dalessio"]
-  spec.email         = ["mike.dalessio@gmail.com"]
+  spec.name = "concourse"
+  spec.version = Concourse::VERSION
+  spec.authors = ["Mike Dalessio"]
+  spec.email = ["mike.dalessio@gmail.com"]
 
-  spec.summary       = "Rake tasks for Concourse pipelines."
-  spec.description   = "Provide Rake tasks to ease management of Concourse pipelines. See https://concourse.ci/ to learn about Concourse."
-  spec.homepage      = "https://github.com/flavorjones/concourse-gem"
-  spec.license       = "MIT"
+  spec.summary = "Rake tasks for Concourse pipelines."
+  spec.description = "Provide Rake tasks to ease management of Concourse pipelines. See https://concourse.ci/ to learn about Concourse."
+  spec.homepage = "https://github.com/flavorjones/concourse-gem"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "term-ansicolor"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/concourse.rb

@@ -11,10 +11,10 @@ class Concourse
 
   # these numbers/names align with public docker image names
   RUBIES = {
-    mri: %w[2.3 2.4 2.5 2.6 2.7-rc], # 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.4 2.5 2.6 2.7], # 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
   }
 
   DEFAULT_DIRECTORY = "concourse"
@@ -25,7 +25,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 +58,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,14 +97,15 @@ 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
     return if File.exist?(docker_compose_path)
     note "fetching docker compose file ..."
     File.open(docker_compose_path, "w") do |f|
-      f.write open("https://concourse-ci.org/docker-compose.yml").read
+      f.write URI.open("https://concourse-ci.org/docker-compose.yml").read
       sh "docker pull concourse/concourse"
     end
   end
@@ -104,7 +113,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
@@ -167,7 +176,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,7 +187,7 @@ 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
@@ -229,8 +238,8 @@ class Concourse
         Tempfile.create("concourse-task") do |f|
           f.write concourse_task["config"].to_yaml
           f.close
-          Bundler.with_clean_env do
-            fly "execute #{fly_execute_args} -c #{f.path}"
+          Bundler.with_unbundled_env do
+            fly "execute", "#{fly_execute_args} -c #{f.path}"
           end
         end
       end
@@ -244,7 +253,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 +264,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.join(" ")} #{args}"
     end
 
     def docker_compose command

data/lib/concourse/version.rb

@@ -2,5 +2,5 @@ require "rake"
 require "erb"
 
 class Concourse
-  VERSION = "0.29.0"
+  VERSION = "0.34.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concourse
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rake tasks for Concourse pipelines.