foreplay 0.9.13 → 0.10.1

data/lib/foreplay/engine.rb

@@ -2,126 +2,77 @@ require 'yaml'
 require 'string'
 require 'hash'
 
-class Foreplay::Engine
-  include Foreplay
-  attr_reader :mode, :environment, :filters
-
-  DEFAULT_CONFIG_FILE = "#{Dir.getwd}/config/foreplay.yml"
-  DEFAULTS_KEY        = 'defaults'
-
-  def initialize(e, f)
-    @environment  = e
-    @filters      = f
-  end
-
-  def deploy
-    @mode = :deploy
-    execute
-  end
-
-  def check
-    @mode = :check
-    execute
-  end
-
-  def execute
-    puts "#{mode.capitalize}ing #{environment.dup.yellow} environment, "\
-         "#{explanatory_text(filters, 'role')}, #{explanatory_text(filters, 'server')}"
-
-    actionable_roles.map { |role, instructions| threads(role, instructions) }.flatten.each(&:join)
-
-    puts mode == :deploy ? 'Finished deployment' : 'Deployment configuration check was successful'
-  end
-
-  private
+require 'foreplay/engine/defaults'
+require 'foreplay/engine/logger'
+require 'foreplay/engine/port'
+require 'foreplay/engine/remote'
+require 'foreplay/engine/role'
+require 'foreplay/engine/secrets'
+require 'foreplay/engine/server'
+require 'foreplay/engine/step'
+
+module Foreplay
+  class Engine
+    include Foreplay::Engine::Defaults
+    attr_reader :mode, :environment, :filters
+
+    def initialize(e, f)
+      @environment  = e
+      @filters      = f
+    end
 
-  def actionable_roles
-    roles.select { |role, _i| role != DEFAULTS_KEY && role != filters['role'] }
-  end
+    [:deploy, :check].each { |m| define_method(m) { execute m } }
 
-  def threads(role, instructions)
-    Foreplay::Engine::Role.new(
-      environment,
-      mode,
-      build_instructions(role, instructions)
-    ).threads
-  end
+    def execute(m)
+      @mode = m
+      puts "#{mode.capitalize}ing #{environment.dup.yellow} environment, "\
+           "#{explanatory_text(filters, 'role')}, #{explanatory_text(filters, 'server')}"
 
-  def explanatory_text(hsh, key)
-    hsh.key?(key) ? "#{hsh[key].dup.yellow} #{key}" : "all #{key}s"
-  end
+      actionable_roles.map { |role, instructions| threads(role, instructions) }.flatten.each(&:join)
 
-  def build_instructions(role, additional_instructions)
-    instructions            = defaults.supermerge(additional_instructions)
-    instructions['role']    = role
-    instructions['verbose'] = verbose
-    required_keys           = %w(name environment role servers path repository)
-
-    required_keys.each do |key|
-      next if instructions.key? key
-      terminate("Required key #{key} not found in instructions for #{environment} environment.\nCheck #{config_file}")
+      puts mode == :deploy ? 'Finished deployment' : 'Deployment configuration check was successful'
     end
 
-    # Apply server filter
-    instructions['servers'] &= server_filter if server_filter
-    instructions
-  end
-
-  def server_filter
-    @server_filter ||= filters['server'].split(',') if filters.key?('server')
-  end
-
-  def config_file
-    @config_file ||= (filters['config_file'] || DEFAULT_CONFIG_FILE)
-  end
+    private
 
-  def defaults
-    return @defaults if @defaults
-
-    # Establish defaults
-    # First the default defaults
-    @defaults = {
-      'name'        =>  File.basename(Dir.getwd),
-      'environment' =>  environment,
-      'env'         =>  { 'RAILS_ENV' => environment },
-      'port'        =>  50_000
-    }
-
-    @defaults['env'].merge! secrets
-    @defaults['application'] = secrets
-    @defaults = @defaults.supermerge(roles_all[DEFAULTS_KEY]) if roles_all.key? DEFAULTS_KEY
-    @defaults = @defaults.supermerge(roles[DEFAULTS_KEY])     if roles.key? DEFAULTS_KEY
-    @defaults
-  end
+    def actionable_roles
+      roles.select { |role, _i| role != DEFAULTS_KEY && (filters.key?('role') ? role == filters['role'] : true) }
+    end
 
