theme-check 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adc4aaf3260408a9b52d9afaa59662308f173a5d5dcd0f3663cbcc68da1d7f39
-  data.tar.gz: 50cd7e0d42fda99ad3816a846c25868c38b92ea521e0be759c515548dd82f70b
+  metadata.gz: 28cb25e47867151bea85360a9f07667f46ea30ad90285f16cc74e85370ad39d9
+  data.tar.gz: 2023811dad002a72f00e2c26562ff3e6b5f2f49c748d44968fd94d1f9e72300f
 SHA512:
-  metadata.gz: 7ffad3310e441edd678143de233584a09167ffff1e09b96109cef417d360d797821dc9ef3491af4564608cd3b35aa59be41ebea6bb76030e1544d53bc9db8d02
-  data.tar.gz: 30b6d8f3b58b95c833a78bc30ceea6cfcfa35d563e3d184b6aee51817965be87b352c2dbad5ff67a74f2a64479fe1945c11db738c1bfb6e64f610ae15b862cb3
+  metadata.gz: f3a5339873aea7a325cbc3f3715e9166b1f7734226e3d9ac7b400f048629a514f3eec5d559c77eaf70febacda35416b8332d8d1a6ebefa1d9a34f29474a4e41d
+  data.tar.gz: 19eec11d1eb86188fe170bce61f884072340d848e800b2bb2b344cddf3561d60594e4f066199b7f9157b54da81ce8afebc5e6db0f3dbfbc5fac208c95d2b5ed8

data/.github/workflows/theme-check.yml

@@ -1,10 +1,6 @@
 name: ThemeCheck
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push]
 
 jobs:
   test:
@@ -36,4 +32,4 @@ jobs:
       run: bundle exec rake
     - name: Test runtime
       # Testing that runtime can execute, not testing the results themselves
-      run: bundle exec theme-check ./test/theme | grep -q "files inspected"
+      run: bundle exec theme-check ./test/theme | grep -q "files inspected"

data/CHANGELOG.md

@@ -1,4 +1,12 @@
 
+v1.2.0 / 2021-07-15
+==================
+
+  * Add Windows Support ([#364](https://github.com/shopify/theme-check/issues/364))
+  * Ignore empty `{{}}` in SpaceInsideBraces ([#350](https://github.com/shopify/theme-check/issues/350))
+  * Switch to main branch
+  * Minor documentation fixes
+
 v1.1.0 / 2021-07-06
 ==================
 

data/RELEASING.md

@@ -13,7 +13,14 @@
 
 4. Commit your changes and make a PR.
 
-5. Merge your PR to master.
+   ```bash
+   git checkout -b "bump/theme-check-$VERSION"
+   git add docs/checks CHANGELOG.md lib/theme_check/version.rb
+   git commit -m "Bump theme-check version to $VERSION"
+   hub compare "main:bump/theme-check-$VERSION"
+   ```
+
+5. Merge your PR to main.
 
 6. On [Shipit](https://shipit.shopify.io/shopify/theme-check/rubygems), deploy your commit.
 
@@ -46,5 +53,30 @@
 
    ```bash
    # shortcut if you have `hub` installed
-   hub compare "master:bump/theme-check-$VERSION"
+   hub compare "main:bump/theme-check-$VERSION"
+   ```
+
+## Shopify CLI Release Process
+
+1. Release `theme-check` on RubyGems by following the steps in the previous section.
+
+2. Update the `theme-check` version in [`shopify-cli`](https://github.com/shopify/shopify-cli)'s `Gemfile.lock` and `shopify-cli.gemspec` files.
+
+   Such as in [this PR.](https://github.com/Shopify/shopify-cli/pull/1357/files)
+
+3. Create a branch + a commit on the [`shopify-cli`](https://github.com/Shopify/shopify-cli) repository.
+
+   ```bash
+   VERSION=X.X.X
+   git checkout -b "bump/theme-check-$VERSION"
+   git add Gemfile.lock
+   git add shopify-cli.gemspec
+   git commit -m "Bump theme-check version to $VERSION"
+   ```
+
+4. Create a pull-request for those changes on the [`shopify-cli`](https://github.com/Shopify/shopify-cli) repository.
+
+   ```bash
+   # shortcut if you have `hub` installed
+   hub compare "main:bump/theme-check-$VERSION"
    ```

data/exe/theme-check-language-server.bat

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+ruby "%~dp0\theme-check-language-server" %*

data/exe/theme-check.bat

@@ -0,0 +1,3 @@
+@ECHO OFF
+
+ruby "%~dp0\theme-check" %*

data/lib/theme_check/check.rb

@@ -69,7 +69,7 @@ module ThemeCheck
       end
 
       def docs_url(path)
-        "https://github.com/Shopify/theme-check/blob/master/docs/checks/#{File.basename(path, '.rb')}.md"
+        "https://github.com/Shopify/theme-check/blob/main/docs/checks/#{File.basename(path, '.rb')}.md"
       end
 
       def can_disable(disableable = nil)

data/lib/theme_check/checks/space_inside_braces.rb

@@ -51,7 +51,7 @@ module ThemeCheck
     end
 
     def on_variable(node)
-      return if @ignore
+      return if @ignore || node.markup.empty?
       if node.markup[0] != " "
         add_offense("Space missing after '{{'", node: node) do |corrector|
           corrector.insert_before(node, " ")

data/lib/theme_check/language_server/handler.rb

@@ -99,7 +99,7 @@ module ThemeCheck
       end
 
       def path_from_uri(uri)
-        uri&.sub('file://', '')
+        uri&.sub('file://', '')&.sub('/c%3A', '')
       end
 
       def relative_path_from_text_document_uri(params)

data/lib/theme_check/language_server/server.rb

@@ -52,8 +52,19 @@ module ThemeCheck
         response_body = JSON.dump(response)
         log(JSON.pretty_generate(response)) if $DEBUG
 
-        @out.write("Content-Length: #{response_body.bytesize}\r\n")
-        @out.write("\r\n")
+        # Because programming is fun,
+        #
+        # Ruby on Windows turns \n into \r\n. Which means that \r\n
+        # gets turned into \r\r\n. Which means that the protocol
+        # breaks on windows unless we turn STDOUT into binary mode and
+        # set the encoding manually (yuk!) or we do this little hack
+        # here and put \n which gets transformed into \r\n on windows
+        # only...
+        #
+        # Hours wasted: 8.
+        eol = Gem.win_platform? ? "\n" : "\r\n"
+        @out.write("Content-Length: #{response_body.bytesize}#{eol}")
+        @out.write(eol)
         @out.write(response_body)
         @out.flush
       end

data/lib/theme_check/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ThemeCheck
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-check
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Marc-André Cournoyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -44,6 +44,8 @@ email:
 executables:
 - theme-check
 - theme-check-language-server
+- theme-check-language-server.bat
+- theme-check.bat
 extensions: []
 extra_rdoc_files: []
 files:
@@ -117,6 +119,8 @@ files:
 - docs/preview.png
 - exe/theme-check
 - exe/theme-check-language-server
+- exe/theme-check-language-server.bat
+- exe/theme-check.bat
 - lib/theme_check.rb
 - lib/theme_check/analyzer.rb
 - lib/theme_check/asset_file.rb