isomorfeus-installer 1.0.0.delta6 → 1.0.0.delta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b21b92089fa246ecb9c6781b0be126cd02e5f7c9b1b38bfe7c57744368788c
-  data.tar.gz: 8fa5982cd3e3d929b8d7d5efd9d9d667dfa295e7476b4105db13b7b31ce1f186
+  metadata.gz: 29383601375ed55792f3e0aa675aed0ed26d6d3c8156ec156ed1dd0e502cc1ce
+  data.tar.gz: 1973625a51378a42e2e25dd686853c4907dfaeb85a035476f8e4a33bb91d8492
 SHA512:
-  metadata.gz: 4f01bf9346b9c163f68138cac2de3b0ce7972ed9ced96ebc1c1442fec7108efb85f888dc07066ada2f9c782c3347622fd7e33f23d63132a9ff9cfaaff877e507
-  data.tar.gz: 5543ec01e5664027e4d58616332a64a4eaa2e10c0ec510de52511c244ba611e19db28b557879003aeb6e84a12c25e6481d46b57cb4509d2b3c440be5b3c23c4e
+  metadata.gz: cdc547f0573241d5b959af4c6e56079f790ccdc0d7b753c3a65124f7ac1cce2dc36745f28ec57fc39b168b11d8c0279ce37711078cf478632a231f9e90dac106
+  data.tar.gz: 3913830a97ed5c32c61b87e1d3fbfd90c369e0b21300b2c247c7b0f774a77f121a7b47b05bd43525c6ff5a6169e906d3119027469d430b1e90ff8cf863d8c92b

data/lib/isomorfeus/installer.rb

@@ -22,14 +22,6 @@ module Isomorfeus
       rack_servers[name] = props
     end
 
-    def self.add_transport_module(name, props)
-      transports[name] = props
-    end
-
-    def self.add_transport_store_module(name, props)
-      transport_stores[name] = props
-    end
-
     class << self
       # application options
       attr_reader   :app_class
@@ -43,8 +35,6 @@ module Isomorfeus
       attr_reader   :project_name
       attr_accessor :rack_server
       attr_accessor :rack_server_name
-      attr_accessor :transport
-      attr_accessor :transport_store
 
       # installer options
       attr_reader :options
@@ -82,14 +72,6 @@ module Isomorfeus
       rack_servers.keys.sort
     end
 
-    def self.sorted_transports
-      transports.keys
-    end
-
-    def self.sorted_transport_stores
-      transport_stores.keys
-    end
-
     def self.databases
       @databases ||= {}
     end
@@ -110,18 +92,10 @@ module Isomorfeus
       @rack_servers ||= {}
     end
 
-    def self.transports
-      @transports ||= {}
-    end
-
-    def self.transport_stores
-      @transport_stores ||= {}
-    end
-
     # installer options and config
 
     def self.module_directories
-      %w[databases transports transport_stores]
+      %w[databases]
     end
 
     # installer paths
@@ -194,12 +168,9 @@ module Isomorfeus
                     isomorfeus_config:              create_isomorfeus_config,
                     middlewares:                    create_middlewares,
                     middlewares_includes:           middlewares_includes,
-                    transport_rack_app_mount_path:  transport&.rack_app_mount_path,
-                    transport_rack_app:             transport&.rack_app,
-                    transport_config:               transport&.config,
-                    use_transport:                  use_transport?,
-                    use_transport_rack_app:         use_transport_rack_app? }
+                    rack_server_init:               rack_server[:rack_server_init] }
       create_file_from_template('app.rb.erb', "#{@project_name}_app.rb", data_hash)
+      create_file_from_template( rack_server[:init_template], rack_server[:init_template][0..-5], {})
       data_hash = { app_require: app_require, app_class: app_class }
       create_file_from_template('config.ru.erb', 'config.ru', data_hash)
       create_file_from_template(File.join('app_loader.rb.erb'), 'app_loader.rb', {})
@@ -210,19 +181,13 @@ module Isomorfeus
                     use_database:       use_database?,
                     use_i18n:           use_i18n?,
                     use_operation:      use_operation?,