-  # Secret environment variables
-  def secrets
-    @secrets ||= Foreplay::Engine::Secrets.new(environment, roles_all['secrets']).fetch || {}
-  end
+    def threads(role, instructions)
+      Foreplay::Engine::Role.new(
+        environment,
+        mode,
+        build_instructions(role, instructions)
+      ).threads
+    end
 
-  def verbose
-    @verbose ||= filters.key?('verbose')
-  end
+    def explanatory_text(hsh, key)
+      hsh.key?(key) ? "#{hsh[key].dup.yellow} #{key}" : "all #{key}s"
+    end
 
-  def roles
-    @roles ||= roles_all[environment]
-  end
+    def build_instructions(role, additional_instructions)
+      instructions            = defaults.supermerge(additional_instructions)
+      instructions['role']    = role
+      instructions['verbose'] = verbose
+      required_keys           = %w(name environment role servers path repository)
 
-  def roles_all
-    return @roles_all if @roles_all
+      required_keys.each do |key|
+        next if instructions.key? key
+        terminate("Required key #{key} not found in instructions for #{environment} environment.\nCheck #{config_file}")
+      end
 
-    @roles_all = YAML.load(File.read(config_file))
+      # Apply server filter
+      instructions['servers'] &= server_filter if server_filter
+      instructions
+    end
 
-    # This environment
-    unless @roles_all.key? environment
-      terminate("No deployment configuration defined for #{environment} environment.\nCheck #{config_file}")
+    def server_filter
+      @server_filter ||= filters['server'].split(',') if filters.key?('server')
     end
 
-    @roles_all
-  rescue Errno::ENOENT
-    terminate "Can't find configuration file #{config_file}.\nPlease run foreplay setup or create the file manually."
-  rescue Psych::SyntaxError
-    terminate "I don't understand the configuration file #{config_file}.\n"\
-      'Please run foreplay setup or edit the file manually.'
+    def verbose
+      @verbose ||= filters.key?('verbose')
+    end
   end
 end

data/lib/foreplay/launcher.rb

@@ -1,13 +1,15 @@
 require 'thor/group'
 
-class Foreplay::Launcher < Thor::Group
-  include Thor::Actions
+module Foreplay
+  class Launcher < Thor::Group
+    include Thor::Actions
 
-  argument :mode,         type: :string,  required: true
-  argument :environment,  type: :string,  required: true
-  argument :filters,      type: :hash,    required: false
+    argument :mode,         type: :string,  required: true
+    argument :environment,  type: :string,  required: true
+    argument :filters,      type: :hash,    required: false
 
-  def parse
-    Foreplay::Engine.new(environment, filters).__send__ mode
+    def parse
+      Foreplay::Engine.new(environment, filters).__send__ mode
+    end
   end
 end

data/lib/foreplay/setup.rb

@@ -1,31 +1,33 @@
 require 'thor/group'
 
-class Foreplay::Setup < Thor::Group
-  include Thor::Actions
+module Foreplay
+  class Setup < Thor::Group
+    include Thor::Actions
 
-  class_option :name,         aliases: '-n', default: File.basename(Dir.getwd)
-  class_option :repository,   aliases: '-r'
-  class_option :user,         aliases: '-u'
-  class_option :password
-  class_option :keyfile
-  class_option :private_key,  aliases: '-k'
-  class_option :port,         aliases: '-p', default: 50_000
-  class_option :path,         aliases: '-f'
-  class_option :servers,      aliases: '-s', type: :array
-  class_option :db_adapter,   aliases: '-a', default: 'postgresql'
-  class_option :db_encoding,  aliases: '-e', default: 'utf8'
-  class_option :db_pool,                     default: 5
-  class_option :db_name,      aliases: '-d'
-  class_option :db_host,      aliases: '-h'
-  class_option :db_user
-  class_option :db_password
-  class_option :resque_redis
+    class_option :name,         aliases: '-n', default: File.basename(Dir.getwd)
+    class_option :repository,   aliases: '-r'
+    class_option :user,         aliases: '-u'
+    class_option :password
+    class_option :keyfile
+    class_option :private_key,  aliases: '-k'
+    class_option :port,         aliases: '-p', default: 50_000
+    class_option :path,         aliases: '-f'
+    class_option :servers,      aliases: '-s', type: :array
+    class_option :db_adapter,   aliases: '-a', default: 'postgresql'
+    class_option :db_encoding,  aliases: '-e', default: 'utf8'
+    class_option :db_pool,                     default: 5
+    class_option :db_name,      aliases: '-d'
+    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__)
-  end
+    def self.source_root
+      File.dirname(__FILE__)
+    end
 
-  def config
-    template('setup/foreplay.yml', 'config/foreplay.yml')
+    def config
+      template('setup/foreplay.yml', 'config/foreplay.yml')
+    end
   end
 end

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.9.13'
+  VERSION = '0.10.1'
 end

data/lib/foreplay.rb

@@ -1,13 +1,16 @@
 require 'foreplay/version'
-require 'foreplay/foreplay'
-require 'foreplay/launcher'
 require 'foreplay/engine'
-require 'foreplay/engine/remote'
-require 'foreplay/engine/remote/check'
-require 'foreplay/engine/remote/step'
-require 'foreplay/engine/logger'
-require 'foreplay/engine/port'
-require 'foreplay/engine/role'
-require 'foreplay/engine/secrets'
-require 'foreplay/engine/server'
-require 'foreplay/engine/step'
+require 'foreplay/launcher'
+
+module Foreplay
+  DEFAULT_PORT = 50_000
+  PORT_GAP = 1_000
+
+  def log(message, options = {})
+    Foreplay::Engine::Logger.new(message, options)
+  end
+
+  def terminate(message)
+    fail message
+  end
+end

data/spec/lib/foreplay/deploy_spec.rb

@@ -137,9 +137,13 @@ describe Foreplay::Launcher do
       'rvm rvmrc warning ignore 50000',
       'gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys D39DC0E3',
       'cd 50000 && mkdir -p tmp doc log config',
-      'rvm info',
+      'rvm rvmrc load && rvm info',
       'if [ -f .ruby-version ] ; then rvm install `cat .ruby-version` ; else echo "No .ruby-version file found" ; fi',
-      'echo "RAILS_ENV=production" > .env',
+      'echo "HOME=$HOME" > .env',
+      'echo "SHELL=$SHELL" >> .env',
+      'echo "PATH=$PATH:`which bundle`" >> .env',
+      'echo "GEM_HOME=$HOME/.rvm/gems/`rvm tools identifier`" >> .env',
+      'echo "RAILS_ENV=production" >> .env',
       'echo "concurrency: web=1,worker=0,scheduler=0" > .foreman',
       'echo "app: foreplay-50000" >> .foreman',
       'echo "port: 50000" >> .foreman',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.10.1
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -218,10 +218,10 @@ files:
 - features/setup.feature
 - features/support/env.rb
 - foreplay.gemspec
-- foreplay.rake
 - lib/foreplay.rb
 - lib/foreplay/cli.rb
 - lib/foreplay/engine.rb
+- lib/foreplay/engine/defaults.rb
 - lib/foreplay/engine/logger.rb
 - lib/foreplay/engine/port.rb
 - lib/foreplay/engine/remote.rb
@@ -232,7 +232,6 @@ files:
 - lib/foreplay/engine/server.rb
 - lib/foreplay/engine/step.rb
 - lib/foreplay/engine/steps.yml
-- lib/foreplay/foreplay.rb
 - lib/foreplay/launcher.rb
 - lib/foreplay/setup.rb
 - lib/foreplay/setup/foreplay.yml

data/foreplay.rake

@@ -1,28 +0,0 @@
-# Syntax:
-#
-#     rake ENV=production [ROLE=web] foreplay:command
-#
-# You can set the environment variables ENV and ROLE elsewhere if you wish.
-# If ROLE is not defined then we deploy all roles.
-#
-# Dependencies:
-#
-#    gem 'net-ssh-shell'
-#
-# You can constrain this to whatever group you use for initiating deployments, e.g.
-#
-#    group :development do
-#      gem 'net-ssh-shell'
-#    end
-
-namespace :foreplay do
-  desc 'Push app to deployment targets'
-  task push: :environment do
-    Foreplay.push
-  end
-
-  desc 'Check deployment configuration'
-  task check: :environment do
-    Foreplay.push true
-  end
-end

data/lib/foreplay/foreplay.rb

@@ -1,9 +0,0 @@
-module Foreplay
-  def log(message, options = {})
-    Foreplay::Engine::Logger.new(message, options)
-  end
-
-  def terminate(message)
-    fail message
-  end
-end