orats 0.6.5 → 0.7.0

data/test/test_helper.rb

@@ -1,23 +1,31 @@
 require 'minitest/autorun'
 require 'securerandom'
-require_relative '../lib/orats/commands/new/server'
+require_relative '../lib/orats/commands/project/server'
 
 module Orats
   module Test
-    include Commands::New::Server
+    include Commands::Project::Server
 
-    BINARY_PATH = File.absolute_path('../../bin/orats', __FILE__)
-    TEST_PATH   = '/tmp/orats/test'
-    ORATS_FLAGS = '--pg-password pleasedonthackme --skip-server-start'
+    TEST_PATH         = ENV['TEST_PATH']         || '/tmp/orats'
+    POSTGRES_LOCATION = ENV['POSTGRES_LOCATION'] || 'localhost'
+    POSTGRES_USERNAME = ENV['POSTGRES_USERNAME'] || 'postgres'
+    POSTGRES_PASSWORD = ENV['POSTGRES_PASSWORD'] || 'pleasedonthackme'
+    REDIS_LOCATION    = ENV['REDIS_LOCATION']    || 'localhost'
+    REDIS_PASSWORD    = ENV['REDIS_PASSWORD']    || ''
+
+    CREDENTIALS = "-l #{POSTGRES_LOCATION} -u #{POSTGRES_USERNAME} -p #{POSTGRES_PASSWORD} -n #{REDIS_LOCATION} -d #{REDIS_PASSWORD}"
+
+    BINARY_PATH     = File.absolute_path('../../bin/orats', __FILE__)
+    ORATS_NEW_FLAGS = "#{CREDENTIALS} -FG"
 
     def orats(command, options = {})
       cmd, app_name   = command.split(' ')
       prepend_command = ''
-
-      command         = "#{cmd} #{TEST_PATH}/#{app_name}" if command.include?(' ')
+      command         = "#{cmd} #{TEST_PATH}/#{app_name}" unless app_name.nil?
 
       if options.has_key?(:answer)
-        options[:answer] == 'y' || options[:answer] == 'yes' ? insert_answer = 'yes' : insert_answer = 'echo'
+        options[:answer] == 'y' || options[:answer] == 'yes' ?
+            insert_answer = 'yes' : insert_answer = 'echo'
 
         prepend_command = "#{insert_answer} | "
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -84,24 +84,73 @@ files:
 - lib/orats.rb
 - lib/orats/cli.rb
 - lib/orats/commands/common.rb
-- lib/orats/commands/new/ansible.rb
-- lib/orats/commands/new/exec.rb
-- lib/orats/commands/new/rails.rb
-- lib/orats/commands/new/server.rb
+- lib/orats/commands/diff/compare.rb
+- lib/orats/commands/diff/exec.rb
+- lib/orats/commands/diff/parse.rb
+- lib/orats/commands/inventory.rb
 - lib/orats/commands/nuke.rb
-- lib/orats/commands/outdated/compare.rb
-- lib/orats/commands/outdated/exec.rb
-- lib/orats/commands/outdated/parse.rb
-- lib/orats/commands/play.rb
+- lib/orats/commands/playbook.rb
+- lib/orats/commands/project/exec.rb
+- lib/orats/commands/project/rails.rb
+- lib/orats/commands/project/server.rb
 - lib/orats/commands/ui.rb
 - lib/orats/templates/auth.rb
 - lib/orats/templates/base.rb
-- lib/orats/templates/includes/Galaxyfile
-- lib/orats/templates/includes/Gemfile
-- lib/orats/templates/includes/app/assets/favicon/favicon_base.png
+- lib/orats/templates/includes/common/LICENSE
 - lib/orats/templates/includes/inventory/group_vars/all.yml
 - lib/orats/templates/includes/inventory/hosts
