concourse 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10b3e2e3d7756b1c61293045f6a7a991df14ec30
-  data.tar.gz: c44c2ce5b4d0e2091893fa1407e1d73a8d566fbc
+  metadata.gz: 309f76ecec1a0a549b9f35131415667cc260857e
+  data.tar.gz: 0bd5fe1842f603a620c853d34c61be8009436595
 SHA512:
-  metadata.gz: bb6a2494b9e0837859fae6f17ef44702607a4bf613d3060899ee36553694fab366318c67d4ec2e6cab03ea9adf71c9a625641acfad977508c913533b25b47f8c
-  data.tar.gz: a53d14f3f898d53e6a7b6ae2f6756ef76ea86a49b38f475b54d52a26ae52217dae930f9de96c6d93a47f90aa7499bd4d082cd383be77cb738516440070c48f40
+  metadata.gz: 301f6a4ebed72c0711407ef3b7af0ede4b0b6a2483682e07c1dbc5e3c33ba52e9601433c8d1ee13643cae7cfd3f340f1bfa154daac2478aefa3b778eddb53d69
+  data.tar.gz: '08723c8657265c31e5ee2c90e5685207751020984080f8c4b38b5859e35a9d5b790b763cf88fce25e17005e2bb0aa58b57caa55eda7f111f035f19be80e294dd'

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # concourse-gem changelog
 
+## 0.13.0 / 2017-03-23
+
+### Features
+
+* allow setting of concourse directory name
+
+
 ## 0.12.0 / 2017-02-14
 
 ### Features

data/README.md

@@ -17,7 +17,45 @@ Concourse.new("myproject").create_tasks!
 
 This will create a set of rake tasks for you.
 
-Create a subdirectory named `concourse`, and edit a Concourse pipeline file named `myproject.yml`, whichi will be interpreted as an ERB template.
+``` sh
+rake concourse:init
+```
+
+The `concourse:init` task will create a subdirectory named `concourse`, and create a Concourse pipeline file named `myproject.yml`, which will be interpreted as an ERB template. It will also ensure that files with sensitive data (`concourse/private.yml` and `concourse/myproject.final.yml`) are in `.gitignore`.
+
+
+### Concourse subdirectory name
+
+You can choose a directory name other than `concourse`:
+
+``` ruby
+Concourse.new("myproject", directory: "ci").create_tasks!
+```
+
+
+### Keeping credentials private
+
+If the file `concourse/private.yml` exists, it will be passed to the `fly` commandline with the `-l` option to fill in template values.
+
+For example, I might have a concourse config that looks like this:
+
+``` yaml
+  - name: nokogiri-pr
+    type: pull-request
+    source:
+      repo: sparklemotion/nokogiri
+      access_token: {{github-repo-status-access-token}}
+      ignore_paths:
+        - concourse/**
+```
+
+I can put my access token in `private.yml` like this:
+
+``` yaml
+github-repo-status-access-token: "your-token-here"
+```
+
+and the final generate template will substitute your credentials into the appropriate place.
 
 
 ### Templating and `RUBIES`

data/lib/concourse.rb

@@ -11,10 +11,9 @@ class Concourse
     rbx:   %w[latest],          # docker repository: "rubinius/docker"
   }
 
-  DIRECTORY = "concourse"
-  PRIVATE_VAR_FILE = File.join DIRECTORY, "private.yml"
+  DEFAULT_DIRECTORY = "concourse"
 
-  attr_reader :project_name, :pipeline_filename, :pipeline_erb_filename
+  attr_reader :project_name, :pipeline_filename, :pipeline_erb_filename, :directory, :private_var_file
 
   def self.validate_fly_target task, task_args
     unless task_args[:fly_target]
@@ -29,19 +28,30 @@ class Concourse
     matching_line.split(/ +/)[1]
   end
 
-  def initialize project_name
+  def initialize project_name, directory: DEFAULT_DIRECTORY
     @project_name = project_name
-    @pipeline_filename = File.join(DIRECTORY, "#{project_name}.final.yml")
-    @pipeline_erb_filename = File.join(DIRECTORY, "#{project_name}.yml")
+    @directory = directory
+    @pipeline_filename = File.join(@directory, "#{project_name}.final.yml")
+    @pipeline_erb_filename = File.join(@directory, "#{project_name}.yml")
+    @private_var_file = File.join(@directory, "private.yml")
   end
 
   def erbify document_string, *args
     ERB.new(document_string, nil, "%-").result(binding)
   end
 
+  def rake_init
+    FileUtils.mkdir_p File.join(directory, "tasks")
+    FileUtils.touch pipeline_erb_filename
+    File.open ".gitignore", "a" do |f|
+      f.puts private_var_file
+      f.puts pipeline_filename
+    end
+  end
+
   def create_tasks!
-    unless Dir.exist? DIRECTORY
-      mkdir_p DIRECTORY
+    unless Dir.exist? directory
+      mkdir_p directory
     end
 
     unless File.exist? pipeline_erb_filename
@@ -56,13 +66,7 @@ class Concourse
       #
       desc "bootstrap a concourse config"
       task :init do
-        FileUtils.mkdir_p "concourse"
-        FileUtils.mkdir_p "concourse/tasks"
-        FileUtils.touch pipeline_erb_filename
-        File.open ".gitignore", "a" do |f|
-          f.puts "concourse/private.yml"
-          f.puts "concourse/#{project_name}.final.yml"
-        end
+        rake_init
       end
 
       #
@@ -83,9 +87,9 @@ class Concourse
           "-p '#{project_name}'",
           "-c '#{pipeline_filename}'",
         ]
-        if File.exist? PRIVATE_VAR_FILE
-          puts "using #{PRIVATE_VAR_FILE} to resolve template vars"
-          options << "-l '#{PRIVATE_VAR_FILE}'"
+        if File.exist? private_var_file
+          puts "using #{private_var_file} to resolve template vars"
+          options << "-l '#{private_var_file}'"
         end
         sh "fly -t #{fly_target} set-pipeline #{options.join(" ")}"
       end

data/lib/concourse/version.rb

@@ -2,5 +2,5 @@ require "rake"
 require "erb"
 
 class Concourse
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concourse
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Rake tasks for Concourse pipelines.