alchemy_cms 3.5.0.rc2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d26c504af85a3c863cb1f1474afde99b0999b0e
-  data.tar.gz: fa93bfde945a32bdec04ba01bbf9c3f594b1e61a
+  metadata.gz: 14e8d027122008b488a73f9b024526409ebe50f7
+  data.tar.gz: c5881956120319ae1223ba35525e29eba86d1656
 SHA512:
-  metadata.gz: cfbfbaab2496508d73613a1799453e077d3ebe390273b71c1a80543889a5aa28826e56b2cfd7f65ef8da60a5a6f62a95d5c0b6a711777a0432344c3c6012e8fd
-  data.tar.gz: 64cb9dfe665da57d5461f17248023d1d485ee022c78e8b406c36aa3d8ccb75da6736d678d68a497ea7d150884922f4f2404e095348c57eb1012a6e7dd5aa79ab
+  metadata.gz: 785a53f247086243c4d59290eb772de017819b423c4b359aac6da424b0d25c2159274a3e7e4baf430f3044aa489208c7fd3e785571a95b9d20c83f614e775399
+  data.tar.gz: 4e34d1760942a244e941ffa38454b66c6b47c76c677cff91c39eaa40aed1c3e296825f13578aadbab9d6dae16a517459e9258568430a77668fac72bbaabeb426

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## 3.5.0 (unreleased)
+## 3.5.0 (2016-12-22)
 
 __New Features__
 
@@ -14,6 +14,7 @@ __New Features__
 
 __Notable Changes__
 
+* Removed the standalone installer (#1206)
 * The essence date input field is now 100% width (#1191)
 * The essence view partials don't get cached anymore (#1099)
 * The essence editor partials don't get cached anymore (#1171)
@@ -43,7 +44,7 @@ __Fixed Bugs__
 * Presence validation of EssenceFile is not working (#1096)
 * Allow to define unique nestable elements (#852)
 
-## 3.4.2 (unreleased)
+## 3.4.2 (2016-12-22)
 
 __Notable Changes__
 
@@ -52,6 +53,7 @@ __Notable Changes__
 __Fixed Bugs__
 
 * The `language_links` helper now only renders languages from the current site
+* Fixes alchemy module generator (#1159)
 
 ## 3.4.1 (2016-08-31)
 

data/README.md

@@ -6,7 +6,7 @@
 
 ## About
 
-![Alchemy CMS](http://alchemy-cms.com/assets/alchemy_logo.svg)
+![Alchemy CMS](app/assets/images/alchemy/alchemy-logo.svg)
 
 Alchemy is a powerful, flexible and user centric Rails CMS.
 
@@ -51,25 +51,6 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
 
 ## Installation
 
-### Install as a standalone project
-
-Use the installer:
-
-```shell
-$ gem install alchemy_cms --pre
-$ alchemy new my_magicpage
-```
-
-and follow the instructions to finish the installation.
-
-The installer has some options (like choosing the database). See them with:
-
-```shell
-$ alchemy --help
-```
-
-### Install into an existing Rails project
-
 #### 1. Add the Alchemy gem:
 
 Put this into your `Gemfile`:

data/alchemy_cms.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.0.0'
   gem.license               = 'BSD New'
   gem.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
-  gem.executables           = 'alchemy'
   gem.require_paths         = ['lib']
 
   gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.9.0']

data/app/controllers/alchemy/admin/layoutpages_controller.rb

@@ -6,7 +6,7 @@ module Alchemy
 
       def index
         @layout_root = Page.find_or_create_layout_root_for(Language.current.id)
-        @languages = Language.all
+        @languages = Language.on_current_site
       end
 
       def edit

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.5.0.rc2"
+  VERSION = "3.5.0"
 
   def self.version
     VERSION

data/lib/tasks/alchemy/install.rake

@@ -32,12 +32,11 @@ namespace :alchemy do
   task :install do
     install_helper = Alchemy::InstallTask.new
 
-    unless ENV['from_binary']
-      puts "\nAlchemy Installer"
-      puts "-----------------"
-    end
+    puts "\nAlchemy Installer"
+    puts "-----------------"
+
     Rake::Task["alchemy:mount"].invoke
-    system("rails g alchemy:install#{ENV['from_binary'] ? ' --force' : ''}") || exit!(1)
+    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
@@ -45,12 +44,11 @@ namespace :alchemy do
     Rake::Task["db:migrate"].invoke
     install_helper.inject_seeder
     Rake::Task["db:seed"].invoke
-    unless ENV['from_binary']
-      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."
-    end
+
+    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."
   end
 
   desc "Mounts Alchemy into your routes."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.5.0.rc2
+  version: 3.5.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -324,8 +324,7 @@ dependencies:
 description: Alchemy is a powerful, userfriendly and flexible Rails 4 CMS.
 email:
 - alchemy@magiclabs.de
-executables:
-- alchemy
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -760,7 +759,6 @@ files:
 - app/views/kaminari/alchemy/_prev_page.html.erb
 - app/views/layouts/alchemy/admin.html.erb
 - app/views/layouts/alchemy/sitemap.xml.erb
-- bin/alchemy
 - bin/rails
 - bin/rspec
 - bin/spring
@@ -904,7 +902,6 @@ files:
 - lib/rails/generators/alchemy/site_layouts/templates/layout.html.haml
 - lib/rails/generators/alchemy/site_layouts/templates/layout.html.slim
 - lib/rails/generators/alchemy/views/views_generator.rb
-- lib/rails/templates/alchemy.rb
 - lib/tasks/alchemy/convert.rake
 - lib/tasks/alchemy/db.rake
 - lib/tasks/alchemy/install.rake
@@ -976,9 +973,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 

data/bin/alchemy

@@ -1,265 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-gem 'rails', '~> 4.2.0'
-
-require 'rails/version'
-require "thor"
-require 'io/console' # for password prompt
-require File.expand_path('../../lib/alchemy/version', __FILE__)
-
-class AlchemyInstaller < Thor
-  include Thor::Actions
-
-  map "-v" => :version
-  map "--version" => :version
-  desc "version", "Prints current Alchemy CMS version", hide: true
-  def version
-    puts Alchemy.version
-  end
-
-  desc "new PROJECT", "Creates a new Alchemy CMS project."
-  method_option :database, type: :string, aliases: "-d", desc: "Preconfigure for selected database (options: mysql/postgresql/sqlite3). Default: sqlite3"
-  def new(project)
-    @application = project.downcase.strip.tr(' ', '_')
-    say welcome_message, :yellow
-    say "Step 1: Creating a Rails #{rails_version} application.", :yellow
-    say "Please wait...", :yellow
-    system("rails _#{rails_version}_ new #{@application} -m #{alchemy_template} -d #{options[:database]} -T") || exit!(1)
-    say "Successfully created the Rails application!", :green
-    say instructions, :yellow
-    if options[:database] == 'mysql' || options[:database] == 'postgresql'
-      create_database_yml(options[:database])
-    end
-    system("#{rake_cmd} alchemy:install from_binary=true") || exit!(1)
-    say "\nStep 3: Installing Alchemy User into Rails app", :yellow
-    say "Please wait...", :yellow
-    system("#{rails_cmd} g alchemy:devise:install") || exit!(1)
-    say "Done.", :green
-    cleanup
-    say "\nSuccessfully installed Alchemy CMS\n", :green
-    say further_instructions, :yellow
-  rescue
-    say "\nError while installing Alchemy CMS!\n#{$!}\n", :red
-  end
-
-  private
-
-  def rails_version
-    Rails::VERSION::STRING
-  end
-
-  def rake_cmd
-    "#{bundle_cmd} rake"
-  end
-
-  def rails_cmd
-    "#{bundle_cmd} rails"
-  end
-
-  def bundle_cmd
-    "cd #{@application} && DISABLE_SPRING=1 bundle exec"
-  end
-
-  def alchemy_template
-    File.join(File.dirname(__FILE__), '..', 'lib', 'rails', 'templates', 'alchemy.rb')
-  end
-
-  def welcome_message
-    <<-MSG
-
-------------------------------------------------------------
--=      Welcome to the Alchemy Standalone Installer       =-
-------------------------------------------------------------
-
-Bootstraping a new Alchemy CMS #{Alchemy.version} project for you.
-
-MSG
-  end
-
-  def instructions
-    <<-INSTRUCTIONS
-
-Step 2: Configuration
-
-In order to guide you through the installation process we need you to answer some questions.
-INSTRUCTIONS
-  end
-
-  def further_instructions
-    <<-EOF
-
-Step 4: Further Instructions
-
-Change into your app folder:
-
-  $ cd #{@application}
-
-Start your local Rails server with:
-
-  $ bin/rails server
-
-Open your browser and enter the following URL:
-
-http://localhost:3000/admin
-
-and follow the on screen instructions to complete the installation.
-
-We hope you have fun using Alchemy!
-EOF
-  end
-
-  def cleanup
-    append_file "#{@application}/.gitignore" do
-      <<-GITIGNORE
-
-# Ignore Alchemy uploads folder
-/uploads
-
-# Ignore sensitive data
-config/database.yml
-config/initializers/secret_token.rb
-GITIGNORE
-    end
-    `
-      cd #{@application}
-      mkdir -p ./uploads
-    `
-  end
-
-  def create_database_yml(type)
-    case type
-    when 'mysql'
-      say "- MySQL Database settings", :yellow
-      @db_user_name = ask("\nPlease enter your local mysql username (DEFAULT: root):")
-      @db_user_name = 'root' if @db_user_name.empty?
-      @db_password = ask_password("Please enter the password for #{@db_user_name} (Leave blank for none):")
-      local_standard_socket = '/tmp/mysql.sock'
-      @db_socket = ask("Please enter your local mysql socket (DEFAULT: #{local_standard_socket}):")
-      @db_socket = local_standard_socket if @db_socket.empty?
-      file = mysql_yml_file
-    when 'postgresql'
-      say "- PostgreSQL Database settings", :yellow
-      @db_user_name = ask("\nPlease enter the local postgresql user name:")
-      @db_password = ask_password("Please enter the password for #{@db_user_name} (Leave blank for none):")
-      file = postgres_yml_file
-    end
-    create_file "./#{@application}/config/database.yml", file, force: true
-  end
-
-  def mysql_yml_file
-<<-DATABASE
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql2
-  encoding: utf8
-  database: #{@application}_development
-  pool: 5
-  username: #{@db_user_name}
-  password: #{@db_password}
-  socket: #{@db_socket}
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  encoding: utf8
-  database: #{@application}_test
-  pool: 5
-  username: #{@db_user_name}
-  password: #{@db_password}
-  socket: #{@db_socket}
-
-production:
-  adapter: mysql2
-  encoding: utf8
-  database: #{@application}_production
-  pool: 5
-  username: #{@db_user_name}
-  password: #{@db_password}
-  socket: #{@db_socket}
-DATABASE
-  end
-
-  def postgres_yml_file
-<<-DATABASE
-# PostgreSQL. Versions 8.2 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On OS X with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On OS X with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-development:
-  adapter: postgresql
-  encoding: unicode
-  database: #{@application}_development
-  pool: 5
-  username: #{@db_user_name}
-  password: #{@db_password}
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: postgresql
-  encoding: unicode
-  database: #{@application}_test
-  pool: 5
-  username: #{@db_user_name}
-  password: #{@db_password}
-
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: #{@application}_production
-  pool: 5
-  username: #{@db_user_name}
-  password: #{@db_password}
-DATABASE
-  end
-
-  def ask_password(message)
-    password = $stdin.noecho { ask(message) }
-    puts "\n"
-    password
-  end
-end
-
-AlchemyInstaller.start

data/lib/rails/templates/alchemy.rb

@@ -1,7 +0,0 @@
-# This rails template installs Alchemy and all depending gems.
-require File.expand_path("../../../alchemy/version", __FILE__)
-
-gem "alchemy_cms",    github: "AlchemyCMS/alchemy_cms",    branch: "master"
-gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "master"
-
-gem "capistrano-alchemy", github: "AlchemyCMS/capistrano-alchemy", branch: "master", group: "development"