spontaneous 0.2.0.alpha6 → 0.2.0.alpha7

data/bin/spot

@@ -30,4 +30,11 @@ end
 
 require 'spontaneous'
 
-Spontaneous::Cli::Root.start(ARGV)
+begin
+  Spontaneous::Cli::Root.start(ARGV)
+rescue Interrupt => e
+  puts "\nAbort..."
+  exit 1
+rescue SystemExit => e
+  exit e.status
+end

data/lib/spontaneous/cli/generate.rb

@@ -12,14 +12,21 @@ module Spontaneous::Cli
     default_task :site
 
     desc "site [DOMAIN]", "Generates a site skeleton. Usage: spot generate <site domain name>"
+
+    method_option :database, :type => :string, :default => "mysql", :aliases => "-d", :desc => "Database adapter"
+    method_option :user, :type => :string, :default => "root", :aliases => "-u", :desc => "Database admin user"
+    method_option :password, :type => :string, :default => "", :aliases => "-p", :desc => "Database admin user"
+
     def site(*args)
-      require File.expand_path('../../../spontaneous', __FILE__)
-      ::Spontaneous::Generators::Site.start(args)
+      # require "spontaneous"
+      ::Spontaneous::Generators::Site.start(ARGV.drop_while { |e| %w(generate site).include?(e) })
     end
 
     def method_missing(method, *args)
       if PublicSuffix.valid?(method.to_s)
+        puts method
         args.unshift(method.to_s)
+        ARGV.unshift("site")
         self.send(:site, *args)
       else
         super

data/lib/spontaneous/cli/init.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require 'etc'
+
 module Spontaneous::Cli
   class Init < ::Thor
     include Spontaneous::Cli::TaskUtils
@@ -10,39 +12,112 @@ module Spontaneous::Cli
     default_task :init
 
     desc :init, "Creates databases and initialises a new Spontaneous site"
+
+    method_option :user, :type => :string, :default => nil, :aliases => "-u", :desc => "Database admin user"
+    method_option :password, :type => :string, :default => "", :aliases => "-p", :desc => "Database admin password"
+    method_option :account, :type => :hash, :default => {}, :aliases => "-a", :desc => "Details of the root login"
+
     def init
       prepare :init
-      site = ::Spontaneous::Site.instantiate(Dir.pwd, options.environment, :back)
-      require File.expand_path('../../../spontaneous', __FILE__)
+
+      site = ::Spontaneous::Site.instantiate(Dir.pwd, options.environment, :console)
       Sequel.extension :migration
-      connection_params = ::Spontaneous.db_settings
-      connection_params[:user] = 'root'
-      database = connection_params.delete(:database)
-      password = connection_params.delete(:password)
-      catch(:error) do
-        Sequel.connect(connection_params) do |connection|
-          ["", "_test"].map { |ext| "#{database}#{ext}"}.each do |db|
-            begin
-              say "  >> Creating database `#{db}`"
-              connection.run("CREATE DATABASE `#{db}` CHARACTER SET UTF8")
-            rescue => e
-              say " >>> Unable to create #{connection_params[:adapter]} database `#{db}`:\n   > #{e}", :red
-              # throw :error
-            end
-            begin
-              connection.run("USE `#{db}`")
-              connection.logger = nil
-              say "  >> Running migrations..."
-              Sequel::Migrator.apply(connection, ::Spontaneous.gem_dir('db/migrations'))
-              say "  >> Done"
-            rescue => e
-              say " >>> Error running migrations on database `#{db}`:\n   > #{e}", :red
-            end
-          end
+
+
+      database, admin_connection_params, site_connection_params = generate_connection_params
+
+      [database, "#{database}_test"].each do |db|
+        config = site_connection_params.merge(:database => db)
+        create(db, admin_connection_params, config)
+        migrate(db, admin_connection_params, config)
+      end
+
+      boot!
+
+      # Add a root user if this is a new site
+      insert_root_user if ::Spontaneous::Permissions::User.count == 0
+
+    end
+
+    protected
+
+    def insert_root_user
+      invoke "user:add", [],  options.account
+      # Set up auto_login configuration with the name of the root user
+      # we've just created
+      root = ::Spontaneous::Permissions::User.first
+      config_path = "./config/environments/development.rb"
+      config = File.read(config_path, encoding: "UTF-8").
+        gsub(/__SPONTANEOUS_ROOT_USER_INSERT__/, root.login)
+      File.open(config_path, "w:UTF-8") do |file|
+        file.write(config)
+      end
+    end
+
+    def create(database, admin_config, site_config)
+      Sequel.connect(admin_config) do |connection|
+        begin
+          say "  >> Creating database `#{site_config[:database]}`", :green
+          create_database(connection, site_config)
+        rescue => e
+          say " >>> Unable to create #{admin_config[:adapter]} database `#{site_config[:database]}`:\n   > #{e}", :red
+        end
+      end
+    end
+
+    def migrate(database, admin_config, site_config)
+      Sequel.connect(admin_config.merge(:database => site_config[:database])) do |connection|
+        begin
+          connection.logger = nil
+          say "  >> Running migrations..."
+          Sequel::Migrator.apply(connection, ::Spontaneous.gem_dir('db/migrations'))
+          say "  >> Done"
+        rescue => e
+          say " >>> Error running migrations on database `#{site_config[:database]}`:\n   > #{e}", :red
         end
-        boot!
       end
     end
 
