cybele 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 265c511e24b5aa4e0e12b5e2c2c3d262564f70293052c4705f2817976b5f73f3
-  data.tar.gz: c02bb3c18aee4fc5f202add2c74e6a6f77f9e40c66f979c4d8ea31526701fbb7
+  metadata.gz: f726b1cb6912328b92da71be0e88f7bfd204f208bbe520d2fcdcdb54ff8a46b7
+  data.tar.gz: 75b6bc1732f293fbe7b03fb8a98af2f089bf2ce1a46d46cd017211c2e8a76b6c
 SHA512:
-  metadata.gz: a0ca4fba87a8933618aec2d0bce1c90f3e690ff131e175e3572a1943bb4dd632231e36eebcbc9a6ef377dfe87dc01acf17e07a328b263973cd0bd439a2f24225
-  data.tar.gz: 25e9d9cac664756a1925c8eb523b32e237babf5c0b51012bf1702c19ad9669383b788fa8ba9f2992e3e359a02fe111b45f1e5cb51b0c29cb1ae65110b703f2dd
+  metadata.gz: e1952a826bf490f40c326f54c9c07657b5a0cf974a91b52a2a8f3e9c141af30cb2313c9fd68e891362f3b9cc3ea8ff4062031a872e8cbb2f74d27d203186d77d
+  data.tar.gz: c902a27a5e6fc011caf907cb2e912b9089913afe98dc0a2b83307c37e3c68d85b8760686d5bbfe052167902618d8a174d9934de7372332fe0b9934b8be2d1562

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.3

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 
 #### [Current]
