orats 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2c27bb2c2a590489d6a99623e2d7f558d379d9
-  data.tar.gz: 4094e0ed724bda3bb83c461afd5027009ea41807
+  metadata.gz: b087e4b8c21cbfe5c1dcea8b3216f91d1b1631ff
+  data.tar.gz: efc9b450b01b1f0417fa8eb8a164c169e6d99bce
 SHA512:
-  metadata.gz: 380dd962f0246cb071c3bef38867bb1f0ed289ba796d9f95ff329e7a213766b61fec6573ded56bf9740c5d766584e280a2abe60c38b37c1f76b64fee0ef03769
-  data.tar.gz: 148b5771f26520873df6bb54f098a96d02f011fbd7d4d2b262fbe196b6550e4a1b7b72064fd955f09c671149f1fdafa57ee6f14cc58fe2e4a0cbb8f3fd515306
+  metadata.gz: 4715024b5981df05313fb886f2672f456ec8a7c524dbc109e1159ecc76930cd22dc3a61d3ac1adb5387eb9e239cbb7ebdd3273f67be655e2eb88c0f2dc7292b0
+  data.tar.gz: eb6d7aadc7522f5cc0378ce780debf1e77ce2f60c94c9c6f422f8322c58e286359fef650f70004c567cd950ec2230867a5bd84e91b32280e4c9eb236455f0c60

data/README.md

@@ -121,9 +121,10 @@ All of the changes have git commits to go with them. After generating a project
         - Use the `dotenv` gem to manage environment variables
         - Use `foreman` to manage the app's processes
         - Use `bullet`, `rack mini profiler` and `meta_request` for profiling/analysis
+        - Log everything to 1 file and rotate it
         - Set `scss`/`coffee` as the default generator engines
     - **Production mode only**:
-        - Setup log rotation
+        - Log everything to 1 file and write the rails output to syslog
         - Add popular file types to the assets precompile list
         - Compress `css`/`js` when running `rake assets:precompile`
     - Change validation errors to output inline on each element instead of a big list

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

@@ -28,13 +28,11 @@ module Orats
         def custom_rails_template
           task 'Add custom template'
 
-          if @options[:custom].include('://')
-            url_to_string(@options[:custom])
-          else
-            file_to_string(@options[:custom])
-          end
-
           rails_template '', "--skip --template #{@options[:custom]}"
+          run_from @target_path,
+                   'rm -rf app/assets/stylesheets/application.css'
+
+          commit 'Add custom template'
         end
 
         def rails_template_actions

data/lib/orats/templates/auth.rb

@@ -9,10 +9,6 @@ require 'securerandom'
 # -----------------------------------------------------------------------------
 # private functions
 # -----------------------------------------------------------------------------
-def generate_token
-  SecureRandom.hex(64)
-end
-
 def method_to_sentence(method)
   method.tr!('_', ' ')
   method[0] = method[0].upcase
@@ -63,7 +59,7 @@ def update_gemfile
   inject_into_file 'Gemfile', before: "\ngem 'kaminari'" do
     <<-S
 
-gem 'devise', '~> 3.2.4'
+gem 'devise', '~> 3.3.0'
 gem 'devise-async', '~> 0.9.0'
 gem 'pundit', '~> 0.2.3'
     S
@@ -74,19 +70,12 @@ end
 def update_dotenv
   task __method__
 
-  inject_into_file '.env', before: "\nSMTP_ADDRESS" do
-    <<-CODE
-TOKEN_DEVISE_SECRET: #{generate_token}
-TOKEN_DEVISE_PEPPER: #{generate_token}
-    CODE
-  end
-
   inject_into_file '.env', before: "\nDATABASE_NAME" do
     <<-CODE
 ACTION_MAILER_DEVISE_DEFAULT_FROM: info@#{app_name}.com
     CODE
   end
-  commit 'Add devise tokens and default e-mail'
+  commit 'Add devise default e-mail'
 end
 
 def run_bundle_install
@@ -141,14 +130,9 @@ def update_devise_initializer
   gsub_file 'config/initializers/devise.rb',
             "'please-change-me-at-config-initializers-devise@example.com'",
             "ENV['ACTION_MAILER_DEVISE_DEFAULT_EMAIL']"
-  gsub_file 'config/initializers/devise.rb', /(?<=key = )'\w{128}'/,
-            "ENV['TOKEN_DEVISE_SECRET']"
-  gsub_file 'config/initializers/devise.rb', /(?<=pepper = )'\w{128}'/,
-            "ENV['TOKEN_DEVISE_PEPPER']"
   gsub_file 'config/initializers/devise.rb',
             '# config.timeout_in = 30.minutes',
             'config.timeout_in = 2.hours'
