Backporting master updates

Author: etki

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.1.1] - 2017-07-31
+### Added
+- `scale` option by [cvakiitho](https://github.com/cvakiitho) ([#2](https://github.com/ama-team/cookbook-docker-compose/pull/2))
+
 ## [0.1.0]
 ### Added
 - Added `docker_compose_installation` resource

README.md

@@ -110,6 +110,7 @@ Attributes:
 | `timeout`       | Integer / Nil     | `10`                            | Timeout for internal docker-compose commands where applicable |
 | `shell_timeout` | Integer / Nil     | `300`                           | Timeout for any underlying command to prevent infinite stalling | 
 | `signal`        | String            | `SIGKILL`                       | Signal for kill command |
+| `scale`         | String            |                                 | Arguments for docker-compose scale command e.g. `nginx=2`|
 
 Available actions are:
 
@@ -126,6 +127,7 @@ Available actions are:
 | `:up`      | Maps to same docker-compose command                  |
 | `:down`    | Maps to same docker-compose command                  |
 | `:kill`    | Maps to same docker-compose command                  |
+| `:scale`   | Maps to same docker-compose command                  |
 
 
 Please note that those actions are always executed (at least, for now),

metadata.rb

@@ -6,7 +6,7 @@
 license          'MIT'
 description      'Installs/Configures ama-docker-compose'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.0'
+version          '0.1.1'
 
 supports 'debian', '>= 7.0'
 supports 'ubuntu', '>= 14.04'

resources/docker_compose_deployment.rb

@@ -1,13 +1,14 @@
 resource_name :docker_compose_deployment
 
-actions :create, :start, :stop, :delete, :rm, :restart, :pull, :push, :up, :down, :kill
+actions :create, :start, :stop, :delete, :rm, :restart, :pull, :push, :up, :down, :kill, :scale
 default_action :up
 
 attribute :executable, String, default: '/usr/local/bin/docker-compose'
 attribute :files, [Array, String], name_property: true
 attribute :timeout, Integer, default: 10
 attribute :shell_timeout, Integer, default: 300
 attribute :signal, String, default: 'SIGKILL'
+attribute :scale, String
 
 action_class do
   def configuration_files
@@ -71,3 +72,6 @@ def command_rm
   execute_command(*arguments)
 end
 
+action :scale do
+    execute_command 'scale', new_resource.scale
+end

test/cookbooks/ama-docker-compose-integration/recipes/deployment_lifecycle.rb

@@ -29,5 +29,6 @@
 
 cookbook_file path
 docker_compose_deployment path do
-  action [:create, :start, :stop, :rm, :delete]
+  scale 'nginx=2'
+  action [:create, :start, :scale, :stop, :rm, :delete]
 end