shopify-cli 1.6.0 → 1.7.0

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '1.6.0'
+  VERSION = "1.7.0"
 end

data/lib/shopify_cli.rb

@@ -8,7 +8,7 @@ Thread.report_on_exception = false
 # require_relative 'support/ruby_backports'
 
 # See bin/load_shopify.rb
-ENV['PATH'] = ENV['PATH'].split(':').select { |p| p.start_with?('/', '~') }.join(':') unless defined?($original_env)
+ENV["PATH"] = ENV["PATH"].split(":").select { |p| p.start_with?("/", "~") }.join(":") unless defined?($original_env)
 
 # Load vendor and CLI UI/Kit.
 # Nothing else should be loaded at this point and nothing else should be added to the load path on boot
@@ -21,10 +21,10 @@ deps.each do |dep|
   $LOAD_PATH.unshift(vendor_path) unless $LOAD_PATH.include?(vendor_path)
 end
 
-require 'cli/ui'
-require 'cli/kit'
-require 'smart_properties'
-require_relative 'shopify-cli/version'
+require "cli/ui"
+require "cli/kit"
+require "smart_properties"
+require_relative "shopify-cli/version"
 
 # Enable stdout routing. At this point all calls to STDOUT (and STDERR) will go through this class.
 # See https://github.com/Shopify/cli-ui/blob/master/lib/cli/ui/stdout_router.rb for more info
@@ -39,16 +39,16 @@ CLI::UI::StdoutRouter.enable
 module ShopifyCli
   extend CLI::Kit::Autocall
 
-  TOOL_NAME         = 'shopify'
-  TOOL_FULL_NAME    = 'Shopify CLI'
-  ROOT              = File.expand_path('../..', __FILE__)
-  PROJECT_TYPES_DIR = File.join(ROOT, 'lib', 'project_types')
-  TEMP_DIR          = File.join(ROOT, '.tmp')
+  TOOL_NAME         = "shopify"
+  TOOL_FULL_NAME    = "Shopify CLI"
+  ROOT              = File.expand_path("../..", __FILE__)
+  PROJECT_TYPES_DIR = File.join(ROOT, "lib", "project_types")
+  TEMP_DIR          = File.join(ROOT, ".tmp")
 
   # programmer emoji if default install location, else wrench emoji
-  EMOJI    = ROOT == '/opt/shopify' ? "\u{1f469}\u{200d}\u{1f4bb}" : "\u{1f527}"
+  EMOJI    = ROOT == "/opt/shopify" ? "\u{1f469}\u{200d}\u{1f4bb}" : "\u{1f527}"
   # shrug or boom emoji
-  FAILMOJI = ROOT == '/opt/shopify' ? "\u{1f937}" : "\u{1f4a5}"
+  FAILMOJI = ROOT == "/opt/shopify" ? "\u{1f937}" : "\u{1f4a5}"
 
   # Exit management in `shopify-app-cli` follows the management set out by CLI Kit.
   # https://github.com/Shopify/cli-kit/blob/master/lib/cli/kit.rb
@@ -94,47 +94,49 @@ module ShopifyCli
     )
   end
 