-
   gsub_file 'config/initializers/devise.rb',
             '# config.expire_auth_token_on_timeout = false',
             'config.expire_auth_token_on_timeout = true'

data/lib/orats/templates/base.rb

@@ -165,7 +165,13 @@ def update_app_config
     # http://www.loc.gov/standards/iso639-2/php/English_list.php
     config.i18n.default_locale = ENV['DEFAULT_LOCALE'] unless ENV['DEFAULT_LOCALE'] == 'en'
 
+    # Log everything to a single file.
     config.paths['log'] = ENV['LOG_FILE']
+
+    # Rotate logs daily. This gets overwritten in staging/production by writing
+    # to syslog instead of a log file. Rotating in development prevents your
+    # log file from getting out of control in size.
+    config.logger = Logger.new(config.paths['log'].first, 'daily')
     S
   end
 
@@ -272,12 +278,23 @@ def update_production_environment
   task __method__
 
   inject_into_file 'config/environments/production.rb',
-                   after: "config.log_level = :info\n" do
+                   before: "Rails.application.configure" do
     <<-'S'
-  config.logger = Logger.new(config.paths['log'].first, 'daily')
+require 'syslog/logger'
+
+    S
+  end
+
+  inject_into_file 'config/environments/production.rb',
+                   after: "config.log_level = :info\n" do
+    <<-S
+
+  # Log to syslog.
+  config.log_tags = [ :subdomain, :uuid ]
+  config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new('#{app_name}'))
     S
   end
-  commit 'Update the logger to rotate daily'
+  commit 'Update the logger to be tagged and sent to syslog'
 
   inject_into_file 'config/environments/production.rb',
                    after: "%w( search.js )\n" do

data/lib/orats/templates/includes/new/rails/.env

@@ -51,7 +51,7 @@ BACKGROUND_THREADS: 5
 SERVICE: 'app_name'
 
 # the log file that both the app and sidekiq write to
-# in production you might consider /var/log/user.log to leverage syslog
+# in production you might consider /var/log/app_name/app_name.log
 LOG_FILE: 'log/app_name.log'
 
 # the path that will contain pids and sockets

data/lib/orats/templates/includes/new/rails/app/views/devise/shared/_links.html.erb

@@ -8,7 +8,7 @@
 
   <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
     <li>
-      <%= link_to 'Sign up', new_registration_path(resource_name) %>
+      <%= link_to 'Register', new_registration_path(resource_name) %>
     </li>
   <% end -%>
 
@@ -35,4 +35,4 @@
       <li><%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %></li>
     <% end -%>
   <% end -%>
-</ul>
+</ul>

data/lib/orats/version.rb

@@ -1,4 +1,4 @@
 # set the version of this gem
 module Orats
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/test/integration/cli_test.rb

@@ -38,6 +38,17 @@ class TestCLI < Minitest::Test
     assert_orats 'templates', 'auth'
   end
 
+  def test_new_with_custom
+    custom_file = "#{TEST_PATH}/custom_file.rb"
+    `mkdir -p #{TEST_PATH}`
+    File.open(custom_file, 'w') do |file|
+      file.write "file 'custom_file.rb', 'class CustomFile\nend'"
+    end
+
+    assert_new "--custom #{custom_file}"
+    assert_path "#{TEST_PATH}/#{@target_path}/custom_file.rb"
+  end
+
   def test_version
     assert_orats 'version', 'Orats'
   end
@@ -77,25 +88,6 @@ class TestCLI < Minitest::Test
     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}"
-  end
-
-  def assert_in_file(file_path, match_regex)
-    file_contents = `cat #{file_path}`
-    assert_match(/#{match_regex}/, file_contents)
-  end
-
-  def assert_path(file_or_dir)
-    assert File.exist?(file_or_dir), "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
-
   def capture_orats(command)
     out, err = capture_subprocess_io do
       orats "#{command} #{@target_path}", flags: @extra_flags

data/test/test_helper.rb

@@ -42,6 +42,27 @@ module Orats
       system "#{prepend_command} #{BINARY_PATH} #{command} #{options[:flags]}"
     end
 
+    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)
+    end
+
+    def assert_path(file_or_dir)
+      assert File.exist?(file_or_dir),
+             "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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor