flash_kick 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f309f0d603a93c56c314c15e2ed7d8c0472a7b
-  data.tar.gz: 2c4fd7afa53498821df604c63cd81da11416ed0c
+  metadata.gz: d26c79471f38ee87db2bec3251dfd308da44ad3f
+  data.tar.gz: 3c77f0c7410a01c365006ea27ab50a501b23a9ee
 SHA512:
-  metadata.gz: 7eead790b1e9f2e8eb3f2e8ff885f52f05553f7431b57fb368595682326c117b0dd8df01e6c0bac31dcb94352a8c0c9a4ebc22569b8ee035833fb0801beb75cc
-  data.tar.gz: 3155bb461a203714081d46da70451755ae1b01cd634fdb67d6712ac069af10ab3fd7200d93e08c6fbdae9eaa23f16cccfc91c602c5a22dd9e2149b2afc14b389
+  metadata.gz: 986a80f2819cfd16c6016f3af497a84b011ee05938aa9fb865403feaf7191715d1b3618c88709913f6084fce7960c5af0f63eca27450199f3ab7667c3dd901a6
+  data.tar.gz: 1ae3f6e55a48596ecfed5b7555ec886fbcb9db8a42e5e17978b61ae815e92861a88297f2e3139a862eeaa1b730368b445163b0be4d790566552cc1c3a43da2d5

data/lib/flash_kick/version.rb

@@ -1,3 +1,3 @@
 module FlashKick
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/generators/flash_kick/deployment_generator.rb

@@ -22,8 +22,8 @@ module FlashKick
       end
       question :string do
         {
-          server_user: 'Enter a name for your server user',
-          required: true
+          server_user: 'Enter a name for your server deployer user',
+          default: 'deploy'
         }
       end
       question :string do
@@ -35,13 +35,13 @@ module FlashKick
       question :string do
         {
           ruby_version: 'Which version of Ruby would you like to install? [enter for default]',
-          default: '2.1.5'
+          default: '2.3.0'
         }
       end
       question :string do
         {
           postgresql_version: 'Which version of PostgreSQL would you like to install? [enter for default]',
-          default: '9.3'
+          default: '9.5'
         }
       end
       question :string do
@@ -53,7 +53,7 @@ module FlashKick
       question :string do
         {
           database_user: 'Enter a name for your production database user',
-          required: true
+          default: 'postgres'
         }
       end
       question :string do

data/lib/generators/flash_kick/lib/question_helper.rb

@@ -6,6 +6,8 @@ module FlashKick
 
     cattr_accessor :required
 
+    @shell ||= Thor::Shell::Color.new
+
     def self.question(type, &block)
       question_hash = block.call
       @@required    = question_hash[:required]
@@ -29,7 +31,7 @@ module FlashKick
         until answer != ''
           answer = Thor.new.ask(question)
           FlashKick::VariableStore.add_variable(key, answer.empty? ? default : answer)
-          puts "Answer required, but you can always change it later!!!\n\n" if answer == ''
+          @shell.say("Answer required, but you can always change it later!!!\n\n", :yellow) if answer == ''
         end
       else
         answer = Thor.new.ask(question)
@@ -44,7 +46,7 @@ module FlashKick
 
     def self.question_divider(value=nil)
       puts '-' * 100
-      puts "Default: #{value}" unless value.nil?
+      @shell.say("Default: #{value}", :green) unless value.nil?
     end
   end
 end

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

@@ -6,11 +6,11 @@ require 'yaml'
 
 FLASH = YAML.load(File.read(File.expand_path('../../.env/production_env.yml', __FILE__)))
 
-set :deploy_to,     FLASH['app_name']
-set :app_path,      FLASH['app_name']
+set :deploy_to,     FLASH['app_root']
 set :user,          FLASH['server_user']
 set :port,          FLASH['server_ssh_port']
 set :repository,    FLASH['app_repo']
+set :rails_env,     FLASH['rails_env']
 set :forward_agent, true
 
 task :production do
@@ -49,14 +49,14 @@ end
 
 namespace :server do
   task start: :environment do
-    queue "cd #{app_path} && rails_env=#{rails_env} && bin/puma.sh start"
+    queue "cd $APP_ROOT/current && 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"
+    queue "cd $APP_ROOT/current && 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"
+    queue "cd $APP_ROOT/current && rails_env=#{rails_env} && bin/puma.sh restart"
   end
 end

data/lib/generators/flash_kick/templates/ansible/playbooks/roles/essentials/tasks/main.yml

@@ -2,6 +2,9 @@
 - name: add keyscan to allow basic access to github
   shell: ssh-keyscan github.com >> /etc/ssh/ssh_known_hosts
 
+- name: add keyscan to allow basic access to Bitbucket
+  shell: ssh-keyscan bitbucket.org >> /etc/ssh/ssh_known_hosts
+
 - name: install basic packages
   apt: pkg={{item}} state=present update_cache=yes
   with_items:

data/lib/generators/flash_kick/templates/ansible/playbooks/roles/postgresql/tasks/main.yml

@@ -13,7 +13,12 @@
   apt_repository: repo="deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_lsb.codename}}-pgdg main"
 
 - name: install postgres
-  apt: name=postgresql-{{postgresql_version}} state=latest update_cache=true
+  become: true
+  apt:
+    name: "postgresql-{{postgresql_version}}"
+    state: present
+    update_cache: yes
+    cache_valid_time: 3600
 
 - name: copy pg_hba.conf
   become: true
@@ -26,6 +31,13 @@
 - name: start postgresql
   service: name=postgresql state=started
 
+- name: Install PostgreSQL contribs
+  become: true
+  apt:
+    name: "postgresql-contrib-{{postgresql_version}}"
+  notify: restart postgresql
+
+
 - name: create db user
   postgresql_user: name={{database_user}} password={{database_password}} role_attr_flags=CREATEDB
   become_user: postgres

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

@@ -18,6 +18,10 @@
     - 'export APP_NAME={{app_name}}'
     - 'export APP_ROOT={{app_root}}'
     - 'export RAILS_ENV={{rails_env}}'
+    - 'export DATABASE_NAME={{database_name}}'
+    - 'export DATABASE_USER={{database_user}}'
+    - 'export DATABASE_PASSWORD={{database_password}}'
+    - 'export SECRET_KEY_BASE={{secret_key_base}}'
 
 - name: source .session_vars from .bashrc
   lineinfile: dest=/home/{{server_user}}/.bashrc insertafter=EOF line='source ~/.session_vars'

data/lib/generators/flash_kick/templates/ansible_templates/_hosts

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_kick
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Helio Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Quick and painless Rails deployment