Skip to content

Commit 1b91b71

Browse files
authored
Merge branch 'main' into master
2 parents 43b65af + b208836 commit 1b91b71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+563
-543
lines changed

.github/workflows/ci.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
pull_request:
9+
branches:
10+
- main
11+
12+
jobs:
13+
test:
14+
runs-on: ubuntu-18.04
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
ruby: [1.9, '2.0', 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, jruby-9.1, jruby-9.2]
19+
gemfile: [no-deps, json-latest, json-old, json-pure]
20+
exclude:
21+
- ruby: '3.0'
22+
gemfile: json-old
23+
- ruby: 3.1
24+
gemfile: json-old
25+
- ruby: 1.9
26+
gemfile: json-latest
27+
- ruby: 1.9
28+
gemfile: json-pure
29+
30+
steps:
31+
- name: Setup Ruby
32+
uses: ruby/setup-ruby@v1
33+
with:
34+
ruby-version: ${{ matrix.ruby }}
35+
36+
- uses: actions/checkout@v2
37+
38+
- name: Install gems
39+
run: |
40+
bundle install --gemfile=gemfiles/${{ matrix.gemfile }}.gemfile --without docs release benchmark
41+
42+
- name: Unit Tests
43+
run: BUNDLE_GEMFILE=gemfiles/${{ matrix.gemfile }}.gemfile bundle exec rake test:unit
44+
45+
- name: Compliance Tests
46+
run: BUNDLE_GEMFILE=gemfiles/${{ matrix.gemfile }}.gemfile bundle exec rake test:compliance

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "tasks/release"]
2+
path = tasks/release
3+
url = https://github.com/aws/aws-sdk-ruby-release-tools.git

.travis.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.yardopts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
--title 'jmespath.rb'
2-
--output-dir docs
32
--markup markdown
43
--markup-provider rdiscount
54
--hide-api private

CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
1-
Unreleased Changes
1+
1.6.1 (2022-03-07)
22
------------------
33

4+
* Issue - Use `JSON.parse` instead of `JSON.load`.
5+
6+
1.6.0 (2022-02-14)
7+
------------------
8+
9+
* Feature - Add support for string comparisons.
10+
11+
1.5.0 (2022-01-10)
12+
------------------
13+
14+
* Support implicitly convertible objects/duck-type values responding to `to_hash` and `to_ary`.
15+
16+
[See related GitHub pull request #51](https://github.com/jmespath/jmespath.rb/pull/51).
17+
418
1.4.0 (2018-04-04)
519
------------------
620

@@ -218,4 +232,3 @@ Unreleased Changes
218232
------------------
219233

220234
* Passing all of the JMESPath compliance tests.
221-

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# frozen_string_literal: true
12
source 'https://rubygems.org'
23

34
gem 'rake', require: false

Rakefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
# frozen_string_literal: true
12
$GEM_ROOT = File.dirname(__FILE__)
23

3-
$: << File.join($GEM_ROOT, 'lib')
4+
$LOAD_PATH << File.join($GEM_ROOT, 'lib')
45

56
$VERSION = ENV['VERSION'] || File.read(File.join($GEM_ROOT, 'VERSION'))
67
$GITHUB_ACCESS_TOKEN = ENV['JMESPATH_GITHUB_ACCESS_TOKEN']

SECURITY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## Reporting a Vulnerability
2+
3+
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security
4+
via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to [email protected].
5+
Please do **not** create a public GitHub issue.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.0
1+
1.6.1

bin/jmespath.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/usr/bin/env ruby
2+
# frozen_string_literal: true
23

3-
$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
4+
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
45

56
require 'jmespath'
67
require 'json'
78

89
expression = ARGV[0]
9-
json = JSON.load(STDIN.read)
10+
json = JSON.parse(STDIN.read)
1011

1112
$stdout.puts(JSON.dump(JMESPath.search(expression, json)))

0 commit comments

Comments
 (0)