mkbrut 0.7.0 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/mkbrut/app.rb +1 -1
- data/lib/mkbrut/cli.rb +1 -10
- data/lib/mkbrut/segments/heroku.rb +1 -1
- data/lib/mkbrut/version.rb +1 -1
- data/lib/mkbrut/versions.rb +4 -7
- data/templates/Base/app/config/i18n/en/1_defaults.rb +2 -2
- data/templates/Base/app/config/i18n/en/2_app.rb +1 -1
- data/templates/Base/bin/setup +1 -1
- data/templates/Base/dx/build +18 -12
- data/templates/segments/Demo/app/src/front_end/components/flash_component.rb +1 -1
- metadata +1 -16
- data/package.json +0 -11
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dbe2cf6d997397c741d9b27ca86ee986483ee39bf659504c3035d6e61db39305
|
|
4
|
+
data.tar.gz: 39e9e0d7bd3b4fd06ff558eeb2d17c35996976e5d30e354196a2a61a99179351
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 502e73d098c1c4c8e1dfda3faf1333b70815edf8b1a5b56cc0e4f32ea4730ae6127d58aeaa0ddd6f7b8d355335facedbe0f57b7ae6abb166c2c8cfca1ae8db7f
|
|
7
|
+
data.tar.gz: 0da67c35c1b15c0c039b4cda01fd3e6ed2a446a273e020b208ec4c8eb68a3b42dcb4ec1f3a9216a19d41550f27b3be6d03a9636d683dc571559f3147cdc9c90c
|
data/lib/mkbrut/app.rb
CHANGED
data/lib/mkbrut/cli.rb
CHANGED
|
@@ -39,15 +39,6 @@ module MKBrut
|
|
|
39
39
|
@out.puts
|
|
40
40
|
@out.puts " BRUT_CLI_RAISE_ON_ERROR - if set to 'true', any error will raise an exception instead of printing to stderr"
|
|
41
41
|
@out.puts
|
|
42
|
-
@out.puts "BRUT VERSIONS"
|
|
43
|
-
@out.puts
|
|
44
|
-
@out.puts " Your app will be set up to use these versions:"
|
|
45
|
-
@out.puts
|
|
46
|
-
@out.puts " BrutRB - #{versions.brut_version_specifier}"
|
|
47
|
-
@out.puts " BrutJS - #{versions.brut_js_version_specifier}"
|
|
48
|
-
@out.puts " BrutCSS - #{versions.brut_css_version_specifier}"
|
|
49
|
-
@out.puts
|
|
50
|
-
|
|
51
42
|
end
|
|
52
43
|
|
|
53
44
|
private
|
|
@@ -109,7 +100,7 @@ module MKBrut
|
|
|
109
100
|
options[:app_name] = MKBrut::AppName.new(args.first)
|
|
110
101
|
options[:app_id] = options[:'app-id']
|
|
111
102
|
options[:dry_run] = !!options[:'dry-run']
|
|
112
|
-
MKBrut::AppOptions.new(**options
|
|
103
|
+
MKBrut::AppOptions.new(**options, versions:)
|
|
113
104
|
end
|
|
114
105
|
|
|
115
106
|
end
|
data/lib/mkbrut/version.rb
CHANGED
data/lib/mkbrut/versions.rb
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
require "pathname"
|
|
2
2
|
require "json"
|
|
3
|
+
require_relative "version"
|
|
3
4
|
|
|
4
5
|
class MKBrut::Versions
|
|
5
6
|
def initialize
|
|
6
|
-
@brut_version =
|
|
7
|
-
package_json_file = Pathname(Gem::Specification.find_by_name("mkbrut").gem_dir) / "package.json"
|
|
8
|
-
package_json = JSON.parse(File.read(package_json_file))
|
|
9
|
-
@brut_js_version = package_json["devDependencies"]["brut-js"]
|
|
10
|
-
@brut_css_version = package_json["devDependencies"]["brut-css"]
|
|
7
|
+
@brut_version = MKBrut::VERSION
|
|
11
8
|
end
|
|
12
9
|
|
|
13
10
|
def brut_version_specifier = "~> #{@brut_version}"
|
|
14
|
-
def brut_css_version_specifier = @
|
|
15
|
-
def brut_js_version_specifier = @
|
|
11
|
+
def brut_css_version_specifier = "~#{@brut_version}"
|
|
12
|
+
def brut_js_version_specifier = "~#{@brut_version}"
|
|
16
13
|
end
|
|
@@ -114,7 +114,7 @@
|
|
|
114
114
|
has_interpolations: "Test %{interp} Test",
|
|
115
115
|
has_pluralizations: {
|
|
116
116
|
one: "Once!",
|
|
117
|
-
other: "More than once!"
|
|
117
|
+
other: "More than once!",
|
|
118
118
|
},
|
|
119
119
|
has_pluralizations_and_zero: {
|
|
120
120
|
zero: "ZERO",
|
|
@@ -123,6 +123,6 @@
|
|
|
123
123
|
},
|
|
124
124
|
simple1: "SIMPLE1",
|
|
125
125
|
simple2: "SIMPLE2",
|
|
126
|
-
}
|
|
126
|
+
},
|
|
127
127
|
},
|
|
128
128
|
}
|
data/templates/Base/bin/setup
CHANGED
data/templates/Base/dx/build
CHANGED
|
@@ -34,35 +34,40 @@ setup_local_user_build_args() {
|
|
|
34
34
|
log "Docker commands will not work"
|
|
35
35
|
fi
|
|
36
36
|
fi
|
|
37
|
-
echo user_uid=${user_uid}
|
|
38
|
-
echo user_gid=${user_gid}
|
|
39
|
-
echo docker_gid=${docker_gid}
|
|
37
|
+
echo user_uid=${user_uid} >> "${SCRIPT_DIR}"/build.args
|
|
38
|
+
echo user_gid=${user_gid} >> "${SCRIPT_DIR}"/build.args
|
|
39
|
+
echo docker_gid=${docker_gid} >> "${SCRIPT_DIR}"/build.args
|
|
40
40
|
echo sadly_user_must_be_added_to_root=${sadly_user_must_be_added_to_root} >> "${SCRIPT_DIR}"/build.args
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
+
initialize_build_args() {
|
|
44
|
+
echo "# This is generated - see build.pre" > "${SCRIPT_DIR}"/build.args
|
|
45
|
+
}
|
|
46
|
+
|
|
43
47
|
setup_playright_build_args() {
|
|
44
48
|
require_command "grep"
|
|
45
49
|
require_command "sed"
|
|
46
50
|
|
|
47
|
-
echo "# This is generated - see build.pre" > "${SCRIPT_DIR}"/build.args
|
|
48
51
|
if [ ! -e "${SCRIPT_DIR}"/Gemfile.lock ]; then
|
|
49
52
|
log "Could not find Gemfile.lock, which is needed to determine the playwright-ruby-client version"
|
|
50
53
|
log "Assuming your app is brand-new, this should be OK"
|
|
51
|
-
echo "# When this file was created, there was no Gemfile.lock, so"
|
|
54
|
+
echo "# When this file was created, there was no Gemfile.lock, so" >> "${SCRIPT_DIR}"/build.args
|
|
52
55
|
echo "# it was not possible to determine which version of Playright was set up." >> "${SCRIPT_DIR}"/build.args
|
|
53
|
-
echo "# Once you've build your app and installed gems, you are "
|
|
54
|
-
echo "# encouraged to re-run \`dx/build\` to address this issue."
|
|
55
|
-
echo PLAYWRIGHT_VERSION=latest
|
|
56
|
+
echo "# Once you've build your app and installed gems, you are " >> "${SCRIPT_DIR}"/build.args
|
|
57
|
+
echo "# encouraged to re-run \`dx/build\` to address this issue." >> "${SCRIPT_DIR}"/build.args
|
|
58
|
+
echo PLAYWRIGHT_VERSION=latest >> "${SCRIPT_DIR}"/build.args
|
|
56
59
|
else
|
|
57
60
|
PLAYWRIGHT_VERSION=$(grep playwright-ruby-client Gemfile.lock | grep '(' | sed 's/^.*(//' | sed 's/).*$//' | grep -v ^=)
|
|
58
61
|
if [ -z "${PLAYWRIGHT_VERSION}" ]; then
|
|
59
62
|
log "Could not find precise version of playwright-ruby-client from Gemfile.lock"
|
|
60
63
|
log "This means that your playwright-ruby-client version and playwright NPM modules may be out of sync and may not work"
|
|
61
|
-
echo "# When this file was created, Gemfile.lock did not
|
|
62
|
-
echo "# This means it
|
|
63
|
-
echo "#
|
|
64
|
+
echo "# When this file was created, Gemfile.lock did not" >> "${SCRIPT_DIR}"/build.args
|
|
65
|
+
echo "# contain playwrith-ruby-client. This means it" >> "${SCRIPT_DIR}"/build.args
|
|
66
|
+
echo "# it was not possible to determine which version of" >> "${SCRIPT_DIR}"/build.args
|
|
67
|
+
echo "# Playright was set up. If you aren't using Playwright," >> "${SCRIPT_DIR}"/build.args
|
|
68
|
+
echo "# that's fine, this won't cause issues" >> "${SCRIPT_DIR}"/build.args
|
|
64
69
|
echo "# If you ARE using Playwright, something may be wrong with your setup" >> "${SCRIPT_DIR}"/build.args
|
|
65
|
-
echo PLAYWRIGHT_VERSION=latest
|
|
70
|
+
echo PLAYWRIGHT_VERSION=latest >> "${SCRIPT_DIR}"/build.args
|
|
66
71
|
else
|
|
67
72
|
echo PLAYWRIGHT_VERSION=${PLAYWRIGHT_VERSION} >> "${SCRIPT_DIR}"/build.args
|
|
68
73
|
fi
|
|
@@ -80,6 +85,7 @@ if ! exec_hook_if_exists "build.pre" Dockerfile.dx "${IMAGE}"; then
|
|
|
80
85
|
fi
|
|
81
86
|
BUILD_ARGS=()
|
|
82
87
|
|
|
88
|
+
initialize_build_args
|
|
83
89
|
setup_local_user_build_args
|
|
84
90
|
setup_playright_build_args
|
|
85
91
|
read_custom_build_args
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mkbrut
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.9.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dave Copeland
|
|
@@ -9,20 +9,6 @@ bindir: exe
|
|
|
9
9
|
cert_chain: []
|
|
10
10
|
date: 1980-01-02 00:00:00.000000000 Z
|
|
11
11
|
dependencies:
|
|
12
|
-
- !ruby/object:Gem::Dependency
|
|
13
|
-
name: brut
|
|
14
|
-
requirement: !ruby/object:Gem::Requirement
|
|
15
|
-
requirements:
|
|
16
|
-
- - ">="
|
|
17
|
-
- !ruby/object:Gem::Version
|
|
18
|
-
version: '0'
|
|
19
|
-
type: :runtime
|
|
20
|
-
prerelease: false
|
|
21
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
22
|
-
requirements:
|
|
23
|
-
- - ">="
|
|
24
|
-
- !ruby/object:Gem::Version
|
|
25
|
-
version: '0'
|
|
26
12
|
- !ruby/object:Gem::Dependency
|
|
27
13
|
name: rake
|
|
28
14
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -80,7 +66,6 @@ files:
|
|
|
80
66
|
- lib/mkbrut/segments/sidekiq.rb
|
|
81
67
|
- lib/mkbrut/version.rb
|
|
82
68
|
- lib/mkbrut/versions.rb
|
|
83
|
-
- package.json
|
|
84
69
|
- templates/Base/.dockerignore
|
|
85
70
|
- templates/Base/.env.development.erb
|
|
86
71
|
- templates/Base/.env.development.local
|
data/package.json
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "mkbrut",
|
|
3
|
-
"version": "1.0.0-irrelevant",
|
|
4
|
-
"description": "`mkbrut` is how you go from zero to having a Brut app where you can start working.",
|
|
5
|
-
"author": "Irrelevant",
|
|
6
|
-
"license": "Irrelevant",
|
|
7
|
-
"devDependencies": {
|
|
8
|
-
"brut-css": "~0.5.0",
|
|
9
|
-
"brut-js": "~0.5.0"
|
|
10
|
-
}
|
|
11
|
-
}
|