+    # Converts the site db parameters into 'admin' connection using the provided
+    # db credentials and the necessary :database settings
+    def generate_connection_params
+      site_connection_params = ::Spontaneous.db_settings
+      connection_params = site_connection_params.dup
+      connection_params[:user] = options.user unless options.user.blank?
+      connection_params[:password] = options.password unless options.password.blank?
+
+      database = connection_params.delete(:database)
+      case connection_params[:adapter]
+      when /mysql/
+      when /postgres/
+        # postgres requires that you connect to a db.
+        # "postgres" is guaranteed to exist
+        connection_params[:database] = "postgres"
+      end
+      [database, connection_params, site_connection_params]
+    end
+
+    def create_database(connection, config)
+      commands = case connection.database_type
+                when :postgres
+                  [
+                    [%(CREATE ROLE "#{config[:user]}" LOGIN PASSWORD '#{config[:password]}'), false],
+                    [%(CREATE DATABASE "#{config[:database]}" TEMPLATE=template0 ENCODING='UTF8' OWNER="#{config[:user]}"), true]
+                  ]
+                when :mysql
+                  host = config[:host].blank? ? "" : "@#{config[:host]}"
+                  [
+                    ["CREATE DATABASE `#{config[:database]}` CHARACTER SET UTF8", true],
+                    ["GRANT ALL ON `#{config[:database]}`.* TO `#{config[:user]}`#{host} IDENTIFIED BY '#{config[:password]}'", false]
+                  ]
+                end
+      commands.each do |command, raise_error|
+        begin
+          connection.run(command)
+        rescue => e
+          raise e if raise_error
+        end
+      end
+    end
   end # Init
 end # Spontaneous::Cli

data/lib/spontaneous/cli/server.rb

@@ -2,8 +2,7 @@
 
 # require 'spontaneous'
 require 'simultaneous'
-require 'foreman'
-require 'foreman/engine'
+require 'foreman/engine/cli'
 
 module Spontaneous
   module Cli
@@ -17,15 +16,14 @@ module Spontaneous
 
       desc "start", "Starts Spontaneous in development mode"
       def start
