refactoring.

diff --git a/cookbooks/concourse-ci/.rubocop.yml b/cookbooks/concourse-ci/.rubocop.yml
index 40056ac..d6966e0 100644 (file)
--- a/cookbooks/concourse-ci/.rubocop.yml
+++ b/cookbooks/concourse-ci/.rubocop.yml
@@ -10,6 +10,9 @@ Lint/UnusedBlockArgument:
   Enabled: false
 Metrics/AbcSize:
   Enabled: false
+Security/MarshalLoad:
+  Exclude:
+    - 'attributes/default.rb'
 Style/BlockComments:
   Enabled: false
 Style/BlockDelimiters:
@@ -20,12 +23,16 @@ Style/FileName:
   Enabled: false
 Style/LeadingCommentSpace:
   Enabled: false
+Style/MultilineIfModifier:
+  Enabled: false
 Style/RescueModifier:
   Enabled: false
 Style/SpaceBeforeFirstArg:
   Enabled: false
+Style/SpaceInsideBlockBraces:
+  Enabled: false
 Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma
+  EnforcedStyleForMultiline: consistent_comma
 Style/WordArray:
   Enabled: false
 

diff --git a/cookbooks/concourse-ci/Rakefile b/cookbooks/concourse-ci/Rakefile
index 7a151a9..64191a5 100644 (file)
--- a/cookbooks/concourse-ci/Rakefile
+++ b/cookbooks/concourse-ci/Rakefile
@@ -5,7 +5,11 @@ require 'stove/rake_task'
 
 namespace :style do
   desc 'Run Ruby style checks'
-  RuboCop::RakeTask.new(:ruby)
+  RuboCop::RakeTask.new(:ruby) do |t|
+    t.options = [
+      '--auto-gen-config',  # creates .rubocop_todo.yml
+    ]
+  end
 
   desc 'Run Chef style checks'
   FoodCritic::Rake::LintTask.new(:chef) do |t|
@@ -24,6 +28,11 @@ RSpec::Core::RakeTask.new(:spec)
 desc 'Publish cookbook'
 Stove::RakeTask.new(:publish) do |t|
   t.stove_opts = [
+    # `--username` and `--key` are set in ~/.stove typically.
+    #'--username', 'somebody',
+    #'--key', '~/chef/chef.io.example.com/somebody.pem',
+    #'--endpoint', 'https://supermarket.io.example.com/api/v1',  # default: supermarket.chef.io
+    #'--no-ssl-verify',
     '--no-git',
     '--log-level', 'info',
   ]

diff --git a/cookbooks/concourse-ci/attributes/default.rb b/cookbooks/concourse-ci/attributes/default.rb
index 26091c3..329d720 100644 (file)
--- a/cookbooks/concourse-ci/attributes/default.rb
+++ b/cookbooks/concourse-ci/attributes/default.rb
@@ -152,6 +152,7 @@ version_1_config = {
       # `${POSTGRES_PASSWORD}` is a placeholder of password string.
       'CONCOURSE_POSTGRES_DATA_SOURCE' => \
         'postgres://concourse:${POSTGRES_PASSWORD}@concourse-db:5432/concourse?sslmode=disable',
+      #'CONCOURSE_RESOURCE_CHECKING_INTERVAL' => '1m',  # default
     },
   },
   'concourse-worker' => {

diff --git a/cookbooks/concourse-ci/metadata.rb b/cookbooks/concourse-ci/metadata.rb
index cefadb1..a737b78 100644 (file)
--- a/cookbooks/concourse-ci/metadata.rb
+++ b/cookbooks/concourse-ci/metadata.rb
@@ -5,10 +5,11 @@ maintainer_email ''
 license          'Apache 2.0'
 description      'Installs/Configures Concourse CI by Docker Compose'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.0'
+version          IO.read(File.join(File.dirname(__FILE__), 'version')).chomp
 source_url       'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
 issues_url       'https://osdn.jp/projects/metasearch/ticket'
 
+chef_version     '>= 12'
 supports 'ubuntu', '>= 14.04'
 =begin
 %w( centos redhat ).each do |os|

diff --git a/cookbooks/concourse-ci/version b/cookbooks/concourse-ci/version
new file mode 100644 (file)
index 0000000..0c62199
--- /dev/null
+++ b/cookbooks/concourse-ci/version
@@ -0,0 +1 @@
+0.2.1