-  autoload :AdminAPI, 'shopify-cli/admin_api'
-  autoload :API, 'shopify-cli/api'
-  autoload :Command, 'shopify-cli/command'
-  autoload :Commands, 'shopify-cli/commands'
-  autoload :Context, 'shopify-cli/context'
-  autoload :Core, 'shopify-cli/core'
-  autoload :DB, 'shopify-cli/db'
-  autoload :Feature, 'shopify-cli/feature'
-  autoload :Form, 'shopify-cli/form'
-  autoload :Git, 'shopify-cli/git'
-  autoload :Helpers, 'shopify-cli/helpers'
-  autoload :Heroku, 'shopify-cli/heroku'
-  autoload :JsDeps, 'shopify-cli/js_deps'
-  autoload :JsSystem, 'shopify-cli/js_system'
-  autoload :MethodObject, 'shopify-cli/method_object'
-  autoload :Log, 'shopify-cli/log'
-  autoload :OAuth, 'shopify-cli/oauth'
-  autoload :Options, 'shopify-cli/options'
-  autoload :PartnersAPI, 'shopify-cli/partners_api'
-  autoload :ProcessSupervision, 'shopify-cli/process_supervision'
-  autoload :Project, 'shopify-cli/project'
-  autoload :ProjectType, 'shopify-cli/project_type'
-  autoload :ResolveConstant, 'shopify-cli/resolve_constant'
-  autoload :Resources, 'shopify-cli/resources'
-  autoload :Result, 'shopify-cli/result'
-  autoload :Shopifolk, 'shopify-cli/shopifolk'
-  autoload :SubCommand, 'shopify-cli/sub_command'
-  autoload :Task, 'shopify-cli/task'
-  autoload :Tasks, 'shopify-cli/tasks'
-  autoload :Tunnel, 'shopify-cli/tunnel'
-
-  require 'shopify-cli/messages/messages'
+  autoload :AdminAPI, "shopify-cli/admin_api"
+  autoload :API, "shopify-cli/api"
+  autoload :Command, "shopify-cli/command"
+  autoload :Commands, "shopify-cli/commands"
+  autoload :Context, "shopify-cli/context"
+  autoload :Core, "shopify-cli/core"
+  autoload :DB, "shopify-cli/db"
+  autoload :Feature, "shopify-cli/feature"
+  autoload :Form, "shopify-cli/form"
+  autoload :Git, "shopify-cli/git"
+  autoload :Helpers, "shopify-cli/helpers"
+  autoload :Heroku, "shopify-cli/heroku"
+  autoload :JsDeps, "shopify-cli/js_deps"
+  autoload :JsSystem, "shopify-cli/js_system"
+  autoload :MethodObject, "shopify-cli/method_object"
+  autoload :LazyDelegator, "shopify-cli/lazy_delegator"
+  autoload :Log, "shopify-cli/log"
+  autoload :OAuth, "shopify-cli/oauth"
+  autoload :Options, "shopify-cli/options"
+  autoload :PartnersAPI, "shopify-cli/partners_api"
+  autoload :ProcessSupervision, "shopify-cli/process_supervision"
+  autoload :Project, "shopify-cli/project"
+  autoload :ProjectType, "shopify-cli/project_type"
+  autoload :ResolveConstant, "shopify-cli/resolve_constant"
+  autoload :Resources, "shopify-cli/resources"
+  autoload :Result, "shopify-cli/result"
+  autoload :Shopifolk, "shopify-cli/shopifolk"
+  autoload :SubCommand, "shopify-cli/sub_command"
+  autoload :Task, "shopify-cli/task"
+  autoload :Tasks, "shopify-cli/tasks"
+  autoload :TransformDataStructure, "shopify-cli/transform_data_structure"
+  autoload :Tunnel, "shopify-cli/tunnel"
+
+  require "shopify-cli/messages/messages"
   Context.load_messages(ShopifyCli::Messages::MESSAGES)
 
   def self.cache_dir
-    cache_dir = if ENV.key?('RUNNING_SHOPIFY_CLI_TESTS')
+    cache_dir = if ENV.key?("RUNNING_SHOPIFY_CLI_TESTS")
       TEMP_DIR
-    elsif ENV['LOCALAPPDATA'].nil?
-      File.join(File.expand_path(ENV.fetch('XDG_CACHE_HOME', '~/.cache')), TOOL_NAME)
+    elsif ENV["LOCALAPPDATA"].nil?
+      File.join(File.expand_path(ENV.fetch("XDG_CACHE_HOME", "~/.cache")), TOOL_NAME)
     else
-      File.join(File.expand_path(ENV['LOCALAPPDATA']), TOOL_NAME)
+      File.join(File.expand_path(ENV["LOCALAPPDATA"]), TOOL_NAME)
     end
 
     # Make sure the cache dir always exists
@@ -144,20 +146,20 @@ module ShopifyCli
   end
 
   def self.tool_config_path
-    if ENV.key?('RUNNING_SHOPIFY_CLI_TESTS')
+    if ENV.key?("RUNNING_SHOPIFY_CLI_TESTS")
       TEMP_DIR
-    elsif ENV['APPDATA'].nil?
-      File.join(File.expand_path(ENV.fetch('XDG_CONFIG_HOME', '~/.config')), TOOL_NAME)
+    elsif ENV["APPDATA"].nil?
+      File.join(File.expand_path(ENV.fetch("XDG_CONFIG_HOME", "~/.config")), TOOL_NAME)
     else
-      File.join(File.expand_path(ENV['APPDATA']), TOOL_NAME)
+      File.join(File.expand_path(ENV["APPDATA"]), TOOL_NAME)
     end
   end
 
   def self.log_file
-    File.join(tool_config_path, 'logs', 'log.log')
+    File.join(tool_config_path, "logs", "log.log")
   end
 
   def self.debug_log_file
-    File.join(tool_config_path, 'logs', 'debug.log')
+    File.join(tool_config_path, "logs", "debug.log")
   end
 end

data/shopify-cli.gemspec

@@ -1,11 +1,11 @@
-require_relative 'lib/shopify-cli/version'
+require_relative "lib/shopify-cli/version"
 
 Gem::Specification.new do |spec|
   spec.name = "shopify-cli"
   spec.version = ShopifyCli::VERSION
   spec.authors = ["Shopify"]
   spec.email = ["dev-tools-education@shopify.com"]
-  spec.license = 'MIT'
+  spec.license = "MIT"
 
   spec.summary = "Shopify CLI helps you build Shopify apps faster."
   spec.description = <<~HERE
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     %x(git ls-files -z).split("\x0").reject do |f|
       f.match(%r{^(test|spec|features|packaging)/}) ||
       f.match(%r{^bin/(update-deps|shopify.bat)$})
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "vendor"]
   spec.extensions = ["ext/shopify-cli/extconf.rb"]
 
-  spec.add_development_dependency('bundler', '~> 1.17')
-  spec.add_development_dependency('rake', '~> 12.3', '>= 12.3.3')
-  spec.add_development_dependency('minitest', '~> 5.0')
+  spec.add_development_dependency("bundler", "~> 1.17")
+  spec.add_development_dependency("rake", "~> 12.3", ">= 12.3.3")
+  spec.add_development_dependency("minitest", "~> 5.0")
 end

data/vendor/gen/template/bin/update-deps

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH.unshift(File.expand_path("../../vendor/deps/cli-ui/lib", __FILE__))
-require 'open3'
-require 'fileutils'
+require "open3"
+require "fileutils"
 
 def fmt(tag, msg)
   # Not really CLI::UI.fmt compatible: no nesting support, for example.
@@ -27,7 +27,7 @@ def warn(msg)
 end
 
 def source_path
-  File.expand_path(ENV.fetch('SOURCE_ROOT', File.expand_path('../../..', __FILE__)))
+  File.expand_path(ENV.fetch("SOURCE_ROOT", File.expand_path("../../..", __FILE__)))
 end
 
 deps = %w(cli-ui cli-kit)
@@ -50,18 +50,18 @@ deps.each do |dep|
   dirty = false
 
   Dir.chdir(path) do
-    _, _, stat = Open3.capture3('git fetch origin master')
+    _, _, stat = Open3.capture3("git fetch origin master")
     bail("couldn't git fetch in dependency: {{yellow:#{dep}}}") unless stat.success?
 
-    head_sha, stat = Open3.capture2('git rev-parse HEAD')
+    head_sha, stat = Open3.capture2("git rev-parse HEAD")
     bail("couldn't determine HEAD: {{yellow:#{dep}}}") unless stat.success?
     head_sha.chomp!
 
-    fetch_head_sha, stat = Open3.capture2('git rev-parse FETCH_HEAD')
+    fetch_head_sha, stat = Open3.capture2("git rev-parse FETCH_HEAD")
     bail("couldn't determine FETCH_HEAD: {{yellow:#{dep}}}") unless stat.success?
     fetch_head_sha.chomp!
 
-    git_status, stat = Open3.capture2('git status --porcelain')
+    git_status, stat = Open3.capture2("git status --porcelain")
     bail("couldn't determine git status: {{yellow:#{dep}}}") unless stat.success?
 
     if head_sha != fetch_head_sha
@@ -84,8 +84,8 @@ deps.each do |dep|
   depdir = File.expand_path("../../vendor/deps/#{dep}", __FILE__)
   FileUtils.rm_rf(depdir)
   FileUtils.mkdir_p(depdir)
-  dstlib = File.expand_path('lib', depdir)
-  srclib = File.expand_path('lib', path)
+  dstlib = File.expand_path("lib", depdir)
+  srclib = File.expand_path("lib", path)
 
   FileUtils.cp_r(srclib, dstlib)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,7 @@ files:
 - lib/graphql/extension_create.graphql
 - lib/graphql/extension_update_draft.graphql
 - lib/graphql/find_organization.graphql
+- lib/graphql/get_app_by_api_key.graphql
 - lib/graphql/get_app_urls.graphql
 - lib/graphql/update_dashboard_urls.graphql
 - lib/project_types/extension/cli.rb
@@ -146,11 +147,13 @@ files:
 - lib/project_types/extension/features/argo_setup_step.rb
 - lib/project_types/extension/features/argo_setup_steps.rb
 - lib/project_types/extension/forms/create.rb
-- lib/project_types/extension/forms/register.rb
-- lib/project_types/extension/graphql/get_app_by_api_key.graphql
+- lib/project_types/extension/forms/questions/ask_app.rb
+- lib/project_types/extension/forms/questions/ask_name.rb
+- lib/project_types/extension/forms/questions/ask_type.rb
 - lib/project_types/extension/messages/message_loading.rb
 - lib/project_types/extension/messages/messages.rb
 - lib/project_types/extension/models/app.rb
+- lib/project_types/extension/models/lazy_specification_handler.rb
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/specification.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
@@ -284,6 +287,7 @@ files:
 - lib/shopify-cli/http_request.rb
 - lib/shopify-cli/js_deps.rb
 - lib/shopify-cli/js_system.rb
+- lib/shopify-cli/lazy_delegator.rb
 - lib/shopify-cli/messages/messages.rb
 - lib/shopify-cli/method_object.rb
 - lib/shopify-cli/oauth.rb
@@ -309,6 +313,7 @@ files:
 - lib/shopify-cli/tasks/ensure_loopback_url.rb
 - lib/shopify-cli/tasks/select_org_and_shop.rb
 - lib/shopify-cli/tasks/update_dashboard_urls.rb
+- lib/shopify-cli/transform_data_structure.rb
 - lib/shopify-cli/tunnel.rb
 - lib/shopify-cli/version.rb
 - lib/shopify_cli.rb

data/lib/project_types/extension/forms/register.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Extension
-  module Forms
-    class Register < ShopifyCli::Form
-      flag_arguments :api_key
-
-      attr_reader :app
-
-      def ask
-        self.app = ask_app
-      end
-
-      private
-
-      attr_writer :app
-
-      def ask_app
-        if !api_key.nil?
-          found_app = Tasks::GetApp.call(context: ctx, api_key: api_key)
-          ctx.abort(ctx.message('register.invalid_api_key', api_key)) if found_app.nil?
-          found_app
-        else
-          apps = load_apps
-          CLI::UI::Prompt.ask(ctx.message('register.ask_app')) do |handler|
-            apps.each do |app|
-              handler.option("#{app.title} by #{app.business_name}") { app }
-            end
-          end
-        end
-      end
-
-      def load_apps
-        ctx.puts(@ctx.message('register.loading_apps'))
-        apps = Tasks::GetApps.call(context: ctx)
-
-        apps.empty? ? abort_no_apps : apps
-      end
-
-      def abort_no_apps
-        ctx.puts(@ctx.message('register.no_apps'))
-        ctx.puts(@ctx.message('register.learn_about_apps'))
-        raise ShopifyCli::AbortSilent
-      end
-    end
-  end
-end