isomorfeus 22.9.0.rc6 → 22.9.0.rc7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isomorfeus/cli.rb +13 -6
  3. data/lib/isomorfeus/command.rb +1 -1
  4. data/lib/isomorfeus/installer/npm.rb +24 -0
  5. data/lib/isomorfeus/installer/target/web.rb +1 -1
  6. data/lib/isomorfeus/installer.rb +2 -3
  7. data/lib/isomorfeus/version.rb +1 -1
  8. data/lib/isomorfeus.rb +1 -1
  9. metadata +23 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c6e26e2ebd8bba2b0e0570a54f31f638ff05fd3e0503c089c6ec096e262c4f13
4
- data.tar.gz: 5d4393f8401eaa3ae51e9a3a3c514230c76cb8b70b8bfc368203179d4874d24d
3
+ metadata.gz: 4123daa683d3c9178b0a1798b72bf82e29c576bbe3fcafbbeb3b6d529ad1a443
4
+ data.tar.gz: 54079b7019e0c12f1df4b7bc16c7cb4c92078993f0947451dcf50cd7e02f8653
5
5
  SHA512:
6
- metadata.gz: d2f14e42ca23f077fdbf55e00251b29bcc968b1c3e2ca5c441c10c0078798c6330f73dc3b1a4df10e31ff847bab3d3d5ab780428321b68021d8f519ebbddf66a
7
- data.tar.gz: 22cdd710ba2c6f9c6b605b875bb04c3eb6ac4dc9bf73bb9f4550068516be8bff652a159ab58156476a097d19f190d29ca1ada5c3099d368b97c9fe75bb46bfab
6
+ metadata.gz: cc645c7a41cf89932731f3777a3e8fab0a55a120763592ce83f9bc10212e9d5693105dd12ee464ed16881cdd746910b93fff0067c56a098c1d7b9966205ca9fe
7
+ data.tar.gz: d9f485856e4a1939006ac1fb4ad41465c47d3c876126e1aaf410373867c5fb0487a3a301d241fc3b0031f950d7d2394b097232204f730686f34c36e651267bf9
data/lib/isomorfeus/cli.rb CHANGED
@@ -13,8 +13,10 @@ Example:
13
13
  -t all - Setup project for all targets
14
14
  -t web - Setup project for web applications only
15
15
  DESC
16
- option :bundle, default: 'yes', required: false, type: :string, aliases: '-y',
17
- desc: "Execute bundle install: -y or -y yes, do not execute: -y no"
16
+ option :bundle, default: 'yes', required: false, type: :string, aliases: '-b',
17
+ desc: "Execute bundle install: -b or -b yes, do not execute: -b no"
18
+ option :npm, default: 'yes', required: false, type: :string, aliases: '-n',
19
+ desc: "Execute npm install, install esbuild: -n or -n yes, do not execute: -n no"
18
20
  def new(project_name)
19
21
  Isomorfeus::Installer.set_project_names(project_name)
20
22
  Isomorfeus::Installer.options = options
@@ -36,7 +38,8 @@ DESC
36
38
  Isomorfeus::Installer::NewProject.execute
37
39
  Isomorfeus::Installer::InstallTargets.execute
38
40
  Isomorfeus::Installer::Gemfile.execute
39
- Isomorfeus::Installer::Bundle.execute
41
+ Isomorfeus::Installer::Bundle.execute if options[:bundle] == 'yes'
42
+ Isomorfeus::Installer::Npm.execute if options[:npm] == 'yes'
40
43
  Dir.chdir('..')
41
44
  end
42
45
 
@@ -88,10 +91,13 @@ DESC
88
91
  desc: 'Select targets to install.'
89
92
  option :rack_server, default: 'isomorfeus-iodine', aliases: '-r',
90
93
  desc: "Select rack server, one of: #{Isomorfeus::Installer.sorted_rack_servers.join(', ')}. (optional, default: iodine)"
91
- option :yarn_and_bundle, default: 'yes', required: false, type: :string, aliases: '-y',
92
- desc: "Execute bundle install: -y or -y yes, do not execute: -y no"
94
+ option :bundle, default: 'yes', required: false, type: :string, aliases: '-b',
95
+ desc: "Execute bundle install: -b or -b yes, do not execute: -b no"
96
+ option :npm, default: 'yes', required: false, type: :string, aliases: '-n',
97
+ desc: "Execute npm install, install esbuild: -n or -n yes, do not execute: -n no"
93
98
  def test_app
94
99
  Isomorfeus::Installer.set_project_names('test_app')
100
+ Isomorfeus::Installer.creating_test_app = true
95
101
  Isomorfeus::Installer.options = options
96
102
  begin
97
103
  Dir.mkdir(Isomorfeus::Installer.project_dir)
@@ -104,7 +110,8 @@ DESC
104
110
  Isomorfeus::Installer::InstallTargets.execute
105
111
  Isomorfeus::Installer::Gemfile.execute
106
112
  Isomorfeus::Installer::TestAppFiles.execute
107
- Isomorfeus::Installer::Bundle.execute
113
+ Isomorfeus::Installer::Bundle.execute if options[:bundle] == 'yes'
114
+ Isomorfeus::Installer::Npm.execute if options[:npm] == 'yes'
108
115
  Dir.chdir('..')
109
116
  end
110
117
  end
data/lib/isomorfeus/command.rb CHANGED
@@ -21,7 +21,7 @@ else
21
21
  require_relative '../isomorfeus/installer/test_app_files'
22
22
  require_relative '../isomorfeus/installer/target/web'
23
23
  require_relative '../isomorfeus/installer/bundle'
24
-
24
+ require_relative '../isomorfeus/installer/npm'
25
25
  require_relative '../isomorfeus/cli'
26
26
 
27
27
  Isomorfeus::CLI.start(ARGV)
data/lib/isomorfeus/installer/npm.rb ADDED
@@ -0,0 +1,24 @@
1
+ module Isomorfeus
2
+ module Installer
3
+ class Npm
4
+ def self.execute
5
+ Bundler.with_original_env do
6
+ begin
7
+ if File.exist?('package.json')
8
+ puts 'Executing npm install:'
9
+ system("npm install")
10
+ end
11
+ rescue
12
+ puts "failed, is npm installed?"
13
+ end
14
+ begin
15
+ puts 'Executing npm install esbuild:'
16
+ system("npm install esbuild")
17
+ rescue
18
+ puts "failed, using the supplied, but slower esuild-wasm instead."
19
+ end
20
+ end
21
+ end
22
+ end
23
+ end
24
+ end
data/lib/isomorfeus/installer/target/web.rb CHANGED
@@ -10,7 +10,7 @@ module Isomorfeus
10
10
  install_configuration
11
11
  install_web_loaders
12
12
  install_web_layouts
13
- install_web_specs unless Isomorfeus::Installer.project_name == 'test_app'
13
+ install_web_specs unless Isomorfeus::Installer.creating_test_app
14
14
  end
15
15
 
16
16
  # DSL
data/lib/isomorfeus/installer.rb CHANGED
@@ -4,8 +4,7 @@ module Isomorfeus
4
4
  class << self
5
5
  # application options
6
6
  attr_reader :app_class
7
- attr_accessor :database
8
- attr_accessor :framework
7
+ attr_accessor :creating_test_app
9
8
  attr_accessor :isomorfeus_module
10
9
  attr_reader :project_dir
11
10
  attr_reader :project_name
@@ -17,7 +16,7 @@ module Isomorfeus
17
16
 
18
17
  # installer options
19
18
  attr_reader :options
20
-
19
+
21
20
  def set_project_names(pro_dir)
22
21
  @project_dir = pro_dir
23
22
  @project_name = pro_dir.underscore
data/lib/isomorfeus/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Isomorfeus
2
- VERSION = '22.9.0.rc6'
2
+ VERSION = '22.9.0.rc7'
3
3
  end
data/lib/isomorfeus.rb CHANGED
@@ -1,10 +1,10 @@
1
1
  require 'isomorfeus-speednode'
2
2
  require 'isomorfeus-asset-manager'
3
3
  require 'isomorfeus-redux'
4
+ require 'isomorfeus-i18n'
4
5
  require 'isomorfeus-preact'