-                    use_policy:         use_policy?,
-                    use_transport:      use_transport?,
-                    transport_requires: use_transport? ? transport.requires : nil }
-
+                    use_policy:         use_policy? }
       create_file_from_template('isomorfeus_loader.rb.erb', File.join(isomorfeus_path, 'isomorfeus_loader.rb'), data_hash)
       create_file_from_template('isomorfeus_web_worker_loader.rb.erb', File.join(isomorfeus_path, 'isomorfeus_web_worker_loader.rb'), data_hash)
     end
 
     def self.install_js_entries
-
-      data_hash = { use_transport:    use_transport_import?,
-                    transport_import: (use_transport_import? ? transport.js_import : nil),
-                    transport_global: (use_transport_import? ? transport.js_global : nil) }
+      data_hash = {}
       create_file_from_template('application.js.erb', entrypoint_path('application.js'), data_hash)
       create_file_from_template('application_common.js.erb', entrypoint_path('application_common.js'), data_hash)
       create_file_from_template('application_ssr.js.erb', entrypoint_path('application_ssr.js'), data_hash)
@@ -239,10 +204,7 @@ module Isomorfeus
         rack_server_gems << generate_gem_line(gem)
       end
       transport_gems = ''
-      Isomorfeus::Installer.transports[options[:transport]]&.fetch(:gems)&.each do |gem|
-        transport_gems << generate_gem_line(gem)
-      end
-      Isomorfeus::Installer.transport_stores[options[:transport_store]]&.fetch(:gems)&.each do |gem|
+      [ { name: 'isomorfeus-transport', version: "~> #{Isomorfeus::Installer::VERSION}", require: true } ]&.each do |gem|
         transport_gems << generate_gem_line(gem)
       end
       database_gems = ''
@@ -284,7 +246,7 @@ module Isomorfeus
     end
 
     def self.create_middlewares
-      "use_isomorfeus_middlewares" if options.has_key?(:transport)
+      "use_isomorfeus_middlewares"
     end
 
     def self.create_isomorfeus_config
@@ -292,14 +254,7 @@ module Isomorfeus
     end
 
     def self.create_package_json
-      npms = ''
-      if use_transport? && transports[options[:transport]].has_key?(:npms)
-        transports[options[:transport]][:npms].each do |npm|
-          npms << "    \"#{npm[:name]}\": \"#{npm[:version]}\",\n"
-        end
-      end
-      data_hash = { application_name: app_class,
-                    npm_packages:     npms.chop }
+      data_hash = { application_name: app_class }
       create_file_from_template('package.json.erb', 'package.json', data_hash)
     end
 
@@ -334,17 +289,5 @@ module Isomorfeus
     def self.use_policy?
       options['policy']
     end
-
-    def self.use_transport?
-      options.has_key?('transport')
-    end
-
-    def self.use_transport_import?
-      use_transport? && transport&.respond_to?(:js_import)
-    end
-
-    def self.use_transport_rack_app?
-      transport&.respond_to?(:rack_app)
-    end
   end
 end

data/lib/isomorfeus/installer/cli.rb

@@ -5,16 +5,12 @@ module Isomorfeus
       desc "new project_name", "create a new isomorfeus project with project_name"
 
       option :database, required: false, aliases: '-d',
-             desc: "Select database, one of: #{Isomorfeus::Installer.sorted_databases.join(', ')}. (optional, requires transport)"
-      option :i18n, default: false, type: :boolean, aliases: '-i', desc: "Use i18n module. (optional, requires transport)"
-      option :operation, default: false, type: :boolean, aliases: '-o', desc: "Use operation module. (optional, requires transport)"
-      option :policy, default: false, type: :boolean, aliases: '-p', desc: "Use policy module. (optional, requires transport)"
-      option :rack_server, default: 'puma', aliases: '-r',
+             desc: "Select database, one of: #{Isomorfeus::Installer.sorted_databases.join(', ')}. (optional)"
+      option :i18n, default: false, type: :boolean, aliases: '-i', desc: "Use i18n module. (optional)"
+      option :operation, default: false, type: :boolean, aliases: '-o', desc: "Use operation module. (optional)"
+      option :policy, default: false, type: :boolean, aliases: '-p', desc: "Use policy module. (optional)"
+      option :rack_server, default: 'iodine', aliases: '-r',
              desc: "Select rack server, one of: #{Isomorfeus::Installer.sorted_rack_servers.join(', ')}. (optional)"
-      option :transport, required: false, aliases: '-t',
-             desc: "Select transport, one of: #{Isomorfeus::Installer.sorted_transports.join(', ')}. (optional if no other features that depend on a transport are used)"
-      option :transport_store, required: false, aliases: '-e',
-             desc: "Select transport store, one of: #{Isomorfeus::Installer.sorted_transport_stores.join(', ')}. (optional with no transport, required if a transport is used)"
       option :yarn_and_bundle, default: true, required: false, type: :boolean, aliases: '-y', desc: "Execute yarn install and bundle install. (optional)"
       def new(project_name)
         Isomorfeus::Installer.set_project_names(project_name)

data/lib/isomorfeus/installer/new_project.rb

@@ -34,8 +34,6 @@ module Isomorfeus
           Isomorfeus::Installer.create_components
           Isomorfeus::Installer.create_spec
 
-          Isomorfeus::Installer.transport&.install(root)
-
           Isomorfeus::Installer.create_package_json
           Isomorfeus::Installer.create_gemfile
           Isomorfeus::Installer.create_procfile

data/lib/isomorfeus/installer/options_mangler.rb

@@ -14,35 +14,11 @@ module Isomorfeus
           end
         end
 
-        if options.key?(:transport) && !options.key?(:transport_store)
-          puts "A transport store (-s) is required when using a transport."
-          exit 1
-        elsif options.key?(:transport_store) && !options.key?(:transport)
-          puts "A transport (-t) is required when using a transport store."
-          exit 1
-        end
-
-        if options.key?(:transport_store)
-          if installer.sorted_transport_stores.include?(options[:transport_store])
-            installer.transport_store = installer.transport_stores[options[:transport_store]]&.fetch(:installer)
-          else
-            puts "Transport store #{options[:transport_store]} not available!"; exit 1
-          end
-        end
-
-        if options.key?(:transport)
-          if installer.sorted_transports.include?(options[:transport])
-            installer.transport = installer.transports[options[:transport]]&.fetch(:installer)
-          else
-            puts "Transport #{options[:transport]} not available!"; exit 1
-          end
-        end
-
         if options.key?(:rack_server) && installer.sorted_rack_servers.include?(options[:rack_server])
           installer.rack_server = installer.rack_servers[options[:rack_server]]
           installer.rack_server_name = options[:rack_server]
         else
-          installer.rack_server = installer.rack_servers['puma']
+          installer.rack_server = installer.rack_servers['iodine']
         end
       end
     end

data/lib/isomorfeus/installer/rack_servers.rb

@@ -1,19 +1,11 @@
-Isomorfeus::Installer.add_rack_server('agoo', {
-  gems: [ { name: 'agoo', version: "~> 2.8.3" } ],
-  start_command: 'bundle exec rackup -s agoo'
-})
-
-Isomorfeus::Installer.add_rack_server('falcon', {
-  gems: [ { name: 'falcon', version: "~> 0.30.0", require: false } ],
-  start_command: 'bundle exec falcon serve'
-})
+# Isomorfeus::Installer.add_rack_server('agoo', {
+#   gems: [ { name: 'agoo', version: "~> 2.8.3" } ],
+#   start_command: 'bundle exec rackup -s agoo'
+# })
 
 Isomorfeus::Installer.add_rack_server('iodine', {
-  gems: [ { name: 'iodine', version: "~> 0.7.31", require: false } ],
-  start_command: 'bundle exec iodine'
-})
-
-Isomorfeus::Installer.add_rack_server('puma', {
-  gems: [ { name: 'puma', version: "~> 3.12.1", require: false } ],
-  start_command: 'bundle exec puma'
+  gems: [ { name: 'iodine', version: "~> 0.7.32", require: true } ],
+  start_command: 'bundle exec iodine',
+  init_template: 'iodine_config.rb.erb',
+  rack_server_init: "require_relative 'iodine_config'"
 })

