KBP-138 #time 20m - fixed conflict and fix rubocop error

cybele.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'bundler', '~> 1.5'
   spec.add_runtime_dependency 'rails', '~> 5.0', Cybele::RAILS_VERSION
-  spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'pronto', '~> 0.9.5'
   spec.add_development_dependency 'pronto-flay', '~> 0.9.0'
   spec.add_development_dependency 'pronto-rubocop', '~> 0.9.0'
+  spec.add_development_dependency 'rspec', '~> 3.5'
 
   spec.extra_rdoc_files = %w[README.md MIT-LICENSE]
 end

lib/cybele.rb

@@ -17,4 +17,5 @@
 require 'cybele/helpers/devise'
 require 'cybele/helpers/docker'
 require 'cybele/helpers/error_pages'
+require 'cybele/helpers/pronto'
 require 'cybele/app_builder'

lib/cybele/app_builder.rb

@@ -17,6 +17,7 @@ class AppBuilder < Rails::AppBuilder
     include Cybele::Helpers::Devise
     include Cybele::Helpers::ErrorPages
     include Cybele::Helpers::Docker
+    include Cybele::Helpers::Pronto
 
     def readme
       template 'README.md.erb',

lib/cybele/generators/app_generator.rb

@@ -88,6 +88,7 @@ def initialize(*args)
     def customize_gemfile
       say 'Customize gem file', :green
       build :add_gems
+      bundle_command 'update thor'
       build :add_simple_form_gem unless @options[:skip_simple_form]
       build :add_show_for_gem unless @options[:skip_show_for]
       build :add_haml_gems unless @options[:skip_haml]
@@ -236,6 +237,11 @@ def docker_development_env
       build :setup_docker_development_env
     end
 
+    def setup_pronto_config
+      say 'Setup pronto config', :green
+      build :configure_pronto
+    end
+
     def goodbye
       say 'Congratulations! That\'s all...', :green
     end

lib/cybele/helpers/pronto.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Cybele
+  module Helpers
+    module Pronto
+      def configure_pronto
+        # Create pronto files
+        template 'pronto/example.pronto.yml.erb',
+                 'example.pronto.yml',
+                 force: true
+        template 'pronto/example.pronto.yml.erb',
+                 '.pronto.yml',
+                 force: true
+        template 'pronto/.rubocop.yml.erb',
+                 '.rubocop.yml',
+                 force: true
+        template 'pronto/rubo.erb',
+                 'bin/rubo',
+                 force: true
+        run 'chmod +x bin/rubo'
+
+        # Ignore secret information file
+        append_file('.gitignore', '.pronto.yml')
+      end
+    end
+  end
+end

spec/features/new_default_project_spec.rb

@@ -244,4 +244,8 @@
     env_production_file = content('.env.production')
     expect(env_production_file).to match('REDISTOGO_URL=')
   end
+
+  it 'uses pronto' do
+    pronto_test
+  end
 end

spec/features/new_not_default_project_spec.rb

@@ -218,4 +218,8 @@
     env_production_file = content('.env.production')
     expect(env_production_file).not_to match('REDISTOGO_URL=')
   end
+
+  it 'uses pronto' do
+    pronto_test
+  end
 end

spec/spec_helper.rb

@@ -21,6 +21,7 @@
   config.include GitIgnoreTestHelper
   config.include MailTestHelpers
   config.include ForceSSLTestHelper
+  config.include ProntoTestHelpers
 
   config.before(:all) do
     create_tmp_directory

spec/support/force_ssl_test_helper.rb

@@ -2,12 +2,21 @@
 
 module ForceSSLTestHelper
   def force_ssl
+    ssl_test
+    environment_test
+  end
+
+  private
+
+  def ssl_test
     config_staging_file = content('config/environments/staging.rb')
     expect(config_staging_file).to match('config.force_ssl')
 
     config_production_file = content('config/environments/staging.rb')
     expect(config_production_file).to match('config.force_ssl')
+  end
 
+  def environment_test
     env_staging_file = content('.env.staging')
     expect(env_staging_file).to match('RAILS_FORCE_SSL=')
 

spec/support/pronto_test_helpers.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module ProntoTestHelpers
+  def pronto_test
+    file_exist_test
+    file_content_test
+    gitignore_test
+  end
+
+  private
+
+  def file_exist_test
+    gemfile_file = content('Gemfile')
+    expect(gemfile_file).to match("gem 'pronto'")
+    expect(gemfile_file).to match("gem 'pronto-flay'")
+    expect(gemfile_file).to match("gem 'pronto-rubocop'")
+  end
+
+  def file_content_test # rubocop:disable Metrics/AbcSize
+    expect(File).to exist(file_project_path('example.pronto.yml'))
+    expect(File).to exist(file_project_path('.pronto.yml'))
+    expect(File).to exist(file_project_path('.rubocop.yml'))
+    expect(File).to exist(file_project_path('bin/rubo'))
+  end
+
+  def gitignore_test
+    gemfile_file = content('.gitignore')
+    expect(gemfile_file).to match('.pronto.yml')
+  end
+end

templates/Gemfile.erb

@@ -1,4 +1,7 @@
 
+# General requirement
+gem 'thor', '~> 0.19.4'
+
 # For never accidentally send emails to real people from staging environment.
 gem 'recipient_interceptor', '~> 0.1.2'
 
@@ -28,6 +31,9 @@ group :development, :test do
   gem 'better_errors', '~> 2.4'
   gem 'bullet', '~> 5.6', '>= 5.6.1'
   gem 'letter_opener', '~> 1.4', '>= 1.4.1'
+  gem 'pronto', '~> 0.9.5'
+  gem 'pronto-flay', '~> 0.9.0', require: false
+  gem 'pronto-rubocop', '~> 0.9.0', require: false
 end
 
 # A set of common locale data and translations to internationalize and/or localize your Rails applications.

templates/pronto/.rubocop.yml.erb

@@ -0,0 +1,35 @@
+AllCops:
+  Includes:
+    - 'Rakefile'
+    - 'config.ru'
+    - 'Gemfile'
+  Excludes:
+    - Guardfile
+    - bin/**
+    - db/**/**
+    - spec/**/**/**/**
+    - test/**/**/**/**
+    - tmp/**/**/**/**
+
+Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 100
+  Exclude:
+    - 'Gemfile'
+
+Metrics/MethodLength:
+  CountComments: false
+  Max: 15
+
+Metrics/BlockLength:
+  CountComments: false
+  Max: 40
+  Exclude:
+    - 'Rakefile'
+    - '**/*.rake'
+    - 'spec/**/*.rb'
+
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: when_needed

templates/pronto/example.pronto.yml.erb

@@ -0,0 +1,27 @@
+all:
+  exclude:
+    - 'spec/**/*'
+bitbucket:
+  slug: 'lab2023corp/<%= app_name%>'
+  username: 'username'
+  password: 'password'
+max_warnings: 50
+verbose: true
+
+## for local changes before the commit
+# before git add .
+# pronto run --unstaged
+# after git add .
+# pronto run --staged
+
+## for branch commits analyze different between develop
+# pronto run
+# pronto run -c origin/develop
+
+## for pull request
+# pronto run -f bitbucket_pr
+# pronto run -f bitbucket_pr -c origin/develop
+
+## for commit
+# pronto run -f bitbucket
+# pronto run -f bitbucket -c origin/develop

templates/pronto/rubo.erb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'English'
+require 'rubocop'
+
+DISABLE_DIRECTORY = %w[db].freeze
+ADDED_OR_MODIFIED = /A|AM|^M/
+
+changed_files = `git status --porcelain`.split(/\n/).select do |file_name_with_status|
+  file_name_with_status =~ ADDED_OR_MODIFIED
+end
+changed_files = changed_files.map do |file_name_with_status|
+  file_name_with_status.split(' ')[1]
+end
+changed_files = changed_files.select do |file_name|
+  directory = file_name.split('/')[0]
+  !DISABLE_DIRECTORY.include?(directory) && File.extname(file_name) == '.rb'
+end
+changed_files = changed_files.join(' ')
+
+system("rubocop #{changed_files}") unless changed_files.empty?
+
+exit $CHILD_STATUS.to_s[-1].to_i