alchemy_cms 5.0.0.beta2 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a4ae7079c8ca7f64ae3b28d1acf1b648090d98fc4b9beff5061f81c73e1044
-  data.tar.gz: bb1169db4e23c9621745888be3963319b3746e156028d711a22870a4f51330e4
+  metadata.gz: 9b719983afdc90cf645552079d8de65a7632372c37b3c3acc98e81c726fe3ddd
+  data.tar.gz: 45f07d11d8cce7598ba56a9e6801eb93e3ef31873d24a5e894d8e5208628f99c
 SHA512:
-  metadata.gz: c60d6b0ddcbe43763ff32fcad72144f572f6f8c91bbd1ac9bd0edbd41fd88723a29ef299f5ae51f5edd366e9f8ad7de5054a19768cfe92f27bb61f36d5c04bc2
-  data.tar.gz: f2f612afa9ae01c12d56b61c674ff311f89951acbeb0d327e3b15465761380a5344c65160dd121a6b88b6ab2ca6841d26a7eb75b92cfea65cba9bfb956fd81a1
+  metadata.gz: de9831e1555fa6ecff7dfe9e28d762ae6bfb9507566aae096ca6ade3087e976a0ec840b1e5a87167fe198154d34cca498fed9d693775f4ba0960d8a062847e24
+  data.tar.gz: 179690bed4cb7feadeb9bff852a8de948c397c8c65d06643bc8dc8863538f951499307a42c883a188454c916d945abe3788ee0eba3f97839e70a881eba2ae21b

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 5.0.0 (unreleased)
 
+- Deprecate redirect_to_public_child ([tvdeyen](https://github.com/tvdeyen))
+- Add --auto-accept option to installer ([tvdeyen](https://github.com/tvdeyen))
+- Move all installer code into install generator ([tvdeyen](https://github.com/tvdeyen))
 - Language Factory: Create default language in host app's locale [#1884](https://github.com/AlchemyCMS/alchemy_cms/pull/1884) ([mamhoff](https://github.com/mamhoff))
 - Respect filter and tagging params in picture archive size buttons [#1880](https://github.com/AlchemyCMS/alchemy_cms/pull/1880) ([tvdeyen](https://github.com/tvdeyen))
 - Extract picture thumbnail sizes in a constant [#1879](https://github.com/AlchemyCMS/alchemy_cms/pull/1879) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -22,7 +22,7 @@ group :development, :test do
     gem "yard"
     gem "redcarpet"
     gem "pry-byebug"
-    gem "rubocop", "~> 0.85.0", require: false
+    gem "rubocop", "~> 0.87.1", require: false
     gem "listen"
     gem "localeapp", "~> 3.0", require: false
     gem "dotenv", "~> 2.2"

data/README.md

@@ -125,7 +125,7 @@ $ bundle add alchemy-devise
 Then run the `alchemy-devise` installer:
 
 ```bash
-$ bin/rails g alchemy_devise:install
+$ bin/rails g alchemy:devise:install
 ```
 
 ##### Use your User model
@@ -167,7 +167,7 @@ Please follow [this guide](http://guides.alchemy-cms.com/stable/custom_authentic
 **After** you set the user model you need to run the Alchemy install task:
 
 ```bash
-$ bin/rake alchemy:install
+$ bin/rails alchemy:install
 ```
 
 Now everything should be set up and you should be able to visit the Alchemy Dashboard at:

data/Rakefile

@@ -39,16 +39,17 @@ namespace :alchemy do
   namespace :spec do
     desc "Prepares database for testing Alchemy"
     task :prepare do
-      result = system <<~BASH
-        cd spec/dummy && \
-        export RAILS_ENV=test && \
-        bin/rake db:create && \
-        bin/rake db:environment:set && \
-        bin/rake db:migrate:reset && \
-        bin/rails g alchemy:install --skip --skip-demo-files && \
-        cd -
-      BASH
-      result || fail
+      system(
+        <<~BASH
+          cd spec/dummy && \
+          export RAILS_ENV=test && \
+          bin/rake db:create && \
+          bin/rake db:environment:set && \
+          bin/rake db:migrate:reset && \
+          bin/rails g alchemy:install --skip --skip-demo-files --auto-accept && \
+          cd -
+        BASH
+      ) || fail
     end
   end
 

data/lib/alchemy/config.rb

@@ -31,7 +31,9 @@ module Alchemy
       # a value of nil means there is no new default
       # any not nil value is the new default
       def deprecated_configs
-        {}
+        {
+          redirect_to_public_child: nil,
+        }
       end
 
       private
@@ -74,11 +76,11 @@ module Alchemy
         if deprecated_configs.key?(name.to_sym)
           config = deprecated_configs[name.to_sym]
           if config.nil?
-            Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy 5.0")
+            Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy 5.1")
           else
             value = show[name.to_s]
             if value != config
-              Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy 5.0")
+              Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy 5.1")
             end
           end
         end

data/lib/alchemy/deprecation.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Alchemy
-  Deprecation = ActiveSupport::Deprecation.new("5.0", "Alchemy")
+  Deprecation = ActiveSupport::Deprecation.new("5.1", "Alchemy")
 end

data/lib/alchemy/install/tasks.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require "thor"
+
+module Alchemy
+  module Install
+    class Tasks < Thor
+      include Thor::Actions
+
+      no_tasks do
+        def inject_routes(auto_accept = false)
+          return if File.read("./config/routes.rb").match?("mount Alchemy::Engine")
+
+          mountpoint = "/"
+          unless auto_accept
+            mountpoint = ask("- At which path do you want to mount Alchemy CMS at?", default: mountpoint)
+          end
+          sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
+          inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
+        end
+
+        def set_primary_language(auto_accept = false)
+          code = "en"
+          unless auto_accept
+            code = ask("- What is the language code of your site's primary language?", default: code)
+          end
+          name = "English"
+          unless auto_accept
+            name = ask("- What is the name of your site's primary language?", default: name)
+          end
+          gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do
+            "default_language:\n  code: #{code}\n  name: #{name}"
+          end
+        end
+
+        def inject_seeder
+          append_file "./db/seeds.rb", "Alchemy::Seeder.seed!\n"
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.0.0.beta2"
+  VERSION = "5.0.0.rc1"
 
   def self.version
     VERSION

data/lib/generators/alchemy/install/install_generator.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 require "rails/generators"
+require "alchemy/install/tasks"
 
 module Alchemy
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       desc "Installs Alchemy into your App."
 
+      class_option :auto_accept,
+        type: :boolean,
+        default: false,
+        desc: "Automatically accept defaults."
+
       class_option :skip_demo_files,
         type: :boolean,
         default: false,
@@ -18,6 +24,13 @@ module Alchemy
 
       source_root File.expand_path("files", __dir__)
 
+      def setup
+        header
+        say "Welcome to AlchemyCMS!"
+        say "Let's begin with some questions.\n\n"
+        install_tasks.inject_routes(options[:auto_accept])
+      end
+
       def copy_config
         copy_file "#{gem_config_path}/config.yml", app_config_path.join("alchemy", "config.yml")
       end
@@ -53,7 +66,11 @@ module Alchemy
       end
 
       def copy_dragonfly_config
-        template "#{__dir__}/templates/dragonfly.rb.tt", app_config_path.join("initializers", "dragonfly.rb")
+        template(
+          "#{__dir__}/templates/dragonfly.rb.tt",
+          app_config_path.join("initializers", "dragonfly.rb"),
+          skip: options[:auto_accept]
+        )
       end
 
       def install_gutentag_migrations
@@ -80,8 +97,46 @@ module Alchemy
           app_root.join(webpack_config["source_path"], webpack_config["source_entry_path"], "alchemy/admin.js")
       end
 
+      def set_primary_language
+        header
+        install_tasks.set_primary_language(options[:auto_accept])
+      end
+
+      def setup_database
+        rake("db:create", abort_on_failure: true)
+        # We can't invoke this rake task, because Rails will use wrong engine names otherwise
+        rake("railties:install:migrations", abort_on_failure: true)
+        rake("db:migrate", abort_on_failure: true)
+        install_tasks.inject_seeder
+        rake("db:seed", abort_on_failure: true)
+      end
+
+      def finalize
+        header
+        say "Alchemy successfully installed!"
+        say "Now start the server with:\n\n"
+        say "  bin/rails server\n\n"
+        say "and point your browser to\n\n"
+        say "  http://localhost:3000/admin\n\n"
+        say "and follow the onscreen instructions to finalize the installation.\n\n"
+      end
+
       private
 
+      def header
+        return if options[:auto_accept]
+
+        puts "─────────────────────"
+        puts "* Alchemy Installer *"
+        puts "─────────────────────"
+      end
+
+      def say(something)
+        return if options[:auto_accept]
+
+        puts "  #{something}"
+      end
+
       def gem_config_path
         @_config_path ||= File.expand_path("../../../../config/alchemy", __dir__)
       end
@@ -105,6 +160,10 @@ module Alchemy
       def app_root
         @_app_root ||= Rails.root
       end
+
+      def install_tasks
+        @_install_tasks ||= Alchemy::Install::Tasks.new
+      end
     end
   end
 end

data/lib/tasks/alchemy/install.rake

@@ -1,59 +1,15 @@
 # frozen_string_literal: true
-require "thor"
-
-class Alchemy::InstallTask < Thor
-  include Thor::Actions
-
-  no_tasks do
-    def inject_routes
-      mountpoint = ask "\nAt which path do you want to mount Alchemy CMS at? (DEFAULT: At root path '/')"
-      mountpoint = "/" if mountpoint.empty?
-      sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
-      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
-    end
-
-    def set_primary_language
-      code = ask "\nWhat's the language code of your site's primary language? (DEFAULT: en)"
-      code = "en" if code.empty?
-      name = ask "What's the name of your site's primary language? (DEFAULT: English)"
-      name = "English" if name.empty?
-      gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do
-        "default_language:\n  code: #{code}\n  name: #{name}"
-      end
-    end
-
-    def inject_seeder
-      append_file "./db/seeds.rb", "Alchemy::Seeder.seed!\n"
-    end
-  end
-end
 
 namespace :alchemy do
   desc "Installs Alchemy CMS into your app."
-  task install: "alchemy:yarn:install" do
-    install_helper = Alchemy::InstallTask.new
-
-    puts "\nAlchemy Installer"
-    puts "-----------------"
-
-    Rake::Task["alchemy:mount"].invoke
-    system("rails g alchemy:install") || exit!(1)
-    install_helper.set_primary_language
-    Rake::Task["db:create"].invoke
-    # We can't invoke this rake task, because Rails will use wrong engine names otherwise
-    `bundle exec rake railties:install:migrations`
-    Rake::Task["db:migrate"].invoke
-    install_helper.inject_seeder
-    Rake::Task["db:seed"].invoke
-
-    puts "\nAlchemy successfully installed."
-    puts "\nNow start the server with:"
-    puts "\n$ bin/rails server"
-    puts "\nand point your browser to http://localhost:3000/admin and follow the onscreen instructions to finalize the installation."
+  task :install do
+    require "generators/alchemy/install/install_generator"
+    Alchemy::Generators::InstallGenerator.start
   end
 
   desc "Mounts Alchemy into your routes."
   task :mount do
-    Alchemy::InstallTask.new.inject_routes
+    require "alchemy/install/tasks"
+    Alchemy::InstallTasks.new.inject_routes
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta2
+  version: 5.0.0.rc1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1087,6 +1087,7 @@ files:
 - lib/alchemy/forms/builder.rb
 - lib/alchemy/hints.rb
 - lib/alchemy/i18n.rb
+- lib/alchemy/install/tasks.rb
 - lib/alchemy/logger.rb
 - lib/alchemy/modules.rb
 - lib/alchemy/name_conversions.rb