isomorfeus-installer 1.0.0.delta9 → 1.0.0.delta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a105a6284c0952401f02836670d1ac8ba7cc0d22b995f0bc13a1e62c05f40966
-  data.tar.gz: 94a7497fb4027d0450b59b548ef5f3ebe9e8bce0f4bc542e66f32a3378cd4770
+  metadata.gz: 5eec40fde73e88b0d7b135aba80c1364a4f9adc0acd73338edd8d595baa4e510
+  data.tar.gz: e3b00cd22f27e5ec50d22746df8c56760dabe212880604cbf5043ba306111d4c
 SHA512:
-  metadata.gz: 100a2b5c82ce3bd90c3798523a9d8b173f06bdc3dbdb19fdf7567697fdcc6dd467ee8f49d36658dbf46cd2ae24e5cd992a22fc3e8e5af13b744a659f2fb0b6e2
-  data.tar.gz: bf9730c6d780335b278c00556c198e28404705dfc121fa99a14444abf157db01f4a54755da8e3882dc00671d8f777b3fba31b1cd20cbdbfc054349519bc4146d
+  metadata.gz: a504844adc2b0275141e8d6aaadbff2c84d1cbb5b17219eaf3696a9c43c7a3800206f851a0d7266ac0928b3322dafd3b398cd3064e434003f3bdcc34ce0da0d5
+  data.tar.gz: 8c70a11c4ff527325b3a51e778ec8ed178dd63dbcd1f7e194c33aea04ec3c9152c6493617ab978b0096a292f4235fcf8663a81f13ebafc3634f031c0305ca0f6

data/lib/isomorfeus/installer/cli.rb

@@ -3,10 +3,6 @@ module Isomorfeus
     class CLI < Thor
 
       desc "new project_name", "create a new isomorfeus project with project_name"
-
-      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)"
       option :rack_server, default: 'iodine', aliases: '-r',
              desc: "Select rack server, one of: #{Isomorfeus::Installer.sorted_rack_servers.join(', ')}. (optional)"

data/lib/isomorfeus/installer/options_mangler.rb

@@ -2,8 +2,6 @@ module Isomorfeus
   module Installer
     module OptionsMangler
       def self.mangle_options(options)
-        Isomorfeus::Installer.use_data = true if options[:i18n]
-
         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]

data/lib/isomorfeus/installer/other_modules.rb

@@ -1,11 +1,3 @@
-Isomorfeus::Installer.add_i18n_module('i18n', {
-  gems: [ { name: 'isomorfeus-i18n', version: "~> #{Isomorfeus::Installer::VERSION}" } ]
-})
-
-Isomorfeus::Installer.add_operation_module('operation', {
-  gems: [ { name: 'isomorfeus-operation', version: "~> #{Isomorfeus::Installer::VERSION}" } ]
-})
-
 Isomorfeus::Installer.add_policy_module('policy', {
   gems: [ { name: 'isomorfeus-policy', version: "~> #{Isomorfeus::Installer::VERSION}" } ]
 })

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

@@ -7,19 +7,21 @@ gem 'foreman', require: false
 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-activesupport', '~> 0.3.3'
 gem 'opal-webpack-loader', '>= 0.9.2'
 
-gem 'isomorfeus-redux', '~> 4.0.8'
-<%= transport_gems %>
-gem 'isomorfeus-react', '~> 16.8.8'
-#<%= database_gems %>
+gem 'isomorfeus-redux', '~> 4.0.11'
+gem 'isomorfeus-react', '>= 16.9.2'
+gem 'isomorfeus-transport', '<%= isomorfeus_version %>'
+gem 'isomorfeus-data', '<%= isomorfeus_version %>'
+gem 'isomorfeus-i18n', '<%= isomorfeus_version %>'
+gem 'isomorfeus-operation', '<%= isomorfeus_version %>'
 #<%= policy_gems %>
-#<%= operation_gems %>
-#<%= i18n_gems %>
 
 group :development do
   gem 'auto_reloader'
+  gem 'debase', '0.2.3.beta5'
+  gem 'ruby-debug-ide', '0.7.0.beta7'
 end
 
 group :test do

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

@@ -1,19 +1,17 @@
 require 'opal'
 require 'opal-autoloader'
 require 'isomorfeus-redux'
-require 'isomorfeus-transport'
 require 'isomorfeus-react'
-
-<% if use_data %>require 'isomorfeus-data'<% end %>
+require 'isomorfeus-transport'
+require 'isomorfeus-data'
+require 'isomorfeus-i18n'
+require 'isomorfeus-operation'
 <% 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_operation %>require_tree 'operations'<% end %>
 
 require_tree 'channels'
 require_tree 'data'
 require_tree 'components'
+require_tree 'operations'
+<% if use_policy %>require_tree 'policies'<% end %>
 
 Isomorfeus.start_app!

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

@@ -2,13 +2,13 @@
   "name": "<%= application_name %>",
   "private": true,
   "dependencies": {
-    "opal-webpack-loader": "^0.9.0",
-    "react": "16.8.6",
-    "react-dom": "16.8.6",
-    "react-router": "^5.0.0",
-    "react-router-dom": "^5.0.0",
-    "redux": "^4.0.1",
-    "ws": "^7.0.1"
+    "opal-webpack-loader": "^0.9.2",
+    "react": "^16.9.0",
+    "react-dom": "^16.9.0",
+    "react-router": "^5.0.1",
+    "react-router-dom": "^5.0.1",
+    "redux": "^4.0.4",
+    "ws": "^7.1.2"
   },
   "scripts": {
     "debug": "webpack-dev-server --config=webpack/debug.js",
@@ -16,22 +16,22 @@
     "production_build": "parallel-webpack --config=webpack/production.js"
   },
   "devDependencies": {
-    "cache-loader": "^4.0.0",
-    "chokidar": "^3.0.1",
+    "cache-loader": "^4.1.0",
+    "chokidar": "^3.0.2",
     "compression-webpack-plugin": "^3.0.0",
-    "css-loader": "^3.0.0",
+    "css-loader": "^3.2.0",
     "extra-watch-webpack-plugin": "^1.0.3",
-    "file-loader": "^4.0.0",
+    "file-loader": "^4.2.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",
-    "terser-webpack-plugin": "^1.3.0",
-    "webpack": "^4.33.0",
+    "puppeteer": "1.19.0",
+    "sass-loader": "^7.2.0",
+    "style-loader": "^1.0.0",
+    "terser-webpack-plugin": "^1.4.1",
+    "webpack": "^4.39.1",
     "webpack-assets-manifest": "^3.1.1",
-    "webpack-cli": "^3.3.4",
-    "webpack-dev-server": "^3.7.1"
+    "webpack-cli": "^3.3.6",
+    "webpack-dev-server": "^3.8.0"
   }
 }

data/lib/isomorfeus/installer/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Installer
-    VERSION = '1.0.0.delta9'
+    VERSION = '1.0.0.delta11'
   end
 end

data/lib/isomorfeus/installer.rb

@@ -6,14 +6,6 @@ module Isomorfeus
       databases[name] = props
     end
 
-    def self.add_i18n_module(name, props)
-      i18ns[name] = props
-    end
-
-    def self.add_operation_module(name, props)
-      operations[name] = props
-    end
-
     def self.add_policy_module(name, props)
       policies[name] = props
     end
@@ -28,14 +20,11 @@ module Isomorfeus
       attr_reader   :app_require
       attr_accessor :database
       attr_accessor :framework
-      attr_accessor :i18n
-      attr_accessor :operation
       attr_accessor :policy
       attr_reader   :project_dir
       attr_reader   :project_name
       attr_accessor :rack_server
       attr_accessor :rack_server_name
-      attr_accessor :use_data
 
       # installer options
       attr_reader :options
@@ -57,14 +46,6 @@ module Isomorfeus
       databases.keys.sort
     end
 
-    def self.sorted_i18ns
-      i18ns.keys.sort
-    end
-
-    def self.sorted_operations
-      operations.keys.sort
-    end
-
     def self.sorted_policies
       policies.keys.sort
     end
@@ -77,14 +58,6 @@ module Isomorfeus
       @databases ||= {}
     end
 
-    def self.i18ns
-      @i18ns ||= {}
-    end
-
-    def self.operations
-      @operations ||= {}
-    end
-
     def self.policies
       @policies ||= {}
     end
@@ -145,6 +118,7 @@ module Isomorfeus
       create_directory(File.join(isomorfeus_path, 'components'))
       create_directory(File.join(isomorfeus_path, 'data'))
       create_directory(File.join(isomorfeus_path, 'handlers'))
+      create_directory(File.join(isomorfeus_path, 'locales'))
       create_directory(File.join(isomorfeus_path, 'operations'))
       create_directory(File.join(isomorfeus_path, 'policies'))
       create_directory(File.join(isomorfeus_path, 'styles'))
@@ -180,11 +154,7 @@ 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_data:           use_data?,
-                    use_i18n:           use_i18n?,
-                    use_operation:      use_operation?,
                     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)
@@ -207,33 +177,20 @@ module Isomorfeus
       Isomorfeus::Installer.rack_servers[options[:rack_server]]&.fetch(:gems)&.each do |gem|
         rack_server_gems << generate_gem_line(gem)
       end
-      transport_gems = ''
-      [ { name: 'isomorfeus-transport', version: "~> #{Isomorfeus::Installer::VERSION}", require: true } ]&.each do |gem|
-        transport_gems << generate_gem_line(gem)
-      end
       database_gems = ''
       Isomorfeus::Installer.databases[options[:database]]&.fetch(:gems)&.each do |gem|
         database_gems << generate_gem_line(gem)
       end
-      i18n_gems = ''
-      Isomorfeus::Installer.i18ns['i18n']&.fetch(:gems)&.each do |gem|
-        i18n_gems << generate_gem_line(gem)
-      end
-      operation_gems = ''
-      Isomorfeus::Installer.operations['operation']&.fetch(:gems)&.each do |gem|
-        operation_gems << generate_gem_line(gem)
-      end
       policy_gems = ''
       Isomorfeus::Installer.policies['policy']&.fetch(:gems)&.each do |gem|
         policy_gems << generate_gem_line(gem)
       end
 
       data_hash = { database_gems:      database_gems.chop,
-                    i18n_gems:          i18n_gems.chop,
-                    operation_gems:     operation_gems.chop,
                     policy_gems:        policy_gems.chop,
                     rack_server_gems:   rack_server_gems.chop,
-                    transport_gems:     transport_gems.chop }
+                    isomorfeus_version: Isomorfeus::Installer::VERSION
+      }
       create_file_from_template('Gemfile.erb', 'Gemfile', data_hash)
     end
 
@@ -278,18 +235,6 @@ module Isomorfeus
       options.has_key?('asset_bundler')
     end
 
-    def self.use_data?
-      !!(options['data'] || use_data)
-    end
-
-    def self.use_i18n?
-      options['i18n']
-    end
-
-    def self.use_operation?
-      options['operation']
-    end
-
     def self.use_policy?
       options['policy']
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-installer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.delta9
+  version: 1.0.0.delta11
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport