shopify-cli 1.6.0 → 1.9.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop_todo.yml +15 -2
- data/CHANGELOG.md +21 -0
- data/Gemfile +12 -12
- data/Gemfile.lock +14 -14
- data/Rakefile +32 -30
- data/bin/load_shopify.rb +6 -6
- data/bin/shopify +2 -2
- data/dev.yml +3 -0
- data/ext/shopify-cli/extconf.rb +7 -7
- data/lib/docgen/markdown.rb +12 -12
- data/lib/graphql/extension_create.graphql +17 -2
- data/lib/graphql/fetch_specifications.graphql +14 -0
- data/lib/{project_types/extension/graphql → graphql}/get_app_by_api_key.graphql +0 -0
- data/lib/project_types/extension/cli.rb +56 -55
- data/lib/project_types/extension/commands/build.rb +3 -3
- data/lib/project_types/extension/commands/create.rb +17 -10
- data/lib/project_types/extension/commands/extension_command.rb +14 -7
- data/lib/project_types/extension/commands/push.rb +10 -10
- data/lib/project_types/extension/commands/register.rb +22 -32
- data/lib/project_types/extension/commands/serve.rb +1 -7
- data/lib/project_types/extension/commands/tunnel.rb +12 -12
- data/lib/project_types/extension/extension_project.rb +22 -7
- data/lib/project_types/extension/extension_project_keys.rb +5 -4
- data/lib/project_types/extension/features/argo.rb +26 -42
- data/lib/project_types/extension/features/argo_config.rb +5 -5
- data/lib/project_types/extension/features/argo_dependencies.rb +5 -5
- data/lib/project_types/extension/features/argo_renderer_package.rb +47 -0
- data/lib/project_types/extension/features/argo_serve.rb +69 -0
- data/lib/project_types/extension/features/argo_setup.rb +3 -3
- data/lib/project_types/extension/features/argo_setup_steps.rb +4 -4
- data/lib/project_types/extension/forms/create.rb +28 -34
- data/lib/project_types/extension/forms/questions/ask_app.rb +53 -0
- data/lib/project_types/extension/forms/questions/ask_name.rb +40 -0
- data/lib/project_types/extension/forms/questions/ask_type.rb +47 -0
- data/lib/project_types/extension/messages/message_loading.rb +3 -1
- data/lib/project_types/extension/messages/messages.rb +55 -55
- data/lib/project_types/extension/models/lazy_specification_handler.rb +12 -0
- data/lib/project_types/extension/models/registration.rb +1 -0
- data/lib/project_types/extension/models/specification.rb +6 -2
- data/lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb +1 -1
- data/lib/project_types/extension/models/specification_handlers/default.rb +10 -2
- data/lib/project_types/extension/models/specifications.rb +14 -3
- data/lib/project_types/extension/models/version.rb +1 -1
- data/lib/project_types/extension/tasks/configure_features.rb +7 -5
- data/lib/project_types/extension/tasks/converters/app_converter.rb +6 -6
- data/lib/project_types/extension/tasks/converters/registration_converter.rb +8 -6
- data/lib/project_types/extension/tasks/converters/validation_error_converter.rb +4 -4
- data/lib/project_types/extension/tasks/converters/version_converter.rb +7 -7
- data/lib/project_types/extension/tasks/create_extension.rb +4 -4
- data/lib/project_types/extension/tasks/fetch_specifications.rb +8 -28
- data/lib/project_types/extension/tasks/get_app.rb +4 -4
- data/lib/project_types/extension/tasks/get_apps.rb +3 -3
- data/lib/project_types/extension/tasks/update_draft.rb +4 -4
- data/lib/project_types/extension/tasks/user_errors.rb +4 -4
- data/lib/project_types/node/cli.rb +19 -19
- data/lib/project_types/node/commands/connect.rb +3 -3
- data/lib/project_types/node/commands/create.rb +40 -38
- data/lib/project_types/node/commands/deploy.rb +4 -4
- data/lib/project_types/node/commands/deploy/heroku.rb +24 -24
- data/lib/project_types/node/commands/generate.rb +2 -24
- data/lib/project_types/node/commands/open.rb +2 -2
- data/lib/project_types/node/commands/populate.rb +6 -6
- data/lib/project_types/node/commands/populate/customer.rb +5 -5
- data/lib/project_types/node/commands/populate/draft_order.rb +5 -5
- data/lib/project_types/node/commands/populate/product.rb +5 -5
- data/lib/project_types/node/commands/serve.rb +9 -9
- data/lib/project_types/node/commands/tunnel.rb +7 -7
- data/lib/project_types/node/forms/create.rb +17 -8
- data/lib/project_types/node/messages/messages.rb +8 -7
- data/lib/project_types/rails/cli.rb +21 -21
- data/lib/project_types/rails/commands/connect.rb +3 -3
- data/lib/project_types/rails/commands/create.rb +51 -48
- data/lib/project_types/rails/commands/deploy.rb +4 -4
- data/lib/project_types/rails/commands/deploy/heroku.rb +30 -30
- data/lib/project_types/rails/commands/generate.rb +7 -7
- data/lib/project_types/rails/commands/generate/webhook.rb +6 -6
- data/lib/project_types/rails/commands/open.rb +2 -2
- data/lib/project_types/rails/commands/populate.rb +6 -6
- data/lib/project_types/rails/commands/populate/customer.rb +5 -5
- data/lib/project_types/rails/commands/populate/draft_order.rb +5 -5
- data/lib/project_types/rails/commands/populate/product.rb +5 -5
- data/lib/project_types/rails/commands/serve.rb +11 -11
- data/lib/project_types/rails/commands/tunnel.rb +7 -7
- data/lib/project_types/rails/forms/create.rb +34 -24
- data/lib/project_types/rails/gem.rb +23 -23
- data/lib/project_types/rails/messages/messages.rb +9 -8
- data/lib/project_types/rails/ruby.rb +2 -2
- data/lib/project_types/script/cli.rb +36 -40
- data/lib/project_types/script/commands/create.rb +9 -13
- data/lib/project_types/script/commands/push.rb +6 -5
- data/lib/project_types/script/config/extension_points.yml +25 -10
- data/lib/project_types/script/errors.rb +1 -19
- data/lib/project_types/script/forms/create.rb +7 -18
- data/lib/project_types/script/graphql/app_script_update_or_create.graphql +7 -5
- data/lib/project_types/script/graphql/script_service_proxy.graphql +1 -2
- data/lib/project_types/script/layers/application/build_script.rb +6 -8
- data/lib/project_types/script/layers/application/create_script.rb +34 -24
- data/lib/project_types/script/layers/application/extension_points.rb +3 -2
- data/lib/project_types/script/layers/application/project_dependencies.rb +4 -4
- data/lib/project_types/script/layers/application/push_script.rb +10 -15
- data/lib/project_types/script/layers/domain/config_ui.rb +16 -0
- data/lib/project_types/script/layers/domain/errors.rb +16 -0
- data/lib/project_types/script/layers/domain/extension_point.rb +60 -45
- data/lib/project_types/script/layers/domain/metadata.rb +18 -25
- data/lib/project_types/script/layers/domain/push_package.rb +9 -5
- data/lib/project_types/script/layers/domain/script_project.rb +38 -0
- data/lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb +39 -10
- data/lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb +9 -44
- data/lib/project_types/script/layers/infrastructure/errors.rb +50 -19
- data/lib/project_types/script/layers/infrastructure/extension_point_repository.rb +2 -2
- data/lib/project_types/script/layers/infrastructure/push_package_repository.rb +16 -21
- data/lib/project_types/script/layers/infrastructure/rust_project_creator.rb +4 -4
- data/lib/project_types/script/layers/infrastructure/rust_task_runner.rb +2 -2
- data/lib/project_types/script/layers/infrastructure/script_project_repository.rb +179 -0
- data/lib/project_types/script/layers/infrastructure/script_service.rb +35 -78
- data/lib/project_types/script/messages/messages.rb +33 -57
- data/lib/project_types/script/ui/error_handler.rb +116 -88
- data/lib/project_types/script/ui/printing_spinner.rb +1 -1
- data/lib/project_types/script/ui/strict_spinner.rb +1 -1
- data/lib/project_types/theme/cli.rb +19 -19
- data/lib/project_types/theme/commands/connect.rb +12 -12
- data/lib/project_types/theme/commands/create.rb +11 -11
- data/lib/project_types/theme/commands/deploy.rb +8 -8
- data/lib/project_types/theme/commands/generate.rb +3 -3
- data/lib/project_types/theme/commands/generate/env.rb +15 -15
- data/lib/project_types/theme/commands/push.rb +15 -15
- data/lib/project_types/theme/commands/serve.rb +5 -5
- data/lib/project_types/theme/forms/connect.rb +4 -4
- data/lib/project_types/theme/forms/create.rb +5 -5
- data/lib/project_types/theme/tasks/ensure_themekit_installed.rb +22 -22
- data/lib/project_types/theme/themekit.rb +15 -15
- data/lib/rubygems_plugin.rb +3 -3
- data/lib/shopify-cli/admin_api.rb +11 -11
- data/lib/shopify-cli/admin_api/populate_resource_command.rb +17 -17
- data/lib/shopify-cli/admin_api/schema.rb +3 -3
- data/lib/shopify-cli/api.rb +10 -10
- data/lib/shopify-cli/command.rb +1 -1
- data/lib/shopify-cli/commands.rb +9 -9
- data/lib/shopify-cli/commands/config.rb +28 -52
- data/lib/shopify-cli/commands/connect.rb +10 -10
- data/lib/shopify-cli/commands/create.rb +5 -5
- data/lib/shopify-cli/commands/help.rb +6 -6
- data/lib/shopify-cli/commands/logout.rb +3 -3
- data/lib/shopify-cli/commands/system.rb +32 -32
- data/lib/shopify-cli/commands/version.rb +2 -2
- data/lib/shopify-cli/context.rb +51 -23
- data/lib/shopify-cli/core.rb +4 -4
- data/lib/shopify-cli/core/entry_point.rb +5 -5
- data/lib/shopify-cli/core/executor.rb +1 -1
- data/lib/shopify-cli/core/help_resolver.rb +2 -2
- data/lib/shopify-cli/core/monorail.rb +16 -16
- data/lib/shopify-cli/db.rb +2 -2
- data/lib/shopify-cli/feature.rb +1 -1
- data/lib/shopify-cli/form.rb +1 -1
- data/lib/shopify-cli/git.rb +17 -17
- data/lib/shopify-cli/helpers.rb +1 -1
- data/lib/shopify-cli/helpers/haikunator.rb +1 -1
- data/lib/shopify-cli/heroku.rb +28 -28
- data/lib/shopify-cli/http_request.rb +2 -2
- data/lib/shopify-cli/js_deps.rb +12 -12
- data/lib/shopify-cli/js_system.rb +7 -7
- data/lib/shopify-cli/lazy_delegator.rb +55 -0
- data/lib/shopify-cli/messages/messages.rb +7 -16
- data/lib/shopify-cli/method_object.rb +1 -1
- data/lib/shopify-cli/oauth.rb +27 -27
- data/lib/shopify-cli/oauth/servlet.rb +9 -9
- data/lib/shopify-cli/options.rb +3 -3
- data/lib/shopify-cli/packager.rb +25 -25
- data/lib/shopify-cli/partners_api.rb +16 -16
- data/lib/shopify-cli/partners_api/organizations.rb +10 -10
- data/lib/shopify-cli/process_supervision.rb +7 -7
- data/lib/shopify-cli/project.rb +16 -16
- data/lib/shopify-cli/project_type.rb +3 -3
- data/lib/shopify-cli/resolve_constant.rb +1 -1
- data/lib/shopify-cli/resources.rb +1 -1
- data/lib/shopify-cli/resources/env_file.rb +10 -10
- data/lib/shopify-cli/result.rb +11 -11
- data/lib/shopify-cli/shopifolk.rb +6 -9
- data/lib/shopify-cli/sub_command.rb +1 -1
- data/lib/shopify-cli/task.rb +3 -3
- data/lib/shopify-cli/tasks.rb +7 -7
- data/lib/shopify-cli/tasks/create_api_client.rb +5 -5
- data/lib/shopify-cli/tasks/ensure_dev_store.rb +12 -12
- data/lib/shopify-cli/tasks/ensure_env.rb +15 -15
- data/lib/shopify-cli/tasks/ensure_loopback_url.rb +4 -4
- data/lib/shopify-cli/tasks/select_org_and_shop.rb +19 -19
- data/lib/shopify-cli/tasks/update_dashboard_urls.rb +10 -10
- data/lib/shopify-cli/transform_data_structure.rb +86 -0
- data/lib/shopify-cli/tunnel.rb +30 -30
- data/lib/shopify-cli/version.rb +1 -1
- data/lib/shopify_cli.rb +56 -54
- data/shopify-cli.gemspec +6 -6
- data/vendor/deps/smart_properties/REVISION +1 -1
- data/vendor/deps/smart_properties/lib/smart_properties/property.rb +7 -1
- data/vendor/deps/smart_properties/lib/smart_properties/version.rb +1 -1
- data/vendor/gen/template/bin/update-deps +9 -9
- metadata +15 -11
- data/lib/project_types/extension/forms/register.rb +0 -47
- data/lib/project_types/script/commands/disable.rb +0 -25
- data/lib/project_types/script/commands/enable.rb +0 -78
- data/lib/project_types/script/graphql/shop_script_delete.graphql +0 -14
- data/lib/project_types/script/graphql/shop_script_update_or_create.graphql +0 -28
- data/lib/project_types/script/layers/application/disable_script.rb +0 -21
- data/lib/project_types/script/layers/application/enable_script.rb +0 -23
- data/lib/project_types/script/script_project.rb +0 -63
data/lib/rubygems_plugin.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
Gem.post_uninstall do |uninstaller|
|
2
|
-
if uninstaller.spec.name ==
|
2
|
+
if uninstaller.spec.name == "shopify-cli"
|
3
3
|
if RUBY_PLATFORM.match(/mingw32/)
|
4
4
|
bat_path = File.dirname(RbConfig.ruby)
|
5
5
|
bat = "#{bat_path}\\shopify.bat"
|
@@ -7,9 +7,9 @@ Gem.post_uninstall do |uninstaller|
|
|
7
7
|
# delete the auto-generated batch script
|
8
8
|
File.unlink(bat)
|
9
9
|
else
|
10
|
-
require
|
10
|
+
require "fileutils"
|
11
11
|
|
12
|
-
symlink =
|
12
|
+
symlink = "/usr/local/bin/shopify"
|
13
13
|
|
14
14
|
# delete the symbolic link IFF it exists AND it does not point to a file
|
15
15
|
# (i.e., it's been left hanging as a result of the uninstall, as expected)
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "shopify_cli"
|
2
2
|
|
3
3
|
module ShopifyCli
|
4
4
|
##
|
@@ -6,8 +6,8 @@ module ShopifyCli
|
|
6
6
|
# these concerns are taken care of.
|
7
7
|
#
|
8
8
|
class AdminAPI < API
|
9
|
-
autoload :PopulateResourceCommand,
|
10
|
-
autoload :Schema,
|
9
|
+
autoload :PopulateResourceCommand, "shopify-cli/admin_api/populate_resource_command"
|
10
|
+
autoload :Schema, "shopify-cli/admin_api/schema"
|
11
11
|
|
12
12
|
class << self
|
13
13
|
##
|
@@ -96,19 +96,19 @@ module ShopifyCli
|
|
96
96
|
env = Project.current.env
|
97
97
|
ShopifyCli::OAuth.new(
|
98
98
|
ctx: ctx,
|
99
|
-
service:
|
99
|
+
service: "admin",
|
100
100
|
client_id: env.api_key,
|
101
101
|
secret: env.secret,
|
102
102
|
scopes: env.scopes,
|
103
103
|
token_path: "/access_token",
|
104
|
-
options: {
|
104
|
+
options: { "grant_options[]" => "per user" },
|
105
105
|
).authenticate("https://#{shop}/admin/oauth")
|
106
106
|
end
|
107
107
|
|
108
|
-
def api_client(ctx, api_version, shop, path:
|
108
|
+
def api_client(ctx, api_version, shop, path: "graphql.json")
|
109
109
|
new(
|
110
110
|
ctx: ctx,
|
111
|
-
auth_header:
|
111
|
+
auth_header: "X-Shopify-Access-Token",
|
112
112
|
token: admin_access_token(ctx, shop),
|
113
113
|
url: "https://#{shop}/admin/api/#{fetch_api_version(ctx, api_version, shop)}/#{path}",
|
114
114
|
)
|
@@ -125,13 +125,13 @@ module ShopifyCli
|
|
125
125
|
return api_version unless api_version.nil?
|
126
126
|
client = new(
|
127
127
|
ctx: ctx,
|
128
|
-
auth_header:
|
128
|
+
auth_header: "X-Shopify-Access-Token",
|
129
129
|
token: admin_access_token(ctx, shop),
|
130
130
|
url: "https://#{shop}/admin/api/unstable/graphql.json",
|
131
131
|
)
|
132
|
-
versions = client.query(
|
133
|
-
latest = versions.find { |version| version[
|
134
|
-
latest[
|
132
|
+
versions = client.query("api_versions")["data"]["publicApiVersions"]
|
133
|
+
latest = versions.find { |version| version["displayName"].include?("Latest") }
|
134
|
+
latest["handle"]
|
135
135
|
end
|
136
136
|
end
|
137
137
|
end
|
@@ -1,5 +1,5 @@
|
|
1
|
-
require
|
2
|
-
require
|
1
|
+
require "shopify_cli"
|
2
|
+
require "optparse"
|
3
3
|
|
4
4
|
module ShopifyCli
|
5
5
|
class AdminAPI
|
@@ -36,7 +36,7 @@ module ShopifyCli
|
|
36
36
|
|
37
37
|
if @help
|
38
38
|
output = display_parent_extended_help
|
39
|
-
output += "\n#{@ctx.message(
|
39
|
+
output += "\n#{@ctx.message("core.populate.options.header", camel_case_resource_type)}\n"
|
40
40
|
output += resource_options.help
|
41
41
|
return @ctx.puts(output)
|
42
42
|
end
|
@@ -45,7 +45,7 @@ module ShopifyCli
|
|
45
45
|
|
46
46
|
if @silent
|
47
47
|
spin_group = CLI::UI::SpinGroup.new
|
48
|
-
spin_group.add(@ctx.message(
|
48
|
+
spin_group.add(@ctx.message("core.populate.populating", @count, camel_case_resource_type)) do |spinner|
|
49
49
|
populate
|
50
50
|
spinner.update_title(completion_message)
|
51
51
|
end
|
@@ -78,18 +78,18 @@ module ShopifyCli
|
|
78
78
|
opts.on(
|
79
79
|
"-c #{DEFAULT_COUNT}",
|
80
80
|
"--count=#{DEFAULT_COUNT}",
|
81
|
-
@ctx.message(
|
81
|
+
@ctx.message("core.populate.options.count_help")
|
82
82
|
) do |value|
|
83
83
|
@count = value.to_i
|
84
84
|
end
|
85
85
|
|
86
|
-
opts.on(
|
86
|
+
opts.on("-h", "--help", "print help") do |value|
|
87
87
|
@help = value
|
88
88
|
end
|
89
89
|
|
90
90
|
opts.on("--silent") { |v| @silent = v }
|
91
91
|
|
92
|
-
opts.on(
|
92
|
+
opts.on("--shop=", "-s") { |value| @shop = value }
|
93
93
|
end
|
94
94
|
end
|
95
95
|
|
@@ -100,12 +100,12 @@ module ShopifyCli
|
|
100
100
|
end
|
101
101
|
|
102
102
|
def input_options
|
103
|
-
schema.type(self.class.input_type)[
|
103
|
+
schema.type(self.class.input_type)["inputFields"].each do |field|
|
104
104
|
resource_options.on(
|
105
|
-
"--#{field[
|
106
|
-
field[
|
105
|
+
"--#{field["name"]}=#{field["defaultValue"]}",
|
106
|
+
field["description"]
|
107
107
|
) do |value|
|
108
|
-
@input[field[
|
108
|
+
@input[field["name"]] = value
|
109
109
|
end
|
110
110
|
end
|
111
111
|
end
|
@@ -120,14 +120,14 @@ module ShopifyCli
|
|
120
120
|
resp = AdminAPI.query(
|
121
121
|
@ctx, "create_#{snake_case_resource_type}", **kwargs
|
122
122
|
)
|
123
|
-
@ctx.abort(resp[
|
124
|
-
@ctx.done(message(resp[
|
123
|
+
@ctx.abort(resp["errors"]) if resp["errors"]
|
124
|
+
@ctx.done(message(resp["data"])) unless @silent
|
125
125
|
end
|
126
126
|
|
127
127
|
def completion_message
|
128
128
|
plural = @count > 1 ? "s" : ""
|
129
129
|
@ctx.message(
|
130
|
-
|
130
|
+
"core.populate.completion_message",
|
131
131
|
@count,
|
132
132
|
"#{camel_case_resource_type}#{plural}",
|
133
133
|
Project.current.env.shop,
|
@@ -142,7 +142,7 @@ module ShopifyCli
|
|
142
142
|
end
|
143
143
|
|
144
144
|
def price
|
145
|
-
format(
|
145
|
+
format("%.2f", rand(1..10))
|
146
146
|
end
|
147
147
|
|
148
148
|
private
|
@@ -155,7 +155,7 @@ module ShopifyCli
|
|
155
155
|
end
|
156
156
|
|
157
157
|
def camel_case_resource_type
|
158
|
-
@camel_case_resource_type ||= self.class.to_s.split(
|
158
|
+
@camel_case_resource_type ||= self.class.to_s.split("::").last
|
159
159
|
end
|
160
160
|
|
161
161
|
def snake_case_resource_type
|
@@ -167,7 +167,7 @@ module ShopifyCli
|
|
167
167
|
end
|
168
168
|
|
169
169
|
def parent_command_klass
|
170
|
-
@parent_command_klass ||= Module.const_get(self.class.to_s.split(
|
170
|
+
@parent_command_klass ||= Module.const_get(self.class.to_s.split("::")[0..-2].join("::"))
|
171
171
|
end
|
172
172
|
end
|
173
173
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "shopify_cli"
|
2
2
|
|
3
3
|
module ShopifyCli
|
4
4
|
class AdminAPI
|
@@ -7,7 +7,7 @@ module ShopifyCli
|
|
7
7
|
def get(ctx)
|
8
8
|
unless ShopifyCli::DB.exists?(:shopify_admin_schema)
|
9
9
|
shop = Project.current.env.shop || get_shop(ctx)
|
10
|
-
schema = AdminAPI.query(ctx,
|
10
|
+
schema = AdminAPI.query(ctx, "admin_introspection", shop: shop)
|
11
11
|
ShopifyCli::DB.set(shopify_admin_schema: JSON.dump(schema))
|
12
12
|
end
|
13
13
|
# This is ruby magic for making a new hash with another hash.
|
@@ -30,7 +30,7 @@ module ShopifyCli
|
|
30
30
|
data = self["data"]
|
31
31
|
schema = data["__schema"]
|
32
32
|
schema["types"].find do |object|
|
33
|
-
object[
|
33
|
+
object["name"] == name.to_s
|
34
34
|
end
|
35
35
|
end
|
36
36
|
|
data/lib/shopify-cli/api.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "shopify_cli"
|
2
2
|
|
3
3
|
module ShopifyCli
|
4
4
|
class API
|
@@ -19,7 +19,7 @@ module ShopifyCli
|
|
19
19
|
class APIRequestThrottledError < APIRequestRetriableError; end
|
20
20
|
|
21
21
|
def self.gid_to_id(gid)
|
22
|
-
gid.split(
|
22
|
+
gid.split("/").last
|
23
23
|
end
|
24
24
|
|
25
25
|
def query(query_name, variables: {})
|
@@ -30,19 +30,19 @@ module ShopifyCli
|
|
30
30
|
ctx.debug(resp)
|
31
31
|
resp
|
32
32
|
rescue API::APIRequestServerError, API::APIRequestUnexpectedError => e
|
33
|
-
ctx.puts(ctx.message(
|
34
|
-
ctx.debug(ctx.message(
|
33
|
+
ctx.puts(ctx.message("core.api.error.internal_server_error"))
|
34
|
+
ctx.debug(ctx.message("core.api.error.internal_server_error_debug", e.message))
|
35
35
|
end
|
36
36
|
|
37
37
|
def request(url:, body: nil, headers: {}, method: "POST")
|
38
38
|
CLI::Kit::Util.begin do
|
39
39
|
uri = URI.parse(url)
|
40
40
|
unless uri.is_a?(URI::HTTP)
|
41
|
-
ctx.abort(ctx.message(
|
41
|
+
ctx.abort(ctx.message("core.api.error.invalid_url", url))
|
42
42
|
end
|
43
43
|
|
44
44
|
# we delay this require so as to avoid a performance hit on starting the CLI
|
45
|
-
require
|
45
|
+
require "shopify-cli/http_request"
|
46
46
|
headers = default_headers.merge(headers)
|
47
47
|
response = if method == "POST"
|
48
48
|
HttpRequest.post(uri, body, headers)
|
@@ -76,12 +76,12 @@ module ShopifyCli
|
|
76
76
|
def load_query(name)
|
77
77
|
project_type = ShopifyCli::Project.current_project_type
|
78
78
|
project_file_path = File.join(
|
79
|
-
ShopifyCli::ROOT,
|
79
|
+
ShopifyCli::ROOT, "lib", "project_types", project_type.to_s, "graphql", "#{name}.graphql"
|
80
80
|
)
|
81
81
|
if !project_type.nil? && File.exist?(project_file_path)
|
82
82
|
File.read(project_file_path)
|
83
83
|
else
|
84
|
-
File.read(File.join(ShopifyCli::ROOT,
|
84
|
+
File.read(File.join(ShopifyCli::ROOT, "lib", "graphql", "#{name}.graphql"))
|
85
85
|
end
|
86
86
|
end
|
87
87
|
|
@@ -93,9 +93,9 @@ module ShopifyCli
|
|
93
93
|
|
94
94
|
def default_headers
|
95
95
|
{
|
96
|
-
|
96
|
+
"User-Agent" => "Shopify App CLI #{ShopifyCli::VERSION} #{current_sha} | #{ctx.uname}",
|
97
97
|
}.tap do |headers|
|
98
|
-
headers[
|
98
|
+
headers["X-Shopify-Cli-Employee"] = "1" if Shopifolk.acting_as_shopify_organization?
|
99
99
|
end.merge(auth_headers(token))
|
100
100
|
end
|
101
101
|
|
data/lib/shopify-cli/command.rb
CHANGED
data/lib/shopify-cli/commands.rb
CHANGED
@@ -1,9 +1,9 @@
|
|
1
|
-
require
|
1
|
+
require "shopify_cli"
|
2
2
|
|
3
3
|
module ShopifyCli
|
4
4
|
module Commands
|
5
5
|
Registry = CLI::Kit::CommandRegistry.new(
|
6
|
-
default:
|
6
|
+
default: "help",
|
7
7
|
contextual_resolver: nil,
|
8
8
|
)
|
9
9
|
@core_commands = []
|
@@ -18,12 +18,12 @@ module ShopifyCli
|
|
18
18
|
@core_commands.include?(cmd)
|
19
19
|
end
|
20
20
|
|
21
|
-
register :Config,
|
22
|
-
register :Connect,
|
23
|
-
register :Create,
|
24
|
-
register :Help,
|
25
|
-
register :Logout,
|
26
|
-
register :System,
|
27
|
-
register :Version,
|
21
|
+
register :Config, "config", "shopify-cli/commands/config", true
|
22
|
+
register :Connect, "connect", "shopify-cli/commands/connect", true
|
23
|
+
register :Create, "create", "shopify-cli/commands/create", true
|
24
|
+
register :Help, "help", "shopify-cli/commands/help", true
|
25
|
+
register :Logout, "logout", "shopify-cli/commands/logout", true
|
26
|
+
register :System, "system", "shopify-cli/commands/system", true
|
27
|
+
register :Version, "version", "shopify-cli/commands/version", true
|
28
28
|
end
|
29
29
|
end
|
@@ -1,97 +1,73 @@
|
|
1
|
-
require
|
1
|
+
require "shopify_cli"
|
2
2
|
|
3
3
|
module ShopifyCli
|
4
4
|
module Commands
|
5
5
|
class Config < ShopifyCli::Command
|
6
6
|
hidden_feature(feature_set: :debug)
|
7
7
|
|
8
|
-
subcommand :Feature,
|
9
|
-
subcommand :Analytics,
|
10
|
-
subcommand :ShopifolkBeta, 'shopifolk-beta'
|
8
|
+
subcommand :Feature, "feature"
|
9
|
+
subcommand :Analytics, "analytics"
|
11
10
|
|
12
11
|
def call(*)
|
13
12
|
@ctx.puts(self.class.help)
|
14
13
|
end
|
15
14
|
|
16
15
|
def self.help
|
17
|
-
ShopifyCli::Context.message(
|
16
|
+
ShopifyCli::Context.message("core.config.help", ShopifyCli::TOOL_NAME)
|
18
17
|
end
|
19
18
|
|
20
19
|
class Feature < ShopifyCli::SubCommand
|
21
20
|
def self.help
|
22
|
-
ShopifyCli::Context.message(
|
21
|
+
ShopifyCli::Context.message("core.config.feature.help", ShopifyCli::TOOL_NAME)
|
23
22
|
end
|
24
23
|
|
25
24
|
options do |parser, flags|
|
26
|
-
parser.on(
|
27
|
-
parser.on(
|
28
|
-
parser.on(
|
25
|
+
parser.on("--enable") { flags[:action] = "enable" }
|
26
|
+
parser.on("--disable") { flags[:action] = "disable" }
|
27
|
+
parser.on("--status") { flags[:action] = "status" }
|
29
28
|
end
|
30
29
|
|
31
30
|
def call(args, _name)
|
32
31
|
feature_name = args.shift
|
33
|
-
return @ctx.puts(@ctx.message(
|
32
|
+
return @ctx.puts(@ctx.message("core.config.help", ShopifyCli::TOOL_NAME)) if feature_name.nil?
|
34
33
|
is_enabled = ShopifyCli::Feature.enabled?(feature_name)
|
35
|
-
if options.flags[:action] ==
|
34
|
+
if options.flags[:action] == "disable" && is_enabled
|
36
35
|
ShopifyCli::Feature.disable(feature_name)
|
37
|
-
@ctx.puts(@ctx.message(
|
38
|
-
elsif options.flags[:action] ==
|
36
|
+
@ctx.puts(@ctx.message("core.config.feature.disabled", feature_name))
|
37
|
+
elsif options.flags[:action] == "enable" && !is_enabled
|
39
38
|
ShopifyCli::Feature.enable(feature_name)
|
40
|
-
@ctx.puts(@ctx.message(
|
39
|
+
@ctx.puts(@ctx.message("core.config.feature.enabled", feature_name))
|
41
40
|
elsif is_enabled
|
42
|
-
@ctx.puts(@ctx.message(
|
41
|
+
@ctx.puts(@ctx.message("core.config.feature.is_enabled", feature_name))
|
43
42
|
else
|
44
|
-
@ctx.puts(@ctx.message(
|
43
|
+
@ctx.puts(@ctx.message("core.config.feature.is_disabled", feature_name))
|
45
44
|
end
|
46
45
|
end
|
47
46
|
end
|
48
47
|
|
49
48
|
class Analytics < ShopifyCli::SubCommand
|
50
49
|
def self.help
|
51
|
-
ShopifyCli::Context.message(
|
50
|
+
ShopifyCli::Context.message("core.config.analytics.help", ShopifyCli::TOOL_NAME)
|
52
51
|
end
|
53
52
|
|
54
53
|
options do |parser, flags|
|
55
|
-
parser.on(
|
56
|
-
parser.on(
|
57
|
-
parser.on(
|
54
|
+
parser.on("--enable") { flags[:action] = "enable" }
|
55
|
+
parser.on("--disable") { flags[:action] = "disable" }
|
56
|
+
parser.on("--status") { flags[:action] = "status" }
|
58
57
|
end
|
59
58
|
|
60
59
|
def call(_args, _name)
|
61
|
-
is_enabled = ShopifyCli::Config.get_bool(
|
62
|
-
if options.flags[:action] ==
|
63
|
-
ShopifyCli::Config.set(
|
64
|
-
@ctx.puts(@ctx.message(
|
65
|
-
elsif options.flags[:action] ==
|
66
|
-
ShopifyCli::Config.set(
|
67
|
-
@ctx.puts(@ctx.message(
|
60
|
+
is_enabled = ShopifyCli::Config.get_bool("analytics", "enabled")
|
61
|
+
if options.flags[:action] == "disable" && is_enabled
|
62
|
+
ShopifyCli::Config.set("analytics", "enabled", false)
|
63
|
+
@ctx.puts(@ctx.message("core.config.analytics.disabled"))
|
64
|
+
elsif options.flags[:action] == "enable" && !is_enabled
|
65
|
+
ShopifyCli::Config.set("analytics", "enabled", true)
|
66
|
+
@ctx.puts(@ctx.message("core.config.analytics.enabled"))
|
68
67
|
elsif is_enabled
|
69
|
-
@ctx.puts(@ctx.message(
|
68
|
+
@ctx.puts(@ctx.message("core.config.analytics.is_enabled"))
|
70
69
|
else
|
71
|
-
@ctx.puts(@ctx.message(
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
75
|
-
|
76
|
-
class ShopifolkBeta < ShopifyCli::SubCommand
|
77
|
-
options do |parser, flags|
|
78
|
-
parser.on('--enable') { flags[:action] = 'enable' }
|
79
|
-
parser.on('--disable') { flags[:action] = 'disable' }
|
80
|
-
parser.on('--status') { flags[:action] = 'status' }
|
81
|
-
end
|
82
|
-
|
83
|
-
def call(_args, _name)
|
84
|
-
is_enabled = ShopifyCli::Config.get_bool('shopifolk-beta', 'enabled')
|
85
|
-
if options.flags[:action] == 'disable' && is_enabled
|
86
|
-
ShopifyCli::Config.set('shopifolk-beta', 'enabled', false)
|
87
|
-
@ctx.puts(@ctx.message('core.config.shopifolk_beta.disabled'))
|
88
|
-
elsif options.flags[:action] == 'enable' && !is_enabled
|
89
|
-
ShopifyCli::Config.set('shopifolk-beta', 'enabled', true)
|
90
|
-
@ctx.puts(@ctx.message('core.config.shopifolk_beta.enabled'))
|
91
|
-
elsif is_enabled
|
92
|
-
@ctx.puts(@ctx.message('core.config.shopifolk_beta.is_enabled'))
|
93
|
-
else
|
94
|
-
@ctx.puts(@ctx.message('core.config.shopifolk_beta.is_disabled'))
|
70
|
+
@ctx.puts(@ctx.message("core.config.analytics.is_disabled"))
|
95
71
|
end
|
96
72
|
end
|
97
73
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "shopify_cli"
|
2
2
|
|
3
3
|
module ShopifyCli
|
4
4
|
module Commands
|
@@ -10,13 +10,13 @@ module ShopifyCli
|
|
10
10
|
end
|
11
11
|
|
12
12
|
def help
|
13
|
-
ShopifyCli::Context.message(
|
13
|
+
ShopifyCli::Context.message("core.connect.help", ShopifyCli::TOOL_NAME)
|
14
14
|
end
|
15
15
|
end
|
16
16
|
|
17
17
|
def call(args, command_name)
|
18
18
|
if Project.current&.env
|
19
|
-
@ctx.puts(@ctx.message(
|
19
|
+
@ctx.puts(@ctx.message("core.connect.already_connected_warning"))
|
20
20
|
end
|
21
21
|
|
22
22
|
project_type = ask_project_type
|
@@ -25,15 +25,15 @@ module ShopifyCli
|
|
25
25
|
|
26
26
|
if klass
|
27
27
|
klass.ctx = @ctx
|
28
|
-
klass.call(args, command_name,
|
28
|
+
klass.call(args, command_name, "connect")
|
29
29
|
else
|
30
30
|
app = default_connect(project_type)
|
31
|
-
@ctx.done(@ctx.message(
|
31
|
+
@ctx.done(@ctx.message("core.connect.connected", app))
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
35
35
|
def ask_project_type
|
36
|
-
CLI::UI::Prompt.ask(@ctx.message(
|
36
|
+
CLI::UI::Prompt.ask(@ctx.message("core.connect.project_type_select")) do |handler|
|
37
37
|
ShopifyCli::Commands::Create.all_visible_type.each do |type|
|
38
38
|
handler.option(type.project_name) { type.project_type }
|
39
39
|
end
|
@@ -42,9 +42,9 @@ module ShopifyCli
|
|
42
42
|
|
43
43
|
def default_connect(project_type)
|
44
44
|
org = ShopifyCli::Tasks::EnsureEnv.call(@ctx, regenerate: true)
|
45
|
-
write_cli_yml(project_type, org[
|
46
|
-
api_key = Project.current(force_reload: true).env[
|
47
|
-
get_app(org[
|
45
|
+
write_cli_yml(project_type, org["id"]) unless Project.has_current?
|
46
|
+
api_key = Project.current(force_reload: true).env["api_key"]
|
47
|
+
get_app(org["apps"], api_key).first["title"]
|
48
48
|
end
|
49
49
|
|
50
50
|
def write_cli_yml(project_type, org_id)
|
@@ -53,7 +53,7 @@ module ShopifyCli
|
|
53
53
|
project_type: project_type,
|
54
54
|
organization_id: org_id,
|
55
55
|
)
|
56
|
-
@ctx.done(@ctx.message(
|
56
|
+
@ctx.done(@ctx.message("core.connect.cli_yml_saved"))
|
57
57
|
end
|
58
58
|
|
59
59
|
def get_app(apps, api_key)
|