+ * [864753a](../../commit/864753a) - __(İsmail Akbudak)__ Merged in feature/improve_gems (pull request [#42](../../issues/42))
+
+Feature/improve gems
+
+ * [cd2480f](../../commit/cd2480f) - __(İsmail Akbudak)__ Change SIDEKIQ_REDIS_URL with REDIS_URL
+ * [0cf91a1](../../commit/0cf91a1) - __(İsmail Akbudak)__ Fix alignment problem for rspec test
+ * [914975a](../../commit/914975a) - __(İsmail Akbudak)__ Update template gemfile gems versions
+ * [b5e504c](../../commit/b5e504c) - __(İsmail Akbudak)__ Code refactor for test specs
+ * [e690b25](../../commit/e690b25) - __(İsmail Akbudak)__ Code refactor for test specs and change sidekiq_redis environment key
+ * [6b10ade](../../commit/6b10ade) - __(İsmail Akbudak)__ Update rails version
+ * [3fa1533](../../commit/3fa1533) - __(İsmail Akbudak)__ Remove pronto-reek gem from cybele gemspec
+ * [3ee5639](../../commit/3ee5639) - __(İsmail Akbudak)__ Remove guard gem configs
+ * [85eadfe](../../commit/85eadfe) - __(İsmail Akbudak)__ Fix ap view files wrong titles
+ * [4036acb](../../commit/4036acb) - __(İsmail Akbudak)__ Add rails credentials edit information to readme
+ * [f246d62](../../commit/f246d62) - __(İsmail Akbudak)__ Update ransack gem version and add binding_of_caller gem for development
+ * [5123d07](../../commit/5123d07) - __(İsmail Akbudak)__ Fix devise generate model migration commented lines
+ * [1d3f4b6](../../commit/1d3f4b6) - __(İsmail Akbudak)__ Upgrade ruby version to 2.5.3
+ * [995ded4](../../commit/995ded4) - __(İsmail Akbudak)__ Improve environment file contents
+ * [b426d4e](../../commit/b426d4e) - __(İsmail Akbudak)__ Add master_key to environment files
+ * [df9542e](../../commit/df9542e) - __(İsmail Akbudak)__ Fix active_storage initialization
+ * [cbc7830](../../commit/cbc7830) - __(İsmail Akbudak)__ Add erb_lint pronto runner
+ * [809ec01](../../commit/809ec01) - __(İsmail Akbudak)__ Merge tag 'v2.1.0' into develop
+
+v2.1.0
+
+#### v2.1.0
+ * [f7d00fc](../../commit/f7d00fc) - __(İsmail Akbudak)__ Update CHANGELOG file
  * [52832d1](../../commit/52832d1) - __(İsmail Akbudak)__ Fix pronto warnings
  * [148c6d4](../../commit/148c6d4) - __(İsmail Akbudak)__ Update CHANGELOG file
  * [ee9d462](../../commit/ee9d462) - __(İsmail AKBUDAK)__ Merge pull request [#127](../../issues/127) from lab2023/feature/update_ruby_rails_to_latest_version

data/cybele.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pronto', '~> 0.9.5'
   spec.add_development_dependency 'pronto-fasterer', '~> 0.9.0'
   spec.add_development_dependency 'pronto-flay', '~> 0.9.0'
-  spec.add_development_dependency 'pronto-reek', '~> 0.9.0'
   spec.add_development_dependency 'pronto-rubocop', '~> 0.9.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'thor', '~> 0.19.4'

data/lib/cybele/generators/app_generator.rb

@@ -156,11 +156,6 @@ module Cybele
       build :generate_rollbar
     end
 
-    def setup_guard
-      say 'Generate guard', :green
-      build :generate_guard
-    end
-
     def configure_locale_language
       say 'Configure locale', :green
       build :configure_locale_language
@@ -283,6 +278,10 @@ module Cybele
 
     private
 
+    def config_master_key_content
+      IO.read(File.join(destination_root, '/config/master.key'))
+    end
+
     # :reek:TooManyStatements
     def ask_questions(options)
       say 'Ask cybele options', :green

data/lib/cybele/helpers/active_storage.rb

@@ -4,36 +4,22 @@ module Cybele
   module Helpers
     module ActiveStorage
       def active_storage_setting
-        %w[config/environments/production.rb config/environments/staging.rb
-           config/environments/development.rb].each do |file|
+        %w[
+          config/environments/production.rb
+          config/environments/staging.rb
+        ].each do |file|
           gsub_file file,
                     /config.active_storage.service = :local/,
                     'config.active_storage.service = :amazon'
         end
-        handle_active_storage_change_file_content
+
         %w[.env.local .env.production .env.staging .env.sample].each do |env|
           append_file(env, template_content('active_storage/amazon_env_all.erb'))
         end
-      end
-
-      private
 
-      def handle_active_storage_change_file_content
-        replace_in_file 'config/storage.yml',
-                        'Rails.application.credentials.dig(:aws, :access_key_id)',
-                        "ENV['AWS_ACCESS_KEY_ID']"
-        replace_in_file 'config/storage.yml',
-                        'Rails.application.credentials.dig(:aws, :secret_access_key)',
-                        "ENV['AWS_SECRET_ACCESS_KEY']"
-        replace_in_file 'config/storage.yml',
-                        'us-east-1',
-                        "<%= ENV['AWS_REGION'] %>"
-        replace_in_file 'config/storage.yml',
-                        'your_own_bucket',
-                        "<%= ENV['BUCKET_NAME'] %>"
-        replace_in_file 'config/storage.yml',
-                        '# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)',
-                        '# AWS S3 access variable'
+        inject_into_file 'config/storage.yml',
+                         template_content('active_storage/active_storage.yml.erb'),
+                         before: '# Use rails credentials:edit to set the AWS secrets'
       end
     end
   end

data/lib/cybele/helpers/devise.rb

@@ -66,6 +66,11 @@ module Cybele
       def add_default_value_to_migrations
         Dir.glob('db/migrate/*devise_create*.rb') do |file|
           replace_in_file file, 't.boolean :is_active', 't.boolean :is_active, default: true'
+          uncomment_lines file, /t.integer  :sign_in_count, default: 0, null: false/
+          uncomment_lines file, /t.datetime :current_sign_in_at/
+          uncomment_lines file, /t.datetime :last_sign_in_at/
+          uncomment_lines file, /t.inet     :current_sign_in_ip/
+          uncomment_lines file, /t.inet     :last_sign_in_ip/
         end
       end
     end

data/lib/cybele/helpers/general.rb

@@ -59,12 +59,6 @@ module Cybele
         generate 'rollbar'
       end
 
-      def generate_guard
-        bundle_command 'exec guard init'
-        inject_into_file('Guardfile', "\n\n#{template_content('guardfile/guardfile_settings.rb.erb')}",
-                         after: 'config/Guardfile" instead of "Guardfile"')
-      end
-
       def configure_bullet
         configure_environment 'development', template_content('bullet/bullet_settings.rb.erb')
       end

data/lib/cybele/helpers/pronto.rb

@@ -24,7 +24,7 @@ module Cybele
         files_to_template(
           'pronto/example.pronto.yml.erb' => 'example.pronto.yml',
           'pronto/.haml-lint.yml.erb' => '.haml-lint.yml',
-          'pronto/config.reek.erb' => 'config.reek',
+          'pronto/.erb-lint.yml.erb' => '.erb-lint.yml',
           'pronto/.rubocop.yml.erb' => '.rubocop.yml',
           'pronto/.flayignore.erb' => '.flayignore'
         )

data/lib/cybele/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Cybele
-  RAILS_VERSION = ['~> 5.2.0', '>= 5.2.0'].freeze
+  RAILS_VERSION = ['~> 5.2.2', '>= 5.2.2'].freeze
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/features/cli_help_spec.rb

@@ -29,6 +29,11 @@ Cybele options:
                                                              # Default: true
       [--skip-create-database], [--no-skip-create-database]  # Skip create database. Default: don't skip
       [--skip-sidekiq], [--no-skip-sidekiq]                  # Skip sidekiq integration. Default: don't skip
+      [--skip-simple-form], [--no-skip-simple-form]          # Skip simple_form integration. Default: don't skip
+      [--skip-show-for], [--no-skip-show-for]                # Skip show_for integration. Default: don't skip
+      [--skip-haml], [--no-skip-haml]                        # Skip haml and haml-rails integration. Default: don't skip
+      [--skip-view-files], [--no-skip-view-files]            # Skip view files. Default: don't skip. Dependent: haml, show-for, simple-form
+      [--skip-docker], [--no-skip-docker]                    # Skip docker development environment. Default: don't skip
 EOH
   end
 

data/spec/features/new_default_project_spec.rb

@@ -24,94 +24,31 @@ RSpec.describe 'Create new project with default configuration' do
     expect(database_file).to match(/^  database: #{app_name}_staging/)
   end
 
-  it 'uses sidekiq' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'sidekiq'/)
-    expect(gemfile_file).to match(/^gem 'sidekiq-cron'/)
-    expect(gemfile_file).to match(/^gem 'cocaine'/)
-    expect(gemfile_file).to match(/^gem 'devise-async'/)
-
-    sidekiq_file = content('config/sidekiq.yml')
-    expect(sidekiq_file).to match('[high_priority, 2]')
-
-    sidekiq_schedule_file = content('config/sidekiq_schedule.yml')
-    expect(sidekiq_schedule_file).to match(/-> Daily at midnight/)
+  it_behaves_like 'uses sidekiq'
 
-    initializers_file = content('config/initializers/sidekiq.rb')
-    expect(initializers_file).to match("^require 'sidekiq'")
-    expect(initializers_file).to match("^require 'sidekiq/web'")
+  it_behaves_like 'uses responders'
 
-    routes_file = content('config/routes.rb')
-    expect(routes_file).to match("^require 'sidekiq/web'")
-    expect(routes_file).to match("^require 'sidekiq/cron/web'")
-    expect(routes_file).to match(/# ========== Sidekiq ==========/)
-
-    rake_file = content('lib/tasks/sidekiq.rake')
-    expect(rake_file).to match(/^namespace :sidekiq/)
-  end
+  it_behaves_like 'uses cybele_version'
 
-  it 'uses responders' do
-    responder_test
-  end
+  it_behaves_like 'uses rollbar'
 
-  it 'uses cybele_version' do
-    expect(File).to exist(file_project_path('VERSION.txt'))
-    expect(File).to exist(file_project_path('public/VERSION.txt'))
-  end
+  it_behaves_like 'uses ransack'
 
-  it 'uses rollbar' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'rollbar'/)
+  it_behaves_like 'uses will_paginate'
 
-    config_file = content('config/initializers/rollbar.rb')
-    expect(config_file).to match(/^Rollbar.configure/)
-  end
+  it_behaves_like 'uses to_xls'
 
-  it 'uses ransack' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'ransack'/)
-  end
-
-  it 'uses will_paginate' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'will_paginate'/)
-    expect(gemfile_file).to match(/^gem 'will_paginate-bootstrap'/)
-  end
-
-  it 'uses to_xls' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'to_xls'/)
-  end
-
-  it 'uses roo' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'roo'/)
-  end
+  it_behaves_like 'uses roo'
 
-  it 'uses roo-xls' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'roo-xls'/)
-  end
+  it_behaves_like 'uses roo-xls'
 
-  it 'uses write_xlsx' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'write_xlsx'/)
-  end
+  it_behaves_like 'uses write_xlsx'
 
-  it 'uses colorize' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match("gem 'colorize'")
-  end
+  it_behaves_like 'uses colorize'
 
-  it 'uses better_errors' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match("gem 'better_errors'")
-  end
+  it_behaves_like 'uses better_errors'
 
-  it 'uses rails-i18n' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'rails-i18n'/)
-  end
+  it_behaves_like 'uses rails-i18n'
 
   it 'uses show_for' do
     gemfile_file = content('Gemfile')
@@ -127,21 +64,11 @@ RSpec.describe 'Create new project with default configuration' do
     expect(show_for_tr_yml_file).to match('show_for')
   end
 
-  it 'uses config and staging file' do
-    config_test
-  end
+  it_behaves_like 'uses config'
 
-  it 'uses recipient_interceptor' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match(/^gem 'recipient_interceptor'/)
+  it_behaves_like 'uses recipient_interceptor'
 
-    config_staging_file = content('config/environments/staging.rb')
-    expect(config_staging_file).to match('RecipientInterceptor.new')
-  end
-
-  it 'uses locale_language' do
-    locale_language_test
-  end
+  it_behaves_like 'uses locale_language'
 
   it 'uses simple_form' do
     gemfile_file = content('Gemfile')
@@ -160,14 +87,9 @@ RSpec.describe 'Create new project with default configuration' do
     expect(simple_form_tr_yml_file).to match('simple_form')
   end
 
-  it 'control .env files' do
-    dotenv_test
-  end
+  it_behaves_like 'has .env files'
 
   it 'uses mailer' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match("gem 'mailtrap'")
-
     expect(File).to exist(file_project_path('config/settings/production.yml'))
     expect(File).to exist(file_project_path('config/settings/staging.yml'))
 
@@ -186,25 +108,13 @@ RSpec.describe 'Create new project with default configuration' do
     expect(File).to exist(file_project_path('app/views/layouts/application.html.haml'))
   end
 
-  it 'uses bullet' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match("gem 'bullet'")
+  it_behaves_like 'uses bullet'
 
-    locale_file = content('config/environments/development.rb')
-    expect(locale_file).to match('Bullet')
-  end
+  it_behaves_like 'uses devise'
 
-  it 'uses devise' do
-    devise_test
-  end
-
-  it 'uses error_pages' do
-    error_pages_test
-  end
+  it_behaves_like 'uses error_pages'
 
-  it 'uses gitignore' do
-    git_ignore_test
-  end
+  it_behaves_like 'uses gitignore'
 
   it 'uses asset files' do
     gemfile_file = content('Gemfile')
@@ -377,80 +287,25 @@ RSpec.describe 'Create new project with default configuration' do
     end
   end
 
-  it 'uses default view files' do
-    # Mailer files
-    hq_admins_view = content('app/views/admin_mailer/login_info.html.haml')
-    expect(hq_admins_view).to match('@admin')
-  end
+  it_behaves_like 'uses default view files'
 
   it 'configure routes file' do
     route_file = content('config/routes.rb')
     expect(route_file).to match('concern :activeable')
   end
 
-  it 'uses model files' do
-    admin_model = content('app/models/admin.rb')
-    expect(admin_model).to match('login_info_mailer')
+  it_behaves_like 'uses model files'
 
-    audit_model = content('app/models/audit.rb')
-    expect(audit_model).to match('class Audit')
-  end
+  it_behaves_like 'uses mailer files'
 
-  it 'uses mailer files' do
-    admin_mailer = content('app/mailers/admin_mailer.rb')
-    expect(admin_mailer).to match('class AdminMailer')
+  it_behaves_like 'uses ssl_setting'
 
-    application_mailer = content('app/mailers/application_mailer.rb')
-    expect(application_mailer).to match('Settings.email.noreply')
-  end
+  it_behaves_like 'uses docker development environment'
 
-  it 'uses ssl_setting' do
-    force_ssl_test
-  end
-
-  it 'uses docker development environment' do
-
-    file_exist_test(
-      %w[
-        docker-compose.yml
-        Dockerfile
-        bin/start-app.sh
-        bin/start-sidekiq.sh
-      ]
-    )
-
-    file_exist_test(
-      %w[
-        .env.sample
-        .env.local
-        .environments/.env.local
-      ]
-    ) do |env|
-      file = content(env)
-      expect(file).to match('REDISTOGO_URL=redis://redis:6379/0')
-      expect(file).to match('RACK_ENV=development')
-      expect(file).to match('POSTGRESQL_HOST=postgres')
-      expect(file).to match('REDIS_HOST=redis')
-    end
-
-    file_exist_test(
-      %w[
-        .environments/.env.staging
-        .environments/.env.production
-      ]
-    ) do |env|
-      expect(content(env)).to match('REDISTOGO_URL=')
-    end
-  end
-
-  it 'uses pronto' do
-    pronto_test
-  end
-
-  it 'uses guardfile' do
-    gemfile_file = content('Gemfile')
-    expect(gemfile_file).to match("gem 'guard'")
+  it_behaves_like 'uses pronto'
 
-    expect(File).to exist(file_project_path('Guardfile'))
+  it 'match readme' do
+    gemfile_file = content('README.md')
+    expect(gemfile_file).to match(file_content('README_DEFAULT.md'))
   end
 end