rails-ahoy 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e194f3aa190aab39d3d6a920d5cc4b1f88f20c76
-  data.tar.gz: 89ecdeae9947711000ed0af3a8dbd442690a549b
+  metadata.gz: 08f470fbac5f3a6329f346ed0bcaed826b4d0714
+  data.tar.gz: 7d183a79ee04bcf6c00b079069024f32c4ff31dc
 SHA512:
-  metadata.gz: 66cd00495a5cc82cf6e146d1c2e380e1d6ed93c2f55a2c4867342b074a38b627e1be6a29eb90be06ba022b2b05b0f92e3fb3b850b58da30d33297e5728f8dd66
-  data.tar.gz: dd454fa0204b7f78526c4d7b83acd3f04444dc26ff4a460c60a9848da66c0c582b114461c12772f9bbb1e9896203e31b5c6e82e57c2a30e05077da294e3439c1
+  metadata.gz: a04b4b7ef531eed308ff3512bf4cca7eb2ab0a90938c3add31696ab4101d7581d3781fc714947ef186868fe1f1910ca7392aef0e131928f626188c351f507d93
+  data.tar.gz: 8f1e15943b9a4e478d579e9c61772a27eea92f54f79ebf2cbc33a9b451439cc2ddf0b7e701891a7899e025316ea90f7f3929ca2024f97943c5167f81af6aa46c

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ahoy.gemspec
 gemspec
+gem 'thor'
+gem 'fileutils'

data/lib/ahoy.rb

@@ -3,13 +3,7 @@ require 'ahoy'
 
 module Ahoy
   def self.env
-    begin
-      env_file = File.open(Rails.root + ".env/#{Rails.env}_env.yml", 'r')
-    rescue
-      if env_file
-        env_yaml = YAML.load(env_file)
-        env_yaml.each { |k,v| ENV[k.to_s.upcase] = v.to_s } if env_yaml.present?
-      end
-    end
+    env_yaml = YAML.load(File.open(Rails.root + ".env/#{Rails.env}_env.yml", 'r'))
+    env_yaml.each { |k,v| ENV[k.to_s.upcase] = v.to_s } if env_yaml.present?
   end
 end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/generators/ahoy/deployment_generator.rb

@@ -86,7 +86,7 @@ module Ahoy
     end
 
     def copy_templates
-      template 'ansible_templates/_production', 'config/ansible/production'
+      template 'ansible_templates/_hosts', 'config/ansible/hosts'
       template 'ansible_templates/playbooks/_production.yml', 'config/ansible/playbooks/production.yml'
       template 'ansible_templates/playbooks/group_vars/_all.yml', 'config/ansible/playbooks/group_vars/all.yml'
       template '_puma.sh', 'bin/puma.sh'
@@ -96,15 +96,12 @@ module Ahoy
     end
 
     def add_gems
-      gem_group :production do
-        gem 'puma'
-        gem 'rb-readline'
-      end
+      gem 'puma'
+      gem 'rb-readline'
     end
 
     def modify_files
       append_file '.gitignore', '.env/'
-      prepend_file 'config/environment.rb', "require 'ahoy'\n"
       inject_into_file 'config/environment.rb', after: "require File.expand_path('../application', __FILE__)\n\n" do <<-'RUBY'
 Ahoy.env
 
@@ -113,7 +110,7 @@ Ahoy.env
     end
 
     def change_permissions
-      FileUtils.chmod 0751, 'config/ansible/production.sh'
+      FileUtils.chmod 0751, 'config/ansible/provision.sh'
       FileUtils.chmod 0751, 'bin/puma.sh'
     end
 

data/lib/generators/ahoy/templates/_deploy.rb

@@ -3,33 +3,34 @@ require 'mina/rails'
 require 'mina/git'
 require 'mina/rbenv'
 
