foreplay 0.0.5 → 0.0.6

data/features/setup.feature

@@ -14,6 +14,7 @@ Feature: Setup
 		  name: aruba
 		  repository: TODO Put the git repository path here
 		  user: TODO Put here the user to logon to the deployment server
+		  password: TODO Supply a password or private key to connect to the server
 		  path: TODO Put here the path to deploy to on the deployment server
 		  port: 50000
 		production:

data/lib/foreplay/cli.rb

@@ -39,6 +39,7 @@ module Foreplay
     method_option :db_host,     :aliases => '-h'
     method_option :db_user
     method_option :db_password
+    method_option :resque_redis
 
     def setup
       Foreplay::Setup.start

data/lib/foreplay/deploy.rb

@@ -152,6 +152,12 @@ module Foreplay
           :before       => '  ',
           :header       => "#{environment}:",
           :path         => 'config/' },
+        { :key          => :resque,
+          :delimiter    => ': ',
+          :suffix       => '.yml',
+          :commentary   => 'Building config/resque.yml',
+          :before       => environment,
+          :path         => 'config/' },
         { :command      => 'bundle install --deployment --without development test',
           :commentary   => 'Using bundler to install the required gems in deployment mode' },
         { :command      => 'sudo ln -f `which foreman` /usr/bin/foreman || echo Using default version of foreman',
@@ -230,8 +236,7 @@ module Foreplay
                 # Output from this step
                 output    = ''
                 previous  = '' # We don't need or want the final CRLF
-
-                commands = build_commands step, instructions
+                commands  = build_step step, instructions
 
                 commands.each do |command|
                   process = sh.execute command
@@ -258,7 +263,7 @@ module Foreplay
       else
         # Deployment check: just say what we would have done
         steps.each do |step|
-          commands = build_commands step, instructions
+          commands = build_step step, instructions
 
           commands.each { |command| puts "#{INDENT * 2}#{command}" unless step[:silent] }
         end
@@ -267,41 +272,54 @@ module Foreplay
       output
     end
 
-    def build_commands step, instructions
+    def build_step step, instructions
       puts "#{INDENT}#{(step[:commentary] || step[:command]).yellow}" unless step[:silent] == true
 
       # Each step can be (1) a command or (2) a series of values to add to a file
-      if step.has_key? :key
-        # Add values from the config file to a file on the remote machine
-        key       = step[:key]
-        prefix    = step[:prefix]     || ''
-        suffix    = step[:suffix]     || ''
-        path      = step[:path]       || ''
-        before    = step[:before]     || ''
-        delimiter = step[:delimiter]  || ''
-        after     = step[:after]      || ''
-
-        step[:silent] = true
-        filename      = '%s%s%s%s' % [path, prefix, key, suffix]
-
-        if step.has_key?(:header)
-          commands  = ['echo "%s" > %s' % [step[:header], filename]]
-          redirect  = '>>'
+      if step.has_key?(:key)
+        if instructions.has_key?(step[:key])
+          build_commands step, instructions
         else
-          commands  = []
-          redirect  = '>'
+          []
         end
+      else
+        # ...or just execute the command specified
+        [step[:command]]
+      end
+    end
+
+    def build_commands step, instructions
+      # Add values from the config file to a file on the remote machine
+      key       = step[:key]
+      prefix    = step[:prefix]     || ''
+      suffix    = step[:suffix]     || ''
+      path      = step[:path]       || ''
+      before    = step[:before]     || ''
+      delimiter = step[:delimiter]  || ''
+      after     = step[:after]      || ''
+
+      step[:silent] = true
+      filename      = '%s%s%s%s' % [path, prefix, key, suffix]
+
+      if step.has_key?(:header)
+        commands  = ['echo "%s" > %s' % [step[:header], filename]]
+        redirect  = '>>'
+      else
+        commands  = []
+        redirect  = '>'
+      end
 
+      if instructions[key].kind_of?(Hash)
         instructions[key].each do |k, v|
           commands << 'echo "%s%s%s%s%s" %s %s' % [before, k, delimiter, v, after, redirect, filename]
           redirect = '>>'
         end
-
-        commands
       else
-        # ...or just execute the command specified
-        [step[:command]]
+        commands << 'echo "%s%s%s%s" %s %s' % [before, delimiter, instructions[key], after, redirect, filename]
+        redirect = '>>'
       end
+
+      commands
     end
 
     def explanatory_text(hsh, key)

data/lib/foreplay/setup.rb

@@ -20,6 +20,7 @@ module Foreplay
     class_option :db_host,      :aliases => '-h'
     class_option :db_user
     class_option :db_password
+    class_option :resque_redis
 
     def self.source_root
       File.dirname(__FILE__)

data/lib/foreplay/setup/foreplay.yml

@@ -64,15 +64,17 @@
 #   key: value                       Values will go into the .env file as key=value
 # foreman:      Role level           Contents of the .foreman file
 #   key: value
+# resque:       Role level           Contents of the resque.yml file for configuring a central redis
+#                                    server for an environment, e.g. production: redis://mydom.com:6379
 #
 defaults:
   name: <%= @options.name? ? @options.name : 'TODO Put the app name here' %>
   repository: <%= @options.repository? ? @options.repository : 'TODO Put the git repository path here' %>
-  user: <%= @options.user? ? @options.user : 'TODO Put here the user to logon to the deployment server' %><%= @options.password? ? "\n  password: #{@options.password}" : '' %><%= @options.keyfile? ? "\n  keyfile: #{@options.keyfile}" : '' %><%= @options.private_key? ? "\n  private_key: #{@options.private_key}" : '' %>
+  user: <%= @options.user? ? @options.user : 'TODO Put here the user to logon to the deployment server' %><%= @options.password? ? "\n  password: #{@options.password}" : '' %><%= @options.keyfile? ? "\n  keyfile: #{@options.keyfile}" : '' %><%= @options.private_key? ? "\n  private_key: #{@options.private_key}" : '' %><%= !@options.password? && !@options.private_key? && !@options.keyfile? ? "\n  password: TODO Supply a password or private key to connect to the server" : '' %>
   path: <%= @options.path? ? @options.path : 'TODO Put here the path to deploy to on the deployment server' %>
   port: <%= @options.port %>
 production:
-  defaults:
+  defaults:<%= @options.resque_redis? ? "\n    resque: #{@options.resque_redis}" : '' %>
     database:
       adapter: <%= @options.db_adapter %>
       encoding: <%= @options.db_encoding %>

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -70,6 +70,7 @@ describe Foreplay::Deploy do
       'rvm rvmrc warning ignore 50000',
       'cd 50000',
       'if [ -f .ruby-version ] ; then rvm install `cat .ruby-version` ; else echo "No .ruby-version file found" ; fi',
+      'mkdir -p config',
       'echo "RAILS_ENV=production" > .env',
       'echo "concurrency: web=1,worker=0,scheduler=0" > .foreman',
       'echo "app: foreplay-50000" >> .foreman',
@@ -112,4 +113,10 @@ describe Foreplay::Deploy do
     `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred -k "top secret private key"`
     Foreplay::Deploy.start([:deploy, 'production', ''])
   end
+
+  it "should add Redis details for Resque" do
+    `rm -f config/foreplay.yml`
+    `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --resque-redis "redis://localhost:6379"`
+    Foreplay::Deploy.start([:deploy, 'production', ''])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3647688978766977844
+      hash: -463785199640223195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3647688978766977844
+      hash: -463785199640223195
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25