data/lib/isomorfeus/installer/templates/Gemfile.erb

@@ -12,8 +12,8 @@ gem 'opal-webpack-loader', '>= 0.9.2'
 
 gem 'opal-autoloader', '~> 0.0.3'
 gem 'isomorfeus-redux', '~> 4.0.7'
-gem 'isomorfeus-react', '~> 16.8.3'
-#<%= transport_gems %>
+<%= transport_gems %>
+gem 'isomorfeus-react', '~> 16.8.7'
 #<%= database_gems %>
 #<%= policy_gems %>
 #<%= operation_gems %>
@@ -25,5 +25,5 @@ end
 
 group :test do
   gem 'rspec', '~> 3.6.0'
-  gem 'isomorfeus-puppetmaster', '~> 0.2.7'
+  gem 'isomorfeus-puppetmaster', '~> 0.2.8'
 end

data/lib/isomorfeus/installer/templates/app.rb.erb

@@ -1,7 +1,7 @@
 require_relative 'app_loader'
 require_relative 'owl_init'
+<%= rack_server_init %>
 <%= isomorfeus_config %>
-<% if use_transport %><%= transport_config %><% end %>
 
 class <%= app_class %> < Roda
   include OpalWebpackLoader::ViewHelper

data/lib/isomorfeus/installer/templates/application_ssr.js.erb

@@ -10,6 +10,8 @@ global.Link = Link;
 global.NavLink = NavLink;
 global.Route = Route;
 global.Switch = Switch;
+import WebSocket from 'ws';
+global.WebSocket = WebSocket;
 // import modules common to browser and server side rendering (ssr)
 // environments from application_common.js
 import './application_common.js';

data/lib/isomorfeus/installer/templates/iodine_config.rb.erb

@@ -0,0 +1,10 @@
+require 'etc'
+Iodine.threads = ENV['THREADS'] || 1
+Iodine.workers = ENV['WORKERS'] || Etc.nprocessors
+
+if ENV['REDIS_URL']
+  Iodine::PubSub.default = Iodine::PubSub::Redis.new(ENV['REDIS_URL'])
+  puts "* Using Redis for pub/sub."
+else
+  puts "* Using Iodine for pub/sub within the process cluster."
+end

data/lib/isomorfeus/installer/templates/isomorfeus_loader.rb.erb

@@ -1,11 +1,9 @@
 require 'opal'
 require 'opal-autoloader'
 require 'isomorfeus-redux'
-require 'isomorfeus-react'
-<% if use_transport %>
 require 'isomorfeus-transport'
-<%= transport_requires %>
-<% end %>
+require 'isomorfeus-react'
+
 <% if use_database %>require 'isomorfeus-record'<% end %>
 <% if use_policy %>require 'isomorfeus-policy'<% end %>
 <% if use_operation %>require 'isomorfeus-operation'<% end %>

data/lib/isomorfeus/installer/templates/package.json.erb

@@ -7,12 +7,13 @@
     "react-dom": "16.8.6",
     "react-router": "^5.0.0",
     "react-router-dom": "^5.0.0",
-    "redux": "^4.0.1"
+    "redux": "^4.0.1",
+    "ws": "^7.0.1"
   },
   "scripts": {
     "debug": "webpack-dev-server --config=webpack/debug.js",
     "development": "webpack-dev-server --config=webpack/development.js",
-    "production_build": "webpack --config=webpack/production.js"
+    "production_build": "parallel-webpack --config=webpack/production.js"
   },
   "devDependencies": {
     "cache-loader": "^4.0.0",
@@ -23,6 +24,7 @@
     "file-loader": "^4.0.0",
     "jsdom": "15.1.1",
     "node-sass": "^4.12.0",
+    "parallel-webpack": "^2.4.0",
     "puppeteer": "1.17.0",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",

data/lib/isomorfeus/installer/templates/spec_helper.rb.erb

@@ -16,5 +16,10 @@ Isomorfeus::Puppetmaster.boot_app
 
 RSpec.configure do |config|
   config.include Isomorfeus::Puppetmaster::DSL
+
+  config.after(:suite) do
+    Iodine.stop if Isomorfeus::Puppetmaster.server == :iodine
+    sleep 10
+  end
 end
 

data/lib/isomorfeus/installer/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Installer
-    VERSION = '1.0.0.delta6'
+    VERSION = '1.0.0.delta7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-installer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.delta6
+  version: 1.0.0.delta7
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -148,7 +148,6 @@ files:
 - lib/isomorfeus/installer/templates/Gemfile.erb
 - lib/isomorfeus/installer/templates/Procfile.erb
 - lib/isomorfeus/installer/templates/ProcfileDebug.erb
-- lib/isomorfeus/installer/templates/actioncable/actioncable_ru.erb
 - lib/isomorfeus/installer/templates/app.rb.erb
 - lib/isomorfeus/installer/templates/app_loader.rb.erb
 - lib/isomorfeus/installer/templates/application.css.erb
@@ -158,6 +157,7 @@ files:
 - lib/isomorfeus/installer/templates/application_web_worker.js.erb
 - lib/isomorfeus/installer/templates/config.ru.erb
 - lib/isomorfeus/installer/templates/hello_component.rb.erb
+- lib/isomorfeus/installer/templates/iodine_config.rb.erb
 - lib/isomorfeus/installer/templates/isomorfeus_loader.rb.erb
 - lib/isomorfeus/installer/templates/isomorfeus_web_worker_loader.rb.erb
 - lib/isomorfeus/installer/templates/my_app.rb.erb
@@ -166,8 +166,6 @@ files:
 - lib/isomorfeus/installer/templates/spec_helper.rb.erb
 - lib/isomorfeus/installer/templates/test_spec.rb.erb
 - lib/isomorfeus/installer/templates/welcome_component.rb.erb
-- lib/isomorfeus/installer/transport_stores/redis.rb
-- lib/isomorfeus/installer/transports/actioncable.rb
 - lib/isomorfeus/installer/version.rb
 homepage: http://isomorfeus.com
 licenses:

data/lib/isomorfeus/installer/templates/actioncable/actioncable_ru.erb

@@ -1,3 +0,0 @@
-<%= requires %>
-
-run ActionCable.server

data/lib/isomorfeus/installer/transport_stores/redis.rb

@@ -1,14 +0,0 @@
-module Isomorfeus
-  module Installer
-    module TransportStores
-      module Redis
-
-      end
-    end
-  end
-end
-
-Isomorfeus::Installer.add_transport_store_module('redis', {
-  gems: [ { name: 'isomorfeus-transport-store-redis', version: "~> #{Isomorfeus::Installer::VERSION}" } ],
-  installer: Isomorfeus::Installer::TransportStores::Redis
-})

data/lib/isomorfeus/installer/transports/actioncable.rb

@@ -1,43 +0,0 @@
-module Isomorfeus
-  module Installer
-    module Transports
-      module ActionCable
-        def self.install(root)
-          # data_hash = { requires: Isomorfeus::Installer.create_requires }
-          # Isomorfeus::Installer.create_file_from_template(File.join('actioncable', 'actioncable_ru.erb'), 'actioncable.ru', data_hash)
-        end
-
-        def self.config
-          'ActionCable::Server::Base.config.logger = ActiveSupport::Logger.new(STDOUT)'
-        end
-
-        def self.js_import
-          "import ActionCable from 'actioncable';"
-        end
-
-        def self.js_global
-          "global.ActionCable = ActionCable;"
-        end
-
-        def self.rack_app
-          'ActionCable.server'
-        end
-
-        def self.rack_app_mount_path
-          'websocket'
-        end
-
-        def self.requires
-          "require 'isomorfeus-transport-actioncable'"
-        end
-      end
-    end
-  end
-end
-
-Isomorfeus::Installer.add_transport_module('actioncable', {
-  gems: [ { name: 'isomorfeus-transport', version: "~> #{Isomorfeus::Installer::VERSION}" },
-          { name: 'isomorfeus-transport-actioncable', version: "~> #{Isomorfeus::Installer::VERSION}" } ],
-  npms: [ { name: 'actioncable', version: '^5.2.2' } ],
-  installer: Isomorfeus::Installer::Transports::ActionCable
-})