shopify-cli 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5832060f2695566da5c38ce98ccd1c67d522e8bb8306a5b2a16d95f92b3e56f1
-  data.tar.gz: e223c587130318b500d5cd12b494c50aef424957aef5da797dafea4b233e9933
+  metadata.gz: 1b440a68e264b97888e3cb181eea5e2465522c3d67338851e08775cc743416a5
+  data.tar.gz: a6f2acacf046ab9c6bd174d7bd077a0ea87312f844db05de015c9cacf5d972bf
 SHA512:
-  metadata.gz: b85a1e420f5d8b80a46f93ca4d16ebc1198fd31899bc7fbb8c9e0fbfa485c5f38fe9eca820782b0c4743b53e10266ce73bb0010fa90cd5b08fff199bb6a99585
-  data.tar.gz: 0dfd783ede5fcad7b04d648ec0f4d7084bea778d1fe7c73c0d2a86e683181cce73e8706a53462b7e285c04095dcebcc0c7cc489587f35ceb34716be4ec71efa2
+  metadata.gz: dc49412e3aa3f7bc5dde8fa5943d2d52ae09138e92de3fcbd949353430a2ea5275dd157951dcf81770cdb36ccb5c023a570ddea3eb7756a357709360d51bb3b4
+  data.tar.gz: 648a9df9b5647e869d92cc23241628fbe336efeeb8c9c6ade691d55b14cb075c419e87a2f97c5eddf851e99bba1da5e595cfcd13d2d78c6c5c0cafbaeaa85dc1

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -20,3 +20,11 @@ Fixes #0000 <!-- link to issue if one exists -->
   Summary of the changes committed.
   Before / after screenshots appreciated for UI changes.
 -->
+
+### Update checklist
+<!--
+  Ideally, CHANGELOG entries should be in the format
+  `* [#PR](PR URL): Message`. You should consider adding your PR
+  and then making the CHANGELOG update once you know the PR number.
+-->
+- [ ] I've added a CHANGELOG entry for this PR

data/.github/workflows/release.yml

