shopify-cli 1.1.2 → 1.4.1

data/lib/shopify-cli/tasks/select_org_and_shop.rb

@@ -10,6 +10,7 @@ module ShopifyCli
         return response(organization_id.to_i, shop_domain) unless organization_id.nil? || shop_domain.nil?
         org = get_organization(organization_id)
         shop_domain ||= get_shop_domain(org)
+        ShopifyCli::Core::Monorail.metadata[:organization_id] = org["id"].to_i
         response(org["id"].to_i, shop_domain)
       end
 

data/lib/shopify-cli/tunnel.rb

@@ -210,7 +210,7 @@ module ShopifyCli
       end
 
       def parse_account
-        account, timeout, _ = @log.match(/AccountName:([\w\s\d@._\-]*) SessionDuration:([\d]+) PlanName/)&.captures
+        account, timeout, _ = @log.match(/AccountName:(.*)\s+SessionDuration:([\d]+) PlanName/)&.captures
         @account = account&.empty? ? nil : account
         @timeout = timeout&.empty? ? 0 : timeout.to_i
       end

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '1.1.2'
+  VERSION = '1.4.1'
 end

data/lib/shopify_cli.rb

@@ -116,6 +116,7 @@ module ShopifyCli
   autoload :Project, 'shopify-cli/project'
   autoload :ProjectType, 'shopify-cli/project_type'
   autoload :Resources, 'shopify-cli/resources'
+  autoload :Shopifolk, 'shopify-cli/shopifolk'
   autoload :SubCommand, 'shopify-cli/sub_command'
   autoload :Task, 'shopify-cli/task'
   autoload :Tasks, 'shopify-cli/tasks'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,8 +77,10 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/probots.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - ".tmp/.gitkeep"
 - ".tmp/sv/.gitkeep"
@@ -147,7 +149,10 @@ files:
 - lib/project_types/extension/commands/tunnel.rb
 - lib/project_types/extension/extension_project.rb
 - lib/project_types/extension/extension_project_keys.rb
-- lib/project_types/extension/features/argo.rb
+- lib/project_types/extension/features/argo/admin.rb
+- lib/project_types/extension/features/argo/base.rb
+- lib/project_types/extension/features/argo/checkout.rb
+- lib/project_types/extension/features/argo_config.rb
 - lib/project_types/extension/features/argo_dependencies.rb
 - lib/project_types/extension/features/argo_setup.rb
 - lib/project_types/extension/features/argo_setup_step.rb
@@ -161,7 +166,7 @@ files:
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/type.rb
 - lib/project_types/extension/models/types/checkout_post_purchase.rb
-- lib/project_types/extension/models/types/subscription_management.rb
+- lib/project_types/extension/models/types/product_subscription.rb
 - lib/project_types/extension/models/validation_error.rb
 - lib/project_types/extension/models/version.rb
 - lib/project_types/extension/tasks/converters/app_converter.rb
@@ -275,6 +280,7 @@ files:
 - lib/shopify-cli/helpers.rb
 - lib/shopify-cli/helpers/haikunator.rb
 - lib/shopify-cli/heroku.rb
+- lib/shopify-cli/http_request.rb
 - lib/shopify-cli/js_deps.rb
 - lib/shopify-cli/js_system.rb
 - lib/shopify-cli/messages/messages.rb
@@ -289,6 +295,7 @@ files:
 - lib/shopify-cli/project_type.rb
 - lib/shopify-cli/resources.rb
 - lib/shopify-cli/resources/env_file.rb
+- lib/shopify-cli/shopifolk.rb
 - lib/shopify-cli/sub_command.rb
 - lib/shopify-cli/task.rb
 - lib/shopify-cli/tasks.rb

data/lib/project_types/extension/features/argo.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-require 'base64'
-
-module Extension
-  module Features
-    class Argo
-      include SmartProperties
-
-      GIT_ADMIN_TEMPLATE = 'https://github.com/Shopify/argo-admin-template.git'
-      GIT_CHECKOUT_TEMPLATE = 'https://github.com/Shopify/argo-checkout-template.git'
-      SCRIPT_PATH = %w(build main.js).freeze
-
-      class << self
-        def admin
-          @admin ||= Argo.new(setup: ArgoSetup.new(git_template: GIT_ADMIN_TEMPLATE))
-        end
-
-        def checkout
-          @checkout ||= Argo.new(
-            setup: ArgoSetup.new(
-              git_template: GIT_CHECKOUT_TEMPLATE,
-              dependency_checks: [ArgoDependencies.node_installed(min_major: 10, min_minor: 16)]
-            )
-          )
-        end
-      end
-
-      property! :setup, accepts: Features::ArgoSetup
-
-      def create(directory_name, identifier, context)
-        setup.call(directory_name, identifier, context)
-      end
-
-      def config(context)
-        filepath = File.join(context.root, SCRIPT_PATH)
-        context.abort(context.message('features.argo.missing_file_error')) unless File.exist?(filepath)
-
-        begin
-          {
-            serialized_script: Base64.strict_encode64(File.open(filepath).read.chomp),
-          }
-        rescue StandardError
-          context.abort(context.message('features.argo.script_prepare_error'))
-        end
-      end
-    end
-  end
-end

data/lib/project_types/extension/models/types/subscription_management.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-require 'base64'
-
-module Extension
-  module Models
-    module Types
-      class SubscriptionManagement < Models::Type
-        IDENTIFIER = 'SUBSCRIPTION_MANAGEMENT'
-
-        def create(directory_name, context)
-          Features::Argo.admin.create(directory_name, IDENTIFIER, context)
-        end
-
-        def config(context)
-          Features::Argo.admin.config(context)
-        end
-      end
-    end
-  end
-end