-task :setup_variables => :environment do
-  set :user,          '<%= Ahoy::VariableStore.variables['server_user'] %>'
+set :deploy_to,     '/var/www/<%= Ahoy::VariableStore.variables['app_name'] %>'
+set :app_path,      '/var/www/<%= Ahoy::VariableStore.variables['app_name'] %>/current'
+set :user,          '<%= Ahoy::VariableStore.variables['server_user'] %>'
+set :port,          '<%= Ahoy::VariableStore.variables['server_ssh_port'] %>'
+set :repository,    '<%= Ahoy::VariableStore.variables['app_repo'] %>'
+set :forward_agent, true
+
+task :production do
   set :domain,        '<%= Ahoy::VariableStore.variables['server_domain'] %>'
-  set :port,          '<%= Ahoy::VariableStore.variables['server_ssh_port'] %>'
-  set :repository,    '<%= Ahoy::VariableStore.variables['app_repo'] %>'
   set :branch,        '<%= Ahoy::VariableStore.variables['app_repo_branch'] %>'
-  set :forward_agent, true
-  set :deploy_to,     '/var/www/<%= Ahoy::VariableStore.variables['app_name'] %>'
-  set :app_path,      '/var/www/<%= Ahoy::VariableStore.variables['app_name'] %>/current'
+  set :rails_env,     'production'
   set :shared_paths,  ['config/database.yml', 'config/secrets.yml', 'log', 'tmp', '.env/production_env.yml']
 end
 
-task :production do
-  invoke :setup_variables
-end
-
 task :environment do
-  queue! %[export PATH="/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH"]
+  queue 'export PATH=/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH'
+  queue 'source ~/.session_vars'
 end
 
-task :setup => :environment do
-  ['log', 'config', 'tmp/log', 'tmp/pids', 'tmp/sockets'].each do |dir|
-    queue! %[mkdir -m 750 -p "#{deploy_to}/#{shared_path}/#{dir}"]
-  end
+task setup: :environment do
+  queue "mkdir -m 750 -p #{deploy_to}/#{shared_path}/log"
+  queue "mkdir -m 750 -p #{deploy_to}/#{shared_path}/config"
+  queue "mkdir -m 750 -p #{deploy_to}/#{shared_path}/tmp/log"
+  queue "mkdir -m 750 -p #{deploy_to}/#{shared_path}/tmp/pids"
+  queue "mkdir -m 750 -p #{deploy_to}/#{shared_path}/tmp/sockets"
 end
 
-task :deploy => :environment do
+task deploy: :environment do
   deploy do
     invoke :'git:clone'
     invoke :'deploy:link_shared_paths'
@@ -44,9 +45,15 @@ task :deploy => :environment do
 end
 
 namespace :server do
-  [:start, :stop, :restart].each do |action|
-    task action => :environment do
-      queue "cd #{app_path} && RAILS_ENV=#{settings[:rails_env]} && bin/puma.sh #{action}"
-    end
+  task start: :environment do
+    queue "cd #{app_path} && rails_env=#{rails_env} && bin/puma.sh start"
+  end
+
+  task stop: :environment do
+    queue "cd #{app_path} && rails_env=#{rails_env} && bin/puma.sh stop"
+  end
+
+  task restart: :environment do
+    queue "cd #{app_path} && rails_env=#{rails_env} && bin/puma.sh restart"
   end
 end

data/lib/generators/ahoy/templates/_puma.sh

@@ -1,10 +1,9 @@
 #! /bin/sh
 
 BUNDLE_BIN=/usr/local/rbenv/shims/bundle
-APP_PATH=/var/www/<%= Ahoy::VariableStore.variables['app_name'] %>
-PUMA_CONFIG_FILE=$APP_PATH/current/config/puma.rb
-PUMA_PID_FILE=$APP_PATH/shared/tmp/pids/puma.pid
-PUMA_SOCKET=$APP_PATH/shared/tmp/sockets/puma.sock
+PUMA_CONFIG_FILE=$APP_ROOT/current/config/puma.rb
+PUMA_PID_FILE=$APP_ROOT/shared/tmp/pids/puma.pid
+PUMA_SOCKET=$APP_ROOT/shared/tmp/sockets/puma.sock
 
 # check if puma process is running
 puma_is_running() {

data/lib/generators/ahoy/templates/ansible/playbooks/roles/complete/tasks/main.yml

@@ -1,14 +1,17 @@
 ---
 - name: create config directory
   sudo: true
-  file: path=/var/www/{{app_root}}/shared/config owner={{server_user}} group={{server_user}} recurse=yes state=directory
+  file: path={{app_root}}/shared/config owner={{server_user}} group={{server_user}} recurse=yes state=directory
 
 - name: copy database.yml
-  template: src=database.yml dest=/var/www/{{app_name}}/shared/config/database.yml owner={{server_user}} group={{server_user}}
+  template: src=database.yml dest={{app_root}}/shared/config/database.yml owner={{server_user}} group={{server_user}}
 
 - name: copy secrets.yml
-  template: src=secrets.yml dest=/var/www/{{app_name}}/shared/config/secrets.yml owner={{server_user}} group={{server_user}}
+  template: src=secrets.yml dest={{app_root}}/shared/config/secrets.yml owner={{server_user}} group={{server_user}}
 
-- name: update www directory permissions
+- name: update app root directory permissions
   sudo: true
-  file: path=/var/www owner={{server_user}} group={{server_user}} recurse=yes state=directory
+  file: path={{app_root}} owner={{server_user}} group={{server_user}} recurse=yes state=directory
+
+- name: add symlink to app root
+  file: src={{app_root}} dest=/home/{{server_user}}/app owner={{server_user}} group={{server_user}} state=link

data/lib/generators/ahoy/templates/ansible/playbooks/roles/complete/templates/database.yml

@@ -1,4 +1,4 @@
-production:
+{{rails_env}}:
   adapter: postgresql
   host: localhost
   encoding: unicode

data/lib/generators/ahoy/templates/ansible/playbooks/roles/complete/templates/secrets.yml

@@ -1,2 +1,2 @@
-production:
+{{rails_env}}:
   secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/application.yml

@@ -1,15 +1,15 @@
 ---
 - name: check if .env exists
-  stat: path=/var/www/{{app_root}}/shared/.env/production_env.yml
+  stat: path={{app_root}}/shared/.env/{{rails_env}}_env.yml
   register: env_file
 
 - name: delete .env if exists
-  shell: rm /var/www/{{app_root}}/shared/.env/production_env.yml
+  shell: rm {{app_root}}/shared/.env/{{rails_env}}_env.yml
   when: env_file.stat.exists == true
 
 - name: add environment variables to .env
   lineinfile:
-    dest=/var/www/{{app_root}}/shared/.env/production_env.yml
+    dest={{app_root}}/shared/.env/{{rails_env}}_env.yml
     line='{{item}}'
     owner={{server_user}}
     insertafter=EOF

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/main.yml

@@ -1,3 +1,3 @@
 ---
-- include: system.yml
+- include: session.yml
 - include: application.yml

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/session.yml

@@ -0,0 +1,23 @@
+---
+- name: check if .session_vars exists
+  stat: path=/home/{{server_user}}/.session_vars
+  register: session_vars
+
+- name: delete .session_vars if exists
+  shell: rm /home/{{server_user}}/.session_vars
+  when: session_vars.stat.exists == true
+
+- name: add environment variables to .session_vars
+  lineinfile:
+    dest=/home/{{server_user}}/.session_vars
+    line='{{item}}'
+    owner={{server_user}}
+    insertafter=EOF
+    create=true
+  with_items:
+    - 'export APP_NAME={{app_name}}'
+    - 'export APP_ROOT={{app_root}}'
+    - 'export RAILS_ENV={{rails_env}}'
+
+- name: source .session_vars from .bashrc
+  lineinfile: dest=/home/{{server_user}}/.bashrc insertafter=EOF line='source ~/.session_vars'

data/lib/generators/ahoy/templates/ansible/provision.sh

@@ -0,0 +1 @@
+ansible-playbook playbooks/$1.yml -i hosts

data/lib/generators/ahoy/templates/ansible_templates/{_production → _hosts}

@@ -1,5 +1,3 @@
 [production]
 root ansible_ssh_host=<%= Ahoy::VariableStore.variables['server_domain'] == '' ? '127.0.0.1' : Ahoy::VariableStore.variables['server_domain'] %>
-
-[production]
 deploy ansible_ssh_host=<%= Ahoy::VariableStore.variables['server_domain'] == '' ? '127.0.0.1' : Ahoy::VariableStore.variables['server_domain'] %> ansible_ssh_port=<%= Ahoy::VariableStore.variables['server_ssh_port'] == '' ? '22' : Ahoy::VariableStore.variables['server_ssh_port'] %>

data/lib/generators/ahoy/templates/env_templates/_production_env.yml

@@ -2,8 +2,9 @@
 server_user: <%= Ahoy::VariableStore.variables['server_user'] %>
 server_domain: <%= Ahoy::VariableStore.variables['server_domain'] %>
 server_ssh_port: <%= Ahoy::VariableStore.variables['server_ssh_port'] %>
+rails_env: production
 app_name: <%= Ahoy::VariableStore.variables['app_name'] %>
-app_root: <%= Ahoy::VariableStore.variables['app_name'] %>
+app_root: /var/www/<%= Ahoy::VariableStore.variables['app_name'] %>
 database_name: <%= Ahoy::VariableStore.variables['database_name'] %>
 database_user: <%= Ahoy::VariableStore.variables['database_user'] %>
 database_password: <%= Ahoy::VariableStore.variables['database_password'] %>

data/lib/generators/ahoy/vagrant_generator.rb

@@ -40,6 +40,10 @@ module Ahoy
       copy_file 'ansible_templates/playbooks/_vagrant.yml', 'config/ansible/playbooks/vagrant.yml'
     end
 
+    def modify_files
+      append_file '.gitignore', "\n.vagrant/"
+    end
+
     def backup_files
       FileUtils.mv 'config/database.yml', 'config/database.yml.bak'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-ahoy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Pearson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,11 +87,10 @@ files:
 - lib/generators/ahoy/templates/ansible/playbooks/roles/user/tasks/main.yml
 - lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/application.yml
 - lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/main.yml
-- lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/system.yml
-- lib/generators/ahoy/templates/ansible/playbooks/roles/variables/templates/profile
+- lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/session.yml
 - lib/generators/ahoy/templates/ansible/playbooks/tasks/vagrant_settings.yml
-- lib/generators/ahoy/templates/ansible/production.sh
-- lib/generators/ahoy/templates/ansible_templates/_production
+- lib/generators/ahoy/templates/ansible/provision.sh
+- lib/generators/ahoy/templates/ansible_templates/_hosts
 - lib/generators/ahoy/templates/ansible_templates/playbooks/_production.yml
 - lib/generators/ahoy/templates/ansible_templates/playbooks/_vagrant.yml
 - lib/generators/ahoy/templates/ansible_templates/playbooks/group_vars/_all.yml

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/tasks/system.yml

@@ -1,25 +0,0 @@
----
-- name: check if .profile exists
-  stat: path=/home/{{server_user}}/.profile
-  register: profile_file
-
-- name: delete .profile if exists
-  shell: rm /home/{{server_user}}/.profile
-  when: profile_file.stat.exists == true
-
-- name: recreate .profile from a clean template
-  template: src=profile dest=/home/{{server_user}}/.profile owner=deploy group=deploy
-
-- name: add environment variables to .profile
-  lineinfile:
-    dest=/home/{{server_user}}/.profile
-    line='{{item}}'
-    owner={{server_user}}
-    insertafter=EOF
-    create=true
-  with_items:
-    - export APP_NAME={{app_name}}
-    - export APP_ROOT={{app_root}}
-    - export APP_DOMAIN="{{server_domain}}"
-    - export APP_REPO="{{app_repo}}"
-    - export APP_REPO_BRANCH={{app_repo_branch}}

data/lib/generators/ahoy/templates/ansible/playbooks/roles/variables/templates/profile

@@ -1,22 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
- 
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
- 
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
- 
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi

data/lib/generators/ahoy/templates/ansible/production.sh

@@ -1 +0,0 @@
-ansible-playbook playbooks/production.yml -i production