orats 0.9.7 → 5.0.0

data/test/test_helper.rb

@@ -1,56 +1,18 @@
 require 'minitest/autorun'
 require 'securerandom'
-require_relative '../lib/orats/commands/new/server'
 
 module Orats
   # test helpers
   module Test
-    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_PORT     = ENV['POSTGRES_PORT']     || '5432'
-    POSTGRES_USERNAME = ENV['POSTGRES_USERNAME'] || 'postgres'
-    POSTGRES_PASSWORD = ENV['POSTGRES_PASSWORD'] || ''
-    REDIS_LOCATION    = ENV['REDIS_LOCATION']    || 'localhost'
-    REDIS_PORT        = ENV['REDIS_PORT']        || '6379'
-    REDIS_PASSWORD    = ENV['REDIS_PASSWORD']    || ''
-
-    CREDENTIALS = "-l #{POSTGRES_LOCATION} -o #{POSTGRES_PORT} " + \
-                  "-u #{POSTGRES_USERNAME} -p #{POSTGRES_PASSWORD} " + \
-                  "-n #{REDIS_LOCATION} -r #{REDIS_PORT} -d #{REDIS_PASSWORD}"
-
-    INCLUDES_PATH   = File.absolute_path('../../lib/orats/templates/includes',
-                                         __FILE__)
-    BINARY_PATH     = File.absolute_path('../../bin/orats', __FILE__)
-    ORATS_NEW_FLAGS = "#{CREDENTIALS} -S"
+    TEST_PATH      = ENV['TEST_PATH'] || '/tmp'
+    TEMPLATES_PATH = File.absolute_path('../../lib/orats/templates', __FILE__)
+    BINARY_PATH    = File.absolute_path('../../bin/orats', __FILE__)
 
     def orats(command, options = {})
-      cmd, app_name   = command.split(' ')
-      command         = "#{cmd} #{TEST_PATH}/#{app_name}" unless app_name.nil?
-
-      insert_answer = answer(options)
-      if insert_answer
-        prepend_command = "#{insert_answer} | "
-      else
-        prepend_command = ''
-      end
-
-      system "#{prepend_command} #{BINARY_PATH} #{command} #{options[:flags]}"
-    end
+      cmd, app_name = command.split(' ')
+      command       = "#{cmd} #{TEST_PATH}/#{app_name}" unless app_name.nil?
 
-    def assert_count(input, regex, expected)
-      assert input.scan(regex).size == 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)
+      system "#{BINARY_PATH} #{command} #{options[:flags]}"
     end
 
     def assert_path(file_or_dir)
@@ -58,25 +20,14 @@ module Orats
              "Expected path '#{file_or_dir}' to exist"
     end
 
-    def refute_path(file_or_dir)
-      refute File.exist?(file_or_dir),
-             "Expected path '#{file_or_dir}' to exist"
-    end
-
     private
 
-    def answer(options)
-      return unless options.key?(:answer)
-
-      if options[:answer] == 'y' || options[:answer] == 'yes'
-        'yes'
-      else
-        'no'
-      end
+    def absolute_test_path
+      File.join(TEST_PATH, @target_path)
     end
 
     def generate_app_name
-      "a_#{SecureRandom.hex(8)}"
+      "orats_#{SecureRandom.hex(8)}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 5.0.0
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,7 +66,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
-description: Generate modern Ruby on Rails applications using  best practices.
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+description: Generate Dockerized Ruby on Rails applications using best practices.
 email:
 - nick.janetakis@gmail.com
 executables:
@@ -75,77 +89,112 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/orats
 - lib/orats.rb
-- lib/orats/argv_adjust.rb
 - lib/orats/cli.rb
+- lib/orats/cli_help/destroy
 - 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/new.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/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/_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/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/unicorn.rb
-- 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/public/deploy.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/base/.dockerignore
+- lib/orats/templates/base/.gitignore
+- lib/orats/templates/base/.rubocop.yml
+- lib/orats/templates/base/Dockerfile
+- lib/orats/templates/base/Gemfile
+- lib/orats/templates/base/Gemfile.lock
+- lib/orats/templates/base/README.md
+- lib/orats/templates/base/Rakefile
+- lib/orats/templates/base/app/assets/config/manifest.js
+- lib/orats/templates/base/app/assets/images/.keep
+- lib/orats/templates/base/app/assets/javascripts/application.js
+- lib/orats/templates/base/app/assets/javascripts/cable.js
+- lib/orats/templates/base/app/assets/javascripts/channels/.keep
+- lib/orats/templates/base/app/assets/stylesheets/application.scss
+- lib/orats/templates/base/app/channels/application_cable/channel.rb
+- lib/orats/templates/base/app/channels/application_cable/connection.rb
+- lib/orats/templates/base/app/controllers/application_controller.rb
+- lib/orats/templates/base/app/controllers/concerns/.keep
+- lib/orats/templates/base/app/controllers/pages_controller.rb
+- lib/orats/templates/base/app/helpers/application_helper.rb
+- lib/orats/templates/base/app/helpers/pages_helper.rb
+- lib/orats/templates/base/app/jobs/application_job.rb
+- lib/orats/templates/base/app/mailers/application_mailer.rb
+- lib/orats/templates/base/app/models/application_record.rb
+- lib/orats/templates/base/app/models/concerns/.keep
+- lib/orats/templates/base/app/views/layouts/_flash.html.erb
+- lib/orats/templates/base/app/views/layouts/_footer.html.erb
+- lib/orats/templates/base/app/views/layouts/_google_analytics.html.erb
+- lib/orats/templates/base/app/views/layouts/_navigation.html.erb
+- lib/orats/templates/base/app/views/layouts/application.html.erb
+- lib/orats/templates/base/app/views/layouts/mailer.html.erb
+- lib/orats/templates/base/app/views/layouts/mailer.text.erb
+- lib/orats/templates/base/app/views/pages/home.html.erb
+- lib/orats/templates/base/bin/bundle
+- lib/orats/templates/base/bin/rails
+- lib/orats/templates/base/bin/rake
+- lib/orats/templates/base/bin/setup
+- lib/orats/templates/base/bin/update
+- lib/orats/templates/base/cable/config.ru
+- lib/orats/templates/base/config.ru
+- lib/orats/templates/base/config/application.rb
+- lib/orats/templates/base/config/boot.rb
+- lib/orats/templates/base/config/cable.yml
+- lib/orats/templates/base/config/database.yml
+- lib/orats/templates/base/config/environment.rb
+- lib/orats/templates/base/config/environments/development.rb
+- lib/orats/templates/base/config/environments/production.rb
+- lib/orats/templates/base/config/environments/staging.rb
+- lib/orats/templates/base/config/environments/test.rb
+- lib/orats/templates/base/config/initializers/application_controller_renderer.rb
+- lib/orats/templates/base/config/initializers/assets.rb
+- lib/orats/templates/base/config/initializers/backtrace_silencers.rb
+- lib/orats/templates/base/config/initializers/cookies_serializer.rb
+- lib/orats/templates/base/config/initializers/filter_parameter_logging.rb
+- lib/orats/templates/base/config/initializers/inflections.rb
+- lib/orats/templates/base/config/initializers/mime_types.rb
+- lib/orats/templates/base/config/initializers/new_framework_defaults.rb
+- lib/orats/templates/base/config/initializers/session_store.rb
+- lib/orats/templates/base/config/initializers/sidekiq.rb
+- lib/orats/templates/base/config/initializers/timeout.rb
+- lib/orats/templates/base/config/initializers/wrap_parameters.rb
+- lib/orats/templates/base/config/locales/en.yml
+- lib/orats/templates/base/config/puma.rb
+- lib/orats/templates/base/config/routes.rb
+- lib/orats/templates/base/config/secrets.yml
+- lib/orats/templates/base/config/sidekiq.yml.erb
+- lib/orats/templates/base/config/spring.rb
+- lib/orats/templates/base/db/seeds.rb
+- lib/orats/templates/base/docker-compose.yml
+- lib/orats/templates/base/lib/assets/.keep
+- lib/orats/templates/base/lib/tasks/.keep
+- lib/orats/templates/base/log/.keep
+- lib/orats/templates/base/public/404.html
+- lib/orats/templates/base/public/422.html
+- lib/orats/templates/base/public/500.html
+- lib/orats/templates/base/public/apple-touch-icon-precomposed.png
+- lib/orats/templates/base/public/apple-touch-icon.png
+- lib/orats/templates/base/public/favicon.ico
+- lib/orats/templates/base/public/robots.txt
+- lib/orats/templates/base/test/controllers/.keep
+- lib/orats/templates/base/test/controllers/pages_controller_test.rb
+- lib/orats/templates/base/test/fixtures/.keep
+- lib/orats/templates/base/test/fixtures/files/.keep
+- lib/orats/templates/base/test/helpers/.keep
+- lib/orats/templates/base/test/integration/.keep
+- lib/orats/templates/base/test/mailers/.keep
+- lib/orats/templates/base/test/models/.keep
+- lib/orats/templates/base/test/test_helper.rb
+- lib/orats/templates/base/tmp/.keep
+- lib/orats/templates/base/vendor/assets/javascripts/.keep
+- lib/orats/templates/base/vendor/assets/stylesheets/.keep
 - lib/orats/ui.rb