5
6
  require 'isomorfeus-policy'
6
7
  require 'isomorfeus-transport'
7
- require 'isomorfeus-i18n'
8
8
  require 'isomorfeus-data'
9
9
  require 'isomorfeus-operation'
10
10
  require 'isomorfeus-empowerment'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: isomorfeus
3
3
  version: !ruby/object:Gem::Version
4
- version: 22.9.0.rc6
4
+ version: 22.9.0.rc7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jan Biedermann
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-26 00:00:00.000000000 Z
11
+ date: 2022-09-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -72,140 +72,140 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.15.4
75
+ version: 0.15.5
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 0.15.4
82
+ version: 0.15.5
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: isomorfeus-preact
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - '='
88
88
  - !ruby/object:Gem::Version
89
- version: 22.9.0.rc6
89
+ version: 22.9.0.rc7
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - '='
95
95
  - !ruby/object:Gem::Version
96
- version: 22.9.0.rc6
96
+ version: 22.9.0.rc7
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: isomorfeus-redux
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - '='
102
102
  - !ruby/object:Gem::Version
103
- version: 22.9.0.rc6
103
+ version: 22.9.0.rc7
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - '='
109
109
  - !ruby/object:Gem::Version
110
- version: 22.9.0.rc6
110
+ version: 22.9.0.rc7
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: isomorfeus-policy
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - '='
116
116
  - !ruby/object:Gem::Version
117
- version: 22.9.0.rc6
117
+ version: 22.9.0.rc7
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - '='
123
123
  - !ruby/object:Gem::Version
124
- version: 22.9.0.rc6
124
+ version: 22.9.0.rc7
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: isomorfeus-transport
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - '='
130
130
  - !ruby/object:Gem::Version
131
- version: 22.9.0.rc6
131
+ version: 22.9.0.rc7
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - '='
137
137
  - !ruby/object:Gem::Version
138
- version: 22.9.0.rc6
138
+ version: 22.9.0.rc7
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: isomorfeus-data
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - '='
144
144
  - !ruby/object:Gem::Version
145
- version: 22.9.0.rc6
145
+ version: 22.9.0.rc7
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - '='
151
151
  - !ruby/object:Gem::Version
152
- version: 22.9.0.rc6
152
+ version: 22.9.0.rc7
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: isomorfeus-i18n
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - '='
158
158
  - !ruby/object:Gem::Version
159
- version: 22.9.0.rc6
159
+ version: 22.9.0.rc7
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - '='
165
165
  - !ruby/object:Gem::Version
166
- version: 22.9.0.rc6
166
+ version: 22.9.0.rc7
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: isomorfeus-operation
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
171
  - - '='
172
172
  - !ruby/object:Gem::Version
173
- version: 22.9.0.rc6
173
+ version: 22.9.0.rc7
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - '='
179
179
  - !ruby/object:Gem::Version
180
- version: 22.9.0.rc6
180
+ version: 22.9.0.rc7
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: isomorfeus-empowerment
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
185
  - - '='
186
186
  - !ruby/object:Gem::Version
187
- version: 22.9.0.rc6
187
+ version: 22.9.0.rc7
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
192
  - - '='
193
193
  - !ruby/object:Gem::Version
194
- version: 22.9.0.rc6
194
+ version: 22.9.0.rc7
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: isomorfeus-mailer
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
199
  - - '='
200
200
  - !ruby/object:Gem::Version
201
- version: 22.9.0.rc6
201
+ version: 22.9.0.rc7
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
206
  - - '='
207
207
  - !ruby/object:Gem::Version
208
- version: 22.9.0.rc6
208
+ version: 22.9.0.rc7
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: bundler
211
211
  requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,7 @@ files:
270
270
  - lib/isomorfeus/installer/gemfile.rb
271
271
  - lib/isomorfeus/installer/install_targets.rb
272
272
  - lib/isomorfeus/installer/new_project.rb
273
+ - lib/isomorfeus/installer/npm.rb
273
274
  - lib/isomorfeus/installer/options_mangler.rb
274
275
  - lib/isomorfeus/installer/rack_servers.rb
275
276
  - lib/isomorfeus/installer/target/web.rb