sambot 0.1.58 → 0.1.60

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/sambot/commands/cookbook.rb +1 -1
  3. data/lib/sambot/domain/common/file_checker.rb +9 -2
  4. data/lib/sambot/templates/.kitchen.gcp.centos.yml +1 -1
  5. data/lib/sambot/templates/.kitchen.gcp.windows.yml +1 -1
  6. data/lib/sambot/templates/.kitchen.rackspace.centos.yml +1 -1
  7. data/lib/sambot/templates/.kitchen.rackspace.windows.yml +1 -1
  8. data/lib/sambot/templates/Berksfile +1 -1
  9. data/lib/sambot/templates/teamcity.sh.erb +29 -0
  10. data/lib/sambot/version.rb +1 -1
  11. data/sambot.gemspec +1 -0
  12. metadata +16 -2
  13. data/lib/sambot/templates/teamcity.sh +0 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 927c5d9451f75732da59fc7dbe67d80b648a2776
4
- data.tar.gz: c51984bddf4ab95a0ed715bd5a9b6850dc47656e
3
+ metadata.gz: ae84f210537be1413764a5b85ee3e1d9b0ac9a6e
4
+ data.tar.gz: e9ca8ae403d74b826f254887b6d2ef3208204453
5
5
  SHA512:
6
- metadata.gz: 63c67a7619d035ec99321aa1f8c5ee6b070b137bd4e5e2155f1fcb6dae28af8fd315aa218a32d2f3b15592304784f5191c253deb51158f93222adb78d8adff4b
7
- data.tar.gz: dbe8a0bb5d344a01ca0f6a4cd0c3c222c70ed3a286811082b4626b85e09094e1b581e38fb6933efbcc463d1f8ddeea9a9e0a1462938a94944db77ef8135bcc24
6
+ metadata.gz: 9c2019fe1ba7f42d8258235deb39efc93cc85b1768611097dde85a00a6496e05b4b188db9070bec0f2bd9df15c24d3b9cf5723b9b76399ee4d9bd4297543f438
7
+ data.tar.gz: e5f32d89662185ee9234a4c433a030602774a3e1d3a51813503a8e4b19afea722ca6ac01714a2e1e044fc567a912f1c8e18fa91d0a2101b53193487020b8cce4
data/lib/sambot/commands/cookbook.rb CHANGED
@@ -2,7 +2,7 @@ module Sambot
2
2
  module Commands
3
3
 
4
4
  ESSENTIAL_FILES = ['.config.yml', 'spec', 'recipes', 'README.md'].freeze
5
- GENERATED_FILES = ['teamcity.sh', 'chefignore', 'Berksfile', '.rubocop.yml', '.gitignore'].freeze
5
+ GENERATED_FILES = ['teamcity.sh.erb', 'chefignore', 'Berksfile', '.rubocop.yml', '.gitignore'].freeze
6
6
 
7
7
  class Cookbook < Thor
8
8
 
data/lib/sambot/domain/common/file_checker.rb CHANGED
@@ -18,10 +18,17 @@ module Sambot
18
18
  private
19
19
 
20
20
  def update_template(filename)
21
- working_path = filename
21
+ working_path = filename.end_with?(".erb") ? filename.gsub(/\.erb/, '') : filename
22
22
  template_path = TemplateProvider.new.get_path(filename)
23
23
  File.delete(working_path) if File.exist?(working_path)
24
- FileUtils.cp(template_path, working_path)
24
+ if template_path.end_with?(".erb")
25
+ input = File.read(template_path)
26
+ eruby = Erubis::Eruby.new(input)
27
+ contents = eruby.evaluate()
28
+ File.write(working_path, contents)
29
+ else
30
+ FileUtils.cp(template_path, working_path)
31
+ end
25
32
  end
26
33
 
27
34
  end
data/lib/sambot/templates/.kitchen.gcp.centos.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  provisioner:
3
3
  name: chef_zero
4
- log_level: info
4
+ log_level: <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
5
5
  deprecations_as_errors: true
6
6
  cookbooks_path:
7
7
  - .
data/lib/sambot/templates/.kitchen.gcp.windows.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  provisioner:
3
3
  name: chef_zero
4
- log_level: info
4
+ log_level: <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
5
5
  deprecations_as_errors: true
6
6
  cookbooks_path:
7
7
  - .
data/lib/sambot/templates/.kitchen.rackspace.centos.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  provisioner:
3
3
  name: chef_zero
4
- log_level: info
4
+ log_level: <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
5
5
  deprecations_as_errors: true
6
6
  cookbooks_path:
7
7
  - .
data/lib/sambot/templates/.kitchen.rackspace.windows.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  provisioner:
3
3
  name: chef_zero
4
- log_level: info
4
+ log_level: <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
5
5
  deprecations_as_errors: true
6
6
  cookbooks_path:
7
7
  - .
data/lib/sambot/templates/Berksfile CHANGED
@@ -1,4 +1,4 @@
1
- # source :chef_server
1
+ source :chef_server
2
2
  source 'https://supermarket.chef.io'
3
3
 
4
4
  metadata
data/lib/sambot/templates/teamcity.sh.erb ADDED
@@ -0,0 +1,29 @@
1
+ #!/usr/bin/env sh
2
+
3
+ set -e
4
+
5
+ chef exec foodcritic .
6
+ chef exec cookstyle .
7
+ chef exec berks install
8
+ chef exec berks update
9
+ chef exec rspec spec --col
10
+ set +e
11
+
12
+ <% if ENV['TEST_KITCHEN_ACTION'] == 'converge' %>
13
+ chef exec kitchen converge -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
14
+ <% elsif ENV['TEST_KITCHEN_ACTION'] == 'multi-step-test' %>
15
+ chef exec kitchen converge -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
16
+ chef exec kitchen verify -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
17
+ chef exec kitchen destroy -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
18
+ <% else %>
19
+ chef exec kitchen test -l <%= ENV['TEST_KITCHEN_LOG_LEVEL'] || 'info' %>
20
+ RETVAL=$?
21
+ if [ $RETVAL -eq 0 ] ; then
22
+ echo "Test Kitchen converged and all tests passed - Ready to upload to server"
23
+ exit $RETVAL
24
+ elif [ $RETVAL -ne 0 ] ; then
25
+ echo "Test Kitchen failed - cleaning up"
26
+ kitchen destroy
27
+ exit $RETVAL
28
+ fi
29
+ <% end %>
data/lib/sambot/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Sambot
2
- VERSION = '0.1.58'.freeze
2
+ VERSION = '0.1.60'.freeze
3
3
  end
data/sambot.gemspec CHANGED
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.add_development_dependency 'rubocop', '~> 0.49'
28
28
  spec.add_development_dependency 'gem-release', '~> 1.0'
29
29
  spec.add_development_dependency 'bundler', '~> 1.14'
30
+ spec.add_development_dependency 'climate_control'
30
31
  spec.add_development_dependency 'rake', '~> 10.0'
31
32
  spec.add_development_dependency 'rspec', '~> 3.0'
32
33
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sambot
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.58
4
+ version: 0.1.60
5
5
  platform: ruby
6
6
  authors:
7
7
  - Olivier Kouame
@@ -134,6 +134,20 @@ dependencies:
134
134
  - - "~>"
135
135
  - !ruby/object:Gem::Version
136
136
  version: '1.14'
137
+ - !ruby/object:Gem::Dependency
138
+ name: climate_control
139
+ requirement: !ruby/object:Gem::Requirement
140
+ requirements:
141
+ - - ">="
142
+ - !ruby/object:Gem::Version
143
+ version: '0'
144
+ type: :development
145
+ prerelease: false
146
+ version_requirements: !ruby/object:Gem::Requirement
147
+ requirements:
148
+ - - ">="
149
+ - !ruby/object:Gem::Version
150
+ version: '0'
137
151
  - !ruby/object:Gem::Dependency
138
152
  name: rake
139
153
  requirement: !ruby/object:Gem::Requirement
@@ -223,7 +237,7 @@ files:
223
237
  - lib/sambot/templates/metadata.rb.erb
224
238
  - lib/sambot/templates/pre-push
225
239
  - lib/sambot/templates/startup-script.ps1
226
- - lib/sambot/templates/teamcity.sh
240
+ - lib/sambot/templates/teamcity.sh.erb
227
241
  - lib/sambot/templates/winrm_config
228
242
  - lib/sambot/version.rb
229
243
  - sambot.gemspec
data/lib/sambot/templates/teamcity.sh DELETED
@@ -1,23 +0,0 @@
1
- #!/usr/bin/env sh
2
-
3
- set -e
4
-
5
- chef exec foodcritic .
6
- chef exec cookstyle .
7
- chef exec berks install
8
- chef exec berks update
9
- chef exec rspec spec --col
10
- set +e
11
-
12
- chef exec kitchen test
13
-
14
- RETVAL=$?
15
-
16
- if [ $RETVAL -eq 0 ] ; then
17
- echo "Test Kitchen converged and all tests passed - Ready to upload to server"
18
- exit $RETVAL
19
- elif [ $RETVAL -ne 0 ] ; then
20
- echo "Test Kitchen failed - cleaning up"
21
- kitchen destroy
22
- exit $RETVAL
23
- fi