orats 0.6.3 → 0.6.4

data/lib/orats/templates/includes/Gemfile

@@ -4,6 +4,7 @@ gem 'rails', '~> 4.1.1'
 gem 'turbolinks', '~> 2.2.2'
 gem 'jquery-rails', '~> 3.1.0'
 gem 'jquery-turbolinks', '~> 2.0.2'
+
 gem 'bootstrap-sass', '~> 3.1.1'
 gem 'font-awesome-rails', '~> 4.1.0'
 
@@ -13,16 +14,19 @@ gem 'redis-rails', '~> 4.0.0'
 gem 'puma', '~> 2.8.2'
 gem 'sidekiq', '~> 3.1.2'
 gem 'sinatra', '>= 1.4.5', require: false
+
 #gem 'jbuilder'
 
-gem 'kaminari', '~> 0.16.0'
+gem 'whenever', '~> 0.9.2', require: false
+gem 'backup', '~> 4.0.1', require: false
 
 gem 'sitemap_generator', '~> 5.0.2'
 gem 'favicon_maker', '~> 1.3'
+gem 'kaminari', '~> 0.16.0'
 
 group :development do
-  gem 'spring', '~> 1.1.2'
   gem 'foreman', require: false
+  gem 'spring', '~> 1.1.2'
   gem 'rack-mini-profiler', '~> 0.9.1'
   gem 'bullet', '~> 4.10.0'
   gem 'meta_request', '~> 0.3.0'
@@ -33,11 +37,6 @@ group :development, :test do
   gem 'dotenv-rails', '~> 0.11.1'
 end
 
-group :staging, :production do
-  gem 'whenever', '~> 0.9.2', require: false
-  gem 'backup', '~> 4.0.1', require: false
-end
-
 group :assets do
   gem 'sass-rails', '~> 4.0.1'
   gem 'coffee-rails', '~> 4.0.1'

data/lib/orats/templates/play.rb

@@ -1,15 +1,35 @@
-# =====================================================================================================
-# Template for generating an ansible playbook
-# =====================================================================================================
-
-# ----- Helper functions and variables ----------------------------------------------------------------
-
 require 'securerandom'
 
+# =============================================================================
+# template for generating an orats ansible playbook for ansible 1.6.x
+# =============================================================================
+# view the task list at the bottom of the file
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
+# private functions
+# -----------------------------------------------------------------------------
 def generate_token
   SecureRandom.hex(64)
 end
 
+def method_to_sentence(method)
+  method.tr!('_', ' ')
+  method[0] = method[0].upcase
+  method
+end
+
+def log_task(message)
+  puts
+  say_status  'task', "#{method_to_sentence(message.to_s)}:", :yellow
+  puts        '-'*80, ''; sleep 0.25
+end
+
+def git_commit(message)
+  git add: '-A'
+  git commit: "-m '#{message}'"
+end
+
 def git_config(field)
   command = "git config --global user.#{field}"
   git_field_value = run(command, capture: true).gsub("\n", '')
@@ -18,53 +38,32 @@ def git_config(field)
   git_field_value.to_s.empty? ? default_value : git_field_value
 end
 
-author_name = git_config 'name'
-author_email = git_config 'email'
-
-# ----- Nuke all of the rails code --------------------------------------------------------------------
-
-puts
-say_status  'shell', 'Removing all of the generated rails code...', :yellow
-puts        '-'*80, ''; sleep 0.25
-
-run 'rm -rf * .git .gitignore'
-
-# ----- Create playbook -------------------------------------------------------------------------------
-
-puts
-say_status  'init', 'Creating playbook...', :yellow
-puts        '-'*80, ''; sleep 0.25
+# ---
 
-run "mkdir -p #{app_name}"
+def delete_generated_rails_code
+  log_task __method__
 
-# ----- Move playbook back one directory --------------------------------------------------------------
-
-puts
-say_status  'shell', 'Moving playbook back one directory...', :yellow
-puts        '-'*80, ''; sleep 0.25
-
-run "mv #{app_name}/* ."
-run "rm -rf #{app_name}"
-
-# ----- Create the git repo ---------------------------------------------------------------------------
-
-puts
-say_status  'git', 'Creating initial commit...', :yellow
-puts        '-'*80, ''; sleep 0.25
+  run 'rm -rf * .git .gitignore'
+end
 
-git :init
-git add: '-A'
-git commit: "-m 'Initial commit'"
+def add_playbook_directory
+  log_task __method__
 
-# ----- Create the license ----------------------------------------------------------------------------
+  run "mkdir -p #{app_name}"
+  run "mv #{app_name}/* ."
+  run "rm -rf #{app_name}"
+  git :init
+  git_commit 'Initial commit'
+end
 
-puts
-say_status  'root', 'Creating the license', :yellow
-puts        '-'*80, ''; sleep 0.25
+def add_license
+  log_task __method__
 
-run 'rm -rf LICENSE'
+  author_name = git_config 'name'
+  author_email = git_config 'email'
 
-file 'LICENSE' do <<-TEXT
+  run 'rm -rf LICENSE'
+  file 'LICENSE' do <<-S
 The MIT License (MIT)
 
 Copyright (c) #{Time.now.year} #{author_name} <#{author_email}>
@@ -87,19 +86,15 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-TEXT
+  S
+  end
+  git_commit 'Add MIT license'
 end
 
-git add: '-A'
-git commit: "-m 'Add MIT license'"
-
-# ----- Create the site file --------------------------------------------------------------------------
+def add_main_playbook
+  log_task __method__
 
-puts
-say_status  'root', 'Creating the site yaml file', :yellow
-puts        '-'*80, ''; sleep 0.25
-
-file 'site.yml' do <<-TEXT
+  file 'site.yml' do <<-S
 ---
 - name: ensure all servers are commonly configured
   hosts: all
@@ -153,21 +148,36 @@ file 'site.yml' do <<-TEXT
     - { role: nickjj.pumacorn, tags: [app, rails] }
     - { role: nickjj.sidekiq, tags: [app, rails] }
     - { role: nickjj.monit, tags: [app, monit] }
-TEXT
+  S
+  end
+  git_commit 'Add the main playbook'
+end
+
+def remove_unused_files_from_git
+  log_task __method__
+
+  git add: '-u'
+  git_commit 'Remove unused files'
 end
 
-git add: '-A'
-git commit: "-m 'Add site.yml file'"
-
-# ----- Installation complete message -----------------------------------------------------------------
-
-puts
-say_status  'success', "\e[1m\Everything has been setup successfully\e[0m", :cyan
-puts
-say_status  'question', 'Are most of your apps similar?', :yellow
-say_status  'answer', 'You only need to generate one playbook and you just did', :white
-say_status  'answer', 'Use the inventory in each project to customize certain things', :white
-puts
-say_status  'question', 'Are you new to ansible?', :yellow
-say_status  'answer', 'http://docs.ansible.com/intro_getting_started.html', :white
-puts        '-'*80
+def log_complete
+  puts
+  say_status  'success', "\e[1m\Everything has been setup successfully\e[0m", :cyan
+  puts
+  say_status  'question', 'Are most of your apps similar?', :yellow
+  say_status  'answer', 'You only need to generate one playbook and you just did', :white
+  say_status  'answer', 'Use the inventory in each project to customize certain things', :white
+  puts
+  say_status  'question', 'Are you new to ansible?', :yellow
+  say_status  'answer', 'http://docs.ansible.com/intro_getting_started.html', :white
+  puts        '-'*80
+end
+
+# ---
+
+delete_generated_rails_code
+add_playbook_directory
+add_license
+add_main_playbook
+remove_unused_files_from_git
+log_complete

data/lib/orats/version.rb

@@ -1,3 +1,3 @@
 module Orats
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor