drailties 0.4.3 → 0.5.0.pre

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDk3ZTlkMTU5ZGIwMjhjYjVlYmFiMTA2NTQzYjM3Mjg3NmM4YWZjMQ==
-  data.tar.gz: !binary |-
-    OGMyZTI3N2FkMTdlMTY0MTUxMTcwMGQyODMwZTk5ZjZiNGVkNjA4ZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDlkNzcxMmMyY2E3Mjk1MDJlY2NjZWRlNTYzZmM0YjM0YWVhMjExMzI0YTlk
-    MzBmNmRmY2Y5YjI4ZWNjOTNkMWE3ZTg5YmM5MDhlYmVmYWYxZmI0MzIzNDNi
-    ZmZmOGYwYjc0NDg1ZTdjNzhjNjAxZGIxYTU2YjAzMzE3NzJhYjg=
-  data.tar.gz: !binary |-
-    ZGYyNzVjZDE3MTI3MWU1NWE2YjQ1NDdhYTIzZWE4YzA4MDA5ODMwY2RmNjdj
-    MTc0ZGNkNzYyMDA1MGQ4Y2U4YTljMDFhYjJhYmMxOWJjZGU1YzY3ZjdhNWEy
-    ZTNhMDQ5NjVlOWIzN2I1YzExNDI0YjNlMTM4ZGU3ZjA4YWZkMjU=
+SHA1:
+  metadata.gz: 2a7dd88b03bbf2263cdce75dfcd41bba3278efba
+  data.tar.gz: 4b41195f65faa47954dd2fe06cbdbffec857c5a0
+SHA512:
+  metadata.gz: ad80208ff69c00f671b652a2ddc7f4eece1c2ca4ef60440b62aa09679b2f14e94923a9d90b439101902a9d888e19ba8d5d6514d48f349f757a4331917a7a0473
+  data.tar.gz: cfebcb2e8d70a8ea7aed32b21338e89445498108ce0777c441bed0602af03c23f060f4d9b2424adf3f2f0b15a56785dc53affa83e29088dbae2febad8f64da76

data/bin/drails

@@ -1,45 +1,7 @@
 #!/usr/bin/env ruby
-unless Gem::Specification.find_by_name('drailties').gem_dir == File.expand_path("../..", __FILE__)
-  $:.push File.expand_path("../../lib", __FILE__)
+
+unless Gem::Specification.find_by_name('drailties').gem_dir == File.expand_path('../..', __FILE__)
+  $:.push File.expand_path('../../lib', __FILE__)
   $:.delete "#{Gem::Specification.find_by_name('drailties').gem_dir}/lib"
 end
-
-ARGV << '--help' if ARGV.empty?
-
-aliases = {
-    'ds' => 'domainserver',
-    's' => 'server',
-    'ps' => 'projectionserver',
-    'g' => 'generate'
-}
-
-
-help_message = <<-EOT
-
-Usage: drails COMMAND
-
-where COMMAND is one of:
-
-  new                     creates a new drails application
-  generate(g)             run a rails generator
-  domainserver(ds)        start the domain server
-  projectionserver(ps)    start the projection server
-  server(s)               start both server
-EOT
-
-command = ARGV.shift
-command = aliases[command] || command
-
-case command
-  when 'new'
-    require 'drails/application'
-  when 'generate','rake','server', 'domainserver', 'projectionserver'
-    ROOT_DIR ||= Dir.pwd
-    require "drails/#{command}"
-  when '-h', '--help'
-    puts help_message
-  else
-    puts "Error: Command '#{command}' not recognized"
-    puts help_message
-    exit(1)
-end
+require 'drails/cli'

data/lib/drails/app_drails_loader.rb

@@ -0,0 +1,62 @@
+require 'pathname'
+
+module Drails
+  module AppDrailsLoader
+    RUBY = File.join(*RbConfig::CONFIG.values_at('bindir', 'ruby_install_name')) + RbConfig::CONFIG['EXEEXT']
+    EXECUTABLES = ['bin/drails']
+    BUNDLER_WARNING = <<EOS
+Looks like your app's ./bin/drails is a stub that was generated by Bundler.
+
+In Rails Disco, your app's bin/ directory contains executables that are versioned
+like any other source code, rather than stubs that are generated on demand.
+
+Here's how to upgrade:
+
+  bundle config --delete bin    # Turn off Bundler's stub generator
+  rake drails:update:bin        # Use the new Rails Disco executables
+  git add bin                   # Add bin/ to source control
+
+You may need to remove bin/ from your .gitignore as well.
+
+When you install a gem whose executable you want to use in your app,
+generate it and add it to source control:
+
+  bundle binstubs some-gem-name
+  git add bin/new-executable
+
+EOS
+
+    def self.exec_app_drails
+      original_cwd = Dir.pwd
+
+      loop do
+        exe = find_executable
+        if exe
+          contents = File.read(exe)
+
+          if contents =~ /(APP|ENGINE)_PATH/
+            exec RUBY, exe, *ARGV
+            break # non reachable, hack to be able to stub exec in the test suite
+          elsif exe.end_with?('bin/drails') && contents.include?('This file was generated by Bundler')
+            $stderr.puts(BUNDLER_WARNING)
+            Object.const_set(:APP_PATH, File.expand_path('config/application', Dir.pwd))
+            require File.expand_path('../boot', APP_PATH)
+            require 'drails/commands'
+            break
+          end
+        end
+
+        # If we exhaust the search there is no executable, this could be a
+        # call to generate a new application, so restore the original cwd.
+        Dir.chdir(original_cwd) and return if Pathname.new(Dir.pwd).root?
+
+        # Otherwise keep moving upwards in search of a executable.
+        Dir.chdir('..')
+      end
+    end
+
+    def self.find_executable
+      EXECUTABLES.find { |exe| File.exists?(exe) }
+    end
+  end
+end

data/lib/drails/cli.rb

@@ -0,0 +1,11 @@
+require 'rbconfig'
+require 'drails/app_drails_loader'
+
+# If we are inside a Rails application this method performs an exec and thus
+# the rest of this script is not run.
+Drails::AppDrailsLoader.exec_app_drails
+
+require 'rails/ruby_version_check'
+Signal.trap('INT') { puts; exit(1) }
+
+require 'drails/commands/application'

data/lib/drails/commands/application.rb

@@ -0,0 +1,43 @@
+require 'rails-disco/version'
+
+if ['--version', '-v'].include?(ARGV.first)
+  puts "Drails #{RailsDisco::VERSION::STRING}"
+  exit(0)
+end
+
+if ARGV.first != "new"
+  ARGV[0] = "--help"
+else
+  ARGV.shift
+  unless ARGV.delete("--no-rc")
+    customrc = ARGV.index{ |x| x.include?("--rc=") }
+    railsrc = if customrc
+                File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ""))
+              else
+                File.join(File.expand_path("~"), '.railsrc')
+              end
+    if File.exist?(railsrc)
+      extra_args_string = File.read(railsrc)
+      extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
+      puts "Using #{extra_args.join(" ")} from #{railsrc}"
+      ARGV.insert(1, *extra_args)
+    end
+  end
+end
+
+require 'rails/generators'
+require 'generators/drails/app/app_generator'
+
+module Drails
+  module Generators
+    class AppGenerator # :nodoc:
+      # We want to exit on failure to be kind to other libraries
+      # This is only when accessing via CLI
+      def self.exit_on_failure?
+        true
+      end
+    end
+  end
+end
+
+Drails::Generators::AppGenerator.start

data/lib/drails/commands/destroy.rb

@@ -0,0 +1,12 @@
+require 'drails/generators'
+
+if [nil, '-h', '--help'].include?(ARGV.first)
+  Rails::Generators.help 'destroy'
+  exit
+end
+
+name = ARGV.shift
+name = name.sub(/^drails:/, '')
+
+root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+Rails::Generators.invoke "drails:#{name}", ARGV, behavior: :revoke, destination_root: root

data/lib/drails/commands/domainserver.rb

@@ -0,0 +1,6 @@
+puts 'Starting Domain Command Server'
+puts '=> Ctrl-C to shutdown domain server'
+Signal.trap('INT') { puts; exit(1) }
+
+Process.spawn({"ROOT_DIR" => Dir.pwd}, "ruby #{File.expand_path '../../server', __FILE__}/domain_server.rb")
+Process.waitall

data/lib/drails/commands/generate.rb

@@ -0,0 +1,12 @@
+require 'drails/generators'
+
+if [nil, '-h', '--help'].include?(ARGV.first)
+  Rails::Generators.help 'generate'
+  exit
+end
+
+name = ARGV.shift
+name = name.sub(/^drails:/, '')
+
+root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+Rails::Generators.invoke "drails:#{name}", ARGV, behavior: :invoke, destination_root: root

data/lib/drails/commands/projectionserver.rb

@@ -0,0 +1,9 @@
+count = [ARGV.shift.to_i, 1].max
+puts "Starting Projection Server (#{count} processes)"
+puts '=> Ctrl-C to shutdown projections server'
+Signal.trap('INT') { puts; exit(1) }
+
+count.times do |i|
+  Process.spawn({'ROOT_DIR' => Dir.pwd, 'WORKER_COUNT' => count.to_s, 'WORKER_NUMBER' => i.to_s}, "ruby #{File.expand_path '../../server', __FILE__}/projection_servers.rb")
+end
+Process.waitall

data/lib/drails/commands/server.rb

@@ -0,0 +1,22 @@
+count = [ARGV.shift.to_i, 1].max
+puts "Starting domain, projection (*#{count}) and Rails server..."
+puts '=> Ctrl-C to shutdown all servers'
+env = {'ROOT_DIR' => Dir.pwd}
+pids = []
+pids << Process.spawn(env, "ruby #{File.expand_path '../../server', __FILE__}/domain_server.rb")
+count.times do |i|
+  pids << Process.spawn(env.merge('WORKER_COUNT' => count.to_s, 'WORKER_NUMBER' => i.to_s), "ruby #{File.expand_path '../../server', __FILE__}/projection_servers.rb")
+end
+pids << Process.spawn(env, 'rails s')
+trap(:INT) do
+  pids.each do |pid|
+    begin
+      Process.kill 9, pid
+    rescue Exception
+      # do nothing
+    end
+  end
+  puts
+  exit(1)
+end
+Process.waitall

data/lib/drails/commands.rb

@@ -0,0 +1,70 @@
+ARGV << '--help' if ARGV.empty?
+
+aliases = {
+    'ds' => 'domainserver',
+    's' => 'server',
+    'ps' => 'projectionserver',
+    'g' => 'generate',
+    '-h' => '--help',
+    '-v' => '--version',
+}
+
+help_message = <<-EOT
+Usage: drails COMMAND [ARGS]
+
+The most common drails commands are:
+ generate(g)           Generate new Rails Disco code
+ domainserver(ds)      Start the domain server
+ projectionserver(ps)  Start the projection server
+ server(s)             Start domain and projection server
+ new                   Creates a new Rails Disco application
+                       "drails new my_app" creates a
+                       new application called MyApp in "./my_app"
+
+In addition to those, there are:
+ application           Generate the Rails Disco application code
+ destroy(d)            Undo code generated with "generate"
+
+All commands can be run with -h (or --help) for more information.
+EOT
+
+
+command = ARGV.shift
+command = aliases[command] || command
+
+case command
+  when 'generate', 'destroy'
+    require 'drails/generators'
+
+    require APP_PATH
+    Rails.application.require_environment!
+    Rails.application.load_generators
+
+    require "drails/commands/#{command}"
+
+  when 'server', 'domainserver', 'projectionserver'
+    Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path('config.ru'))
+
+    require "drails/commands/#{command}"
+
+  when 'new'
+    if %w(-h --help).include?(ARGV.first)
+      require 'drails/commands/application'
+    else
+      puts "Can't initialize a new Rails Disco application within the directory of another, please change to a non-Rails Disco directory first.\n"
+      puts "Type 'drails' for help."
+      exit(1)
+    end
+
+  when '--version'
+    require 'rails-disco/version'
+    puts "Drails #{RailsDisco::VERSION::STRING}"
+
+  when '--help'
+    puts help_message
+
+  else
+    puts "Error: Command '#{command}' not recognized"
+    puts help_message
+    exit(1)
+end

data/lib/drails/generators.rb

@@ -0,0 +1,48 @@
+require 'rails/generators'
+
+module Rails
+  module Generators
+
+    def self.help(command = 'generate')
+      lookup!
+
+      namespaces = subclasses.map { |k| k.namespace }
+      namespaces.sort!
+
+      drails = []
+      namespaces.each do |namespace|
+        drails << namespace if namespace.split(':').first == 'drails'
+      end
+
+      puts <<-EOT
+Usage: drails #{command} GENERATOR [args] [options]
+
+General options:
+  -h, [--help]     # Print generator's options and usage
+  -p, [--pretend]  # Run but do not make any changes
+  -f, [--force]    # Overwrite files that already exist
+  -s, [--skip]     # Skip files that already exist
+  -q, [--quiet]    # Suppress status output
+
+Please choose a generator below.
+
+      EOT
+
+      drails.reject! { |n| hidden_namespaces.include?(n) }
+      drails.map! { |n| n.sub(/^drails:/, '') }
+      drails.delete('app')
+      drails.delete('plugin_new')
+      print_list('drails', drails)
+    end
+
+  end
+end
+
+Rails::Generators.options.deep_merge! drails: {
+    command: :command,
+    command_processor: :command_processor,
+    migration: :migration,
+    model: :model,
+    projection: :projection,
+    scaffold_controller: :scaffold_controller,
+}

data/lib/drails/server/domain_server.rb

@@ -1,9 +1,12 @@
 #!/usr/bin/env ruby.exe
+ROOT_DIR ||= ENV['ROOT_DIR']
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ROOT_DIR)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+
 require 'active_event'
 require 'active_domain'
 require 'active_record'
 
-ROOT_DIR ||= ENV['ROOT_DIR']
 LOGGER = ActiveEvent::Support::MultiLogger.new 'Domain Server'
 
 ActiveEvent::Autoload.app_path = ROOT_DIR

data/lib/drails/server/projection_servers.rb

@@ -1,9 +1,12 @@
 #!/usr/bin/env ruby.exe
+ROOT_DIR ||= ENV['ROOT_DIR']
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ROOT_DIR)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+
 require 'active_event'
 require 'active_projection'
 require 'active_record'
 
-ROOT_DIR ||= ENV['ROOT_DIR']
 WORKER_COUNT = [ENV['WORKER_COUNT'].to_i, 1].max
 WORKER_NUMBER = ENV['WORKER_NUMBER'].to_i
 LOGGER = ActiveEvent::Support::MultiLogger.new "Projection Server#{WORKER_COUNT > 1 ? " Nr. #{WORKER_NUMBER}" : ""}"
@@ -20,4 +23,4 @@ RELOADER = ActiveSupport::FileUpdateChecker.new([], watchable_dirs) do
   ActiveProjection::Autoload.reload
 end
 ActiveProjection::Server.base_path = ROOT_DIR
-ActiveProjection::Server.run
+ActiveProjection::Server.run

data/lib/generators/drails/app/USAGE

@@ -1,13 +1,13 @@
-Description:
-    Add drails to your project.
-
-Example:
-    rails generate drails:app
-
-    This will create:
-        app/controllers/event_source_controller.rb
-        a route for this controller
-        config/build_validations_registry.rb
-        config/initializers/create_domain.rb
-        config/disco.yml
+Description:
+    Add drails to your project.
+
+Example:
+    rails generate drails:app
+
+    This will create:
+        app/controllers/event_source_controller.rb
+        a route for this controller
+        config/build_validations_registry.rb
+        config/initializers/create_domain.rb
+        config/disco.yml
         adds rails-disco to your gemfile

data/lib/generators/drails/app/app_generator.rb

@@ -1,52 +1,134 @@
-module Drails
-  module Generators
-    class AppGenerator < Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
-      argument :name, type: :string, default: '', banner: "[name]"
-
-      def copy_config
-        copy_file 'disco.yml', File.join('config', 'disco.yml')
-      end
-
-      def create_domain_initializer
-        template 'create_domain.rb', File.join('config', 'initializers', 'create_domain.rb')
-      end
-
-      def copy_validation_registry_initializer
-        copy_file 'build_validations_registry.rb', File.join('config', 'initializers', 'build_validations_registry.rb')
-      end
-
-      def copy_sse_controller
-        copy_file 'event_source_controller.rb', File.join('app', 'controllers', 'event_source_controller.rb')
-      end
-
-      def add_sse_route
-        route "get 'event_stream' => 'event_source#stream'"
-      end
-
-      def add_drails_to_gemfile
-        gem "rails-disco"
-      end
-
-      def enable_rake_tasks
-        content = "
-require 'rails-disco/tasks'"
-        inject_into_file File.join('config/application.rb'), content, after: /require 'rails\/all'/
-      rescue Exception
-        puts "Seems like you invoked it from an engine, so put\n
-        require 'rails-disco/tasks'\n
-        in your application.rb from the main application to have the rails disco rake tasks available"
-      end
-
-      def enable_concurrency
-        application 'config.preload_frameworks = true'
-        application 'config.allow_concurrency = true'
-      rescue Exception
-        puts "Seems like you invoked it from an engine, so remember to put\n
-        config.preload_frameworks = true
-        config.allow_concurrency = true\n
-        in your application.rb from the main application"
-      end
-    end
-  end
-end
+require 'rails/generators/rails/app/app_generator'
+require 'yaml'
+
+module Drails
+  class AppBuilder < Rails::AppBuilder
+
+    def gemfile
+      super
+      append_file 'Gemfile', "\n# Rails Disco support
+gem 'rails-disco', '~> #{RailsDisco::VERSION::STRING}'\n
+# Required Multithreaded Webserver
+gem 'puma'\n" unless behavior == :revoke
+    end
+
+    def app
+      super
+      copy_file 'app/controllers/event_source_controller.rb'
+      keep_file 'app/commands'
+      keep_file 'app/events'
+      keep_file 'app/projections'
+      keep_file 'app/validations'
+
+      keep_file 'domain/command_processors/domain'
+      keep_file 'domain/models/domain'
+      keep_file 'domain/projections/domain'
+      keep_file 'domain/validations/domain'
+    end
+
+    def bin
+      super
+      copy_file 'bin/drails'
+      chmod 'bin/drails', 0755, verbose: false
+    end
+
+    def config
+      super
+      inside 'config/initializers' do
+        template 'create_domain.rb'
+        copy_file 'build_validations_registry.rb'
+      end
+    end
+
+    def database_yml
+      super
+      template 'config/disco.yml'
+    end
+
+    def db
+      super
+      append_file 'db/seeds.rb', File.binread(File.expand_path('../templates/db/seeds.rb', __FILE__)) unless behavior == :revoke
+    end
+  end
+
+  module Generators
+    class AppGenerator < Rails::Generators::AppGenerator
+      remove_class_option :version
+      class_option :version, type: :boolean, aliases: '-v', group: :drails,
+                   desc: 'Show Rails Disco version number and quit'
+
+      remove_class_option :help
+      class_option :help, type: :boolean, aliases: '-h', group: :drails,
+                   desc: 'Show this help message and quit'
+
+      # this does not seem to work !
+      remove_command :apply_rails_template, :run_bundle
+
+      def source_paths
+        [File.join(Gem::Specification.find_by_name('railties').gem_dir, 'lib/rails/generators/rails/app/templates'), File.expand_path('../templates', __FILE__)]
+      end
+
+      def add_event_source_route
+        return if behavior == :revoke
+        route "get 'event_stream' => 'event_source#stream'"
+      end
+
+      def enable_rake_tasks
+        return if behavior == :revoke
+        content = "
+require 'rails-disco/tasks'"
+        inject_into_file File.join('config/application.rb'), content, after: /require 'rails\/all'/
+      rescue Exception
+        puts "Seems like you invoked it from an engine, so put\n
+        require 'rails-disco/tasks'\n
+        in your application.rb from the main application to have the rails disco rake tasks available"
+      end
+
+      def enable_concurrency
+        return if behavior == :revoke
+        application 'config.preload_frameworks = true'
+        application 'config.allow_concurrency = true'
+      rescue Exception
+        puts "Seems like you invoked it from an engine, so remember to put\n
+        config.preload_frameworks = true
+        config.allow_concurrency = true\n
+        in your application.rb from the main application"
+      end
+
+      public_task :apply_rails_template, :run_bundle
+
+      private
+
+      def get_builder_class
+        defined?(::AppBuilder) ? ::AppBuilder : Drails::AppBuilder
+      end
+
+      def domain_database(env, indent_level)
+        config = YAML.load(File.read('config/database.yml'))[env.to_s]
+        config['database'].sub!(/.*#{env}/, '\0_domain')
+        indent( ({'domain_database' => config}.to_yaml(indentation: 2))[4..-1], indent_level)
+      end
+
+      # copied namespace support from NamedBase
+      def module_namespacing(&block)
+        content = capture(&block)
+        content = wrap_with_namespace(content) if namespace
+        concat(content)
+      end
+
+      def indent(content, multiplier = 2)
+        spaces = ' ' * multiplier
+        content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join
+      end
+
+      def wrap_with_namespace(content)
+        content = indent(content).chomp
+        "module #{namespace.name}\n#{content}\nend\n"
+      end
+
+      def namespace
+        Rails::Generators.namespace
+      end
+    end
+  end
+end

data/lib/generators/drails/app/templates/{event_source_controller.rb → app/controllers/event_source_controller.rb}

@@ -1,16 +1,16 @@
-class EventSourceController < ApplicationController
-  include ActionController::Live
-  include ActiveEvent::EventSourceServer
-
-  def stream
-    event_connection.start
-    response.headers['Content-Type'] = 'text/event-stream'
-    sse = ActiveEvent::SSE.new(response.stream)
-    subscribe_to event_queue do |delivery_info, properties, body|
-      sse.write({:id => body}, :event => 'refresh')
-    end
-  rescue IOError
-  ensure
-    sse.close
-  end
+class EventSourceController < ApplicationController
+  include ActionController::Live
+  include ActiveEvent::EventSourceServer
+
+  def stream
+    event_connection.start
+    response.headers['Content-Type'] = 'text/event-stream'
+    sse = ActiveEvent::SSE.new(response.stream)
+    subscribe_to event_queue do |delivery_info, properties, body|
+      sse.write({:id => body}, :event => 'refresh')
+    end
+  rescue IOError
+  ensure
+    sse.close
+  end
 end

data/lib/generators/drails/app/templates/bin/drails

@@ -0,0 +1,3 @@
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'drails/commands'