producer-rails 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ecea15a3878eeff0a016f4524e97990a47c2f26
-  data.tar.gz: dae3fa6716e2ab50d81d8de1b0c853a8edbc710f
+  metadata.gz: e47134856bd5d3447bc62bfc3be0b9fef1afa1f6
+  data.tar.gz: a1ef63458c408b2e8fb7379c4e788ff2b392cdda
 SHA512:
-  metadata.gz: bd71e1361a7475fded1790e97c3ffd13514305750655573a84152c35045a827fff6a7caf85afa97f3b7adbf57e8b6041396d0fdc9997f44c65fa3ee4e6ada57d
-  data.tar.gz: d3a352ff6b085b11951cd100fe12d980889edfaa797d4ec922911c476bd8a72f71395f1d718ce03ad479571bfb923f46168132933078f93b264c9f0d0c42d49f
+  metadata.gz: 07e1b5dfc4d6f4418c23c75e9faab80c552f04b894b657cbfa2a9bd0f2a754f6b6f730a04d1aa3db6f55aa3255731f5f61cc098b4d6ea5e98700054cc0c9d383
+  data.tar.gz: 34c13ff707c882f577bddeb4263482d4af0456f5f4a09a18b669dfb4965104703bcb78885508fff6d70581efee44c24a36ec06af9d704b028b7e68f6e0d7a0d0

data/.travis.yml

@@ -0,0 +1,13 @@
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.2
+  - ruby-head
+  - 2.1
+before_script:
+  - ssh-keygen -f ~/.ssh/id_rsa -t rsa -N ''
+  - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+  - chmod 600 ~/.ssh/authorized_keys
+  - eval `ssh-agent -s`
+  - ssh-add ~/.ssh/id_rsa

data/Guardfile

@@ -0,0 +1,7 @@
+directories %w[features lib]
+
+guard :cucumber, cli: '--format pretty --quiet', all_on_start: false do
+  watch(%r{\Afeatures/.+\.feature\z})
+  watch(%r{\Afeatures/support/.+\.rb\z})                { 'features' }
+  watch(%r{\Afeatures/step_definitions/.+_steps\.rb\z}) { 'features' }
+end

data/LICENSE

@@ -0,0 +1,30 @@
+Copyright 2014 Thibault Jouan. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the software nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -0,0 +1,43 @@
+producer-rails
+==============
+
+  Ruby on Rails specific macros and tests for [producer][].
+
+[![Version][badge-version-img]][badge-version-uri]
+
+
+Usage
+-----
+
+```ruby
+# config/deploy.rb
+require 'producer/rails'
+
+set :repository,  'git.example:repository_path'
+set :app_path,    'deployment_path'
+
+deploy
+```
+
+```
+# Deploy for the first time:
+$ producer config/deploy.rb -t host.example -- init
+
+# Deploy updated application (with application restart):
+$ producer config/deploy.rb -t host.example -- update
+
+# Start application
+$ producer config/deploy.rb -t host.example -- start
+
+# Stop application
+$ producer config/deploy.rb -t host.example -- stop
+
+# Restart application
+$ producer config/deploy.rb -t host.example -- restart
+```
+
+
+
+[producer]:           https://github.com/tjouan/producer-core
+[badge-version-img]:  https://img.shields.io/gem/v/producer-rails.svg?style=flat-square
+[badge-version-uri]:  https://rubygems.org/gems/producer-rails

data/features/arguments.feature

@@ -0,0 +1,40 @@
+@sshd @sshd_gem_env
+Feature: producer recipe arguments usage
+
+  Background:
+    Given a rails app repository
+
+  Scenario: `init' recipe argument is given
+    Given I write a standard deployment recipe
+    When I execute the deployment recipe with "init" recipe argument
+    Then the deployed app must be initialized
+
+  Scenario: `update' recipe argument is given
+    Given I make the initial deployment
+    And I make a change in the rails app repository
+    And I write a standard deployment recipe
+    When I execute the deployment recipe with "update" recipe argument
+    Then the deployed app repository must be up to date
+
+  @unicorn_kill
+  Scenario: `start' recipe argument is given
+    Given I make the initial deployment
+    And I write a standard deployment recipe
+    When I execute the deployment recipe with "start" recipe argument
+    Then the deployed app unicorn server must be running
+
+  Scenario: `stop' recipe argument is given
+    Given I make the initial deployment
+    And I start the deployed app
+    And I write a standard deployment recipe
+    When I execute the deployment recipe with "stop" recipe argument
+    Then the deployed app unicorn server must not be running
+
+  @unicorn_kill
+  Scenario: `restart' recipe argument is given
+    Given I make the initial deployment
+    And I start the deployed app
+    And the deployed app unicorn server is running with a certain pid
+    And I write a standard deployment recipe
+    When I execute the deployment recipe with "restart" recipe argument
+    Then the deployed app unicorn server must have a different pid

data/features/deploy_init.feature

@@ -2,34 +2,29 @@
 Feature: `deploy_init' macro
 
   Background:
-    Given a rails app repository in remote directory "repos/my_app"
-    And a recipe with:
-      """
-      require 'producer/rails'
-
-      set :repository,  'repos/my_app'
-      set :app_path,    'deploys/my_app'
-      set :www_workers, 2
-
-      deploy_init
-
-      """
+    Given a rails app repository
+    And I write a deployment recipe calling "deploy_init"
 
   Scenario: clones the app in configured remote directory
-    When I successfully execute the recipe on remote target
-    Then the remote file "deploys/my_app/config.ru" must exist
+    When I execute the deployment recipe
+    Then the deployed app repository must be cloned
 
   Scenario: configures the database connection
-    When I successfully execute the recipe on remote target
-    Then the remote file "deploys/my_app/config/database.yml" must contain exactly:
-      """
-      default: &default
-        adapter: postgresql
-        encoding: unicode
-        pool: 5
+    When I execute the deployment recipe
+    Then the deployed app must have its database connection configured
+
+  Scenario: installs dependencies with bundler
+    When I execute the deployment recipe
+    Then the deployed app must have its dependencies installed
+
+  Scenario: executes database migrations
+    When I execute the deployment recipe
+    Then the deployed app must have its database migrations up
 
-      production:
-        <<: *default
-        database: some_host_test
+  Scenario: generates a secret key for production
+    When I execute the deployment recipe
+    Then the deployed app must have secret key setup
 
-      """
+  Scenario: configures unicorn server
+    When I execute the deployment recipe
+    Then the deployed app must have unicorn configuration

data/features/deploy_restart.feature

@@ -0,0 +1,14 @@
+@sshd @sshd_gem_env
+Feature: `deploy_restart' macro
+
+  Background:
+    Given a rails app repository
+    And I make the initial deployment
+    And I start the deployed app
+    And the deployed app unicorn server is running with a certain pid
+    And I write a deployment recipe calling "deploy_restart"
+
+  @unicorn_kill
+  Scenario: restarts unicorn server
+    When I execute the deployment recipe
+    Then the deployed app unicorn server must have a different pid

data/features/deploy_start.feature

@@ -0,0 +1,12 @@
+@sshd @sshd_gem_env
+Feature: `deploy_start' macro
+
+  Background:
+    Given a rails app repository
+    And I make the initial deployment
+    And I write a deployment recipe calling "deploy_start"
+
+  @unicorn_kill
+  Scenario: starts unicorn server
+    When I execute the deployment recipe
+    Then the deployed app unicorn server must be running

data/features/deploy_stop.feature

@@ -0,0 +1,12 @@
+@sshd @sshd_gem_env
+Feature: `deploy_stop' macro
+
+  Background:
+    Given a rails app repository
+    And I make the initial deployment
+    And I start the deployed app
+    And I write a deployment recipe calling "deploy_stop"
+
+  Scenario: stops unicorn server
+    When I execute the deployment recipe
+    Then the deployed app unicorn server must not be running

data/features/deploy_update.feature

@@ -0,0 +1,12 @@
+@sshd @sshd_gem_env
+Feature: `deploy_update' macro
+
+  Background:
+    Given a rails app repository
+    And I make the initial deployment
+    And I make a change in the rails app repository
+    And I write a deployment recipe calling "deploy_update"
+
+  Scenario: updates the deployed app repository
+    When I execute the deployment recipe
+    Then the deployed app repository must be up to date

data/features/steps/deploy_steps.rb

@@ -0,0 +1,131 @@
+RECIPE_PATH = 'recipe.rb'.freeze
+DEPLOY_PATH = 'deploys/my_app'.freeze
+
+def deploy_recipe_write(repository, macro)
+  @deploy_path = DEPLOY_PATH
+  write_file RECIPE_PATH, <<-eoh
+    require 'producer/rails'
+
+    set :repository,  '#{repository}'
+    set :app_path,    '#{@deploy_path}'
+
+    #{macro}
+  eoh
+end
+
+def deploy_recipe_run(rargv: [])
+  run_recipe remote: true, check: true, rargv: rargv, options: '-v'
+end
+
+Given /^I write a deployment recipe calling "([^"]+)"$/ do |macro|
+  deploy_recipe_write @repository, macro
+end
+
+Given /^I write a standard deployment recipe$/ do
+  deploy_recipe_write @repository, 'deploy'
+end
+
+Given /^I make the initial deployment$/ do
+  deploy_recipe_write @repository, 'deploy_init'
+  deploy_recipe_run
+end
+
+Given /^I start the deployed app$/ do
+  deploy_recipe_write @repository, 'deploy_start'
+  deploy_recipe_run
+end
+
+Given /^the deployed app unicorn server is running with a certain pid$/ do
+  in_current_dir do
+    @deploy_unicorn_pid = File.read("#{@deploy_path}/tmp/run/www.pid").to_i
+  end
+end
+
+When /^I execute the deployment recipe$/ do
+  deploy_recipe_run
+end
+
+When /^I execute the deployment recipe with "([^"]+)" recipe argument$/ do |arg|
+  deploy_recipe_run rargv: [arg]
+end
+
+Then /^the deployed app must be initialized$/ do
+  step 'the deployed app must have unicorn configuration'
+end
+
+Then /^the deployed app repository must be cloned$/ do
+  in_current_dir do
+    expect(`git -C #{@deploy_path} log --oneline -1`)
+      .to include 'Add generated rails app'
+  end
+end
+
+Then /^the deployed app repository must be up to date$/ do
+  in_current_dir do
+    expect(`git -C #{@deploy_path} log --oneline -1`).to include 'Make change'
+  end
+end
+
+Then /^the deployed app must have its database connection configured$/ do
+  check_file_content "#{@deploy_path}/config/database.yml", <<-eoh
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
+
+production:
+  <<: *default
+  database: some_host_test
+  eoh
+end
+
+Then /^the deployed app must have its dependencies installed$/ do
+  check_file_presence "#{@deploy_path}/Gemfile.lock", true
+end
+
+Then /^the deployed app must have its database migrations up$/ do
+  unset_bundler_env_vars
+  with_env 'RUBYLIB' => nil, 'RAILS_ENV' => 'production' do
+    in_current_dir do
+      expect(`cd #{@deploy_path} && bundle exec rake db:migrate:status`)
+        .to match /up\s+\d+\s+Create users/
+    end
+  end
+end
+
+Then /^the deployed app must have secret key setup$/ do
+  in_current_dir do
+    secrets = YAML.load(File.read("#{@deploy_path}/config/secrets.yml"))
+    expect(secrets['production']['secret_key_base']).to be
+  end
+end
+
+Then /^the deployed app must have unicorn configuration$/ do
+  check_file_content "#{@deploy_path}/config/unicorn.rb", <<-eoh
+worker_processes  2
+timeout           60
+preload_app       false
+pid               'tmp/run/www.pid'
+listen            "\#{ENV['HOME']}/#{@deploy_path}/tmp/run/www.sock"
+  eoh
+end
+
+Then /^the deployed app unicorn server must be running$/ do
+  pid_path = "#{@deploy_path}/tmp/run/www.pid"
+  check_file_presence pid_path, true
+  in_current_dir do
+    expect { expect(Process.kill(0, File.read(pid_path).to_i)).to eq 1 }
+      .not_to raise_error
+  end
+end
+
+Then /^the deployed app unicorn server must not be running$/ do
+  check_file_presence "#{@deploy_path}/tmp/run/www.pid", false
+end
+
+Then /^the deployed app unicorn server must have a different pid$/ do
+  in_current_dir do
+    expect(File.read("#{@deploy_path}/tmp/run/www.pid").to_i)
+      .not_to eq @deploy_unicorn_pid
+  end
+end

data/features/steps/repository_steps.rb

