isomorfeus-installer 1.0.0.delta8 → 1.0.0.delta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b24386263bccfc05d9a0b2cdb394bab35405a433e331f2590063872ad423e80a
-  data.tar.gz: a77e328e665923bcf1820afd3128de0a9ab84a189af6210bd387078a957f05e6
+  metadata.gz: a105a6284c0952401f02836670d1ac8ba7cc0d22b995f0bc13a1e62c05f40966
+  data.tar.gz: 94a7497fb4027d0450b59b548ef5f3ebe9e8bce0f4bc542e66f32a3378cd4770
 SHA512:
-  metadata.gz: 00cf00fad01ea7be6275b0a3703d8dfbdd2f82c84b5c010b4a5e5c867af862acc84e77314c6331b0ee414d8c8c963cb12d6e53c3ec0b8655b599dc57d5cbe5a3
-  data.tar.gz: d6f01f66b94c23afa5c483d68b1f0b6ee68205ebe231afc750b8dee1fed1ecb9952f5c306d3655d945acd3d604f0e1eed8aabc516328873de43b46b98a68a87d
+  metadata.gz: 100a2b5c82ce3bd90c3798523a9d8b173f06bdc3dbdb19fdf7567697fdcc6dd467ee8f49d36658dbf46cd2ae24e5cd992a22fc3e8e5af13b744a659f2fb0b6e2
+  data.tar.gz: bf9730c6d780335b278c00556c198e28404705dfc121fa99a14444abf157db01f4a54755da8e3882dc00671d8f777b3fba31b1cd20cbdbfc054349519bc4146d

data/lib/isomorfeus/installer.rb

@@ -35,6 +35,7 @@ module Isomorfeus
       attr_reader   :project_name
       attr_accessor :rack_server
       attr_accessor :rack_server_name
+      attr_accessor :use_data
 
       # installer options
       attr_reader :options
@@ -140,8 +141,10 @@ module Isomorfeus
 
     def self.create_directories
       create_directory(File.join(isomorfeus_path, 'imports'))
+      create_directory(File.join(isomorfeus_path, 'channels'))
       create_directory(File.join(isomorfeus_path, 'components'))
-      create_directory(File.join(isomorfeus_path, 'models'))
+      create_directory(File.join(isomorfeus_path, 'data'))
+      create_directory(File.join(isomorfeus_path, 'handlers'))
       create_directory(File.join(isomorfeus_path, 'operations'))
       create_directory(File.join(isomorfeus_path, 'policies'))
       create_directory(File.join(isomorfeus_path, 'styles'))
@@ -177,8 +180,9 @@ module Isomorfeus
     end
 
     def self.install_isomorfeus_entries
+      STDERR.puts "ud: #{use_data?}, #{options.has_key?('data')}, #{options}, #{use_data}"
       data_hash = { app_class:          app_class,
-                    use_database:       use_database?,
+                    use_data:           use_data?,
                     use_i18n:           use_i18n?,
                     use_operation:      use_operation?,
                     use_policy:         use_policy? }
@@ -274,8 +278,8 @@ module Isomorfeus
       options.has_key?('asset_bundler')
     end
 
-    def self.use_database?
-      options.has_key?('database')
+    def self.use_data?
+      !!(options['data'] || use_data)
     end
 
     def self.use_i18n?

data/lib/isomorfeus/installer/cli.rb

@@ -4,8 +4,7 @@ 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)"
+      option :data, default: false, type: :boolean, aliases: '-d', desc: "Use data module. (optional, required by other modules)"
       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)"

data/lib/isomorfeus/installer/options_mangler.rb

@@ -1,24 +1,14 @@
 module Isomorfeus
   module Installer
     module OptionsMangler
-      def self.installer
-        Isomorfeus::Installer
-      end
-
       def self.mangle_options(options)
-        if options.key?(:database)
-          if installer.sorted_databases.include?(options[:database])
-            installer.database = installer.databases[options[:database]]&.fetch(:installer)
-          else
-            puts "Database #{options[:database]} not available!"; exit 1
-          end
-        end
+        Isomorfeus::Installer.use_data = true if options[:i18n]
 
-        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]
+        if options.key?(:rack_server) && Isomorfeus::Installer.sorted_rack_servers.include?(options[:rack_server])
+          Isomorfeus::Installer.rack_server = Isomorfeus::Installer.rack_servers[options[:rack_server]]
+          Isomorfeus::Installer.rack_server_name = options[:rack_server]
         else
-          installer.rack_server = installer.rack_servers['iodine']
+          Isomorfeus::Installer.rack_server = Isomorfeus::Installer.rack_servers['iodine']
         end
       end
     end

data/lib/isomorfeus/installer/rack_servers.rb

@@ -4,7 +4,7 @@
 # })
 
 Isomorfeus::Installer.add_rack_server('iodine', {
-  gems: [ { name: 'iodine', version: "~> 0.7.32", require: true } ],
+  gems: [ { name: 'iodine', version: "~> 0.7.33", 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

@@ -4,16 +4,15 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 <%= rack_server_gems %>
 gem 'foreman', require: false
 
-gem 'roda', '~> 3.19.0'
+gem 'roda', '~> 3.22.0'
 
 gem 'opal', github: 'janbiedermann/opal', branch: 'es6_modules_1_1'
 gem 'opal-activesupport', github: 'janbiedermann/opal-activesupport', branch: 'relax'
 gem 'opal-webpack-loader', '>= 0.9.2'
 
-gem 'opal-autoloader', '~> 0.0.3'
-gem 'isomorfeus-redux', '~> 4.0.7'
+gem 'isomorfeus-redux', '~> 4.0.8'
 <%= transport_gems %>
-gem 'isomorfeus-react', '~> 16.8.7'
+gem 'isomorfeus-react', '~> 16.8.8'
 #<%= database_gems %>
 #<%= policy_gems %>
 #<%= operation_gems %>
@@ -24,6 +23,6 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 3.6.0'
-  gem 'isomorfeus-puppetmaster', '~> 0.2.8'
+  gem 'rspec', '~> 3.8.0'
+  gem 'isomorfeus-puppetmaster', '~> 0.2.9'
 end

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

@@ -37,7 +37,7 @@ class <%= app_class %> < Roda
     end
 
     r.get do
-      page_content(env['REQUEST_PATH'])
+      page_content(env['PATH_INFO'])
     end
   end
 end

data/lib/isomorfeus/installer/templates/config.ru.erb

@@ -1,4 +1,4 @@
-if ENV['RACK_ENV'] != 'development'
+if ENV['RACK_ENV'] && ENV['RACK_ENV'] != 'development'
   require_relative '<%= app_require %>'
   run <%= app_class %>.app
 else

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

@@ -1,6 +1,6 @@
 require 'etc'
-Iodine.threads = ENV['THREADS'] || 1
-Iodine.workers = ENV['WORKERS'] || Etc.nprocessors
+Iodine.threads = ENV['THREADS'] ? ENV['THREADS'].to_i : 4
+Iodine.workers = ENV['WORKERS'] ? ENV['WORKERS'].to_i : Etc.nprocessors
 
 if ENV['REDIS_URL']
   Iodine::PubSub.default = Iodine::PubSub::Redis.new(ENV['REDIS_URL'])

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

@@ -4,14 +4,16 @@ require 'isomorfeus-redux'
 require 'isomorfeus-transport'
 require 'isomorfeus-react'
 
-<% if use_database %>require 'isomorfeus-record'<% end %>
+<% if use_data %>require 'isomorfeus-data'<% end %>
 <% if use_policy %>require 'isomorfeus-policy'<% end %>
 <% if use_operation %>require 'isomorfeus-operation'<% end %>
 <% if use_i18n %>require 'isomorfeus-i18n'<% end %>
 
 <% if use_policy %>require_tree 'policies'<% end %>
-<% if use_database %>require_tree 'models'<% end %>
 <% if use_operation %>require_tree 'operations'<% end %>
+
+require_tree 'channels'
+require_tree 'data'
 require_tree 'components'
 
 Isomorfeus.start_app!

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

@@ -16,10 +16,5 @@ 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.delta8'
+    VERSION = '1.0.0.delta9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-installer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.delta8
+  version: 1.0.0.delta9
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: roda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.19.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.19.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement