orats 0.7.3 → 0.8.0

data/test/integration/cli_test.rb

@@ -1,6 +1,6 @@
-require 'yaml'
 require_relative '../test_helper'
 
+# integration tests for the orats cli
 class TestCLI < Minitest::Test
   include Orats::Test
 
@@ -15,104 +15,23 @@ class TestCLI < Minitest::Test
     assert_nuked unless @target_path.nil?
   end
 
-  def test_project
-    assert_project ansible: :assert
+  def test_new
+    assert_new
   end
 
-  def test_project_with_auth
-    assert_project '--template auth', ansible: :assert
+  def test_new_with_auth
+    assert_new '--template auth'
   end
 
-  def test_project_without_ansible
-    assert_project '--skip-ansible', ansible: :refute
-  end
-
-  def test_project_with_invalid_template
+  def test_new_with_invalid_template
     @target_path = generate_app_name
     @extra_flags = "#{ORATS_NEW_FLAGS} --template foo"
 
-    assert_orats 'project', 'not a valid template'
-  end
-
-  def test_inventory
-    assert_inventory
-  end
-
-  def test_playbook
-    assert_playbook
-  end
-
-  def test_playbook_update_roles
-    target_path = generate_app_name
-
-    assert_playbook target_path
-    assert_playbook target_path
-  end
-
-  def test_role
-    @target_path = 'githubname.myrole'
-    @extra_flags = '-r ansible-myrole'
-
-    out, err = capture_orats('role')
-
-    assert_match /success/, out, err
-
-    absolute_target_path = "#{TEST_PATH}/#{@target_path}"
-
-    assert_path "#{absolute_target_path}/.gitignore"
-    assert_path "#{absolute_target_path}/.travis.yml"
-    assert_path "#{absolute_target_path}/README.md"
-    assert_path "#{absolute_target_path}/LICENSE"
-    assert_path "#{absolute_target_path}/tests"
-    assert_path "#{absolute_target_path}/tests/main.yml"
-    assert_path "#{absolute_target_path}/tests/inventory"
-    refute_path "#{absolute_target_path}/files/main.yml"
-    refute_path "#{absolute_target_path}/templates/main.yml"
-
-    meta_main  = IO.read("#{absolute_target_path}/meta/main.yml")
-    readme     = IO.read("#{absolute_target_path}/README.md")
-    tests_main = IO.read("#{absolute_target_path}/tests/main.yml")
-
-    refute meta_main.include?('author_name')
-    assert_count readme, 'githubname.myrole', 2
-    assert_count readme, 'ansible-myrole', 3
-    assert_count tests_main, 'myrole', 1
-  end
-
-  def test_diff
-    assert_diff
-
-    out, err = capture_orats('diff')
-
-    assert_count out, 'gem', 1
-    assert_count out, 'missing', 0
-    assert_count out, 'outdated', 0
-    assert_count out, 'extra', 0
-  end
-
-  def test_diff_with_differences
-    file_paths = assert_diff
-
-    hosts_path      = "#{file_paths[0]}/hosts"
-    inventory_path  = "#{file_paths[0]}/group_vars/all.yml"
-    galaxyfile_path = "#{file_paths[1]}/Galaxyfile"
-    site_path       = "#{file_paths[1]}/site.yml"
-
-    gsub_file(hosts_path, '[cache]', '[something]')
-    gsub_file(inventory_path, 'postgres_user', 'hello_world')
-    gsub_file(galaxyfile_path, /nickjj.ruby,v.*$/, "nickjj.ruby,v0.1.2\nfoo")
-    gsub_file(site_path, 'nickjj.whenever', 'bar')
-
-    out, err = capture_orats('diff')
-
-    assert_count out, 'gem', 1
-    assert_count out, 'missing', 3
-    assert_count out, 'outdated', 1
-    assert_count out, 'extra', 4
+    assert_orats 'new', 'not a valid template'
   end
 
   def test_templates
-    assert_orats 'templates', '--template auth'
+    assert_orats 'templates', 'auth'
   end
 
   def test_version
@@ -121,30 +40,22 @@ class TestCLI < Minitest::Test
 
   private
 
-  def assert_orats(command, match_regex, ansible: nil)
+  def assert_orats(command, match_regex)
     out, err = capture_orats(command)
 
-    assert_match /#{match_regex}/, out, err unless match_regex.empty?
-
-    assert_or_refute_ansible ansible if ansible
+    assert_match(/#{match_regex}/, out, err) unless match_regex.empty?
   end
 
-  def assert_project(flags = '', ansible: nil)
+  def assert_new(flags = '')
     @target_path         = generate_app_name
-    absolute_target_path = "#{TEST_PATH}/#{@target_path}"
     @extra_flags         = "#{ORATS_NEW_FLAGS} #{flags}"
+    absolute_target_path = "#{TEST_PATH}/#{@target_path}"
 
-    assert_orats 'project', 'Start your server', ansible: ansible
-
-    if ansible == :assert
-      assert_ansible_yaml "#{absolute_target_path}/inventory/group_vars/all.yml"
-    end
-
-    absolute_target_path << "/services/#{@target_path}"
-    assert_project_tests_pass absolute_target_path
+    assert_orats 'new', 'Start your server'
+    assert_new_tests_pass absolute_target_path
   end
 
-  def assert_project_tests_pass(target_path)
+  def assert_new_tests_pass(target_path)
     out, err = capture_subprocess_io do
       system "cd #{target_path} && bundle exec rake test"
     end
@@ -153,87 +64,32 @@ class TestCLI < Minitest::Test
     assert out.include?('0 failures') && out.include?('0 errors'), err
   end
 
-  def assert_inventory
-    @target_path = generate_app_name
-
-    assert_orats 'inventory', 'success'
-    assert_path "#{TEST_PATH}/#{@target_path}/inventory/hosts"
-    assert_ansible_yaml "#{TEST_PATH}/#{@target_path}/inventory/group_vars/all.yml"
-  end
-
-  def assert_playbook(target_path = generate_app_name)
-    @target_path = target_path
-
-    assert_orats 'playbook', 'success'
-    assert_path "#{TEST_PATH}/#{@target_path}/Galaxyfile"
-    assert_ansible_yaml "#{TEST_PATH}/#{@target_path}/common.yml"
-    assert_ansible_yaml "#{TEST_PATH}/#{@target_path}/site.yml"
-  end
-
-  def assert_diff
-    assert_inventory
-    inventory_path = "#{TEST_PATH}/#{@target_path}/inventory"
-
-    assert_playbook
-    playbook_path = "#{TEST_PATH}/#{@target_path}"
-
-    @target_path = ''
-    @extra_flags = "-i #{inventory_path} -p #{playbook_path}"
-
-    [inventory_path, playbook_path]
-  end
-
   def assert_nuked(options = {})
-    out, err = capture_subprocess_io do
+    out, _ = capture_subprocess_io do
       orats "nuke #{@target_path}", flags: options[:flags], answer: 'y'
     end
 
-    assert_match /#{@target_path}/, out
+    assert_match(/#{@target_path}/, out)
     system "rm -rf #{TEST_PATH}"
   end
 
   def assert_count(input, regex, expected)
     assert input.scan(regex).size == expected,
-           "Found #{input.scan(regex).size} matches for '#{regex}' but expected #{expected}"
+           "Found #{input.scan(regex).size} matches for '#{regex}' but " + \
+           "expected #{expected}"
   end
 
   def assert_in_file(file_path, match_regex)
     file_contents = `cat #{file_path}`
-    assert_match /#{match_regex}/, file_contents
+    assert_match(/#{match_regex}/, file_contents)
   end
 
   def assert_path(file_or_dir)
-    assert File.exists?(file_or_dir), "Expected path '#{file_or_dir}' to exist"
+    assert File.exist?(file_or_dir), "Expected path '#{file_or_dir}' to exist"
   end
 
   def refute_path(file_or_dir)
-    refute File.exists?(file_or_dir), "Expected path '#{file_or_dir}' to exist"
-  end
-
-  def assert_or_refute_ansible(assert_or_refute)
-    absolute_target_path = "#{TEST_PATH}/#{@target_path}"
-
-    assert_path "#{absolute_target_path}/services"
-    send("#{assert_or_refute.to_s}_path",
-         "#{absolute_target_path}/inventory")
-    send("#{assert_or_refute.to_s}_path",
-         "#{absolute_target_path}/secrets")
-  end
-
-  def assert_ansible_yaml(file_path)
-    begin
-      file                 = IO.read(file_path)
-      invalid_ansible_yaml = file.match(/^([^#].\w): {/)
-
-      if invalid_ansible_yaml
-        assert false, "Invalid yaml syntax found near:\n #{invalid_ansible_yaml}\n\nYou need to include quotes around values that start with jinja template tags:\n Example, foo: '{{ bar }}'"
-        return
-      end
-
-      assert YAML.load(file)
-    rescue Psych::SyntaxError => ex
-      assert false, ex.message
-    end
+    refute File.exist?(file_or_dir), "Expected path '#{file_or_dir}' to exist"
   end
 
   def capture_orats(command)
@@ -252,20 +108,15 @@ class TestCLI < Minitest::Test
           line.include?('Running') || line.include?('Run options') ||
           line.empty?
     end
+  end
 
+  def print_rails_test_results(out)
     puts
-    puts '-'*80
+    puts '-' * 80
     puts 'Results of running `bundle exec rake test` on the generated test app:'
-    puts '-'*80
-    puts out_lines.join("\n\n").rstrip
-    puts '-'*80
+    puts '-' * 80
+    puts out.join("\n\n").rstrip
+    puts '-' * 80
     puts
   end
-
-  def gsub_file(file_path, replace, with)
-    IO.write(file_path, File.open(file_path) do |f|
-      f.read.gsub(replace, with)
-    end
-    )
-  end
 end

data/test/test_helper.rb

@@ -1,19 +1,25 @@
 require 'minitest/autorun'
 require 'securerandom'
-require_relative '../lib/orats/commands/project/server'
+require_relative '../lib/orats/commands/new/server'
 
 module Orats
+  # test helpers
   module Test
-    include Commands::Project::Server
+    include Commands::New::Server
+
+    # creating and destroying databases needs to be done with raw psql
+    # commands when the host isn't localhost or 127.0.0.1
 
     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'
+    POSTGRES_PASSWORD = ENV['POSTGRES_PASSWORD'] || ''
     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}"
+    CREDENTIALS = "-l #{POSTGRES_LOCATION} -u #{POSTGRES_USERNAME} " + \
+                  " -p #{POSTGRES_PASSWORD} " + \
+                  " -n #{REDIS_LOCATION} -d #{REDIS_PASSWORD}"
 
     INCLUDES_PATH   = File.absolute_path('../../lib/orats/templates/includes',
                                          __FILE__)
@@ -22,14 +28,13 @@ module Orats
 
     def orats(command, options = {})
       cmd, app_name   = command.split(' ')
-      prepend_command = ''
       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'
-
+      insert_answer = answer(options)
+      if insert_answer
         prepend_command = "#{insert_answer} | "
+      else
+        prepend_command = ''
       end
 
       system "#{prepend_command} #{BINARY_PATH} #{command} #{options[:flags]}"
@@ -37,6 +42,16 @@ module Orats
 
     private
 
+    def answer(options)
+      return unless options.key?(:answer)
+
+      if options[:answer] == 'y' || options[:answer] == 'yes'
+        'yes'
+      else
+        'no'
+      end
+    end
+
     def generate_app_name
       "a_#{SecureRandom.hex(8)}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,8 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
-description: A collection of rails application templates using modern versions of
-  Ruby on Rails. Launch new applications and the infrastructure to run them in seconds.
+description: Generate modern Ruby on Rails applications using  best practices.
 email:
 - nick.janetakis@gmail.com
 executables:
@@ -77,30 +76,28 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/orats
 - lib/orats.rb
+- lib/orats/argv_adjust.rb
 - lib/orats/cli.rb
-- lib/orats/commands/common.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/cli_help/new
+- lib/orats/cli_help/nuke
+- lib/orats/commands/new/exec.rb
+- lib/orats/commands/new/rails.rb
+- lib/orats/commands/new/server.rb
 - lib/orats/commands/nuke.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/role.rb
-- lib/orats/commands/ui.rb
+- lib/orats/common.rb
+- lib/orats/postgres.rb
+- lib/orats/process.rb
+- lib/orats/redis.rb
+- lib/orats/shell.rb
 - lib/orats/templates/auth.rb
 - lib/orats/templates/base.rb
 - lib/orats/templates/includes/common/.gitignore
 - lib/orats/templates/includes/common/LICENSE
-- lib/orats/templates/includes/inventory/group_vars/all.yml
-- lib/orats/templates/includes/inventory/hosts
 - lib/orats/templates/includes/new/rails/.env
 - lib/orats/templates/includes/new/rails/Gemfile
 - lib/orats/templates/includes/new/rails/Procfile
@@ -136,10 +133,10 @@ files:
 - 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/schedule.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
@@ -150,16 +147,7 @@ files:
 - 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/common.yml
-- lib/orats/templates/includes/playbook/site.yml
-- lib/orats/templates/includes/role/.travis.yml
-- lib/orats/templates/includes/role/README.md
-- lib/orats/templates/includes/role/meta/main.yml
-- lib/orats/templates/includes/role/tests/inventory
-- lib/orats/templates/includes/role/tests/main.yml
-- lib/orats/templates/playbook.rb
-- lib/orats/templates/role.rb
+- lib/orats/ui.rb
 - lib/orats/version.rb
 - orats.gemspec
 - test/integration/cli_test.rb

data/lib/orats/commands/common.rb

@@ -1,146 +0,0 @@
-require 'orats/commands/ui'
-require 'orats/commands/diff/parse'
-
-module Orats
-  module Commands
-    class Common
-      include Thor::Base
-      include Thor::Shell
-      include Thor::Actions
-      include UI
-      include Diff::Parse
-
-      RELATIVE_PATHS = {
-          galaxyfile: 'templates/includes/playbook/Galaxyfile',
-          playbook:   'templates/includes/playbook/site.yml',
-          hosts:      'templates/includes/inventory/hosts',
-          inventory:  'templates/includes/inventory/group_vars/all.yml',
-          version:    'version.rb'
-      }
-
-      attr_accessor :remote_gem_version, :remote_paths, :local_paths
-
-      def initialize(target_path = '', options = {})
-        @target_path = target_path
-        @options     = options
-        @active_path = @target_path
-
-        @local_paths  = {}
-        @remote_paths = {}
-
-        build_common_paths
-
-        self.destination_root = Dir.pwd
-        @behavior             = :invoke
-      end
-
-      def self.copy_from_local_gem(source, dest)
-        base_path     = File.join(File.expand_path(File.dirname(__FILE__)),
-                                  '..')
-        template_path = "#{base_path}/templates/includes"
-
-        system "mkdir -p #{File.dirname(dest)}" unless Dir.exist?(File.dirname(dest))
-        system "cp #{template_path}/#{source} #{dest}"
-      end
-
-      def base_path
-        File.join(File.expand_path(File.dirname(__FILE__)), '..')
-      end
-
-      def repo_path
-        %w(https://raw.githubusercontent.com/nickjj/orats lib/orats)
-      end
-
-      def url_to_string(url)
-        begin
-          open(url).read
-        rescue *[OpenURI::HTTPError, SocketError] => ex
-          log_error 'error', "Error accessing URL #{url}",
-                    'message', ex
-          exit 1
-        end
-      end
-
-      def file_to_string(path)
-        if File.exist?(path) && File.file?(path)
-          IO.read(path)
-        else
-          log_error 'error', 'Error finding file',
-                    'message', path
-          exit 1
-        end
-      end
-
-      def exit_if_path_exists(extend_path='')
-        log_task 'Check if this path exists'
-
-        extended_path = @active_path.dup
-        extended_path = File.join(extended_path, extend_path) unless extend_path
-        .empty?
-
-        if Dir.exist?(extended_path) || File.exist?(extended_path)
-          log_error 'error', 'A file or directory already exists at this location', 'path', extended_path
-          exit 1
-        end
-      end
-
-      def exit_if_process(check_for, *processes)
-        case check_for
-          when :not_found
-            command = 'which'
-            phrase  = 'on your system path'
-          when :not_running
-            command = 'ps cax | grep'
-            phrase  = 'running'
-          else
-            command = ''
-            phrase  = ''
-        end
-
-        processes.each do |process|
-          log_task "Check if #{process} is #{phrase}"
-
-          exit 1 if process_unusable?("#{command} #{process}", process, phrase)
-        end
-      end
-
-      private
-
-      def build_common_paths
-        @remote_paths[:version] = select_branch 'master', RELATIVE_PATHS[:version]
-        @remote_gem_version     = gem_version
-
-        RELATIVE_PATHS.each_pair do |key, value|
-          @local_paths[key]  = "#{base_path}/#{value}"
-          @remote_paths[key] = select_branch @remote_gem_version,
-                                             check_old_remote_file_paths(value)
-        end
-      end
-
-      def check_old_remote_file_paths(url)
-        new_url = url.dup
-
-        if @remote_gem_version[1..-1] < '0.6.6'
-          new_url.gsub!('playbook/', '')
-          new_url.gsub!('includes/site.yml', 'play.rb')
-        end
-
-        new_url
-      end
-
-      def select_branch(branch, value)
-        "#{repo_path[0]}/#{branch}/#{repo_path[1]}/#{value}"
-      end
-
-      def process_unusable?(command, process, phrase)
-        command_output = run(command, capture: true)
-
-        log_error 'error', "Cannot detect #{process}", 'question', "Are you sure #{process} is #{phrase}?", true do
-          log_status_bottom 'tip', "#{process} must be #{phrase} before running this orats command", :white
-        end if command_output.empty?
-
-        command_output.empty?
-      end
-    end
-  end
-end

data/lib/orats/commands/diff/compare.rb

@@ -1,106 +0,0 @@
-module Orats
-  module Commands
-    module Diff
-      module Compare
-        def remote_gem_vs_yours
-          log_remote_info 'gem',
-                          'Compare your orats version to the latest version',
-                          'version',
-                          "You have v#{VERSION} and the latest version is #{@remote_gem_version}"
-        end
-
-        def remote_vs_yours(label, remote, yours, exact_match)
-          log_remote_info label,
-                          "Compare your #{label} to the latest version (#{@remote_gem_version})",
-                          'file', File.basename(Common::RELATIVE_PATHS[label
-                                                                       .to_sym])
-
-          outdated_and_missing = difference(remote, yours, exact_match, true)
-          extras               = difference(yours, remote, exact_match)
-          both_lists           = outdated_and_missing + extras
-          sorted_diff          = sort_difference(both_lists).uniq { |item| item[:name] }
-
-          if sorted_diff.empty?
-            log_status_bottom 'results', 'no differences were found',
-                              :magenta, true
-          else
-            padded_length = pad_by(sorted_diff)
-
-            sorted_diff.each do |item|
-              name    = sorted_diff.empty? ? item[:name] : item[:name].ljust(padded_length)
-              version = item[:version].empty? ? '' : "#{set_color('|',
-                                                                  :cyan)} #{item[:version]}"
-
-              log_status_bottom item[:status], "#{name} #{version}",
-                                item[:color], true
-            end
-          end
-        end
-
-        private
-
-        def name_and_version_from_line(line)
-          line.split(',')
-        end
-
-        def pad_by(sorted_diff)
-          longest_role = sorted_diff.max_by { |s| s[:name].length }
-          longest_role[:name].length
-        end
-
-        def sort_difference(diff_list)
-          # custom sort order on the color key
-          diff_list.sort_by { |item| {red:    1,
-                                      yellow: 2,
-                                      green:  3}[item[:color]] }
-        end
-
-        def difference(remote, yours, exact_match, missing_and_outdated = false)
-          @diff_list      = []
-          yours_as_string = yours.join
-
-          if missing_and_outdated
-            diff = remote - yours
-
-            diff.each do |line|
-              line_parts      = name_and_version_from_line(line)
-              status          = 'outdated'
-              color           = :yellow
-              search_contents = exact_match ? yours : yours_as_string
-
-              unless search_contents.include?(line_parts[0])
-                status = 'missing'
-                color  = :red
-              end
-
-              @diff_list.push({
-                                  color:   color,
-                                  status:  status,
-                                  name:    line_parts[0],
-                                  version: line_parts[1] || ''
-                              })
-
-            end
-          else
-            remote.each do |line|
-              unless yours.include?(line)
-                line_parts = name_and_version_from_line(line)
-                status     = 'extra'
-                color      = :green
-
-                @diff_list.push({
-                                    color:   color,
-                                    status:  status,
-                                    name:    line_parts[0],
-                                    version: line_parts[1] || ''
-                                })
-              end
-            end
-          end
-
-          @diff_list
-        end
-      end
-    end
-  end
-end