@@ -0,0 +1,34 @@
+Given /^a rails app repository$/ do
+  @repository = 'repos/my_app'
+  env = {
+    'BUNDLE_GEMFILE'  => nil,
+    'RUBYLIB'         => nil,
+    'RUBYOPT'         => nil
+  }
+  in_current_dir do
+    [
+      "rails new --database=postgresql --skip-bundle #{@repository} > /dev/null",
+      "rm -f #{@repository}/config/secrets.yml",
+      "echo gem \\'unicorn\\' >> #{@repository}/Gemfile",
+      "cd #{@repository} && bundle install > /dev/null",
+      "cd #{@repository} && bundle exec rails g model User name:string > /dev/null 2>&1",
+      "rm -f #{@repository}/config/database.yml",
+      "echo /config/database.yml > #{@repository}/.gitignore",
+      "echo /config/secrets.yml >> #{@repository}/.gitignore",
+      "echo /log/*.log >> #{@repository}/.gitignore",
+      "echo /public/assets/ >> #{@repository}/.gitignore",
+      "echo /tmp/ >> #{@repository}/.gitignore",
+      "git -C #{@repository} init > /dev/null",
+      "git -C #{@repository} config user.email bob@example",
+      "git -C #{@repository} config user.name Bob",
+      "git -C #{@repository} add . > /dev/null",
+      "git -C #{@repository} commit -m 'Add generated rails app' > /dev/null"
+    ].each { |cmd| fail unless with_env(env) { system cmd } }
+  end
+end
+
+Given /^I make a change in the rails app repository$/ do
+  in_current_dir do
+    fail unless system "git -C #{@repository} commit --allow-empty -m 'Make change'"
+  end
+end

data/features/support/env.rb

@@ -3,19 +3,6 @@ require 'producer/core/testing/cucumber'
 
 GEMRC = "gem: --no-ri --no-rdoc\n".freeze
 
-Before('@sshd_gem_env_bundler') do
-  env = { 'GEM_HOME' => "#{ENV['HOME']}/.gem" }
-  write_file '.gemrc', GEMRC
-  write_file '.ssh/rc', <<-eoh
-export GEM_HOME=#{env['GEM_HOME']}
-export PATH=#{env['GEM_HOME']}/bin:$PATH
-  eoh
-  with_env(env) do
-    unset_bundler_env_vars
-    fail unless system 'gem install bundler > /dev/null'
-  end
-end
-
 Before('@sshd_gem_env') do
   write_file '.gemrc', GEMRC
   write_file '.ssh/rc', <<-eoh
@@ -24,3 +11,14 @@ export PATH=#{ENV['GEM_HOME']}/bin:$PATH
 export RAILS_ENV=production
   eoh
 end
+
+After('@unicorn_kill') do
+  in_current_dir do
+    pid = File.read("#{@deploy_path}/tmp/run/www.pid").to_i
+    Process.kill('QUIT', pid)
+  end
+end
+
+Before do
+  system 'dropdb --if-exists some_host_test > /dev/null'
+end

data/lib/producer/rails.rb

@@ -1,8 +1,8 @@
+require 'producer/stdlib'
+require 'securerandom'
+
 module Producer
   module Rails
-    require 'producer/stdlib'
-    require 'securerandom'
-
     class << self
       def define_macro(name, &block)
         ::Producer::Core::Recipe.define_macro(name, block)
@@ -14,77 +14,70 @@ module Producer
     end
 
     UNICORN_CONF_PATH     = 'config/unicorn.rb'.freeze
+    WWW_WORKERS           = 2
+    WWW_TIMEOUT           = 60
     WWW_PID_PATH          = 'tmp/run/www.pid'.freeze
     WWW_SOCK_PATH         = 'tmp/run/www.sock'.freeze
     BUNDLER_UNSET_GROUPS  = %w[development test].freeze
 
-    define_macro :deploy do
-      app_path = get :app_path
-
-      if ENV.key? 'DEPLOY_INIT'
-        deploy_init app_path
-      else
-        deploy_update app_path
-      end
-
-      assets_update app_path if set? :assets_update
-
-      deploy_restart
+    define_macro :_deploy_registry_setup do
+      set :database, target.sub(?., ?_) unless set? :database
     end
 
-    define_macro :deploy_init do |app_path = get(:app_path)|
-      app_path ||= get :app_path
+    define_macro :deploy do |path = get(:app_path)|
+      _deploy_registry_setup
 
-      ensure_dir      app_path, mode: 0701
-      git_clone       get(:repository), app_path
-      app_init        app_path,
-        dirs:   (get :app_mkdir, []),
-        files:  (get :app_mkfile, [])
-      db_config       app_path
-      bundle_install  app_path, (get :bundler_unset, [])
-      db_init         app_path
-      db_seed         app_path if set? :db_seed
-      secrets_init    app_path
-      www_config      app_path
+      case recipe_argv[0]
+      when 'init'     then deploy_init
+      when 'update'   then deploy_update
+      when 'start'    then deploy_start
+      when 'stop'     then deploy_stop
+      when 'restart'  then deploy_restart
+      end
     end
 
-    define_macro :deploy_update do |app_path = nil|
-      app_path ||= get :app_path
+    define_macro :deploy_init do |path = get(:app_path)|
+      _deploy_registry_setup
 
-      git_update      app_path
-      bundle_install  app_path
-      db_migrate      app_path
-      db_seed         app_path if set? :db_seed
-      www_config      app_path
+      ensure_dir      path, mode: 0711
+      git_clone       get(:repository), path
+      app_init        path,
+        dirs:   get(:app_mkdir, []),
+        files:  get(:app_mkfile, [])
+      db_config       path
+      bundle_install  path, get(:bundler_unset, [])
+      db_init         path
+      db_seed         path if set? :db_seed
+      secrets_init    path
+      www_config      path
+      assets_update   path if set? :assets_update
     end
 
-    define_macro :deploy_restart do |app_path = nil|
-      app_path ||= get :app_path
+    define_macro :deploy_update do |path = get(:app_path)|
+      _deploy_registry_setup
 
-      if ENV.key?('DEPLOY_INIT') || ENV.key?('DEPLOY_START')
-        deploy_start
-      else
-        deploy_stop
-        deploy_start
-      end
+      git_update      path
+      db_config       path
+      bundle_install  path
+      db_migrate      path
+      db_seed         path if set? :db_seed
+      www_config      path
+      assets_update   path if set? :assets_update
     end
 
-    define_macro :deploy_stop do
-      app_path      ||= get :app_path
-      www_pid_path  = (get :www_pid_path, WWW_PID_PATH)
-      processes     = (get :processes, nil)
-
-      app_stop if processes
-      www_stop app_path, www_pid_path
+    define_macro :deploy_restart do |path = get(:app_path)|
+      deploy_stop path
+      deploy_start path
     end
 
-    define_macro :deploy_start do
-      app_path      ||= get :app_path
-      www_pid_path  = (get :www_pid_path, WWW_PID_PATH)
-      processes     = (get :processes, nil)
+    define_macro :deploy_stop do |path = get(:app_path)|
+      app_stop if set? :processes
+      www_stop path, get(:www_pid_path, WWW_PID_PATH)
+    end
 
-      www_start app_path, www_pid_path
-      app_start app_path, processes if processes
+    define_macro :deploy_start do |path = get(:app_path)|
+      www_start path, get(:www_pid_path, WWW_PID_PATH)
+      app_start path, get(:processes, nil) if set? :processes
     end
 
     define_test :bundle_installed? do |gemfile|
@@ -116,8 +109,7 @@ module Producer
     end
 
     define_macro :db_config do |path|
-      path = "#{path}/config/database.yml"
-      conf = <<-eoh
+      file_write_once "#{path}/config/database.yml", <<-eoh
 default: &default
   adapter: postgresql
   encoding: unicode
@@ -125,20 +117,20 @@ default: &default
 
 production:
   <<: *default
-  database: #{target.sub '.', '_'}
-          eoh
-
-      file_write_once path, conf
+  database: #{get :database}
+      eoh
     end
 
     define_macro :db_init do |path|
-      condition { no_sh 'psql -l | grep -E "^ +%s"' % target }
+      condition { no_sh 'psql -l | grep -E "^ +%s"' % get(:database) }
 
       sh "cd #{path} && bundle exec rake db:create db:migrate"
     end
 
     define_macro :db_migrate do |path|
-      condition { sh "cd #{path} && bundle exec rake db:migrate:status | grep -E '^ +down'" }
+      condition do
+        sh "cd #{path} && bundle exec rake db:migrate:status | grep -E '^ +down'"
+      end
 
       sh "cd #{path} && bundle exec rake db:migrate"
     end
@@ -148,33 +140,29 @@ production:
     end
 
     define_macro :secrets_init do |path|
-      path = "#{path}/config/secrets.yml"
+      secrets_path = "#{path}/config/secrets.yml"
       conf = <<-eoh
 production:
   secret_key_base: #{SecureRandom.hex(64)}
       eoh
 
-      condition { no_file? path }
+      condition { no_file? secrets_path }
 
-      file_write path, conf
+      file_write secrets_path, conf
     end
 
     define_macro :www_config do |path|
       www_config_path = File.join(
         path,
-        (get :www_config_path, UNICORN_CONF_PATH)
+        get(:www_config_path, UNICORN_CONF_PATH)
       )
