shopify-cli 1.0.2 → 1.1.1

data/lib/project_types/extension/cli.rb

@@ -2,7 +2,7 @@
 
 module Extension
   class Project < ShopifyCli::ProjectType
-    hidden_project_type
+    hidden_feature
     creator 'App Extension', 'Extension::Commands::Create'
 
     register_command('Extension::Commands::Build', "build")

data/lib/project_types/extension/commands/build.rb

@@ -4,7 +4,7 @@ require 'shopify_cli'
 module Extension
   module Commands
     class Build < ExtensionCommand
-      hidden_command
+      hidden_feature
 
       YARN_BUILD_COMMAND = %w(build)
       NPM_BUILD_COMMAND = %w(run-script build)

data/lib/project_types/extension/models/type.rb

@@ -12,6 +12,7 @@ module Extension
         end
 
         def inherited(klass)
+          super
           @all_extension_types ||= []
           @all_extension_types << klass
         end

data/lib/project_types/extension/tasks/create_extension.rb

@@ -20,7 +20,7 @@ module Extension
           extension_context: extension_context,
         }
 
-        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, input).dig(*RESPONSE_FIELD)
+        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, **input).dig(*RESPONSE_FIELD)
         context.abort(context.message('tasks.errors.parse_error')) if response.nil?
 
         abort_if_user_errors(context, response)

data/lib/project_types/extension/tasks/get_app.rb

@@ -12,7 +12,7 @@ module Extension
       def call(context:, api_key:)
         input = { api_key: api_key }
 
-        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, input).dig(*RESPONSE_FIELD)
+        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, **input).dig(*RESPONSE_FIELD)
         context.abort(context.message('tasks.errors.parse_error')) if response.nil?
 
         Converters::AppConverter.from_hash(response.dig(APP_FIELD))

data/lib/project_types/extension/tasks/update_draft.rb

@@ -18,7 +18,7 @@ module Extension
           config: JSON.generate(config),
           extension_context: extension_context,
         }
-        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, input).dig(*RESPONSE_FIELD)
+        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, **input).dig(*RESPONSE_FIELD)
         context.abort(context.message('tasks.errors.parse_error')) if response.nil?
 
         abort_if_user_errors(context, response)

data/lib/project_types/node/commands/create.rb

@@ -54,8 +54,8 @@ module Node
       private
 
       def check_node
-        _, stat = @ctx.capture2e('which', 'node')
-        @ctx.abort(@ctx.message('node.create.error.node_required')) unless stat.success?
+        cmd_path = @ctx.which('node')
+        @ctx.abort(@ctx.message('node.create.error.node_required')) if cmd_path.nil?
 
         version, stat = @ctx.capture2e('node', '-v')
         @ctx.abort(@ctx.message('node.create.error.node_version_failure')) unless stat.success?
@@ -64,8 +64,8 @@ module Node
       end
 
       def check_npm
-        _, stat = @ctx.capture2e('which', 'npm')
-        @ctx.abort(@ctx.message('node.create.error.npm_required')) unless stat.success?
+        cmd_path = @ctx.which('npm')
+        @ctx.abort(@ctx.message('node.create.error.npm_required')) if cmd_path.nil?
 
         version, stat = @ctx.capture2e('npm', '-v')
         @ctx.abort(@ctx.message('node.create.error.npm_version_failure')) unless stat.success?

data/lib/project_types/node/commands/deploy/heroku.rb

@@ -19,10 +19,15 @@ module Node
           end
           spin_group.wait
 
-          spin_group.add(@ctx.message('node.deploy.heroku.installing')) do |spinner|
+          install_message = @ctx.message(
+            @ctx.windows? ? 'node.deploy.heroku.installing_windows' : 'node.deploy.heroku.installing'
+          )
+          spin_group.add(install_message) do |spinner|
             heroku_service.install
             spinner.update_title(@ctx.message('node.deploy.heroku.installed'))
           end
+          spin_group.wait
+
           spin_group.add(@ctx.message('node.deploy.heroku.git.checking')) do |spinner|
             ShopifyCli::Git.init(@ctx)
             spinner.update_title(@ctx.message('node.deploy.heroku.git.initialized'))

data/lib/project_types/node/commands/generate/billing.rb

@@ -5,8 +5,8 @@ module Node
     class Generate
       class Billing < ShopifyCli::SubCommand
         BILLING_TYPES = {
-          'recurring-billing' => './node_modules/.bin/generate-node-app recurring-billing',
-          'one-time-billing' => './node_modules/.bin/generate-node-app one-time-billing',
+          'recurring-billing' => ['./node_modules/.bin/generate-node-app', 'recurring-billing'],
+          'one-time-billing' => ['./node_modules/.bin/generate-node-app', 'one-time-billing'],
         }
         def call(args, _name)
           selected_type = BILLING_TYPES[args[1]]
@@ -18,11 +18,13 @@ module Node
             end
           end
           billing_type_name = BILLING_TYPES.key(selected_type)
+          selected_type[0] = File.join(ShopifyCli::Project.current.directory, selected_type[0])
+          selected_type[0] = "\"#{selected_type[0]}\""
+          selected_type = selected_type.join(' ')
+
           spin_group = CLI::UI::SpinGroup.new
           spin_group.add(@ctx.message('node.generate.billing.generating', billing_type_name)) do |spinner|
-            Node::Commands::Generate.run_generate(
-              selected_type, billing_type_name, @ctx
-            )
+            Node::Commands::Generate.run_generate(selected_type, billing_type_name, @ctx)
             spinner.update_title(@ctx.message('node.generate.billing.generated', billing_type_name))
           end
           spin_group.wait

data/lib/project_types/node/commands/generate/page.rb

@@ -5,10 +5,10 @@ module Node
     class Generate
       class Page < ShopifyCli::SubCommand
         PAGE_TYPES = {
-          'empty-state' => './node_modules/.bin/generate-node-app empty-state-page',
-          'two-column' => './node_modules/.bin/generate-node-app two-column-page',
-          'annotated' => './node_modules/.bin/generate-node-app settings-page',
-          'list' => './node_modules/.bin/generate-node-app list-page',
+          'empty-state' => ['./node_modules/.bin/generate-node-app', 'empty-state-page'],
+          'two-column' => ['./node_modules/.bin/generate-node-app', 'two-column-page'],
+          'annotated' => ['./node_modules/.bin/generate-node-app', 'settings-page'],
+          'list' => ['./node_modules/.bin/generate-node-app', 'list-page'],
         }
 
         options do |parser, flags|
@@ -37,9 +37,13 @@ module Node
               end
             end
           end
+          page_type_name = PAGE_TYPES.key(selected_type)
+          selected_type[0] = File.join(ShopifyCli::Project.current.directory, selected_type[0])
+          selected_type[0] = "\"#{selected_type[0]}\""
+          selected_type = selected_type.join(' ')
 
           spin_group = CLI::UI::SpinGroup.new
-          spin_group.add(@ctx.message('node.generate.page.generating', selected_type)) do |spinner|
+          spin_group.add(@ctx.message('node.generate.page.generating', page_type_name)) do |spinner|
             Node::Commands::Generate.run_generate("#{selected_type} #{name}", name, @ctx)
             spinner.update_title(@ctx.message('node.generate.page.generated', name, name))
           end

data/lib/project_types/node/commands/generate/webhook.rb

@@ -15,9 +15,13 @@ module Node
               end
             end
           end
+
+          generate_path = File.join(ShopifyCli::Project.current.directory, "node_modules/.bin/generate-node-app")
+          generate_path = "\"#{generate_path}\""
+
           spin_group = CLI::UI::SpinGroup.new
           spin_group.add(@ctx.message('node.generate.webhook.generating', selected_type)) do |spinner|
-            Node::Commands::Generate.run_generate("./node_modules/.bin/generate-node-app webhook #{selected_type}",
+            Node::Commands::Generate.run_generate("#{generate_path} webhook #{selected_type}",
               selected_type, @ctx)
             spinner.update_title(@ctx.message('node.generate.webhook.generated', selected_type))
           end

data/lib/project_types/node/messages/messages.rb

@@ -54,6 +54,7 @@ module Node
             downloading: "Downloading Heroku CLI…",
             downloaded: "Downloaded Heroku CLI",
             installing: "Installing Heroku CLI…",
+            installing_windows: "Running Heroku CLI install wizard…",
             installed: "Installed Heroku CLI",
             authenticating: "Authenticating with Heroku…",
             authenticated: "{{v}} Authenticated with Heroku",

data/lib/project_types/rails/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Rails
   class Project < ShopifyCli::ProjectType
-    # hidden_project_type
     creator 'Ruby on Rails App', 'Rails::Commands::Create'
 
     register_command('Rails::Commands::Deploy', "deploy")

data/lib/project_types/rails/commands/create.rb

@@ -30,6 +30,9 @@ module Rails
         @ctx.abort(@ctx.message('rails.create.error.invalid_ruby_version')) unless
           Ruby.version(@ctx).satisfies?('~>2.5')
 
+        check_node
+        check_yarn
+
         build(form.name, form.db)
         set_custom_ua
         ShopifyCli::Project.write(
@@ -65,12 +68,51 @@ module Rails
 
       private
 
+      def check_node
+        cmd_path = @ctx.which('node')
+        if cmd_path.nil?
+          @ctx.abort(@ctx.message('rails.create.error.node_required')) unless @ctx.windows?
+          @ctx.puts("{{x}} {{red:" + @ctx.message('rails.create.error.node_required') + "}}")
+          @ctx.puts(@ctx.message('rails.create.info.open_new_shell', 'node'))
+          raise ShopifyCli::AbortSilent
+        end
+
+        version, stat = @ctx.capture2e('node', '-v')
+        unless stat.success?
+          @ctx.abort(@ctx.message('rails.create.error.node_version_failure')) unless @ctx.windows?
+          # execution stops above if not Windows
+          @ctx.puts("{{x}} {{red:" + @ctx.message('rails.create.error.node_version_failure') + "}}")
+          @ctx.puts(@ctx.message('rails.create.info.open_new_shell', 'node'))
+          raise ShopifyCli::AbortSilent
+        end
+
+        @ctx.done(@ctx.message('rails.create.node_version', version))
+      end
+
+      def check_yarn
+        cmd_path = @ctx.which('yarn')
+        if cmd_path.nil?
+          @ctx.abort(@ctx.message('rails.create.error.yarn_required')) unless @ctx.windows?
+          @ctx.puts("{{x}} {{red:" + @ctx.message('rails.create.error.yarn_required') + "}}")
+          @ctx.puts(@ctx.message('rails.create.info.open_new_shell', 'yarn'))
+          raise ShopifyCli::AbortSilent
+        end
+
+        version, stat = @ctx.capture2e('yarn', '-v')
+        unless stat.success?
+          @ctx.abort(@ctx.message('rails.create.error.yarn_version_failure')) unless @ctx.windows?
+          @ctx.puts("{{x}} {{red:" + @ctx.message('rails.create.error.yarn_version_failure') + "}}")
+          @ctx.puts(@ctx.message('rails.create.info.open_new_shell', 'yarn'))
+          raise ShopifyCli::AbortSilent
+        end
+
+        @ctx.done(@ctx.message('rails.create.yarn_version', version))
+      end
+
       def build(name, db)
-        install_gem('rails')
-        CLI::UI::Frame.open(@ctx.message('rails.create.installing_bundler')) do
-          install_gem('bundler', '~>1.0')
+        @ctx.abort(@ctx.message('rails.create.error.install_failure', 'rails')) unless install_gem('rails')
+        @ctx.abort(@ctx.message('rails.create.error.install_failure', 'bundler ~>2.0')) unless
           install_gem('bundler', '~>2.0')
-        end
 
         CLI::UI::Frame.open(@ctx.message('rails.create.generating_app', name)) do
           new_command = %w(rails new)
@@ -106,6 +148,12 @@ module Rails
           syscall(%w(rails db:create))
           syscall(%w(rails db:migrate RAILS_ENV=development))
         end
+
+        unless File.exist?(File.join(@ctx.root, 'config/webpacker.yml'))
+          CLI::UI::Frame.open(@ctx.message('rails.create.running_webpacker_install')) do
+            syscall(%w(rails webpacker:install))
+          end
+        end
       end
 
       def set_custom_ua

data/lib/project_types/rails/commands/generate.rb

@@ -28,6 +28,7 @@ module Rails
       end
 
       def self.run_generate(script, name, ctx)
+        Gem.gem_path(ctx)
         stat = ctx.system(script)
         unless stat.success?
           ctx.abort(response(stat.exitstatus, name, ctx))

data/lib/project_types/rails/commands/generate/webhook.rb

@@ -29,9 +29,10 @@ module Rails
 
         def generate_command(selected_type)
           parts = selected_type.downcase.split("_")
-          env = ShopifyCli::Project.current.env.host
+          host = ShopifyCli::Project.current.env.host
           selected_type = parts[0..-2].join("_") + "/" + parts[-1]
-          "rails g shopify_app:add_webhook -t #{selected_type} -a #{env}/webhooks/#{selected_type.downcase}"
+          command = @ctx.windows? ? "ruby bin\\rails" : "bin/rails"
+          "#{command} g shopify_app:add_webhook -t #{selected_type} -a #{host}/webhooks/#{selected_type.downcase}"
         end
       end
     end

data/lib/project_types/rails/commands/serve.rb

@@ -26,12 +26,16 @@ module Rails
             @ctx.open_url!("#{project.env.host}/login?shop=#{project.env.shop}")
           end
         end
-        Gem.gem_home(@ctx)
         CLI::UI::Frame.open(@ctx.message('rails.serve.running_server')) do
           env = ShopifyCli::Project.current.env.to_h
           env.delete('HOST')
           env['PORT'] = ShopifyCli::Tunnel::PORT.to_s
-          @ctx.system('bin/rails server', env: env)
+          env['GEM_PATH'] = Gem.gem_path(@ctx)
+          if @ctx.windows?
+            @ctx.system("ruby bin\\rails server", env: env)
+          else
+            @ctx.system('bin/rails server', env: env)
+          end
         end
       end
 

data/lib/project_types/rails/gem.rb

@@ -15,30 +15,65 @@ module Rails
         version = args.shift
         gem = new(ctx: ctx, name: name, version: version)
         ctx.debug(ctx.message('rails.gem.installed_debug', name, gem.installed?))
-        gem.install! unless gem.installed?
+        gem.installed? ? true : gem.install!
       end
 
       def binary_path_for(ctx, binary)
-        File.join(gem_home(ctx), 'bin', binary)
+        path_to_binary = File.join(gem_home(ctx), 'bin', binary)
+        File.exist?(path_to_binary) ? path_to_binary : binary
       end
 
       def gem_home(ctx)
         ctx.getenv('GEM_HOME') || apply_gem_home(ctx)
       end
 
+      def gem_path(ctx)
+        ctx.getenv('GEM_PATH') || apply_gem_path(ctx)
+      end
+
       private
 
       def apply_gem_home(ctx)
-        path = File.join(ctx.getenv('HOME'), '.gem', 'ruby', RUBY_VERSION)
+        path = ''
+        # extract GEM_HOME from `gem environment home` command
+        out, stat = ctx.capture2e('gem', 'environment', 'home')
+        path = out&.empty? ? '' : out.strip if stat.success?
+        # fallback if return from `gem environment home` is empty (somewhat unlikely)
+        path = fallback_gem_home_path(ctx) if path.empty?
+        # fallback if path isn't writable (if using a system installed ruby)
+        path = fallback_gem_home_path(ctx) unless File.writable?(path)
         ctx.mkdir_p(path) unless Dir.exist?(path)
+        ctx.debug(ctx.message('rails.gem.setting_gem_home', path))
         ctx.setenv('GEM_HOME', path)
       end
+
+      def apply_gem_path(ctx)
+        path = ''
+        out, stat = ctx.capture2e('gem', 'environment', 'path')
+        path = out&.empty? ? '' : out.strip if stat.success?
+        # usually GEM_PATH already contains GEM_HOME
+        # if gem_home() falls back to our fallback path, we need to add it
+        path = gem_home(ctx) + File::PATH_SEPARATOR + path unless path.include?(gem_home(ctx))
+        ctx.debug(ctx.message('rails.gem.setting_gem_path', path))
+        ctx.setenv('GEM_PATH', path)
+      end
+
+      def fallback_gem_home_path(ctx)
+        File.join(ctx.getenv('HOME'), '.gem', 'ruby', RUBY_VERSION)
+      end
     end
 
     def installed?
-      !!Dir.glob("#{self.class.gem_home(ctx)}/gems/#{name}-*").detect do |f|
-        f =~ %r{/#{Regexp.quote(name)}-\d}
+      found = false
+      paths = self.class.gem_path(ctx).split(File::PATH_SEPARATOR)
+      paths.each do |path|
+        ctx.debug(ctx.message('rails.gem.checking_installation_path', "#{path}/gems/", name))
+        found = !!Dir.glob("#{path}/gems/#{name}-*").detect do |f|
+          gem_satisfies_version?(f)
+        end
+        break if found
       end
+      found
     end
 
     def install!
@@ -46,11 +81,31 @@ module Rails
       spin.add(ctx.message('rails.gem.installing', name)) do |spinner|
         args = %w(gem install)
         args.push(name)
-        args.push('-v', version) unless version.nil?
+        unless version.nil?
+          if ctx.windows? && version.include?('~')
+            args.push('-v', "\"#{version}\"")
+          else
+            args.push('-v', version)
+          end
+        end
         ctx.system(*args)
         spinner.update_title(ctx.message('rails.gem.installed', name))
       end
       spin.wait
     end
+
+    def gem_satisfies_version?(path)
+      if version
+        # there was a specific version given during new(), so
+        # check version of gem found to determine match
+        require 'semantic/semantic'
+        found_version, _ = path.match(%r{/#{Regexp.quote(name)}-([\d\.]+)})&.captures
+        found_version.nil? ? false : Semantic::Version.new(found_version).satisfies?(version)
+      else
+        # otherwise ignore the actual version number,
+        # just check there's an initial digit
+        %r{/#{Regexp.quote(name)}-\d}.match?(path)
+      end
+    end
   end
 end

data/lib/project_types/rails/messages/messages.rb

@@ -9,9 +9,12 @@ module Rails
         },
 
         gem: {
+          checking_installation_path: "Checking path %s for gem %s",
+          installed: "Installed %s gem",
           installed_debug: "%s installed: %s",
           installing: "Installing %s gem...",
-          installed: "Installed %s gem",
+          setting_gem_home: "GEM_HOME being set to %s",
+          setting_gem_path: "GEM_PATH being set to %s",
         },
 
         create: {
@@ -33,6 +36,14 @@ module Rails
             See {{underline:https://github.com/Shopify/shopify-app-cli/blob/master/docs/installing-ruby.md}}
             for our recommended method of installing ruby.
             MSG
+            install_failure: "Error installing %s gem",
+            node_required: "node is required to create a rails project. Download at https://nodejs.org/en/download.",
+            node_version_failure: "Failed to get the current node version. Please make sure it is installed as " \
+              "per the instructions at https://nodejs.org/en.",
+            yarn_required: "yarn is required to create a rails project. Download at " \
+              "https://classic.yarnpkg.com/en/docs/install.",
+            yarn_version_failure: "Failed to get the current yarn version. Please make sure it is installed as per " \
+              "the instructions at https://classic.yarnpkg.com/en/docs/install.",
           },
 
           info: {
@@ -40,13 +51,18 @@ module Rails
             serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
               "to start a local server",
             install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
+            open_new_shell: "{{*}} {{yellow:After installing %s, please open a new Command Prompt or PowerShell " \
+              "window to continue.}}",
           },
-          installing_bundler: "Installing bundler…",
+          installing_bundler: "Installing bundler...",
           generating_app: "Generating new rails app project in %s...",
-          adding_shopify_gem: "{{v}} Adding shopify_app gem…",
+          adding_shopify_gem: "{{v}} Adding shopify_app gem...",
+          node_version: "node %s",
+          yarn_version: "yarn %s",
           running_bundle_install: "Running bundle install...",
           running_generator: "Running shopify_app generator...",
-          running_migrations: "Running migrations…",
+          running_migrations: "Running migrations...",
+          running_webpacker_install: "Running webpacker:install...",
         },
 
         deploy: {
@@ -65,14 +81,14 @@ module Rails
             Deploy the current Rails project to Heroku
             Usage: {{command:%s deploy heroku}}
             HELP
-            downloading: "Downloading Heroku CLI…",
+            downloading: "Downloading Heroku CLI...",
             downloaded: "Downloaded Heroku CLI",
-            installing: "Installing Heroku CLI…",
+            installing: "Installing Heroku CLI...",
             installed: "Installed Heroku CLI",
             authenticated_with_account: "{{v}} Authenticated with Heroku as `%s`",
-            authenticating: "Authenticating with Heroku…",
+            authenticating: "Authenticating with Heroku...",
             authenticated: "{{v}} Authenticated with Heroku",
-            deploying: "Deploying to Heroku…",
+            deploying: "Deploying to Heroku...",
             deployed: "{{v}} Deployed to Heroku",
             db_check: {
               validating: "Validating application...",
@@ -86,7 +102,7 @@ module Rails
               SQLITE
             },
             git: {
-              checking: "Checking git repo…",
+              checking: "Checking git repo...",
               initialized: "Git repo initialized",
               what_branch: "What branch would you like to deploy?",
               branch_selected: "{{v}} Git branch `%s` selected for deploy",
@@ -95,10 +111,10 @@ module Rails
               no_apps_found: "No existing Heroku app found. What would you like to do?",
               name: "What is your Heroku app’s name?",
               select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app `%s`…",
+              selecting: "Selecting Heroku app `%s`...",
               selected: "{{v}} Heroku app `%s` selected",
               create: "Create a new Heroku app",
-              creating: "Creating new Heroku app…",
+              creating: "Creating new Heroku app...",
               created: "{{v}} New Heroku app created",
             },
           },