+- lib/orats/util.rb
 - lib/orats/version.rb
 - orats.gemspec
 - test/integration/cli_test.rb
@@ -170,11 +219,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Opinionated rails application templates.
 test_files:
 - test/integration/cli_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/lib/orats/argv_adjust.rb

@@ -1,61 +0,0 @@
-require 'orats/ui'
-
-module Orats
-  # adjust ARGV by adding args from the .oratsrc file if necessary
-  class ARGVAdjust
-    include Orats::UI
-
-    def initialize(argv = ARGV)
-      @argv = argv
-
-      @default_rc_file = File.expand_path('~/.oratsrc')
-      @rc_path = ''
-    end
-
-    def init
-      rc_path @argv.first
-      return @argv if @rc_path.empty?
-
-      argv
-    end
-
-    private
-
-    def rc_path(command)
-      return unless command == 'new' || command == 'nuke'
-
-      rc_flag = @argv.index { |item| item.include?('--rc') }
-
-      if rc_flag
-        cli_rc_file(rc_flag)
-      elsif File.exist?(@default_rc_file)
-        @rc_path = @default_rc_file
-      end
-    end
-
-    def argv
-      if File.exist?(@rc_path)
-        extra_args = File.readlines(@rc_path).flat_map(&:split)
-        results 'Using values from an .oratsrc file',
-                'args', extra_args.join(' ')
-        puts
-
-        (@argv += extra_args).flatten
-      else
-        error 'The .oratsrc file cannot be found', @rc_path
-      end
-    end
-
-    def cli_rc_file(index)
-      rc_value = @argv[index]
-
-      if rc_value.include?('=')
-        @rc_path = rc_value.gsub('--rc=', '')
-        @argv.slice! index
-      elsif rc_value == '--rc'
-        @rc_path = @argv[index + 1]
-        @argv.slice! index + 1
-      end
-    end
-  end
-end

data/lib/orats/cli_help/nuke

@@ -1,19 +0,0 @@
-Delete the target path and optionally all data associated to it.
-
-Development server credentials:
-
-`--pg-location` to supply a custom postgres location [localhost]
-
-`--pg-username` to supply a custom postgres username [postgres]
-
-`--pg-password` to supply your postgres password []
-
-`--redis-location` to supply a custom redis location [localhost]
-
-`--redis-password` to supply your redis password []
-
-Options:
-
-`--skip-data` to skip deleting app specific postgres and redis data [false]
-
-`--rc` to supply an .oratsrc file path to automatically populate credentials []

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

@@ -1,59 +0,0 @@
-require 'orats/common'
-require 'orats/commands/new/rails'
-require 'orats/commands/new/server'
-
-module Orats
-  module Commands
-    module New
-      # entry point to the new command
-      class Exec < Common
-        include Rails
-        include Server
-
-        AVAILABLE_TEMPLATES = {
-          auth: 'add authentication and authorization'
-        }
-
-        def initialize(target_path = '', options = {})
-          super
-        end
-
-        def init
-          check_exit_conditions
-
-          rails_template 'base' do
-            rails_template_actions
-          end
-
-          orats_rails_template if template_exist?(@options[:template])
-          custom_rails_template unless @options[:custom].empty?
-          server_start
-        end
-
-        def available_templates
-          puts
-          log 'templates',
-              'Add `-t TEMPLATE` to the new command to mixin a template',
-              :magenta
-          puts
-
-          AVAILABLE_TEMPLATES.each_pair do |key, value|
-            log key, value, :cyan
-          end
-        end
-
-        private
-
-        def orats_to_local(source, dest)
-          includes_path = "#{base_path}/templates/includes"
-
-          unless Dir.exist?(File.dirname(dest))
-            system "mkdir -p #{File.dirname(dest)}"
-          end
-
-          system "cp #{includes_path}/#{source} #{dest}"
-        end
-      end
-    end
-  end
-end