-      conf = <<-eoh
-worker_processes  #{get :www_workers}
-timeout           #{get :www_timeout, 60}
+      file_write_once www_config_path, <<-eoh
+worker_processes  #{get :www_workers, WWW_WORKERS}
+timeout           #{get :www_timeout, WWW_TIMEOUT}
 preload_app       false
 pid               '#{get :www_pid_path, WWW_PID_PATH}'
-listen            "\#{ENV['HOME']}/#{path}/#{(get :www_sock_path, WWW_SOCK_PATH)}"
+listen            "\#{ENV['HOME']}/#{path}/#{get(:www_sock_path, WWW_SOCK_PATH)}"
       eoh
-
-      condition { no_file_contains www_config_path, conf }
-
-      file_write www_config_path, conf
     end
 
     define_macro :assets_update do |path|
@@ -184,30 +172,32 @@ listen            "\#{ENV['HOME']}/#{path}/#{(get :www_sock_path, WWW_SOCK_PATH)
       sh "cd #{path} && find public/assets -type f -exec chmod 644 {} \\;"
     end
 
-    define_macro :app_start do |app_path, processes|
+    define_macro :app_start do |path, processes|
       condition { no_sh 'tmux has-session -t app' }
 
-      sh "cd #{app_path} && tmux new -d -s app 'foreman start -c #{processes}; zsh'"
+      sh "cd #{path} && tmux new -d -s app 'foreman start -c #{processes}; zsh'"
     end
 
     define_macro :app_stop do
       sh 'tmux kill-session -t app'
     end
 
-    define_macro :www_start do |app_path, www_pid_path|
-      condition { no_file? [app_path, www_pid_path].join('/') }
+    define_macro :www_start do |path, www_pid_path|
+      condition { no_file? [path, www_pid_path].join('/') }
 
-      sh "cd #{app_path} && bundle exec unicorn -c config/unicorn.rb -D"
+      sh "cd #{path} && bundle exec unicorn -c config/unicorn.rb -D"
     end
 
-    define_macro :www_reload do |app_path, www_pid_path|
-      sh "kill -HUP $(cat #{app_path}/#{www_pid_path})"
+    define_macro :www_reload do |path, www_pid_path|
+      sh "kill -HUP $(cat #{path}/#{www_pid_path})"
     end
 
-    define_macro :www_stop do |app_path, www_pid_path|
-      condition { file? [app_path, www_pid_path].join('/') }
+    define_macro :www_stop do |path, www_pid_path|
+      pid_path = [path, www_pid_path].join '/'
+
+      condition { file? pid_path }
 
-      sh "kill -QUIT $(cat #{app_path}/#{www_pid_path}); sleep 1"
+      sh "kill -QUIT $(cat #{pid_path}); while [ -f #{pid_path} ]; do sleep 0.1; done"
     end
   end
 end

data/lib/producer/rails/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Rails
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/producer-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'aruba',         '~> 0.6'
   s.add_development_dependency 'cucumber',      '~> 2.0'
-  s.add_development_dependency 'cucumber-sshd', '~> 0.2'
+  s.add_development_dependency 'cucumber-sshd', '~> 1.1'
   s.add_development_dependency 'rake',          '~> 10.4'
   s.add_development_dependency 'rails',         '~> 4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: producer-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: producer-core
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,10 +116,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Guardfile
+- LICENSE
+- README.md
 - Rakefile
+- features/arguments.feature
 - features/deploy_init.feature
-- features/steps/rails_steps.rb
+- features/deploy_restart.feature
+- features/deploy_start.feature
+- features/deploy_stop.feature
+- features/deploy_update.feature
+- features/steps/deploy_steps.rb
+- features/steps/repository_steps.rb
 - features/support/env.rb
 - lib/producer/rails.rb
 - lib/producer/rails/version.rb
@@ -148,4 +158,3 @@ signing_key:
 specification_version: 4
 summary: producer rails addon
 test_files: []
-has_rdoc: 

data/features/steps/rails_steps.rb

@@ -1,10 +0,0 @@
-Given /^a rails app repository in remote directory "([^"]+)"$/ do |dir|
-  in_current_dir do
-    [
-      "rails new --database=postgresql --skip-bundle #{dir} > /dev/null",
-      "git -C #{dir} init > /dev/null",
-      "git -C #{dir} add . > /dev/null",
-      "git -C #{dir} commit -m 'Add generated rails app' > /dev/null"
-    ].each { |cmd| fail unless system cmd }
-  end
-end