Bump a whole bunch of stuff

Author: kddnewton

.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/auto-merge.yml

@@ -0,0 +1,22 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/main.yml

@@ -1,7 +1,8 @@
 name: Main
 on:
 - push
-- pull_request_target
+- pull_request
+
 jobs:
   ci:
     name: CI
@@ -19,18 +20,6 @@ jobs:
         ruby-version: '3.1'
 
     - name: Test
-      run: bundle exec rake test
-  automerge:
-    name: AutoMerge
-    needs: ci
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-    steps:
-    - uses: actions/github-script@v3
-      with:
-        script: |
-          github.pulls.merge({
-            owner: context.payload.repository.owner.login,
-            repo: context.payload.repository.name,
-            pull_number: context.payload.pull_request.number
-          })
+      run: |
+        bundle exec rake test
+        bundle exec rake stree:check

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.3.0] - 2022-08-09
+
+### Changed
+
+- Dropped `json` as a dependency, doing all parsing in-gem.
+
 ## [0.2.0] - 2022-05-13
 
 ### Changed

Gemfile.lock

@@ -1,16 +1,14 @@
 PATH
   remote: .
   specs:
-    syntax_tree-json (0.2.0)
-      json
+    syntax_tree-json (0.3.0)
       prettier_print
       syntax_tree (>= 2.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     docile (1.4.0)
-    json (2.6.2)
     minitest (5.16.2)
     prettier_print (0.1.0)
     rake (13.0.6)

Rakefile

@@ -2,11 +2,18 @@
 
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "syntax_tree/rake_tasks"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+SOURCE_FILES =
+  FileList[%w[Gemfile Rakefile syntax_tree-json.gemspec lib/**/*.rb test/*.rb]]
+
+SyntaxTree::Rake::CheckTask.new { |t| t.source_files = SOURCE_FILES }
+SyntaxTree::Rake::WriteTask.new { |t| t.source_files = SOURCE_FILES }
+
 task default: :test

lib/syntax_tree/json/parser.rb

@@ -46,23 +46,22 @@ def make_tokens
         buffer.gsub!(/\A\s+/, "")
 
         until buffer.empty?
-          tokens <<
-            case buffer
-            in /\A[\{\}\[\],:]/
-              Token.new(type: $&.to_sym)
-            in %r{\A-?(0|[1-9]\d*)(\.\d+)?([Ee][-+]?\d+)?}
-              Token.new(type: :number, value: $&)
-            in %r{\A"[^"\\\t\n\x00]*(?:\\[bfnrtu\\/"][^"\\]*)*"}
-              Token.new(type: :string, value: $&)
-            in /\Atrue/
-              Token.new(type: :true)
-            in /\Afalse/
-              Token.new(type: :false)
-            in /\Anull/
-              Token.new(type: :null)
-            else
-              raise ParseError, "unexpected token: #{buffer[0]}"
-            end
+          tokens << case buffer
+          in /\A[\{\}\[\],:]/
+            Token.new(type: $&.to_sym)
+          in /\A-?(0|[1-9]\d*)(\.\d+)?([Ee][-+]?\d+)?/
+            Token.new(type: :number, value: $&)
+          in %r{\A"[^"\\\t\n\x00]*(?:\\[bfnrtu\\/"][^"\\]*)*"}
+            Token.new(type: :string, value: $&)
+          in /\Atrue/
+            Token.new(type: :true)
+          in /\Afalse/
+            Token.new(type: :false)
+          in /\Anull/
+            Token.new(type: :null)
+          else
+            raise ParseError, "unexpected token: #{buffer[0]}"
+          end
 
           buffer = $'.gsub(/\A\s+/, "")
         end
@@ -72,11 +71,11 @@ def make_tokens
 
       def parse_array(tokens)
         values = []
-      
+
         loop do
           value, tokens = parse_item(tokens)
           values << value
-      
+
           case tokens
           in [Token[type: :"]"], *rest]
             return AST::Array.new(values: values), rest
@@ -87,15 +86,15 @@ def parse_array(tokens)
           end
         end
       end
-      
+
       def parse_object(tokens)
         values = {}
-      
+
         loop do
           if tokens in [{ type: :string, value: key }, { type: :":" }, *tokens]
             value, tokens = parse_item(tokens)
             values[key] = value
-        
+
             case tokens
             in [{ type: :"}" }, *rest]
               return AST::Object.new(values: values), rest

lib/syntax_tree/json/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module JSON
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

syntax_tree-json.gemspec

@@ -3,27 +3,26 @@
 require_relative "lib/syntax_tree/json/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "syntax_tree-json"
-  spec.version       = SyntaxTree::JSON::VERSION
-  spec.authors       = ["Kevin Newton"]
-  spec.email         = ["[email protected]"]
+  spec.name = "syntax_tree-json"
+  spec.version = SyntaxTree::JSON::VERSION
+  spec.authors = ["Kevin Newton"]
+  spec.email = ["[email protected]"]
 
-  spec.summary       = "Syntax Tree support for JSON"
-  spec.homepage      = "https://github.com/ruby-syntax-tree/syntax_tree-json"
-  spec.license       = "MIT"
-  spec.metadata      = { "rubygems_mfa_required" => "true" }
+  spec.summary = "Syntax Tree support for JSON"
+  spec.homepage = "https://github.com/ruby-syntax-tree/syntax_tree-json"
+  spec.license = "MIT"
+  spec.metadata = { "rubygems_mfa_required" => "true" }
 
-  spec.files         = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      f.match(%r{^(test|spec|features)/})
+  spec.files =
+    Dir.chdir(__dir__) do
+      `git ls-files -z`.split("\x0")
+        .reject { |f| f.match(%r{^(test|spec|features)/}) }
     end
-  end
 
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_dependency "json"
   spec.add_dependency "prettier_print"
   spec.add_dependency "syntax_tree", ">= 2.0.1"
 

test/json_test.rb

@@ -58,29 +58,29 @@ def test_literals
       assert_format("1\n")
     end
 
-    Dir["test/JSONTestSuite/test_parsing/y_*.json"].each do |filepath|
-      define_method(:"test_#{filepath}") do
-        parse(JSON.read(filepath))
-      end
+    pattern = "JSONTestSuite/test_parsing/y_*.json"
+    Dir[File.expand_path(pattern, __dir__)].each do |filepath|
+      define_method(:"test_#{filepath}") { parse(JSON.read(filepath)) }
     end
 
     KNOWN_N_FAILURES = %w[
-      test/JSONTestSuite/test_parsing/n_string_1_surrogate_then_escape_u.json
-      test/JSONTestSuite/test_parsing/n_string_1_surrogate_then_escape_u1.json
-      test/JSONTestSuite/test_parsing/n_string_1_surrogate_then_escape_u1x.json
-      test/JSONTestSuite/test_parsing/n_string_1_surrogate_then_escape.json
-      test/JSONTestSuite/test_parsing/n_string_incomplete_escaped_character.json
-      test/JSONTestSuite/test_parsing/n_string_incomplete_surrogate_escape_invalid.json
-      test/JSONTestSuite/test_parsing/n_string_incomplete_surrogate.json
-      test/JSONTestSuite/test_parsing/n_string_invalid_unicode_escape.json
-      test/JSONTestSuite/test_parsing/n_structure_100000_opening_arrays.json
-      test/JSONTestSuite/test_parsing/n_structure_open_array_object.json
-      test/JSONTestSuite/test_parsing/n_structure_whitespace_formfeed.json
+      n_string_1_surrogate_then_escape_u.json
+      n_string_1_surrogate_then_escape_u1.json
+      n_string_1_surrogate_then_escape_u1x.json
+      n_string_1_surrogate_then_escape.json
+      n_string_incomplete_escaped_character.json
+      n_string_incomplete_surrogate_escape_invalid.json
+      n_string_incomplete_surrogate.json
+      n_string_invalid_unicode_escape.json
+      n_structure_100000_opening_arrays.json
+      n_structure_open_array_object.json
+      n_structure_whitespace_formfeed.json
     ]
 
-    Dir["test/JSONTestSuite/test_parsing/n_*.json"].each do |filepath|
+    pattern = "JSONTestSuite/test_parsing/n_*.json"
+    Dir[File.expand_path(pattern, __dir__)].each do |filepath|
       define_method(:"test_#{filepath}") do
-        skip if KNOWN_N_FAILURES.include?(filepath)
+        skip if KNOWN_N_FAILURES.include?(File.basename(filepath))
 
         assert_raises(JSON::Parser::ParseError) do
           JSON.parse(JSON.read(filepath))