@@ -0,0 +1,62 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Extract tag name
+      id: tag
+      run: echo "::set-output name=value::${GITHUB_REF##*/}"
+    - uses: actions/checkout@v2
+    
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1.1.2
+      with:
+        ruby-version: 2.6
+    
+    - name: Install dependencies
+      run: bundle install
+
+    - name: Create package
+      run: bundle exec rake package
+
+    - name: Get Directory
+      id: folder
+      run: |
+        cd packaging/builds
+        echo ::set-output name=name::$(ls)
+    
+    - name: Get Packages
+      id: binaries
+      run: |
+        cd packaging/builds/${{ steps.folder.outputs.name }}
+        deb=$(find . -type f -name '*.deb')
+        rpm=$(find . -type f -name "*.rpm")
+        echo ::set-output name=deb_file::"${deb:2}"
+        echo ::set-output name=rpm_file::"${rpm:2}"
+
+    - uses: dawidd6/action-homebrew-bump-formula@v3
+      with:
+        token: ${{secrets.BREW_TOKEN}}
+        tap: shopify/shopify
+        formula: shopify-cli
+        tag: ${{ steps.folder.outputs.name }}
+        message: "Version bump, created by github actions"
+
+    - name: Create Release # https://hub.github.com/hub-release.1.html
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        cd packaging/builds/${{ steps.folder.outputs.name }}
+        hub release create ${{ steps.tag.outputs.value }} \
+        -a ${{ steps.binaries.outputs.deb_file }} \
+        -a ${{ steps.binaries.outputs.rpm_file }} \
+        -m "Version ${{ steps.folder.outputs.name }}
+
+        Release of version ${{ steps.folder.outputs.name }} of the Shopify App CLI
+        Please refer to [CHANGELOG](https://github.com/Shopify/shopify-app-cli/blob/master/CHANGELOG.md) for details."

data/.rubocop.yml

@@ -1,9 +1,44 @@
 inherit_from: .rubocop_todo.yml
 
+require: rubocop-minitest
+
 inherit_gem:
   rubocop-shopify:
     - rubocop-cli.yml
 
+Minitest:
+  Enabled: true
+  Include:
+    - '**/test/**/*'
+    - '**/*_test.rb'
+
+Minitest/AssertInDelta: # (new in 0.10)
+  Enabled: true
+Minitest/AssertionInLifecycleHook: # (new in 0.10)
+  Enabled: true
+Minitest/AssertKindOf: # (new in 0.10)
+  Enabled: true
+Minitest/AssertOutput: # (new in 0.10)
+  Enabled: true
+Minitest/AssertPathExists: # (new in 0.10)
+  Enabled: false # only available from minitest 5.13.0
+Minitest/AssertSilent: # (new in 0.10)
+  Enabled: true
+Minitest/LiteralAsActualArgument: # (new in 0.10)
+  Enabled: true
+Minitest/MultipleAssertions: # (new in 0.10)
+  Enabled: true
+Minitest/RefuteInDelta: # (new in 0.10)
+  Enabled: true
+Minitest/RefuteKindOf: # (new in 0.10)
+  Enabled: true
+Minitest/RefutePathExists: # (new in 0.10)
+  Enabled: false # only available from minitest 5.13.0
+Minitest/TestMethodName: # (new in 0.10)
+  Enabled: true
+Minitest/UnspecifiedException: # (new in 0.10)
+  Enabled: true
+
 AllCops:
   Exclude:
     - 'vendor/**/*'

data/.rubocop_todo.yml

@@ -1,12 +1,16 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-10-17 00:53:36 UTC using RuboCop version 0.93.1.
+# on 2020-10-24 22:13:10 UTC using RuboCop version 0.93.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 66
+# Offense count: 29
+Minitest/MultipleAssertions:
+  Max: 9
+
+# Offense count: 74
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoreMacros, IgnoredMethods, IgnoredPatterns, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, EnforcedStyle.
 # SupportedStyles: require_parentheses, omit_parentheses

data/.travis.yml

@@ -11,3 +11,4 @@ install:
 - bundle install
 script:
   - bundle exec rake
+  - if [ -f "~/.config/shopify/config" ]; then echo "Found a config file in home directory. This means the tests would modify a developer's local config. Consider using FakeFS"; exit 1; fi

data/CHANGELOG.md

@@ -1,10 +1,14 @@
 Unreleased
 ------
 
+Version 1.4.1
+------
+* [#917](https://github.com/Shopify/shopify-app-cli/pull/917): Ensure analytics for create action includes the same fields as other commands
+
 Version 1.4.0
 ------
 * Updates to tests, dependencies and internal tooling
-* #924: Improve debugging messages on Partner API errors
+* [#924](https://github.com/Shopify/shopify-app-cli/pull/924): Improve debugging messages on Partner API errors
 
 Version 1.3.1
 ------

data/Gemfile

@@ -9,6 +9,7 @@ group :development, :test do
   gem 'pry-byebug'
   gem 'byebug'
   gem 'rubocop-shopify', require: false
+  gem 'rubocop-minitest', require: false
 end
 
 group :test do

data/Gemfile.lock

@@ -1,37 +1,34 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     ast (2.4.1)
-    builder (3.2.3)
-    byebug (8.2.5)
-    coderay (1.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    builder (3.2.4)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    crack (0.4.4)
     fakefs (1.2.2)
-    hashdiff (0.3.2)
-    metaclass (0.0.4)
-    method_source (0.9.2)
-    minitest (5.11.3)
-    minitest-reporters (1.3.5)
+    hashdiff (1.0.1)
+    method_source (1.0.0)
+    minitest (5.14.2)
+    minitest-reporters (1.4.2)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mocha (1.7.0)
-      metaclass (~> 0.0.1)
+    mocha (1.11.2)
     parallel (1.19.2)
     parser (2.7.2.0)
       ast (~> 2.4.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.3.0)
-      byebug (~> 8.0)
-      pry (~> 0.10)
-    public_suffix (3.0.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.1)
     regexp_parser (1.8.2)
@@ -45,18 +42,19 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
+    rubocop-ast (1.1.0)
       parser (>= 2.7.1.5)
+    rubocop-minitest (0.10.1)
+      rubocop (>= 0.87)
     rubocop-shopify (1.0.6)
       rubocop (>= 0.92, < 0.94)
     ruby-progressbar (1.10.1)
-    safe_yaml (1.0.4)
-    timecop (0.9.1)
+    timecop (0.9.2)
     unicode-display_width (1.7.0)
-    webmock (2.3.2)
+    webmock (3.9.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -69,6 +67,7 @@ DEPENDENCIES
   mocha
   pry-byebug
   rake
+  rubocop-minitest
   rubocop-shopify
   timecop
   webmock

data/RELEASING.md

@@ -43,21 +43,7 @@
    ```
    This will generate the `.deb`, `.rpm` and brew formula files, which will be located in `packaging/builds/X.Y.Z/`.
 
-1. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
-    * create a branch named `release_X_Y_Z_of_shopify-cli`
-    * update the brew formula in `shopify-cli.rb` with the generated formula in `packaging/builds/X.Y.Z/` in the `Shopify/shopify-app-cli` repo (from step 9)
-    * commit the change and create a PR on the [Shopify Homebrew repository](https://github.com/Shopify/homebrew-shopify)
-    * when PR is approved, merge into main branch
-
-1. Go to [releases](https://github.com/Shopify/shopify-app-cli/releases) page of `Shopify/shopify-app-cli` repo and create a new release:
-    * use the tag created in step 8 by Shipit (should be "vX.Y.Z")
-    * release title = "Version X.Y.Z"
-    * description should be 
-      ```
-      Release of version X.Y.Z of Shopify App CLI
-    
-      Please refer to [CHANGELOG](https://github.com/Shopify/shopify-app-cli/blob/master/CHANGELOG.md) for details.
-      ```
-    * upload the `.deb` and `.rpm` files from `packaging/builds/X.Y.Z/` (generated in step 9)
-    * if it's a pre-release version, select the "This is a pre-release" checkbox
-    * and click "Publish release".
+1. Check the "Actions" tab to see if the _Create Release_ workflow is successful. 
+   The workflow will automatically create a release with the latest tag and the `.deb`, `.rpm` assets attached.
+
+1. Check the `Shopify/homebrew-shopify` repository for new branch `bump-shopify-cli-{version}` and create PR.

data/lib/shopify-cli/core/monorail.rb

@@ -102,13 +102,14 @@ module ShopifyCli
               cli_version: ShopifyCli::VERSION,
               ruby_version: RUBY_VERSION,
             }.tap do |payload|
-              payload[:metadata] = JSON.dump(metadata) unless metadata.empty?
-
+              payload[:api_key] = metadata.delete(:api_key)
+              payload[:partner_id] = metadata.delete(:organization_id)
               if Project.has_current?
-                project = Project.current
+                project = Project.current(force_reload: true)
                 payload[:api_key] = project.env&.api_key
                 payload[:partner_id] = project.config['organization_id']
               end
+              payload[:metadata] = JSON.dump(metadata) unless metadata.empty?
             end,
           }
         end

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

@@ -17,12 +17,14 @@ module ShopifyCli
           redir: [OAuth::REDIRECT_HOST]
         )
 
-        user_errors = resp["data"]["appCreate"]["userErrors"]
+        user_errors = resp.dig("data", "appCreate", "userErrors")
         if !user_errors.nil? && user_errors.any?
           ctx.abort(user_errors.map { |err| "#{err['field']} #{err['message']}" }.join(", "))
         end
 
-        resp["data"]["appCreate"]["app"]
+        ShopifyCli::Core::Monorail.metadata[:api_key] = resp.dig("data", "appCreate", "app", "apiKey")
+
+        resp.dig("data", "appCreate", "app")
       end
     end
   end

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/probots.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"