-        # I can do this programatically in the latest version of Foreman
-        File.open(".Procfile", 'wb') do |procfile|
-          procfile.write(%(back: #{binary} server back --root=#{options.site}\n))
-          procfile.write(%(front: #{binary} server front --root=#{options.site}\n))
-          procfile.write(%(simultaneous: #{binary} server simultaneous --root=#{options.site}\n))
-          procfile.flush
-          engine = ::Foreman::Engine.new(procfile.path)
-          engine.start
+        root   = File.expand_path(options.site)
+        engine = ::Foreman::Engine::CLI.new(root: options.site)
+
+        %w(back front publish).each do |process|
+          engine.register(process, "#{binary} server #{process} --root=#{root}")
         end
+
+        engine.start
       end
 
       desc "front", "Starts Spontaneous in front/public mode"
@@ -49,15 +47,13 @@ module Spontaneous
       def simultaneous
         prepare! :start
         connection = options[:connection] || ::Spontaneous.config.simultaneous_connection
-        fork {
-          ENV.delete("BUNDLE_GEMFILE")
-          puts("#{Simultaneous.server_binary} -c #{connection} --debug")
-          exec("#{Simultaneous.server_binary} -c #{connection} --debug")
-          # sleep 10
-        }
-        Process.wait
+        exec({"BUNDLE_GEMFILE" => nil}, "#{Simultaneous.server_binary} -c #{connection} --debug")
       end
 
+      # A shorter name for the 'simultaneous' task is useful (Foreman appends
+      # it to each line of output)
+      map %w(bg publish) => :simultaneous
+
       private
 
       def binary

data/lib/spontaneous/cli/user.rb

@@ -3,11 +3,11 @@ module ::Spontaneous
   module Cli
     class User < ::Thor
       include Spontaneous::Cli::TaskUtils
-      # namespace :user
 
+      namespace    :user
       default_task :add
 
-      desc "#{namespace}:add", "Add a new user"
+      desc "add", "Add a new user"
 
       method_option :login,  :type => :string, :aliases => "-l",
         :desc => "The user's login -- must be unique"
@@ -15,91 +15,160 @@ module ::Spontaneous
         :desc => "The user's name"
       method_option :email,  :type => :string, :aliases => "-e",
         :desc => "The user's email address"
-      method_option :passwd, :type => :string, :aliases => ["-p", "--password"],
+      method_option :password, :type => :string, :aliases => ["-p", "--passwd"],
         :desc => "The user's password"
       method_option :level, :type => :string, :aliases => "-a",
         :desc => "The user's access level"
 
       def add
-        prepare :adduser, :console
-        boot!
+        prepare! :adduser, :console
+
         users = ::Spontaneous::Permissions::User.count
-        attrs = {}
-        width = 14
-        valid_login = /^[a-z0-9_]{3,}$/
-        levels = ::Spontaneous::Permissions::UserLevel.all.map(&:to_s)
-        level = nil
+
+        defaults = find_defaults(users)
 
         say("\nAll fields are required:\n", :green)
-        if options.login
-          attrs[:login] = options.login
-          say "Login : ".rjust(width, " ")+" ", :white
-          say options.login, :green
+
+        attrs, level = ask_user_details(defaults, users)
+
+        user = ::Spontaneous::Permissions::User.new(attrs)
+
+        if user.save
+          user.update(:level => level)
+          say("\nUser '#{user.login}' created with level '#{user.level}'", :green)
         else
-          begin
-            attrs[:login] = ask "Login : ".rjust(width, " ")
-            say("Login must consist of at least 3 letters, numbers and underscores", :red) unless valid_login === attrs[:login]
-          end while attrs[:login] !~ valid_login
+          errors = user.errors.map do | a, e |
+            " - #{a.to_s.capitalize} #{e.first} #{attrs[a].inspect}"
+          end.join("\n")
+          say("\nUnable to create user:\n"+errors, :red)
+          exit 127
         end
+      end
+
+
+      desc "list", "List the current users"
+      method_option :bare, :type => :boolean, :default => false, :aliases => %w(-b),
+        :desc => "Remove descriptive text from result"
+      def list
+        prepare! :listusers, :console
+        user_table(::Spontaneous::Permissions::User.all, options.bare)
+      end
 
-        attrs[:name] = options.name || ask("Name : ".rjust(width, " "))
 
-        if options.name
-          say "Name : ".rjust(width, " ")+" ", :white
-          say options.name, :green
+      desc "authenticate LOGIN PASSWORD", "Test a user/password combination"
+      method_option :bare, :type => :boolean, :default => false, :aliases => %w(-b),
+        :desc => "Remove descriptive text from result"
+
+      def authenticate(login, password)
+        prepare! :user_authenticate, :console
+        key = Spontaneous::Permissions::User.authenticate login, password
+        if key
+          say "\nAuthentication successful for user '#{login}'", :green unless options.bare
+          user_table([key.user], options.bare)
+        else
+          say "\nInvalid username & password combination", :red
+          exit 127
         end
+      end
+
+      protected
+
+      def user_table(users, hide_headers = false)
+        columns = [:login, :name, :email, :level]
+        users = ::Spontaneous::Permissions::User.all.map { |user|
+          columns.map { |column| user.send(column) }
+        }
+        users.unshift columns.map { |c| c.to_s.capitalize } unless hide_headers
+        puts "\n" unless hide_headers
+        print_table(users, indent: (hide_headers ? 0 : 2))
+        puts "\n"
+      end
 
-        attrs[:email] = options.email || ask("Email : ".rjust(width, " "))
+      def find_defaults(existing_user_count)
+        return {} if existing_user_count > 0
 
-        if options.email
-          say "Email : ".rjust(width, " ")+" ", :white
-          say options.email, :green
+        require 'etc'
+
+        defaults = { login: Etc.getlogin }
+        git_installed = Kernel.system "which git > /dev/null 2>&1"
+
+        if git_installed
+          defaults[:email] = `git config --get user.email`.chomp
+          defaults[:name]  = `git config --get user.name`.chomp
         end
+        defaults
+      end
 
-        if options.passwd
-          attrs[:password] = options.passwd
-          say "Password : ".rjust(width, " ")+" ", :white
-          say options.passwd, :green
+      def prompt(attribute, default = nil, width = 14)
+        prompt = (attribute.to_s.capitalize).rjust(width, " ")
+        prompt << " :"
+        prompt << %( [#{default}]) if default
+        prompt
+      end
+
+      def request(attribute, default, value = nil)
+        if value
+          say prompt(attribute)+" ", :white
+          say value, :green
+          return value
         else
+          if block_given?
+            return yield
+          else
+            return ask_with_default(attribute, default)
+          end
+        end
+      end
+
+      def ask_with_default(attribute, default = nil)
+        result = ask(prompt(attribute, default))
+        return default if default && result == ""
+        result
+      end
+
+      def ask_user_details(defaults = {}, users)
+        attrs = {}
+        level = nil
+        width = 14
+        valid_login = /^[a-z0-9_]{3,}$/
+        levels = ::Spontaneous::Permissions::UserLevel.all.map(&:to_s)
+
+        attrs[:login] = request(:login, defaults[:login], options.login) do
           begin
-            attrs[:password] = ask "Password : ".rjust(width, " ")
-            say("Password must be at least 6 characters long", :red) unless attrs[:password].length > 5
-          end while attrs[:password].length < 6
+            login =  ask_with_default(:login, defaults[:login])
+            say("Login must consist of at least 3 letters, numbers and underscores", :red) unless valid_login === login
+          end while login !~ valid_login
+          login
         end
 
+        attrs[:name]     = request(:name, defaults[:name], options.name)
+        attrs[:email]    = request(:email, defaults[:email], options.email)
+        attrs[:password] = request(:password, nil, options.password) do
+          begin
+            passwd = ask_with_default(:password)
+            say("Password must be at least 6 characters long", :red) unless passwd.length > 5
+          end while passwd.length < 6
+          passwd
+        end
 
         if users == 0
           level = "root"
         else
-          if options.level
-            level = options.level
-            say "User level : ".rjust(width, " ")+" ", :white
-            say options.level, :green
-            unless levels.include?(level)
-              say("\nInvalid level '#{level}'", :red)
-              say("Valid levels are: #{levels.join(", ")}", :red)
-              exit 127
-            end
-          else
+          level = options.level
+          unless level.blank? or levels.include?(level)
+            say("\nInvalid level '#{level}'", :red)
+            say("Valid levels are: #{levels.join(", ")}", :red)
+            exit 127
+          end
+          level = request(:level, nil, level) do
             begin
-              level = ask("User level [#{levels.join(', ')}] : ")
+              level = ask(prompt("User level")+ " [#{levels.join(', ')}]")
               say("Invalid level '#{level}'", :red) unless levels.include?(level)
             end while !levels.include?(level)
+            level
           end
         end
-
-        user = ::Spontaneous::Permissions::User.new(attrs)
-
-        if user.save
-          user.update(:level => level)
-          say("\nUser '#{user.login}' created with level '#{user.level}'", :green)
-        else
-          errors = user.errors.map do | a, e |
-            " - '#{a.to_s.capitalize}' #{e.first}"
-          end.join("\n")
-          say("\nInvalid user details:\n"+errors, :red)
-          exit 127
-        end
+        [attrs, level]
       end
     end
   end

data/lib/spontaneous/cli.rb

@@ -12,7 +12,7 @@ module Spontaneous
             "#{basename} #{task.formatted_usage(self, true, subcommand)}"
           end
         end
-        base.class_option :site, :type => :string, :aliases => ["-s", "--root"], :desc => "Site root dir"
+        base.class_option :site, :type => :string, :aliases => ["-s", "--root"], :default => ".", :desc => "Site root dir"
         base.class_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development, :desc => "Spontaneous Environment"
         base.class_option :mode, :type => :string,  :aliases => "-m", :default => :back, :desc => "Spontaneous mode ('front' or 'back')"
         base.class_option :help, :type => :boolean, :desc => "Show help usage"
@@ -113,6 +113,8 @@ module Spontaneous
         ::Launchy.open("http://localhost:#{::Spontaneous::Site.config.port}/@spontaneous")
       end
 
+      map %w(--version -v) => :version
+
       desc :version, "Show the version of Spontaneous in use"
       def version
         require "spontaneous/version"

data/lib/spontaneous/generators/site/.gitignore

@@ -1,6 +1,5 @@
 log/*
 tmp/*
 cache/*
-.Procfile
 .irb_history
 

data/lib/spontaneous/generators/site/Gemfile.tt

@@ -1,8 +1,11 @@
 source :rubygems
 
-## choose your poison:
-# gem 'pg', '~> 0.14.0'
-gem 'mysql2', '~> 0.3'
+# You can either fix the version of Spontaneous that this site uses
+gem 'spontaneous', '~> <%= Spontaneous::VERSION %>'
+# Or point it at a git repository to use the cutting edge or your custom version
+# gem 'spontaneous', :git => "https://github.com/SpontaneousCMS/spontaneous.git"
+
+gem '<%= @database[:gem].name %>', '<%= @database[:gem].requirement %>'
 
 # Deploy with Capistrano
 gem 'capistrano', '~> 2.9'
@@ -13,12 +16,6 @@ gem 'capistrano', '~> 2.9'
 #gem 'xapian-full', "~> 1.2.3"
 #gem 'xapian-fu', "~> 1.3"
 
-## TODO: replace this path based gem with a version once the gem is live
-#gem 'spontaneous', '<%= Spontaneous::VERSION %>'
-
-gem 'spontaneous', :git => "git://github.com/SpontaneousCMS/spontaneous.git"
-gem 'simultaneous', :git => "git://github.com/SpontaneousCMS/simultaneous.git"
-
 # group :production do
 #   gem 'thin',    '~> 1.3.1'
 #   gem 'unicorn', '~> 4.2'

data/lib/spontaneous/generators/site/config/boot.rb

@@ -1,5 +1,5 @@
 SPOT_ENV = (ENV["SPOT_ENV"] ||= ENV["RACK_ENV"] ||= "development").to_sym unless defined?(SPOT_ENV)
-SPOT_MODE = (ENV["SPOT_MODE"] ||= "back").to_sym unless defined?(SPOT_MODE)
+SPOT_MODE = (ENV["SPOT_MODE"] ||= "console").to_sym unless defined?(SPOT_MODE)
 
 Encoding.default_external = Encoding::UTF_8 if defined?(Encoding)
 
@@ -10,10 +10,4 @@ require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 
 Bundler.require(:default, SPOT_ENV, SPOT_MODE)
 
-# TODO: configuration of template engine
-# so, remove this require and move the template init into part of the ::load! method
-# using config settings to determine engine
-require 'cutaneous'
-
 Spontaneous.init(:environment => SPOT_ENV, :mode => SPOT_MODE)
-

data/lib/spontaneous/generators/site/config/database.yml.tt

@@ -1,9 +1,12 @@
 ---
 :development: &defaults
-  :adapter:    mysql2
+  :adapter:    <%= @database[:adapter] %>
   :database:   <%= @site_name %>
-  :user:       root
-  :host:       localhost
+  :user:       <%= @database[:user] %>
+  :password:   <%= @database[:password] %>
+<% unless (host = @database[:host]).blank? -%>
+  :host:       <%= host %>
+<% end %>
 
 :test:
   <<:         *defaults
@@ -13,7 +16,7 @@
   <<:         *defaults
   :database:  <%= @site_name %>
   :user:      <%= @site_name %>
-  :password:  passw0rd
+  :password:   <%= @database[:password] %>
 
 :rake:
   <<:         *defaults

data/lib/spontaneous/generators/site/config/environments/development.rb.tt

@@ -6,12 +6,21 @@ simultaneous_connection "/tmp/simultaneous.<%= @site_name %>.sock"
 # ensures that schema classes are reloaded with every request
 reload_classes true
 
+# This provides you with login-less access to the CMS interface while in
+# development mode. Change this value to automatically login as a different
+# user or comment it out to reproduce the production environment.
+# DO NOT set this value in production.
+auto_login '__SPONTANEOUS_ROOT_USER_INSERT__'
+
 host 'localhost'
 
+# This sets the port that the editing interface runs under
 back do
-	port 2011
+  port 2011
 end
 
+# This sets the port that the published/live version of the development
+# site runs under.
 front do
-	port 2012
+  port 2012
 end

data/lib/spontaneous/generators/site.rb

@@ -6,7 +6,9 @@ module Spontaneous
   module Generators
     class Site < Thor::Group
       def self.available_dbs
-        %w(mysql postgres)
+        { "mysql"      => { :gem => "mysql2", :adapter => "mysql2" },
+          "postgresql" => { :gem => "pg", :adapter => "postgres" },
+          "postgres"   => { :gem => "pg", :adapter => "postgres" } }
       end
 
       def self.source_root; File.expand_path(File.dirname(__FILE__) + "/site"); end
@@ -14,20 +16,27 @@ module Spontaneous
 
       include Thor::Actions
 
+      argument :domain, :type => :string, :desc => "The domain name of the site to generate"
+
       class_option :root,    :desc => "The root destination", :aliases => '-r', :default => ".",   :type => :string
-      class_option :database,    :desc => "The database to use ('mysql' (default) or 'postgres')", :aliases => '-d', :default => "mysql",   :type => :string
-      class_option :dbpwd,    :desc => "The password for the database root user", :aliases => '-p', :default => "",   :type => :string
+      class_option :database,    :desc => "The database to use ('mysql' (default) or 'postgres')", :aliases => %w(-d --db), :default => "mysql",   :type => :string
+      class_option :user,    :desc => "The database account to use", :aliases => '-u', :default => "root",   :type => :string
+      class_option :password,    :desc => "The password for the database user", :aliases => %w(-p), :default => "",   :type => :string
+      class_option :host,    :desc => "The database host", :aliases => %w(-h), :default => "",   :type => :string
 
-      argument :domain, :type => :string, :desc => "The domain name of the site to generate"
 
       desc "Generates a new site for DOMAIN"
       def create_site
-        if self.class.available_dbs.include?(options.database)
+        if self.class.available_dbs.keys.include?(options.database)
+          spec = Gem::Specification.load(File.expand_path("../../../../spontaneous.gemspec", __FILE__))
+          adapter = self.class.available_dbs[options.database]
+          adapter_dependency =  spec.development_dependencies.detect { |dependency| dependency.name == adapter[:gem] }
           @valid = true
           say "Generating '#{domain}'...", :bold
           @domain = domain
           @site_name = domain.to_s.gsub(/\./, "_")
           @username  = domain.split(/\./).first
+          @database  = { :user => options.user, :adapter => adapter[:adapter], :gem => adapter_dependency, :password => options.password, :host => options.host }
           self.destination_root = options[:root]
           empty_directory(@site_name)
           self.destination_root = self.destination_root / @site_name
@@ -49,7 +58,7 @@ module Spontaneous
           template "lib/tasks/site.rake.tt", "lib/tasks/#{@site_name}.rake"
         else
           @valid = false
-          say "Invalid database selection '#{options.database}'. Valid options are: #{available_dbs.join(', ')}", :red
+          say "Invalid database selection '#{options.database}'. Valid options are: #{self.class.available_dbs.keys.join(', ')}", :red
         end
       end
 

data/lib/spontaneous/json.rb

@@ -1,26 +1,26 @@
 # encoding: UTF-8
 
-require 'oj'
+require 'yajl'
 
-Oj.default_options = {
-  mode: :compat
-} if defined?(Oj)
+Oj.default_options = { mode: :compat } if defined?(Oj)
 
 module Spontaneous
   module JSON
-    module OjParser
-      def parse(json_string)
-        ::Oj.load(json_string, symbol_keys: true)
-      rescue
-        nil
-      end
+    if defined?(::Oj)
+      module OjParser
+        def parse(json_string)
+          ::Oj.load(json_string, symbol_keys: true)
+        rescue
+          nil
+        end
 
-      def encode(object)
-        ::Oj.dump(object)
+        def encode(object)
+          ::Oj.dump(object)
+        end
       end
     end
 
-    if defined?(Yajl)
+    if defined?(::Yajl)
       module YajlParser
         def parser
           Yajl::Parser.new(:symbolize_keys => true)
@@ -41,7 +41,7 @@ module Spontaneous
       end
     end
 
-    extend OjParser
+    extend const_get ["OjParser", "YajlParser"].detect { |m| const_defined?(m) }
 
     def parse_json(json_string)
       Spontaneous::JSON.parse(json_string)

data/lib/spontaneous/publishing/simultaneous.rb

@@ -20,7 +20,7 @@ module Spontaneous
       end
 
       def self.register_task
-        publish_binary = spot_binary + " site:publish"
+        publish_binary = spot_binary + " site publish"
         site_root = Pathname.new(Spontaneous.root).expand_path.to_s
         niceness = S.config.publish_niceness || 15
         logfile =  "#{site_root}/log/publish.log"

data/lib/spontaneous/rack/back.rb

@@ -254,8 +254,8 @@ module Spontaneous
           Content.db.transaction {
             dataset = lock ? Content.for_update : Content
             content = dataset.first(:id => params[:id])
-            content.current_editor = user
             halt 404 if content.nil?
+            content.current_editor = user
             if box_id = Spontaneous.schema.uids[params[:box_id]]
               box = content.boxes.detect { |b| b.schema_id == box_id }
               yield(content, box)

data/lib/spontaneous/sequel.rb

@@ -4,14 +4,14 @@ Sequel.extension :inflector
 
 require 'sequel/plugins/serialization'
 
-# Sequel::Plugins::Serialization.register_format(
-#   :yajl,
-#   lambda { |v| Yajl::Encoder.new.encode(v) },
-#   lambda { |v| Yajl::Parser.new(:symbolize_keys => true).parse(v)   }
-# )
 Sequel::Plugins::Serialization.register_format(
   :ojson,
-  lambda { |v| Oj.dump(v) },
-  lambda { |v| Oj.load(v, symbol_keys: true)   }
+  lambda { |v| Yajl::Encoder.new.encode(v) },
+  lambda { |v| Yajl::Parser.new(:symbolize_keys => true).parse(v)   }
 )
+# Sequel::Plugins::Serialization.register_format(
+#   :ojson,
+#   lambda { |v| Oj.dump(v) },
+#   lambda { |v| Oj.load(v, symbol_keys: true)   }
+# )
 

data/lib/spontaneous/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Spontaneous
-  VERSION = "0.2.0.alpha6"
+  VERSION = "0.2.0.alpha7"
   GEM = false
 end

data/spontaneous.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'spontaneous'
-  s.version           = '0.2.0.alpha6'
-  s.date              = '2012-10-17'
+  s.version           = '0.2.0.alpha7'
+  s.date              = '2012-11-01'
   s.rubyforge_project = 'spontaneous'
 
   ## Make sure your summary is short. The description may be as long
@@ -49,14 +49,13 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('activesupport',   ["~> 3.2.0"])
-  s.add_dependency('i18n',            ["~> 0.6.0"]) # this is an undeclared activesupport dependency
   s.add_dependency('base58',          ["~> 0.1.0"])
   s.add_dependency('bundler',         ["> 1.0.15"])
   s.add_dependency('coffee-script',   ["~> 2.2.0"])
   s.add_dependency('cutaneous',       ["~> 0.1.3"])
   s.add_dependency('erubis',          ["~> 2.6"])
   s.add_dependency('fog',             ["~> 1.6.0"])
-  s.add_dependency('foreman',         ["~> 0.22.0"])
+  s.add_dependency('foreman',         ["~> 0.60.2"])
   s.add_dependency('kramdown',        ["~> 0.14.0"])
   s.add_dependency('launchy',         ["~> 2.1.2"])
   s.add_dependency('mini_magick',     ["~> 3.3"])
@@ -78,7 +77,7 @@ Gem::Specification.new do |s|
   s.add_dependency('thin',            ["~> 1.2"])
   s.add_dependency('thor',            ["~> 0.16.0"])
   s.add_dependency('uglifier',        ["~> 1.3.0"])
-  s.add_dependency('oj',              ["~> 1.4"])
+  s.add_dependency('yajl-ruby',       ["~> 1.1.0"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

data/test/integration/test_installation.rb

@@ -2,30 +2,188 @@
 
 require File.expand_path('../../test_integration_helper', __FILE__)
 
-describe "Installation" do
-  def system(command)
-    puts "SYSTEM #{command.inspect}"
-    Kernel.system command
+require 'open3'
+require 'expect'
+require 'yaml'
+require 'etc'
+require 'bundler'
+
+ENV["DB"]      ||= "mysql"
+ENV["DB_USER"] ||= "root"
+
+puts "--- Testing against db #{ENV["DB"]} (#{ENV["DB_USER"]})"
+
+$_pwd = Dir.pwd
+
+# Test both the currently released gem and the development version
+# This is mostly about dependencies
+if ENV["GEM_SOURCE"] == "rubygems"
+  $_gem = "spontaneous"
+else
+  system "rm -rf pkg && rake gem:build"
+  $_gem = File.expand_path(Dir["pkg/*.gem"].last)
+end
+
+$_root = Dir.mktmpdir
+Dir.chdir($_root)
+
+
+class SpontaneousInstallationTest < OrderedTestCase
+
+  def self.before_suite
   end
 
-  before do
-    @root = Dir.mktmpdir
-    Dir.chdir(@root)
-    puts "root.before"
+  def self.after_suite
+    Kernel.system "gem uninstall -a -x -I spontaneous"
+    Dir.chdir($_pwd)
+    FileUtils.rm_r($_root)
   end
 
-  describe "when starting with a base system" do
-    before do
-      puts "describe.before"
+  def system(command, env = {})
+    Bundler.with_clean_env do
+      puts "$ #{command}" #if $DEBUG
+      Open3.popen3(env, command) do |stdin, stdout, stderr, wait_thread|
+        out = stdout.read.chomp
+        err = stderr.read.chomp
+        sts = wait_thread.value
+        [sts, out, err]
+      end
     end
+  end
 
-    it "will allow the installation of the spontaneous gem" do
-      assert_raises "Precondition failed, spontaneous gem is already installed", Gem::LoadError do
-        Gem::Specification.find_by_name("spontaneous")
-      end
-      system "gem install spontaneous --prerelease --no-rdoc --no-ri"
-      spec = Gem::Specification.find_by_name("spontaneous")
-      asssert_instance_of Gem::Specification, spec, "spontaneous gem should have been installed"
+  def existing_databases(database = ENV["DB"])
+    case database
+    when "postgres"
+      status, out, _ = system "psql -t -l -U #{ENV["DB_USER"]}"
+      databases = out.split("\n").map { |line| line.split("|").first.strip }
+    when "mysql"
+      status, out, _ = system "mysql -u #{ENV["DB_USER"]} --skip-column-names -e 'show databases'"
+      databases = out.split("\n").map { |line| line.strip }
+    end
+  end
+
+  def setup
+    @account = {
+      :login => Etc.getlogin,
+      :password => "0123456789",
+      :name => "A User",
+      :email => "auser@example.com"
+    }
+  end
+
+  def test_step_001__gem_installation
+    assert_raises "Precondition failed, spontaneous gem is already installed", Gem::LoadError do
+      Gem::Specification.find_by_name("spontaneous")
+    end
+    system "gem install #{$_gem} --no-rdoc --no-ri"
+    Gem.refresh
+    @spec = Gem::Specification.find_by_name("spontaneous")
+    assert_instance_of Gem::Specification, @spec, "spontaneous gem should have been installed"
+  end
+
+
+  def test_step_002__spontaneous_version
+    @spec = Gem::Specification.find_by_name("spontaneous")
+    %w(version --version -v).each do |opt|
+      status, version, _ = system "spot #{opt}"
+      assert status.exitstatus == 0, "Expected status of 0 but got #{status.exitstatus}"
+      assert_match /#{@spec.version.to_s}/, version, "Got an incorrect version #{version.inspect} for spontaneous"
+    end
+  end
+
+  def test_step_003__valid_site_creation
+    domain = "example.org"
+    refute File.exist?("example_org"), "Precondition failed, site directory should not exist"
+    status, output, err = system "spot generate --database=#{ENV["DB"]} --user=#{ENV["DB_USER"]} --host=#{ENV["DB_HOST"]} #{domain}"
+    assert status.exitstatus == 0, "Expected status of 0 but got #{status.exitstatus}"
+    assert File.exist?("example_org"), "Site directory should exist after generation step"
+    Dir.chdir("example_org")
+    assert File.exist?("Gemfile")
+    assert File.exist?("config/schema.yml")
+  end
+
+  def test_step_004__bundler_should_install_dependencies
+    ENV["BUNDLE_GEMFILE"] = File.expand_path("Gemfile")
+    status, output, err = system "bundle install --without development test", { "BUNDLE_GEMFILE" => ENV["BUNDLE_GEMFILE"] }
+    puts output
+    assert status.exitstatus == 0, "Bundler failed to run #{err.inspect}"
+  end
+
+  def test_step_005__site_initialization_should_run
+    cmd =  "spot init --user=#{ENV['DB_USER']} "
+    cmd << "--account login:#{@account[:login]} email:#{@account[:email]} name:'#{@account[:name]}' password:#{@account[:password]}"
+    status, out, err = system cmd, { "BUNDLE_GEMFILE" => ENV["BUNDLE_GEMFILE"] }
+    puts out
+    puts err
+    unless status.exitstatus == 0
+      fail "init task failed with error"
+    end
+  end
+
+  def test_step_006__site_initialization_should_create_databases
+    db_config = YAML.load_file("config/database.yml")
+    assert existing_databases.include?(db_config[:development][:database]),
+      "Database '#{db_config[:development][:database]}' should have been created"
+  end
+
+  def test_step_007__site_initialization_should_run_migrations
+    %w(example_org example_org_test).each do |db|
+      tables = case ENV["DB"]
+               when "postgres"
+                 status, out, _ = system "psql -t -U #{ENV["DB_USER"]} -d #{db} -c '\\dt'"
+                 out.split("\n").map { |line| line.split("|")[1].strip }
+               when "mysql"
+                 status, out, _ = system "mysql -u #{ENV["DB_USER"]} --skip-column-names -e 'show tables' #{db}"
+                 out.split("\n").map { |line| line.strip }
+               end
+      expected = %w(content spontaneous_users spontaneous_state)
+      assert (expected & tables) == expected, "Migration has not created expected tables: #{tables}"
     end
   end
+
+  def select_users
+    status, out, _ = system "spot user list --bare", { "BUNDLE_GEMFILE" => ENV["BUNDLE_GEMFILE"] }
+    assert status.exitstatus == 0, "Failed to list users"
+    parse_user_list(out)
+  end
+
+  def parse_user_list(output)
+    users = output.strip.split("\n").map { |line| line.split(/ {2,}/).map(&:strip) }
+  end
+
+  def test_step_008__site_initialization_should_add_root_user
+    status, out, _ = system "spot user list --bare", { "BUNDLE_GEMFILE" => ENV["BUNDLE_GEMFILE"] }
+    assert status.exitstatus == 0, "Failed to list users"
+    users = select_users
+    assert users.length == 1, "Site initialization should have created a single user not #{users.length}"
+    login, name, email, level = users.first
+    assert login == @account[:login], "Incorrect login #{login}"
+    assert name == @account[:name], "Incorrect name #{name}"
+    assert email == @account[:email], "Incorrect email #{email}"
+    assert level == "root", "Incorrect level #{email}"
+  end
+
+  def test_step_009__site_initialization_should_not_add_root_user_if_exists
+    users = select_users.length
+    assert users == 1, "Precondition failed. There should only be 1 user"
+    cmd =  "spot init --user=#{ENV['DB_USER']}"
+    status, out, _ = system cmd, { "BUNDLE_GEMFILE" => ENV["BUNDLE_GEMFILE"] }
+    users = select_users.length
+    assert users == 1, "Re-running the 'init' command shouldn't add another user"
+  end
+
+  def test_step_010__site_initialization_should_use_correct_password
+    status, out, _ = system "spot user authenticate #{@account[:login]} #{@account[:password]} --bare", { "BUNDLE_GEMFILE" => ENV["BUNDLE_GEMFILE"] }
+    assert status.exitstatus == 0, "Failed to authenticate root user"
+    users = parse_user_list(out)
+    assert users.length == 1, "Site initialization should have created a single user not #{users.length}"
+    assert users.first.first == @account[:login]
+  end
+
+  def test_step_011__site_initialization_should_append_auto_login_config
+    config = File.read("config/environments/development.rb")
+    assert_match /^\s*auto_login +('|")#{@account[:login]}\1/, config,
+      "Config should include auto_login for '#{@account[:login]}'"
+  end
 end
+

data/test/test_integration_helper.rb

@@ -1,9 +1,50 @@
 # encoding: UTF-8
 
 # Helpers for integration tests
+require "rbconfig"
 require "rubygems"
-require "bundler/setup"
-require "minitest/spec"
+
+# 1.9.2's minitest is way out of date
+if RUBY_VERSION < "1.9.3"
+  gem "minitest"
+end
+
+require "minitest/unit"
 require "minitest/autorun"
-require 'tmpdir'
-require 'pp'
+require "tmpdir"
+require "pp"
+
+
+# A test case that reproduces the actions of a user and hence need to run in order
+# I.e. I don't suck thank you very much
+class OrderedRunner < MiniTest::Unit
+  def before_suites
+  end
+
+  def after_suites
+  end
+
+  def _run_suites(suites, type)
+    begin
+      before_suites
+      super(suites, type)
+    ensure
+      after_suites
+    end
+  end
+
+  def _run_suite(suite, type)
+    begin
+      suite.before_suite if suite.respond_to?(:before_suite)
+      super(suite, type)
+    ensure
+      suite.after_suite if suite.respond_to?(:after_suite)
+    end
+  end
+end
+
+MiniTest::Unit.runner = OrderedRunner.new
+
+class OrderedTestCase < MiniTest::Unit::TestCase
+  i_suck_and_my_tests_are_order_dependent!
+end

data/test/unit/test_generators.rb

@@ -26,6 +26,11 @@ class GeneratorsTest < MiniTest::Spec
     }
   end
 
+  def database_config(path)
+    path = File.join(@tmp, path, "config/database.yml")
+    YAML.load_file(path)
+  end
+
   attr_reader :site_root
 
   context "Site generator" do
@@ -75,8 +80,63 @@ class GeneratorsTest < MiniTest::Spec
       assert File.read(site_root / '.gitignore') =~ /cache\/\*/
       assert File.read(site_root / 'schema/piece.rb') =~ /class Piece < Spontaneous::Piece/
     end
-    should "accept domain names starting with numbers"
-    should "accept domain names containing dashes"
+
+    should "specify the current version of spontaneous as the dependency" do
+      generate(:site, "example.com", "--root=#{@tmp}")
+      site_root = File.join(@tmp, 'example_com')
+      gemfile = File.read(File.join(site_root, "Gemfile"))
+      gemfile.should =~ /^gem 'spontaneous', +'~> *#{Spontaneous::VERSION}'$/
+    end
+
+    should "correctly configure the site for a 'mysql' database" do
+      site_root = File.join(@tmp, 'example_com')
+      generate(:site, "example.com", "--root=#{@tmp}", "--database=mysql", "--host=127.0.0.1")
+      gemfile = File.read(File.join(site_root, "Gemfile"))
+      gemfile.should =~ /^gem 'mysql2'/
+      config = database_config("example_com")
+      [:development, :test, :production].each do |environment|
+        config[environment][:adapter].should == "mysql2"
+        config[environment][:database].should =~ /^example_com(_test)?/
+        # db connections seem to work if you exclude the host
+        config[environment][:host].should == "127.0.0.1"
+      end
+    end
+
+    should "correctly configure the site for a 'postgresql' database" do
+      site_root = File.join(@tmp, 'example_com')
+      generate(:site, "example.com", "--root=#{@tmp}", "--database=postgresql", "--host=")
+      gemfile = File.read(File.join(site_root, "Gemfile"))
+      gemfile.should =~ /^gem 'pg'/
+      config = database_config("example_com")
+      [:development, :test, :production].each do |environment|
+        config[environment][:adapter].should == "postgres"
+        config[environment][:database].should =~ /^example_com(_test)?/
+        config[environment].key?(:host).should be_false
+      end
+    end
+
+    should "correctly configure the site for a 'postgres' database" do
+      site_root = File.join(@tmp, 'example_com')
+      generate(:site, "example.com", "--root=#{@tmp}", "--database=postgres")
+      gemfile = File.read(File.join(site_root, "Gemfile"))
+      gemfile.should =~ /^gem 'pg'/
+      config = database_config("example_com")
+      [:development, :test, :production].each do |environment|
+        config[environment][:adapter].should == "postgres"
+      end
+    end
+
+    should "include specified connection params in the generated database config" do
+      site_root = File.join(@tmp, 'example_com')
+      generate(:site, "example.com", "--root=#{@tmp}", "--database=postgres", "--user=spontaneous", "--password=s3cret")
+      gemfile = File.read(File.join(site_root, "Gemfile"))
+      gemfile.should =~ /^gem 'pg'/
+      config = database_config("example_com")
+      [:development, :test].each do |environment|
+        config[environment][:user].should == "spontaneous"
+        config[environment][:password].should == "s3cret"
+      end
+    end
   end
 
   context "Page generator" do
@@ -84,6 +144,7 @@ class GeneratorsTest < MiniTest::Spec
       generate(:site, "example.com", "--root=#{@tmp}")
       @site_root = File.join(@tmp, 'example_com')
     end
+
     should "create a page class and associated templates" do
       %w(large_page LargePage).each do |name|
         generate(:page, name, "--root=#{site_root}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha6
+  version: 0.2.0.alpha7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: base58
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.60.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.60.2
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -492,13 +476,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -506,7 +490,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement