trusty-cms 4.1.2 → 4.1.3

data/lib/method_observer.rb

@@ -1,5 +1,4 @@
 class MethodObserver
-
   attr_reader :target
   attr_accessor :result
 
@@ -11,6 +10,7 @@ class MethodObserver
 
   def observe(target)
     raise ObserverCannotObserveTwiceError if @target
+
     @target = target
     make_observable(target)
   end
@@ -26,25 +26,26 @@ class MethodObserver
   end
 
   private
-    def make_observable(target)
-      methods_to_observe.each do |method|
-        target.instance_eval %{
+
+  def make_observable(target)
+    methods_to_observe.each do |method|
+      target.instance_eval %{
           def #{method}(*args, &block)
-            observer = #{self.class}.instances[#{self.object_id}]
+            observer = #{self.class}.instances[#{object_id}]
             observer.send(:before_#{method}, *args, &block) if observer.respond_to? :before_#{method}
             observer.result = super
             observer.send(:after_#{method}, *args, &block) if observer.respond_to? :after_#{method}
             observer.result
           end
         }
-      end
     end
+  end
 
-    def methods_to_observe
-      (methods_for(:before) + methods_for(:after)).uniq
-    end
+  def methods_to_observe
+    (methods_for(:before) + methods_for(:after)).uniq
+  end
 
-    def methods_for(name)
-      methods.grep(/^#{name}_/).map { |n| n.to_s.gsub(/^#{name}_/, '').intern }
-    end
+  def methods_for(name)
+    methods.grep(/^#{name}_/).map { |n| n.to_s.gsub(/^#{name}_/, '').intern }
+  end
 end

data/lib/ostruct.rb

@@ -2,22 +2,19 @@
 # See more here: http://stackoverflow.com/questions/39278864/openstruct-issue-with-ruby-2-3-1/39280374#39280374
 
 class OpenStruct
-
-  def initialize(hash=nil)
+  def initialize(hash = nil)
     @table = {}
-    if hash
-      hash.each_pair do |k, v|
-        k = k.to_sym
-        @table[k] = v
-        new_ostruct_member(k)
-      end
+    hash&.each_pair do |k, v|
+      k = k.to_sym
+      @table[k] = v
+      new_ostruct_member(k)
     end
   end
 
   def modifiable
     begin
       @modifiable = true
-    rescue
+    rescue StandardError
       raise RuntimeError, "can't modify frozen #{self.class}", caller(3)
     end
     @table
@@ -41,6 +38,7 @@ class OpenStruct
       if len != 1
         raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
       end
+
       modifiable[new_ostruct_member(mname)] = args[0]
     elsif len == 0
       @table[mid]
@@ -50,5 +48,4 @@ class OpenStruct
       raise err
     end
   end
-
 end

data/lib/simpleton.rb

@@ -1,11 +1,9 @@
 module Simpleton
-
   def self.included(base)
     base.extend(ClassMethods)
   end
 
   module ClassMethods
-
     def instance(&block)
       @instance ||= new
       block.call(@instance) if block_given?
@@ -15,7 +13,5 @@ module Simpleton
     def method_missing(method, *args, &block)
       instance.respond_to?(method) ? instance.send(method, *args, &block) : super
     end
-
   end
-
 end

data/lib/string_extensions/string_extensions.rb

@@ -2,15 +2,15 @@ require 'stringex'
 
 class String
   def symbolize
-    self.gsub(/[^A-Za-z0-9]+/, "_").gsub(/(^_+|_+$)/, "").underscore.to_sym
+    gsub(/[^A-Za-z0-9]+/, '_').gsub(/(^_+|_+$)/, '').underscore.to_sym
   end
 
   def titlecase
-    self.gsub(/((?:^|\s)[a-z])/) { $1.to_s.upcase }
+    gsub(/((?:^|\s)[a-z])/) { $1.to_s.upcase }
   end
 
   def to_name(last_part = '')
-    self.underscore.gsub('/', ' ').humanize.titlecase.gsub(/\s*#{last_part}$/, '')
+    underscore.gsub('/', ' ').humanize.titlecase.gsub(/\s*#{last_part}$/, '')
   end
 
   unless methods.include?('parameterize')

data/lib/symbol_extensions/symbol_extensions.rb

@@ -1,5 +1,5 @@
 class Symbol
   def symbolize
-    self.to_s.symbolize
+    to_s.symbolize
   end
 end

data/lib/tasks/database.rake

@@ -1,44 +1,44 @@
 namespace :db do
-  desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
-  task :remigrate => :environment do
+  desc 'Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!'
+  task remigrate: :environment do
     require 'highline/import'
-    if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    if (ENV['OVERWRITE'].to_s.downcase == 'true') || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       # Migrate downward
       ActiveRecord::Migrator.migrate("#{TRUSTY_CMS_ROOT}/db/migrate/", 0)
 
       # Migrate upward
-      Rake::Task["db:migrate"].invoke
+      Rake::Task['db:migrate'].invoke
 
       # Dump the schema
-      Rake::Task["db:schema:dump"].invoke
+      Rake::Task['db:schema:dump'].invoke
     else
-      say "Task cancelled."
+      say 'Task cancelled.'
       exit
     end
   end
 
-  task :remigrate => :environment do
+  task remigrate: :environment do
     require 'highline/import'
-    if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    if (ENV['OVERWRITE'].to_s.downcase == 'true') || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       # Migrate downward
       ActiveRecord::Migrator.migrate("#{TRUSTY_CMS_ROOT}/db/migrate/", 0)
 
       # Migrate upward
-      Rake::Task["db:migrate"].invoke
+      Rake::Task['db:migrate'].invoke
 
       # Dump the schema
-      Rake::Task["db:schema:dump"].invoke
+      Rake::Task['db:schema:dump'].invoke
     else
-      say "Task cancelled."
+      say 'Task cancelled.'
       exit
     end
   end
 
-  task :initialize => :environment do
+  task initialize: :environment do
     require 'highline/import'
-    if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    if (ENV['OVERWRITE'].to_s.downcase == 'true') || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
 
       # We need to erase and remove all existing trusty-cms tables, but we don't want to
       # assume that the administrator has access to drop and create the database.
@@ -48,21 +48,21 @@ namespace :db do
       ActiveRecord::Base.connection.tables.each do |table|
         ActiveRecord::Migration[5.2].drop_table table
       end
-      Rake::Task["db:migrate"].invoke
+      Rake::Task['db:migrate'].invoke
     else
-      say "Task cancelled."
+      say 'Task cancelled.'
       exit
     end
   end
 
-  desc "Bootstrap your database for TrustyCms."
-  task :bootstrap => :initialize do
+  desc 'Bootstrap your database for TrustyCms.'
+  task bootstrap: :initialize do
     require 'trusty_cms/setup'
     TrustyCms::Setup.bootstrap(
-      :admin_name => ENV['ADMIN_NAME'],
-      :admin_username => ENV['ADMIN_USERNAME'],
-      :admin_password => ENV['ADMIN_PASSWORD'],
-      :database_template => ENV['DATABASE_TEMPLATE']
+      admin_name: ENV['ADMIN_NAME'],
+      admin_username: ENV['ADMIN_USERNAME'],
+      admin_password: ENV['ADMIN_PASSWORD'],
+      database_template: ENV['DATABASE_TEMPLATE'],
     )
     puts %{
 Your TrustyCms application is ready to use. Run `rails s -e production` to
@@ -78,16 +78,16 @@ To add more extensions just add them to your Gemfile and run `bundle install`.
 }
   end
 
-  desc "Migrate the database through all available migration scripts (looks for db/migrate/* in trusty-cms, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false."
-  task :migrate => [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
-    ActiveRecord::Migration[5.2].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-    Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+  desc 'Migrate the database through all available migration scripts (looks for db/migrate/* in trusty-cms, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false.'
+  task migrate: [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
+    ActiveRecord::Migration[5.2].verbose = ENV['VERBOSE'] ? ENV['VERBOSE'] == 'true' : true
+    Rake::Task['db:schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
   namespace :migrate do
-    desc "Migrates the database through steps defined in the core trusty-cms distribution. Usual db:migrate options can apply."
-    task :trusty_cms => :environment do
-      ActiveRecord::Migration[5.2].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+    desc 'Migrates the database through steps defined in the core trusty-cms distribution. Usual db:migrate options can apply.'
+    task trusty_cms: :environment do
+      ActiveRecord::Migration[5.2].verbose = ENV['VERBOSE'] ? ENV['VERBOSE'] == 'true' : true
       Rake::Task['db:migrate'].invoke
     end
   end

data/lib/tasks/extensions.rake

@@ -2,20 +2,20 @@ require 'rake/testtask'
 
 namespace :db do
   namespace :migrate do
-    desc "Run all TrustyCms extension migrations"
-    task :extensions => :environment do
+    desc 'Run all TrustyCms extension migrations'
+    task extensions: :environment do
       require 'trusty_cms/extension_migrator'
       TrustyCms::ExtensionMigrator.migrate_extensions
       Rake::Task['db:schema:dump'].invoke
     end
   end
   namespace :remigrate do
-    desc "Migrate down and back up all TrustyCms extension migrations"
-    task :extensions => :environment do
+    desc 'Migrate down and back up all TrustyCms extension migrations'
+    task extensions: :environment do
       require 'highline/import'
       if agree("This task will destroy any data stored by extensions in the database. Are you sure you want to \ncontinue? [yn] ")
         require 'trusty_cms/extension_migrator'
-        TrustyCms::Extension.descendants.each {|ext| ext.migrator.migrate(0) }
+        TrustyCms::Extension.descendants.each { |ext| ext.migrator.migrate(0) }
         Rake::Task['db:migrate:extensions'].invoke
         Rake::Task['db:schema:dump'].invoke
       end
@@ -24,13 +24,13 @@ namespace :db do
 end
 
 namespace :test do
-  desc "Runs tests on all available TrustyCms extensions, pass EXT=extension_name to test a single extension"
-  task :extensions => "db:test:prepare" do
+  desc 'Runs tests on all available TrustyCms extensions, pass EXT=extension_name to test a single extension'
+  task extensions: 'db:test:prepare' do
     extensions = TrustyCms.configuration.enabled_extensions
-    if ENV["EXT"]
-      extensions = extensions & [ENV["EXT"].to_sym]
+    if ENV['EXT']
+      extensions = extensions & [ENV['EXT'].to_sym]
       if extensions.empty?
-        puts "Sorry, that extension is not installed."
+        puts 'Sorry, that extension is not installed.'
       end
     end
     extensions.each do |extension|
@@ -49,13 +49,13 @@ namespace :test do
 end
 
 namespace :spec do
-  desc "Runs specs on all available TrustyCms extensions, pass EXT=extension_name to test a single extension"
-  task :extensions => "db:test:prepare" do
+  desc 'Runs specs on all available TrustyCms extensions, pass EXT=extension_name to test a single extension'
+  task extensions: 'db:test:prepare' do
     extensions = TrustyCms.configuration.enabled_extensions
-    if ENV["EXT"]
-      extensions = extensions & [ENV["EXT"].to_sym]
+    if ENV['EXT']
+      extensions = extensions & [ENV['EXT'].to_sym]
       if extensions.empty?
-        puts "Sorry, that extension is not installed."
+        puts 'Sorry, that extension is not installed.'
       end
     end
     extensions.each do |extension|
@@ -76,10 +76,10 @@ end
 
 namespace :trusty_cms do
   namespace :extensions do
-    desc "Runs update asset task for all extensions"
-    task :update_all => [:environment] do
+    desc 'Runs update asset task for all extensions'
+    task update_all: [:environment] do
       extension_update_tasks = TrustyCms.configuration.enabled_extensions.map { |n| "trusty_cms:extensions:#{n}:update" }.select { |t| Rake::Task.task_defined?(t) }
-      extension_update_tasks.each {|t| Rake::Task[t].invoke }
+      extension_update_tasks.each { |t| Rake::Task[t].invoke }
     end
   end
 end

data/lib/tasks/framework.rake

@@ -2,14 +2,14 @@
 unless File.directory? "#{Rails.root}/app"
   namespace :trusty_cms do
     namespace :freeze do
-      desc "Lock this application to the current gems (by unpacking them into vendor/trusty)"
+      desc 'Lock this application to the current gems (by unpacking them into vendor/trusty)'
       task :gems do
         require 'rubygems'
         require 'rubygems/gem_runner'
 
         trusty = (version = ENV['VERSION']) ?
           Gem.cache.search('trusty-cms', "= #{version}").first :
-          Gem.cache.search('trusty-cms').sort_by { |g| g.version }.last
+          Gem.cache.search('trusty-cms').max_by { |g| g.version }
 
         version ||= trusty.version
 
@@ -19,49 +19,48 @@ unless File.directory? "#{Rails.root}/app"
         end
 
         puts "Freezing to the gems for TrustyCms #{trusty.version}"
-        rm_rf   "vendor/trusty"
+        rm_rf 'vendor/trusty'
 
-        chdir("vendor") do
-          Gem::GemRunner.new.run(["unpack", "trusty", "--version", "=#{version}"])
-          FileUtils.mv(Dir.glob("trusty*").first, "trusty")
+        chdir('vendor') do
+          Gem::GemRunner.new.run(['unpack', 'trusty', '--version', "=#{version}"])
+          FileUtils.mv(Dir.glob('trusty*').first, 'trusty')
         end
       end
 
-      desc "Lock to latest Edge TrustyCms or a specific revision with REVISION=X (ex: REVISION=245484e), a tag with TAG=Y (ex: TAG=0.6.6), or a branch with BRANCH=Z (ex: BRANCH=mental)"
+      desc 'Lock to latest Edge TrustyCms or a specific revision with REVISION=X (ex: REVISION=245484e), a tag with TAG=Y (ex: TAG=0.6.6), or a branch with BRANCH=Z (ex: BRANCH=mental)'
       task :edge do
         $verbose = false
-        unless system "git --version"
-          $stderr.puts "ERROR: Must have git available in the PATH to lock this application to Edge TrustyCms"
+        unless system 'git --version'
+          warn 'ERROR: Must have git available in the PATH to lock this application to Edge TrustyCms'
           exit 1
         end
 
-        trusty_git = "git://github.com/pgharts/trusty-cms.git"
+        trusty_git = 'git://github.com/pgharts/trusty-cms.git'
 
-        if File.exist?("vendor/trusty_cms/.git/HEAD")
-          cd("vendor/trusty") { system "git checkout master"; system "git pull origin master"}
+        if File.exist?('vendor/trusty_cms/.git/HEAD')
+          cd('vendor/trusty') { system 'git checkout master'; system 'git pull origin master' }
         else
           system "git clone #{trusty_git} vendor/trusty"
         end
 
-        case
-        when ENV['TAG']
-          cd("vendor/trusty") { system "git checkout -b v#{ENV['TAG']} #{ENV['TAG']}"}
-        when ENV['BRANCH']
-          cd("vendor/trusty") { system "git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}"}
-        when ENV['REVISION']
-          cd("vendor/trusty") { system "git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}"}
+        if ENV['TAG']
+          cd('vendor/trusty') { system "git checkout -b v#{ENV['TAG']} #{ENV['TAG']}" }
+        elsif ENV['BRANCH']
+          cd('vendor/trusty') { system "git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}" }
+        elsif ENV['REVISION']
+          cd('vendor/trusty') { system "git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}" }
         end
 
-        cd("vendor/trusty") { system "git submodule update --init"}
+        cd('vendor/trusty') { system 'git submodule update --init' }
       end
     end
 
-    desc "Unlock this application from freeze of gems or edge and return to a fluid use of system gems"
+    desc 'Unlock this application from freeze of gems or edge and return to a fluid use of system gems'
     task :unfreeze do
-      rm_rf "vendor/trusty"
+      rm_rf 'vendor/trusty'
     end
 
-    desc "Update configs, scripts, html, images, sass, stylesheets and javascripts from TrustyCms."
+    desc 'Update configs, scripts, html, images, sass, stylesheets and javascripts from TrustyCms.'
     task :update do
       tasks = %w{scripts javascripts configs static_html images sass stylesheets cached_assets bundle}
       tasks = tasks & ENV['ONLY'].split(',') if ENV['ONLY']
@@ -74,9 +73,9 @@ unless File.directory? "#{Rails.root}/app"
     end
 
     namespace :update do
-      desc "Add new scripts to the instance script/ directory"
+      desc 'Add new scripts to the instance script/ directory'
       task :scripts do
-        local_base = "script"
+        local_base = 'script'
         edge_base  = "#{File.dirname(__FILE__)}/../../script"
 
         local = Dir["#{local_base}/**/*"].reject { |path| File.directory?(path) }
@@ -84,33 +83,34 @@ unless File.directory? "#{Rails.root}/app"
         edge  = edge.reject { |f| f =~ /(generate|plugin|destroy)$/ }
 
         edge.each do |script|
-          base_name = script[(edge_base.length+1)..-1]
-          next if local.detect { |path| base_name == path[(local_base.length+1)..-1] }
+          base_name = script[(edge_base.length + 1)..-1]
+          next if local.detect { |path| base_name == path[(local_base.length + 1)..-1] }
+
           if !File.directory?("#{local_base}/#{File.dirname(base_name)}")
             mkdir_p "#{local_base}/#{File.dirname(base_name)}"
           end
-          install script, "#{local_base}/#{base_name}", :mode => 0755
+          install script, "#{local_base}/#{base_name}", mode: 0o755
         end
-        install "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_generate", "#{local_base}/generate", :mode => 0755
+        install "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_generate", "#{local_base}/generate", mode: 0o755
       end
 
-      desc "Update your javascripts from your current trusty install"
+      desc 'Update your javascripts from your current trusty install'
       task :javascripts do
         FileUtils.mkdir_p("#{Rails.root}/public/javascripts/admin/")
         copy_javascripts = proc do |project_dir, scripts|
-          scripts.reject!{|s| File.basename(s) == 'overrides.js'} if File.exists?(project_dir + 'overrides.js')
+          scripts.reject! { |s| File.basename(s) == 'overrides.js' } if File.exists?(project_dir + 'overrides.js')
           FileUtils.cp(scripts, project_dir)
         end
         copy_javascripts[Rails.root + '/public/javascripts/', Dir["#{File.dirname(__FILE__)}/../../public/javascripts/*.js"]]
         copy_javascripts[Rails.root + '/public/javascripts/admin/', Dir["#{File.dirname(__FILE__)}/../../public/javascripts/admin/*.js"]]
       end
 
-      desc "Update the cached assets for the admin UI"
+      desc 'Update the cached assets for the admin UI'
       task :cached_assets do
         TrustyCms::TaskSupport.cache_admin_js
       end
 
-      desc "Update Gemfile from your current trusty install, backing up if required."
+      desc 'Update Gemfile from your current trusty install, backing up if required.'
       task :bundle do
         require 'erb'
         file = "#{Rails.root}/Gemfile"
@@ -123,7 +123,7 @@ unless File.directory? "#{Rails.root}/app"
           'mysql2' => 'mysql2',
           'pg' => 'postgresql',
           'db2' => 'db2',
-          'activerecord-sqlserver-adapter' => 'sqlserver'
+          'activerecord-sqlserver-adapter' => 'sqlserver',
         }
         active_db_gem = db_gems.keys.find { |g| Gem.loaded_specs[g] } || 'sqlite3'
 
@@ -134,7 +134,7 @@ unless File.directory? "#{Rails.root}/app"
         end
 
         unless File.exist?(file) && FileUtils.compare_file(file, tmpfile)
-          warning = ""
+          warning = ''
           if File.exist?(file)
             FileUtils.cp(file, backfile)
             warning << "** WARNING **
@@ -149,44 +149,44 @@ A Gemfile has been created in your application directory. If you have config.gem
         puts warning
       end
 
-      desc "Update configuration files from your current trusty install"
+      desc 'Update configuration files from your current trusty install'
       task :configs do
         require 'erb'
         instances = {
-          :env          => "#{Rails.root}/config/environment.rb",
-          :development  => "#{Rails.root}/config/environments/development.rb",
-          :test         => "#{Rails.root}/config/environments/test.rb",
-          :cucumber     => "#{Rails.root}/config/environments/cucumber.rb",
-          :production   => "#{Rails.root}/config/environments/production.rb"
+          env: "#{Rails.root}/config/environment.rb",
+          development: "#{Rails.root}/config/environments/development.rb",
+          test: "#{Rails.root}/config/environments/test.rb",
+          cucumber: "#{Rails.root}/config/environments/cucumber.rb",
+          production: "#{Rails.root}/config/environments/production.rb",
         }
         tmps = {
-          :env          => "#{Rails.root}/config/environment.tmp",
-          :development  => "#{Rails.root}/config/environments/development.tmp",
-          :test         => "#{Rails.root}/config/environments/test.tmp",
-          :cucumber     => "#{Rails.root}/config/environments/cucumber.rb",
-          :production   => "#{Rails.root}/config/environments/production.tmp"
+          env: "#{Rails.root}/config/environment.tmp",
+          development: "#{Rails.root}/config/environments/development.tmp",
+          test: "#{Rails.root}/config/environments/test.tmp",
+          cucumber: "#{Rails.root}/config/environments/cucumber.rb",
+          production: "#{Rails.root}/config/environments/production.tmp",
         }
         gens = {
-          :env          => "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_environment.rb",
-          :development  => "#{File.dirname(__FILE__)}/../../config/environments/development.rb",
-          :test         => "#{File.dirname(__FILE__)}/../../config/environments/test.rb",
-          :cucumber     => "#{File.dirname(__FILE__)}/../../config/environments/cucumber.rb",
-          :production   => "#{File.dirname(__FILE__)}/../../config/environments/production.rb"
+          env: "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_environment.rb",
+          development: "#{File.dirname(__FILE__)}/../../config/environments/development.rb",
+          test: "#{File.dirname(__FILE__)}/../../config/environments/test.rb",
+          cucumber: "#{File.dirname(__FILE__)}/../../config/environments/cucumber.rb",
+          production: "#{File.dirname(__FILE__)}/../../config/environments/production.rb",
         }
         backups = {
-          :env          => "#{Rails.root}/config/environment.bak",
-          :development  => "#{Rails.root}/config/environments/development.bak",
-          :test         => "#{Rails.root}/config/environments/test.bak",
-          :cucumber     => "#{Rails.root}/config/environments/cucumber.bak",
-          :production   => "#{Rails.root}/config/environments/production.bak"
+          env: "#{Rails.root}/config/environment.bak",
+          development: "#{Rails.root}/config/environments/development.bak",
+          test: "#{Rails.root}/config/environments/test.bak",
+          cucumber: "#{Rails.root}/config/environments/cucumber.bak",
+          production: "#{Rails.root}/config/environments/production.bak",
         }
 
         FileUtils.cp("#{File.dirname(__FILE__)}/../generators/instance/templates/instance_boot.rb", Rails.root + '/config/boot.rb')
         FileUtils.cp("#{File.dirname(__FILE__)}/../../config/preinitializer.rb", Rails.root + '/config/preinitializer.rb')
-        warning = ""
-        [:env, :development, :test, :cucumber, :production].each do |env_file|
+        warning = ''
+        %i[env development test cucumber production].each do |env_file|
           File.open(tmps[env_file], 'w') do |f|
-            app_name        = File.basename(File.expand_path(Rails.root))
+            app_name = File.basename(File.expand_path(Rails.root))
             trusty_version = TrustyCms::VERSION.to_s
             f.write ERB.new(File.read(gens[env_file])).result(binding)
           end
@@ -206,14 +206,14 @@ the new files: #{warning}"
         end
       end
 
-      desc "Update static HTML files from your current trusty install"
+      desc 'Update static HTML files from your current trusty install'
       task :static_html do
-        project_dir = Rails.root + "/public/"
+        project_dir = Rails.root + '/public/'
         html_files = Dir["#{File.dirname(__FILE__)}/../../public/*.html"].delete_if { |f| f =~ /404.html|500.html/ }
         FileUtils.cp(html_files, project_dir)
       end
 
-      desc "Update admin and trusty images from your current trusty install"
+      desc 'Update admin and trusty images from your current trusty install'
       task :images do
         %w{admin trusty}.each do |d|
           project_dir = Rails.root + "/public/images/#{d}/"
@@ -223,22 +223,22 @@ the new files: #{warning}"
         end
       end
 
-      desc "Update admin stylesheets from your current trusty install"
+      desc 'Update admin stylesheets from your current trusty install'
       task :stylesheets do
         project_dir = Rails.root + '/public/stylesheets/admin/'
 
         copy_stylesheets = proc do |project_dir, styles|
-          styles.reject!{|s| File.basename(s) == 'overrides.css'} if File.exists?(project_dir + 'overrides.css')
+          styles.reject! { |s| File.basename(s) == 'overrides.css' } if File.exists?(project_dir + 'overrides.css')
           FileUtils.cp(styles, project_dir)
         end
-        copy_stylesheets[Rails.root + '/public/stylesheets/admin/',Dir["#{File.dirname(__FILE__)}/../../public/stylesheets/admin/*.css"]]
+        copy_stylesheets[Rails.root + '/public/stylesheets/admin/', Dir["#{File.dirname(__FILE__)}/../../public/stylesheets/admin/*.css"]]
       end
 
-      desc "Update admin sass files from your current trusty install"
+      desc 'Update admin sass files from your current trusty install'
       task :sass do
         copy_sass = proc do |project_dir, sass_files|
-          sass_files.reject!{|s| File.basename(s) == 'overrides.sass'} if File.exists?(project_dir + 'overrides.sass') || File.exists?(project_dir + '../overrides.css')
-          sass_files.reject!{|s| File.directory?(s) }
+          sass_files.reject! { |s| File.basename(s) == 'overrides.sass' } if File.exists?(project_dir + 'overrides.sass') || File.exists?(project_dir + '../overrides.css')
+          sass_files.reject! { |s| File.directory?(s) }
           FileUtils.mkpath(project_dir)
           FileUtils.cp(sass_files, project_dir)
         end