spontaneous 0.2.0.alpha4 → 0.2.0.alpha5

data/bin/spot

@@ -3,21 +3,31 @@
 require 'rubygems' unless defined?(Gem) # Useful only on --dev mode
 require 'bundler'
 
-begin
-	Bundler.setup(:default)
-rescue Bundler::GemfileNotFound
-	# We're operating outside of a site dir, probably generating a site
-	# so load the Spontaneous gem Gemfile
-  ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
-	retry
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
+# Are we in the root of a Spontaneous site?
+# If so then we want to use the bundled version of Spontaneous and its
+# dependencies
+if File.exist?("config/schema.yml")
+  begin
+    Bundler.setup(:default)
+  rescue Bundler::GemfileNotFound
+    # We're operating outside of a site dir, probably generating a site
+    # so load the Spontaneous gem Gemfile
+    ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+    retry
+  rescue Bundler::GemNotFound => e
+    STDERR.puts e.message
+    STDERR.puts "Try running `bundle install`."
+    exit!
+  end
+else
+  # If spot is being run outside of a site, then we want to use the global
+  # gem files
+  spot_path = File.expand_path('../../lib', __FILE__)
+  if File.directory?(spot_path) && !$:.include?(spot_path)
+    $:.unshift(spot_path)
+  end
 end
 
-spot_path = File.expand_path('../../lib', __FILE__)
-$:.unshift(spot_path) if File.directory?(spot_path) && !$:.include?(spot_path)
+require 'spontaneous'
 
-require 'spontaneous/cli'
-Spontaneous::Cli::Runner.start(ARGV)
+Spontaneous::Cli::Root.start(ARGV)

data/lib/spontaneous/capistrano/deploy.rb

@@ -29,7 +29,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     task :bundle_assets do
-      run "cd #{release_path} && bundle exec spot assets:compile --destination=#{release_path}"
+      run "cd #{release_path} && ./bin/spot assets compile --destination=#{release_path}"
     end
   end
 

data/lib/spontaneous/cli/assets.rb

@@ -1,17 +1,16 @@
 module Spontaneous
   module Cli
-    class Assets < ::Spontaneous::Cli::Thor
-      Spontaneous = ::Spontaneous
+    class Assets < ::Thor
+      include Spontaneous::Cli::TaskUtils
+
       namespace :assets
       default_task :compile
 
 
-      # class Up < SyncTask
-      #   desc "Syncs up"
-      # end
+      desc "compile", "Compiles assets for the Spontaneous UI"
 
-      desc "#{namespace}:compile", "Compiles assets for the Spontaneous UI"
       method_option :destination, :type => :string, :aliases => "-d", :required => true, :desc => "Compile assets into DESTINATION"
+
       def compile
         prepare(:compile)
         # options[:mode] = :console
@@ -20,7 +19,7 @@ module Spontaneous
         spec = Bundler.load.specs.find{|s| s.name == "spontaneous" }
         p spec.full_gem_path
 
-        compiler = Spontaneous::Asset::AppCompiler.new(spec.full_gem_path, options.destination)
+        compiler = ::Spontaneous::Asset::AppCompiler.new(spec.full_gem_path, options.destination)
         compiler.compile
       end
     end

data/lib/spontaneous/cli/console.rb

@@ -2,34 +2,26 @@
 
 # require 'watchr'
 
-module Spontaneous::Cli
-  class Console < ::Spontaneous::Cli::Thor
-    Spontaneous = ::Spontaneous
+module ::Spontaneous::Cli
+  class Console < ::Thor
+    include Spontaneous::Cli::TaskUtils
     include Thor::Actions
-    namespace :console
 
+    namespace    :console
     default_task :open
 
-    desc "#{namespace}:open", "Gives you console access to the current site"
+    desc "open", "Gives you console access to the current site"
     def open
-      # script = Watchr::Script.new
-      # script.watch('(lib|schema)/.*\\.rb') { puts 'reload!' } # doesn't block
-      # Thread.new do
-      #   Watchr::Controller.new(script, Watchr.handler.new).run
-      # end
+      prepare! :console
 
-
-      ENV["SPOT_MODE"] = "console"
-      prepare :console
       ARGV.clear
       ARGV.concat [ "--readline", "--prompt-mode", "simple" ]
-      require 'irb'
-      boot!
 
+      require 'irb'
       require 'irb/completion'
       require 'irb/ext/save-history'
 
-      history_file = Spontaneous.root / ".irb_history"
+      history_file = ::Spontaneous.root / ".irb_history"
 
       IRB.setup(nil)
       IRB.conf[:SAVE_HISTORY] = 100
@@ -38,8 +30,7 @@ module Spontaneous::Cli
       irb = IRB::Irb.new
       IRB.conf[:MAIN_CONTEXT] = irb.context
 
-      irb.context.evaluate((<<-INIT), __LINE__)
-
+      irb.context.evaluate((<<-CONTEXT), __LINE__)
         module Readline
           module History
             def self.write_log(line)
@@ -57,16 +48,15 @@ module Spontaneous::Cli
             ln
           end
         end
-
-
-      INIT
+      CONTEXT
 
       trap("SIGINT") do
         irb.signal_handle
       end
-      catch(:IRB_EXIT) do
+
+      catch("IRB_EXIT") do
         irb.eval_input
       end
     end
   end # Console
-end # Spontaneous::Cli
+end # ::Spontaneous::Cli

data/lib/spontaneous/cli/generate.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+require 'public_suffix'
+
+module Spontaneous::Cli
+  class Generate < ::Thor
+    include Spontaneous::Cli::TaskUtils
+    include Thor::Actions
+
+    namespace :generate
+
+    default_task :site
+
+    desc "site [DOMAIN]", "Generates a site skeleton. Usage: spot generate <site domain name>"
+    def site(*args)
+      require File.expand_path('../../../spontaneous', __FILE__)
+      ::Spontaneous::Generators::Site.start(args)
+    end
+
+    def method_missing(method, *args)
+      if PublicSuffix.valid?(method.to_s)
+        args.unshift(method.to_s)
+        self.send(:site, *args)
+      else
+        super
+      end
+    end
+  end # Generate
+end # Spontaneous::Cli
+

data/lib/spontaneous/cli/init.rb

@@ -0,0 +1,48 @@
+# encoding: UTF-8
+
+module Spontaneous::Cli
+  class Init < ::Thor
+    include Spontaneous::Cli::TaskUtils
+    include Thor::Actions
+
+    namespace :init
+
+    default_task :init
+
+    desc :init, "Creates databases and initialises a new Spontaneous site"
+    def init
+      prepare :init
+      site = ::Spontaneous::Site.instantiate(Dir.pwd, options.environment, :back)
+      require File.expand_path('../../../spontaneous', __FILE__)
+      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
+        end
+        boot!
+      end
+    end
+
+  end # Init
+end # Spontaneous::Cli

data/lib/spontaneous/cli/media.rb

@@ -4,7 +4,7 @@ module Spontaneous
     class Media < ::Thor
       namespace :media
 
-      desc "#{namespace}:cleanup", "Removes stale temp files"
+      desc "cleanup", "Removes stale temp files"
       def cleanup
         puts "CLEANING UP!!"
       end

data/lib/spontaneous/cli/migrate.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+module Spontaneous::Cli
+  class Migrate < ::Thor
+    include Spontaneous::Cli::TaskUtils
+    include Thor::Actions
+
+    namespace    :migrate
+    default_task :apply
+
+    desc :apply, "Runs Spontaneous migrations"
+    def apply
+      prepare! :migrate
+      Sequel.extension :migration
+      connection_params = ::Spontaneous.db_settings
+      say "  >> Running migrations..."
+      Sequel::Migrator.apply(Spontaneous.database, ::Spontaneous.gem_dir('db/migrations'))
+      say "  >> Done"
+    end
+
+  end # Migrate
+end # Spontaneous::Cli

data/lib/spontaneous/cli/server.rb

@@ -1,31 +1,34 @@
 # encoding: UTF-8
 
-require 'spontaneous'
+# require 'spontaneous'
 require 'simultaneous'
 require 'foreman'
 require 'foreman/engine'
 
 module Spontaneous
   module Cli
-    class Server < ::Spontaneous::Cli::Thor
-      namespace :server
+    class Server < ::Thor
+      include Spontaneous::Cli::TaskUtils
+
+      namespace    :server
       default_task :start
 
       class_option :no_browser, :type => :boolean, :default => false, :aliases => "-b", :desc => "Don't launch browser"
 
-      desc "#{namespace}:start", "Starts Spontaneous in development mode"
+      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.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
         end
       end
 
-      desc "#{namespace}:front", "Starts Spontaneous in front/public mode"
+      desc "front", "Starts Spontaneous in front/public mode"
       # method_option :adapter, :type => :string,  :aliases => "-a", :desc => "Rack Handler (default: autodetect)"
       method_option :host, :type => :string,  :aliases => "-h", :desc => "Bind to HOST address"
       method_option :port, :type => :numeric, :aliases => "-p", :desc => "Use PORT"
@@ -33,7 +36,7 @@ module Spontaneous
         start_server(:front)
       end
 
-      desc "#{namespace}:back", "Starts Spontaneous in back/CMS mode"
+      desc "back", "Starts Spontaneous in back/CMS mode"
       # method_option :adapter, :type => :string,  :aliases => "-a", :desc => "Rack Handler (default: autodetect)"
       method_option :host, :type => :string,  :aliases => "-h", :desc => "Bind to HOST address"
       method_option :port, :type => :numeric, :aliases => "-p", :desc => "Use PORT"
@@ -41,11 +44,10 @@ module Spontaneous
         start_server(:back)
       end
 
-      desc "#{namespace}:simultaneous", "Launches the Simultaneous server"
+      desc "simultaneous", "Launches the Simultaneous server"
       method_option :connection, :type => :string, :aliases => "-c", :desc => "Use CONNECTION"
       def simultaneous
-        prepare(:start)
-        boot!
+        prepare! :start
         connection = options[:connection] || ::Spontaneous.config.simultaneous_connection
         fork {
           ENV.delete("BUNDLE_GEMFILE")
@@ -63,11 +65,8 @@ module Spontaneous
       end
 
       def start_server(mode)
-        prepare mode.to_sym
-        ENV["SPOT_MODE"] = mode.to_s
-        require File.expand_path(File.dirname(__FILE__) + "/adapter")
-        boot!
-        Spontaneous::Cli::Adapter.start(options)
+        prepare! :server, mode
+        Spontaneous::Server.run!(options)
       end
 
     end

data/lib/spontaneous/cli/site.rb

@@ -2,7 +2,8 @@ require 'spontaneous/cli'
 
 module Spontaneous
   module Cli
-    class Site < ::Spontaneous::Cli::Thor
+    class Site < ::Thor
+      include Spontaneous::Cli::TaskUtils
       namespace :site
 
       default_task :browse
@@ -98,26 +99,23 @@ module Spontaneous
         end
       end
 
-      desc "#{namespace}:dump", "Dumps the current site to an archive on the local machine"
+      desc "dump", "Dumps the current site to an archive on the local machine"
       def dump
-        prepare :dump
-        boot!
+        prepare! :dump
         Dump.start
       end
 
-      desc "#{namespace}:load", "Uploads a dump of the current site to a remote server"
+      desc "load", "Uploads a dump of the current site to a remote server"
       def load
-        prepare :load
-        boot!
+        prepare! :load
         Load.start
       end
 
-      desc "#{namespace}:publish", "Publishes the site"
+      desc "publish", "Publishes the site"
       method_option :pages, :type => :array, :desc => "List of pages to publish"
       method_option :logfile, :type => :string, :desc => "Location of logfile"
       def publish
-        prepare :publish
-        boot!
+        prepare! :publish
         ::Site.publishing_method = :immediate
         ::Spontaneous::Logger.setup(:logfile => options.logfile) if options.logfile
         say "Creating revision #{::Site.revision}", :green, true
@@ -130,22 +128,20 @@ module Spontaneous
         end
       end
 
-      desc "#{namespace}:render", "Re-renders the current content"
+      desc "render", "Re-renders the current content"
       def render
-        prepare :render
-        boot!
+        prepare! :render
         ::Site.publishing_method = :immediate
         ::Site.rerender
       end
 
-      desc "#{namespace}:revision", "Shows the site status"
+      desc "revision", "Shows the site status"
       def revision
-        prepare :revision
-        boot!
+        prepare! :revision
         say "Site is at revision #{::Site.revision}", :green
       end
 
-      desc "#{namespace}:browse", "Launces a browser pointing to the current development CMS"
+      desc "browse", "Launces a browser pointing to the current development CMS"
       def browse
         prepare :browse
         require 'launchy'

data/lib/spontaneous/cli/sync.rb

@@ -1,8 +1,9 @@
 
 module Spontaneous
   module Cli
-    class Sync < ::Spontaneous::Cli::Thor
-      Spontaneous = ::Spontaneous
+    class Sync < ::Thor
+      include Spontaneous::Cli::TaskUtils
+
       namespace :sync
       default_task :down
 
@@ -28,12 +29,12 @@ module Spontaneous
         desc "Syncs up"
       end
 
-      desc "#{namespace}:down", "Makes the local copy a clone of the live server"
+      desc "down", "Makes the local copy a clone of the production server"
       def down
         Down.start
       end
 
-      desc "#{namespace}:up", "Makes the local copy a clone of the live server"
+      desc "up", "Makes the local copy a clone of the production server"
       def up
         Down.start
       end

data/lib/spontaneous/cli/user.rb

@@ -1,9 +1,9 @@
 
-module Spontaneous
+module ::Spontaneous
   module Cli
-    class User < ::Spontaneous::Cli::Thor
-      Spontaneous = ::Spontaneous
-      namespace :user
+    class User < ::Thor
+      include Spontaneous::Cli::TaskUtils
+      # namespace :user
 
       default_task :add
 
@@ -23,11 +23,11 @@ module Spontaneous
       def add
         prepare :adduser, :console
         boot!
-        users = Spontaneous::Permissions::User.count
+        users = ::Spontaneous::Permissions::User.count
         attrs = {}
         width = 14
         valid_login = /^[a-z0-9_]{3,}$/
-        levels = Spontaneous::Permissions::UserLevel.all.map(&:to_s)
+        levels = ::Spontaneous::Permissions::UserLevel.all.map(&:to_s)
         level = nil
 
         say("\nAll fields are required:\n", :green)
@@ -88,7 +88,7 @@ module Spontaneous
           end
         end
 
-        user = Spontaneous::Permissions::User.new(attrs)
+        user = ::Spontaneous::Permissions::User.new(attrs)
 
         if user.save
           user.update(:level => level)

data/lib/spontaneous/cli.rb

@@ -1,25 +1,26 @@
 require 'thor'
-require 'thor/runner'
+require 'thor/group'
 
 module Spontaneous
   module Cli
-    class Thor < ::Thor
+    module TaskUtils
+      # include Thor::Actions
 
-      class_option :site, :type => :string, :aliases => ["-s", "--root"], :desc => "Site root dir"
-      class_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development, :desc => "Spontaneous Environment"
-      class_option :mode, :type => :string,  :aliases => "-m", :default => :back, :desc => "Spontaneous mode ('front' or 'back')"
-      class_option :help, :type => :boolean, :desc => "Show help usage"
-
-      protected
-
-      def boot!
-        begin
-          require File.expand_path('config/boot.rb')
-        rescue Spontaneous::SchemaModificationError => error
-          fix_schema(error)
+      def self.included(base)
+        base.class_eval do
+          def self.banner(task, namespace = true, subcommand = false)
+            "#{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 :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"
       end
 
+
+      protected
+
       def fix_schema(error)
         modification = error.modification
         actions = modification.actions
@@ -42,14 +43,14 @@ module Spontaneous
         end
       end
 
-      def prepare(task, mode = nil)
+      def prepare(task, mode = "console")
         if options.help?
           help(task.to_s)
           raise SystemExit
         end
-        ENV["SPOT_ENV"] ||= options.environment.to_s
+        ENV["SPOT_ENV"] ||= options.environment.to_s ||
         ENV["RACK_ENV"] = ENV["SPOT_ENV"] # Also set this for middleware
-        ENV["SPOT_MODE"] = mode.to_s unless mode.nil?
+        ENV["SPOT_MODE"] = mode.to_s
         chdir(options.site)
         unless File.exist?('config/boot.rb')
           puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb\n=> Are you sure this is a Spontaneous site?"
@@ -57,6 +58,19 @@ module Spontaneous
         end
       end
 
+      def prepare!(task, mode = "console")
+        prepare(task, mode)
+        boot!
+      end
+
+      def boot!
+        begin
+          require File.expand_path('config/boot.rb')
+        rescue Spontaneous::SchemaModificationError => error
+          fix_schema(error)
+        end
+      end
+
       def chdir(dir)
         return unless dir
         begin
@@ -69,116 +83,41 @@ module Spontaneous
       end
     end
 
-    class Runner < ::Thor
-      namespace "default"
-
-      remove_task :help
-
-      map %w(-T) => :list, %w(--version -v) => :version
+    autoload :Console,  "spontaneous/cli/console"
+    autoload :Site,     "spontaneous/cli/site"
+    autoload :Init,     "spontaneous/cli/init"
+    autoload :User,     "spontaneous/cli/user"
+    autoload :Generate, "spontaneous/cli/generate"
+    autoload :Server,   "spontaneous/cli/server"
+    autoload :Media,    "spontaneous/cli/media"
+    autoload :Sync,     "spontaneous/cli/sync"
+    autoload :Migrate,  "spontaneous/cli/migrate"
+    autoload :Assets,   "spontaneous/cli/assets"
+
+    class Root < ::Thor
+      register Spontaneous::Cli::Console,  "console",  "console",           "Gives you console access to the current site"
+      register Spontaneous::Cli::User,     "user",     "user [ACTION]",     "Administer site users"
+      register Spontaneous::Cli::Generate, "generate", "generate [OBJECT]", "Generates things"
+      register Spontaneous::Cli::Site,     "site",     "site [ACTION]",     "Run site-wide actions"
+      register Spontaneous::Cli::Init,     "init",     "init",              "Creates databases and initialises a new Spontaneous site"
+      register Spontaneous::Cli::Server,   "server",   "server [ACTION]",   "Launch development server(s)"
+      register Spontaneous::Cli::Media,    "media",    "media [ACTION]",    "Manage site media"
+      register Spontaneous::Cli::Sync,     "sync",     "sync [DIRECTION]",  "Sync database and media to and from the production server"
+      register Spontaneous::Cli::Migrate,  "migrate",  "migrate",           "Runs Spontaneous migrations"
+      register Spontaneous::Cli::Assets,   "assets",   "assets [ACTION]",   "Manage Spontaneous assets"
+
+      desc :browse, "Launces a browser pointing to the current development CMS"
+      def browse
+        prepare! :browse
+        require 'launchy'
+        ::Launchy.open("http://localhost:#{::Spontaneous::Site.config.port}/@spontaneous")
+      end
 
-      desc "version", "Show Spontaneous version"
+      desc :version, "Show the version of Spontaneous in use"
       def version
-        require 'spontaneous/version'
+        require "spontaneous/version"
         say "Spontaneous #{Spontaneous::VERSION}"
       end
-
-      desc "list [SEARCH]", "List the available tasks (--substring means .*SEARCH)"
-      method_options :substring => :boolean, :group => :string, :all => :boolean, :debug => :boolean
-      def list(search="")
-        initialize_thorfiles
-
-        search = ".*#{search}" if options["substring"]
-        search = /^#{search}.*/i
-        group  = options[:group] || "standard"
-
-        klasses = Thor::Base.subclasses.select do |k|
-          (options[:all] || k.group == group) && k.namespace =~ search
-        end
-
-        display_klasses(false, false, klasses)
-      end
-
-      # Override Thor#help so it can give information about any class and any method.
-      #
-      desc "help [TASK]", "Describe available tasks or one specific task"
-      def help(task = nil, subcommand = false)
-        task ? self.class.task_help(shell, task) : self.class.help(shell, subcommand)
-      end
-
-
-      # Override Thor#help so it can give information about any class and any method.
-      #
-      def help(meth = nil)
-        if meth && !self.respond_to?(meth)
-          initialize_thorfiles(meth)
-          klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
-          klass.start(["-h", task].compact, :shell => self.shell)
-        else
-          list
-        end
-      end
-
-      # If a task is not found on Thor::Runner, method missing is invoked and
-      # Thor::Runner is then responsable for finding the task in all classes.
-      #
-      def method_missing(meth, *args)
-        meth = meth.to_s
-        initialize_thorfiles(meth)
-        klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
-        args.unshift(task) if task
-        klass.start(args, :shell => self.shell)
-      end
-
-      private
-
-      # Display information about the given klasses. If with_module is given,
-      # it shows a table with information extracted from the yaml file.
-      #
-      def display_klasses(with_modules=false, show_internal=false, klasses=Thor::Base.subclasses)
-        klasses -= [Thor, Thor::Runner, Thor::Group] unless show_internal
-
-        raise Error, "No tasks available" if klasses.empty?
-        show_modules if with_modules && !thor_yaml.empty?
-
-        list = Hash.new { |h,k| h[k] = [] }
-        groups = klasses.select { |k| k.ancestors.include?(Thor::Group) }
-
-        # Get classes which inherit from Thor
-        (klasses - groups).each { |k| list[k.namespace.split(":").first] += k.printable_tasks(false) }
-
-        list.delete("thor")
-
-        # Order namespaces with default coming first
-        list = list.sort{ |a,b| a[0].sub(/^default/, '') <=> b[0].sub(/^default/, '') }
-        list.each { |n, tasks| display_tasks(n, tasks) unless tasks.empty? }
-      end
-
-      def display_tasks(namespace, list) #:nodoc:
-        list.sort!{ |a,b| a[0] <=> b[0] }
-
-        say shell.set_color(namespace, :blue, true)
-        say "-" * namespace.size
-
-        print_table(list, :truncate => true)
-        say
-      end
-
-      def initialize_thorfiles(relevant_to=nil, skip_lookup=false)
-        thorfiles(relevant_to, skip_lookup).each do |f|
-          Thor::Util.load_thorfile(f, nil, options[:debug]) unless Thor::Base.subclass_files.keys.include?(File.expand_path(f))
-        end
-      end
-
-      def thorfiles(*args)
-        task_dir = File.expand_path('../cli', __FILE__)
-        Dir["#{task_dir}/*.rb"]
-      end
     end
-
-    autoload :Adapter,  "spontaneous/cli/adapter"
-    autoload :Base,     "spontaneous/cli/base"
-    autoload :Site,     "spontaneous/cli/site"
-    autoload :User,     "spontaneous/cli/user"
   end
 end
-

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

@@ -1,8 +1,8 @@
 source :rubygems
 
 ## choose your poison:
-# gem 'pg', '~> 0.9.0'
-gem 'mysql2', '~> 0.2'
+# gem 'pg', '~> 0.14.0'
+gem 'mysql2', '~> 0.3'
 
 # Deploy with Capistrano
 gem 'capistrano', '~> 2.9'
@@ -19,10 +19,10 @@ gem 'capistrano', '~> 2.9'
 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'
-end
+# group :production do
+#   gem 'thin',    '~> 1.3.1'
+#   gem 'unicorn', '~> 4.2'
+# end
 
 
 # source gemfiles from Plugins & Features

data/lib/spontaneous/generators/site/config/schema.yml

@@ -0,0 +1,2 @@
+# Maps database IDs to content classes
+# Will be automatically generated & maintained

data/lib/spontaneous/generators/site.rb

@@ -68,7 +68,10 @@ module Spontaneous
         2. bundle install
         3. spot init
 
-        Then go to http://spontaneouscms.org/docs
+        Then go to
+
+          http://spontaneous.io/documentation
+
         and read the many useful guides to getting started with Spontaneous.
 
         MSG

data/lib/spontaneous/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Spontaneous
-  VERSION = "0.2.0.alpha4"
+  VERSION = "0.2.0.alpha5"
   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.alpha4'
-  s.date              = '2012-10-15'
+  s.version           = '0.2.0.alpha5'
+  s.date              = '2012-10-16'
   s.rubyforge_project = 'spontaneous'
 
   ## Make sure your summary is short. The description may be as long
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
   s.add_dependency('stringex',        ["= 1.3"])
   s.add_dependency('therubyracer',    ['~> 0.9.10'])
   s.add_dependency('thin',            ["~> 1.2"])
-  s.add_dependency('thor',            ["~> 0.14.6"])
+  s.add_dependency('thor',            ["~> 0.16.0"])
   s.add_dependency('uglifier',        ["~> 1.3.0"])
   s.add_dependency('oj',              ["~> 1.4"])
 
@@ -286,15 +286,15 @@ Gem::Specification.new do |s|
     lib/spontaneous/capistrano/sync.rb
     lib/spontaneous/change.rb
     lib/spontaneous/cli.rb
-    lib/spontaneous/cli/adapter.rb
     lib/spontaneous/cli/assets.rb
-    lib/spontaneous/cli/base.rb
     lib/spontaneous/cli/console.rb
+    lib/spontaneous/cli/generate.rb
+    lib/spontaneous/cli/init.rb
     lib/spontaneous/cli/media.rb
+    lib/spontaneous/cli/migrate.rb
     lib/spontaneous/cli/server.rb
     lib/spontaneous/cli/site.rb
     lib/spontaneous/cli/sync.rb
-    lib/spontaneous/cli/tasks.rb
     lib/spontaneous/cli/user.rb
     lib/spontaneous/collections/box_set.rb
     lib/spontaneous/collections/change_set.rb
@@ -349,6 +349,7 @@ Gem::Specification.new do |s|
     lib/spontaneous/generators/site/config/environments/production.rb.tt
     lib/spontaneous/generators/site/config/front.ru
     lib/spontaneous/generators/site/config/indexes.rb.tt
+    lib/spontaneous/generators/site/config/schema.yml
     lib/spontaneous/generators/site/config/user_levels.yml
     lib/spontaneous/generators/site/lib/site.rb.tt
     lib/spontaneous/generators/site/lib/tasks/site.rake.tt

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha4
+  version: 0.2.0.alpha5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -450,7 +450,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -458,7 +458,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -864,15 +864,15 @@ files:
 - lib/spontaneous/capistrano/sync.rb
 - lib/spontaneous/change.rb
 - lib/spontaneous/cli.rb
-- lib/spontaneous/cli/adapter.rb
 - lib/spontaneous/cli/assets.rb
-- lib/spontaneous/cli/base.rb
 - lib/spontaneous/cli/console.rb
+- lib/spontaneous/cli/generate.rb
+- lib/spontaneous/cli/init.rb
 - lib/spontaneous/cli/media.rb
+- lib/spontaneous/cli/migrate.rb
 - lib/spontaneous/cli/server.rb
 - lib/spontaneous/cli/site.rb
 - lib/spontaneous/cli/sync.rb
-- lib/spontaneous/cli/tasks.rb
 - lib/spontaneous/cli/user.rb
 - lib/spontaneous/collections/box_set.rb
 - lib/spontaneous/collections/change_set.rb
@@ -927,6 +927,7 @@ files:
 - lib/spontaneous/generators/site/config/environments/production.rb.tt
 - lib/spontaneous/generators/site/config/front.ru
 - lib/spontaneous/generators/site/config/indexes.rb.tt
+- lib/spontaneous/generators/site/config/schema.yml
 - lib/spontaneous/generators/site/config/user_levels.yml
 - lib/spontaneous/generators/site/lib/site.rb.tt
 - lib/spontaneous/generators/site/lib/tasks/site.rake.tt
@@ -1385,7 +1386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: spontaneous
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: Spontaneous is a next-generation Ruby CMS

data/lib/spontaneous/cli/adapter.rb

@@ -1,13 +0,0 @@
-# encoding: UTF-8
-
-module Spontaneous
-  module Cli
-    module Adapter
-      class << self
-        def start(options)
-          ::Spontaneous::Server.run!(options)
-        end
-      end
-    end # Adapter
-  end # Cli
-end # Spontaneous

data/lib/spontaneous/cli/base.rb

@@ -1,144 +0,0 @@
-# encoding: UTF-8
-
-require 'thor'
-
-module Spontaneous
-  module Cli
-    class Base < ::Spontaneous::Cli::Thor
-      Spontaneous = ::Spontaneous
-      include Thor::Actions
-      namespace :default
-
-      class InvalidGenerator < Error
-        attr_reader :name
-        def initialize(name)
-          @name = name
-          super()
-        end
-      end
-
-
-
-
-
-
-
-      desc :console, "Gives you console access to the current site"
-      def console
-        ENV["SPOT_MODE"] = "console"
-        prepare :console
-        ARGV.clear
-        require 'irb'
-        boot!
-        IRB.setup(nil)
-        irb = IRB::Irb.new
-        IRB.conf[:MAIN_CONTEXT] = irb.context
-        irb.context.evaluate("require 'irb/completion'", 0)
-        irb.context.evaluate("require '#{File.expand_path(File.dirname(__FILE__) + '/console')}'", 0)
-        # irb.context.evaluate("include Spontaneous", 0)
-        trap("SIGINT") do
-          irb.signal_handle
-        end
-        catch(:IRB_EXIT) do
-          irb.eval_input
-        end
-      end
-
-      desc :generate, "Executes the Spontaneous generator with given options."
-      def generate(*args)
-        require File.expand_path('../../../spontaneous', __FILE__)
-        ARGV.shift
-        generator_name = ARGV.shift
-        generator = nil
-        d = Spontaneous::Generators
-        case generator_name
-        when ''
-          raise InvalidGenerator.new(generator_name)
-        when 'site'
-          generator = d::Site
-        when 'page'
-          prepare(:generator)
-          boot!
-          generator = d::Page
-        when /[a-zA-Z0-9-]+(\.[a-z]+)+/
-          # generator called as 'spot generate domain.com'
-          ARGV.unshift(generator_name)
-          generator = d::Site
-        else
-          raise InvalidGenerator.new(generator_name)
-        end
-        generator.start(ARGV) if generator
-      rescue InvalidGenerator => e
-        say "Unrecognised generator '#{e.name}'. Available options are:\n\n  #{available_generators.join("\n  ")}\n"
-      end
-
-      desc :browse, "Launces a browser pointing to the current development CMS"
-      def browse
-        prepare :browse
-        require 'launchy'
-        boot!
-        ::Launchy.open("http://localhost:#{Site.config.port}/@spontaneous")
-      end
-
-
-      desc :init, "Creates databases and initialises a new Spontaneous site"
-      def init
-        prepare :init
-        site = Spontaneous::Site.instantiate(Dir.pwd, options.environment, :back)
-        require File.expand_path('../../../spontaneous', __FILE__)
-        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
-          end
-          boot!
-        end
-      end
-
-      desc :migrate, "Runs migrations"
-      def migrate
-        prepare :init
-        boot!
-        Sequel.extension :migration
-        connection_params = Spontaneous.db_settings
-        say "  >> Running migrations..."
-        Sequel::Migrator.apply(Spontaneous.database, Spontaneous.gem_dir('db/migrations'))
-        say "  >> Done"
-      end
-
-      private
-
-
-      def available_generators
-        Spontaneous::Generators.available.map do |g|
-          g.name.demodulize.underscore
-        end
-      end
-
-
-
-
-    end # Base
-  end # Cli
-end # Spontaneous

data/lib/spontaneous/cli/tasks.rb

@@ -1,9 +0,0 @@
-require 'thor'
-
-module Spontaneous
-  # class Cli
-    # module Tasks
-    # end
-  # end
-end
-