Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a

## [Unreleased]

## [1.6.0] - 2025-10-16

### Added

- Add support for passing `"current"` as the version option to `Prism.*` APIs.

### Changed

- Remove a compiler warning for a missing unsigned cast for a shift value.

## [1.5.2] - 2025-10-09

### Changed
Expand Down Expand Up @@ -685,7 +695,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a

- 🎉 Initial release! 🎉

[unreleased]: https://github.com/ruby/prism/compare/v1.5.2...HEAD
[unreleased]: https://github.com/ruby/prism/compare/v1.6.0...HEAD
[1.6.0]: https://github.com/ruby/prism/compare/v1.5.2...v1.6.0
[1.5.2]: https://github.com/ruby/prism/compare/v1.5.1...v1.5.2
[1.5.1]: https://github.com/ruby/prism/compare/v1.5.0...v1.5.1
[1.5.0]: https://github.com/ruby/prism/compare/v1.4.0...v1.5.0
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
PATH
remote: .
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
specs:
ast (2.4.3)
benchmark-ips (2.14.0)
date (3.4.1)
erb (5.0.3)
erb (5.1.1)
ffi (1.17.2)
mini_portile2 (2.8.9)
nokogiri (1.18.10)
Expand Down
25 changes: 2 additions & 23 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ bundle install
```sh
for VERSION in "2.7" "3.0" "3.1" "3.2" "3.3" "3.4"; do docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/$VERSION/Gemfile" "ruby:$VERSION" bundle update; done
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/3.5/Gemfile" ruby:3.5.0-preview1 bundle update
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/jruby/Gemfile" jruby:latest bundle update
BUNDLE_GEMFILE=gemfiles/truffleruby/Gemfile chruby-exec truffleruby -- bundle update
```

Expand All @@ -73,26 +74,4 @@ git push
## Publishing

* Update the GitHub release page with a copy of the latest entry in the `CHANGELOG.md` file.
* Publish the gem to [rubygems.org](rubygems.org). Note that you must have access to the `prism` gem to do this.

```sh
bundle exec rake release
```

* Generate the `wasm` artifact (or download it from GitHub actions and put it in `javascript/src/prism.wasm`).

```sh
make wasm
```

* Publish the JavaScript package to [npmjs.com](npmjs.com). Note that you must have access to the `@ruby/prism` package to do this.

```sh
npm publish
```

* Publish the rust crate to [crates.io](crates.io). Note that you must have access to the `ruby-prism-sys` and `ruby-prism` crates to do this.

```sh
bundle exec rake cargo:publish:real
```
* Push a new tag to the GitHub repository, following the `vX.Y.Z` format.
2 changes: 1 addition & 1 deletion ext/prism/extension.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef PRISM_EXT_NODE_H
#define PRISM_EXT_NODE_H

#define EXPECTED_PRISM_VERSION "1.5.2"
#define EXPECTED_PRISM_VERSION "1.6.0"

#include <ruby.h>
#include <ruby/encoding.h>
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/2.7/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.0/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.1/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.2/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.3/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.4/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.5/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/jruby/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/truffleruby/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
prism (1.5.2)
prism (1.6.0)

GEM
remote: https://rubygems.org/
Expand Down
6 changes: 3 additions & 3 deletions include/prism/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
/**
* The minor version of the Prism library as an int.
*/
#define PRISM_VERSION_MINOR 5
#define PRISM_VERSION_MINOR 6

/**
* The patch version of the Prism library as an int.
*/
#define PRISM_VERSION_PATCH 2
#define PRISM_VERSION_PATCH 0

/**
* The version of the Prism library as a constant string.
*/
#define PRISM_VERSION "1.5.2"
#define PRISM_VERSION "1.6.0"

#endif
2 changes: 1 addition & 1 deletion javascript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ruby/prism",
"version": "1.5.2",
"version": "1.6.0",
"description": "Prism Ruby parser",
"type": "module",
"main": "src/index.js",
Expand Down
2 changes: 1 addition & 1 deletion prism.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |spec|
spec.name = "prism"
spec.version = "1.5.2"
spec.version = "1.6.0"
spec.authors = ["Shopify"]
spec.email = ["ruby@shopify.com"]

Expand Down
4 changes: 2 additions & 2 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/ruby-prism-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ruby-prism-sys"
version = "1.5.2"
version = "1.6.0"
edition = "2021"
license-file = "../../LICENSE.md"
repository = "https://github.com/ruby/prism"
Expand Down
2 changes: 1 addition & 1 deletion rust/ruby-prism-sys/tests/utils_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn version_test() {
CStr::from_ptr(version)
};

assert_eq!(&cstring.to_string_lossy(), "1.5.2");
assert_eq!(&cstring.to_string_lossy(), "1.6.0");
}

#[test]
Expand Down
4 changes: 2 additions & 2 deletions rust/ruby-prism/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ruby-prism"
version = "1.5.2"
version = "1.6.0"
edition = "2021"
license-file = "../../LICENSE.md"
repository = "https://github.com/ruby/prism"
Expand All @@ -26,7 +26,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_yaml = "0.9"

[dependencies]
ruby-prism-sys = { version = "1.5.2", path = "../ruby-prism-sys" }
ruby-prism-sys = { version = "1.6.0", path = "../ruby-prism-sys" }

[features]
default = ["vendored"]
Expand Down
4 changes: 2 additions & 2 deletions templates/java/org/prism/Loader.java.erb
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ public class Loader {
expect((byte) 'M', "incorrect prism header");

expect((byte) 1, "prism major version does not match");
expect((byte) 5, "prism minor version does not match");
expect((byte) 2, "prism patch version does not match");
expect((byte) 6, "prism minor version does not match");
expect((byte) 0, "prism patch version does not match");

expect((byte) 1, "Loader.java requires no location fields in the serialized output");

Expand Down
4 changes: 2 additions & 2 deletions templates/javascript/src/deserialize.js.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as nodes from "./nodes.js";

const MAJOR_VERSION = 1;
const MINOR_VERSION = 5;
const PATCH_VERSION = 2;
const MINOR_VERSION = 6;
const PATCH_VERSION = 0;

// The DataView getFloat64 function takes an optional second argument that
// specifies whether the number is little-endian or big-endian. It does not
Expand Down
4 changes: 2 additions & 2 deletions templates/lib/prism/serialize.rb.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ module Prism

# The minor version of prism that we are expecting to find in the serialized
# strings.
MINOR_VERSION = 5
MINOR_VERSION = 6

# The patch version of prism that we are expecting to find in the serialized
# strings.
PATCH_VERSION = 2
PATCH_VERSION = 0

# Deserialize the dumped output from a request to parse or parse_file.
#
Expand Down