-- lib/orats/templates/play.rb
+- lib/orats/templates/includes/new/rails/.env
+- lib/orats/templates/includes/new/rails/Gemfile
+- lib/orats/templates/includes/new/rails/Procfile
+- lib/orats/templates/includes/new/rails/README.md
+- lib/orats/templates/includes/new/rails/app/assets/favicon/favicon_base.png
+- lib/orats/templates/includes/new/rails/app/helpers/application_helper.rb
+- lib/orats/templates/includes/new/rails/app/models/account.rb
+- lib/orats/templates/includes/new/rails/app/views/devise/confirmations/new.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/mailer/confirmation_instructions.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/mailer/reset_password_instructions.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/mailer/unlock_instructions.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/passwords/edit.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/passwords/new.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/registrations/edit.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/registrations/new.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/sessions/new.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/shared/_links.html.erb
+- lib/orats/templates/includes/new/rails/app/views/devise/unlocks/new.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_disqus_comments_snippet.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_disqus_count_snippet.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_flash.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_footer.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_google_analytics_snippet.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_google_analytics_tracker.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_navigation.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_navigation_auth.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/_navigation_links.html.erb
+- lib/orats/templates/includes/new/rails/app/views/layouts/application.html.erb
+- lib/orats/templates/includes/new/rails/app/views/pages/home.html.erb
+- lib/orats/templates/includes/new/rails/config/database.yml
+- lib/orats/templates/includes/new/rails/config/environments/staging.rb
+- lib/orats/templates/includes/new/rails/config/initializers/devise_async.rb
+- lib/orats/templates/includes/new/rails/config/initializers/mini_profiler.rb
+- lib/orats/templates/includes/new/rails/config/initializers/sidekiq.rb
+- lib/orats/templates/includes/new/rails/config/puma.rb
+- lib/orats/templates/includes/new/rails/config/secrets.yml
+- lib/orats/templates/includes/new/rails/config/sidekiq.yml
+- lib/orats/templates/includes/new/rails/config/sitemap.rb
+- lib/orats/templates/includes/new/rails/config/whenever.rb
+- lib/orats/templates/includes/new/rails/lib/backup/config.rb
+- lib/orats/templates/includes/new/rails/lib/backup/models/backup.rb
+- lib/orats/templates/includes/new/rails/lib/tasks/orats/backup.rake
+- lib/orats/templates/includes/new/rails/lib/tasks/orats/favicon.rake
+- lib/orats/templates/includes/new/rails/public/404.html
+- lib/orats/templates/includes/new/rails/public/422.html
+- lib/orats/templates/includes/new/rails/public/500.html
+- lib/orats/templates/includes/new/rails/public/502.html
+- lib/orats/templates/includes/new/rails/test/fixtures/accounts.yml
+- lib/orats/templates/includes/new/rails/test/models/account_test.rb
+- lib/orats/templates/includes/playbook/Galaxyfile
+- lib/orats/templates/includes/playbook/site.yml
+- lib/orats/templates/playbook.rb
 - lib/orats/version.rb
 - orats.gemspec
 - test/integration/cli_test.rb

data/lib/orats/commands/new/ansible.rb

@@ -1,98 +0,0 @@
-require 'securerandom'
-
-module Orats
-  module Commands
-    module New
-      module Ansible
-        def ansible_extras
-          create_inventory
-
-          secrets_path = "#{@target_path}/secrets"
-          create_secrets secrets_path
-
-          log_task 'Update secrets path in group_vars/all.yml'
-          gsub_file "#{@target_path}/#{fix_path_for_user(Commands::Common::RELATIVE_PATHS[:inventory])}",
-                    '~/tmp/testproj/secrets/', File.expand_path(secrets_path)
-
-          log_task 'Update place holder app name in group_vars/all.yml'
-          gsub_file "#{@target_path}/#{fix_path_for_user(Commands::Common::RELATIVE_PATHS[:inventory])}",
-                    'testproj', File.basename(@target_path)
-
-          log_task 'Add ssh keypair'
-          run "ssh-keygen -t rsa -P '' -f #{secrets_path}/id_rsa"
-
-          log_task 'Add self signed ssl certificates'
-          run create_rsa_certificate(secrets_path, 'sslkey.key', 'sslcert.crt')
-
-          log_task 'Add monit pem file'
-          run "#{create_rsa_certificate(secrets_path,
-                                        'monit.pem', 'monit.pem')} && openssl gendh 512 >> #{secrets_path}/monit.pem"
-
-          install_role_dependencies unless @options[:skip_galaxy]
-        end
-
-        private
-
-        def create_inventory
-          log_task 'Add ansible inventory'
-          run "mkdir -p #{@target_path}/inventory/group_vars"
-
-          local_to_user Commands::Common::RELATIVE_PATHS[:hosts]
-          local_to_user Commands::Common::RELATIVE_PATHS[:inventory]
-        end
-
-        def local_to_user(file)
-          fixed_file = fix_path_for_user(file)
-
-          log_task "Add #{fixed_file}"
-          run "cp #{base_path}/#{file} #{@target_path}/#{fixed_file}"
-        end
-
-        def create_secrets(secrets_path)
-          log_task 'Add ansible secrets'
-          run "mkdir #{secrets_path}"
-
-          save_secret_string "#{secrets_path}/postgres_password"
-          save_secret_string "#{secrets_path}/redis_password"
-          save_secret_string "#{secrets_path}/mail_password"
-          save_secret_string "#{secrets_path}/rails_token"
-          save_secret_string "#{secrets_path}/devise_token"
-          save_secret_string "#{secrets_path}/devise_pepper_token"
-        end
-
-        def save_secret_string(file)
-          File.open(file, 'w+') { |f| f.write(SecureRandom.hex(64)) }
-        end
-
-        def create_rsa_certificate(secrets_path, keyout, out)
-          "openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj '/C=US/ST=Foo/L=Bar/O=Baz/CN=qux.com' -keyout #{secrets_path}/#{keyout} -out #{secrets_path}/#{out}"
-        end
-
-        def install_role_dependencies
-          log_task 'Update ansible roles from the galaxy'
-
-          galaxy_install =
-              "ansible-galaxy install -r #{base_path}/#{Commands::Common::RELATIVE_PATHS[:galaxyfile]} --force"
-
-          galaxy_out = run(galaxy_install, capture: true)
-
-          if galaxy_out.include?('you do not have permission')
-            if @options[:sudo_password].empty?
-              sudo_galaxy_command = 'sudo'
-            else
-              sudo_galaxy_command = "echo #{@options[:sudo_password]} | sudo -S"
-            end
-
-            run("#{sudo_galaxy_command} #{galaxy_install}")
-          end
-        end
-
-        private
-
-        def fix_path_for_user(file)
-          file.sub('templates/includes/', '')
-        end
-      end
-    end
-  end
-end

data/lib/orats/commands/new/exec.rb

@@ -1,60 +0,0 @@
-require 'orats/commands/common'
-require 'orats/commands/new/ansible'
-require 'orats/commands/new/rails'
-require 'orats/commands/new/server'
-
-module Orats
-  module Commands
-    module New
-      class Exec < Commands::Common
-        include Ansible
-        include Rails
-        include Server
-
-        def initialize(target_path = '', options = {})
-          super
-
-          @active_path = services_path
-        end
-
-        def init
-          check_exit_conditions
-
-          rails_template 'base' do
-            gsub_postgres_info
-            gsub_redis_info unless @options[:redis_password].empty?
-            gsub_project_path
-            gsub_readme
-
-            bundle_install
-            bundle_binstubs
-            spring_binstub
-
-            create_and_migrate_database
-            generate_home_page
-            run_rake 'orats:favicons'
-          end
-
-          if @options[:auth]
-            rails_template 'auth', '--skip ' do
-              run_rake 'db:migrate db:seed'
-            end
-          end
-
-          ansible_extras unless @options[:skip_extras]
-
-          custom_rails_template unless @options[:template].empty?
-
-          server_start unless @options[:skip_server_start]
-        end
-
-        private
-
-        def services_path
-          @options[:skip_extras] ? @target_path
-          : "#{@target_path}/services/#{File.basename @target_path}"
-        end
-      end
-    end
-  end
-end

data/lib/orats/commands/outdated/exec.rb

@@ -1,46 +0,0 @@
-require 'orats/commands/common'
-require 'orats/version'
-require 'orats/commands/outdated/parse'
-require 'orats/commands/outdated/compare'
-
-module Orats
-  module Commands
-    module Outdated
-      class Exec < Commands::Common
-        include Parse
-        include Compare
-
-        def initialize(target_path = '', options = {})
-          super
-
-          @remote_galaxyfile = galaxyfile url_to_string(@remote_paths[:galaxyfile])
-          @remote_inventory  = inventory url_to_string(@remote_paths[:inventory])
-          @remote_playbook   = playbook url_to_string(@remote_paths[:playbook])
-
-          @local_galaxyfile = galaxyfile file_to_string(@local_paths[:galaxyfile])
-          @local_inventory  = inventory file_to_string(@local_paths[:inventory])
-          @local_playbook   = playbook file_to_string(@local_paths[:playbook])
-        end
-
-        def init
-          remote_to_local_gem_versions
-          remote_to_local_galaxyfiles
-          remote_to_local 'inventory', 'variables', @remote_inventory, @local_inventory
-          remote_to_local 'playbook', 'roles', @remote_playbook, @local_playbook
-
-          unless @options[:playbook].empty?
-            local_to_user('playbook', 'roles', @options[:playbook], @local_playbook) do
-              playbook file_to_string(@options[:playbook])
-            end
-          end
-
-          unless @options[:inventory].empty?
-            local_to_user('inventory', 'variables', @options[:inventory], @local_inventory) do
-              inventory file_to_string(@options[:inventory])
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/orats/templates/play.rb

@@ -1,185 +0,0 @@
-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", '')
-  default_value   = "YOUR_#{field.upcase}"
-
-  git_field_value.to_s.empty? ? default_value : git_field_value
-end
-
-# ---
-
-def delete_generated_rails_code
-  log_task __method__
-
-  run 'rm -rf * .git .gitignore'
-end
-
-def add_playbook_directory
-  log_task __method__
-
-  run "mkdir -p #{app_name}"
-  run "mv #{app_name}/* ."
-  run "rm -rf #{app_name}"
-  git :init
-  git_commit 'Initial commit'
-end
-
-def add_license
-  log_task __method__
-
-  author_name  = git_config 'name'
-  author_email = git_config 'email'
-
-  run 'rm -rf LICENSE'
-  file 'LICENSE' do
-    <<-S
-The MIT License (MIT)
-
-Copyright (c) #{Time.now.year} #{author_name} <#{author_email}>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-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.
-    S
-  end
-  git_commit 'Add MIT license'
-end
-
-def add_main_playbook
-  log_task __method__
-
-  file 'site.yml' do
-    <<-S
----
-- name: ensure all servers are commonly configured
-  hosts: all
-  sudo: true
-
-  roles:
-    - { role: nickjj.user, tags: [common, user] }
-
-- name: ensure database servers are configured
-  hosts: database
-  sudo: true
-
-  roles:
-    - role: nickjj.security
-      tags: [database, security]
-      security_ufw_ports:
-        - rule: deny
-          port: 80
-          proto: tcp
-    - { role: nickjj.postgres, tags: [database, postgres] }
-
-- name: ensure cache servers are configured
-  hosts: cache
-  sudo: true
-
-  roles:
-    - role: nickjj.security
-      tags: [cache, security]
-      security_ufw_ports:
-        - rule: deny
-          port: 80
-          proto: tcp
-    - { role: DavidWittman.redis, tags: [cache, redis] }
-
-- name: ensure app servers are configured
-  hosts: app
-  sudo: true
-
-  roles:
-    - role: nickjj.security
-      tags: [app, security]
-      security_ufw_ports:
-        - rule: allow
-          port: 80
-          proto: tcp
-    - { role: nickjj.ruby, tags: [app, ruby] }
-    - { role: nickjj.nodejs, tags: [app, nodejs] }
-    - { role: nickjj.nginx, tags: [app, nginx] }
-    - { role: nickjj.rails, tags: [app, rails] }
-    - { role: nickjj.whenever, tags: [app, rails] }
-    - { role: nickjj.pumacorn, tags: [app, rails] }
-    - { role: nickjj.sidekiq, tags: [app, rails] }
-    - { role: nickjj.monit, tags: [app, monit] }
-    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
-
-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