parlour 8.0.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 582795fa8110d41a3772eefeb31873feccb06b60c5ee12e5c58681913a96ff51
-  data.tar.gz: 9035f9e26cb6b799f6c2982b4a0731fa5b4750bbea9e960158d0cf088b05fac8
+  metadata.gz: 8988bf8b6435625031d284916803461e688cc3b28a755da9918cd3d83189f260
+  data.tar.gz: ff851e34b9f7a85fdfb11db892a0d7ef692337157125ad0bab14856e7e67ced2
 SHA512:
-  metadata.gz: 3d3987aaad533c76f3d63cb9187f815e3d8fab5616db8458e5676558526cdea9dcd808a4adec629bf4bd848c3a5886a1f1fb802ececf9aca0b16f29280e3f577
-  data.tar.gz: e3f80d41de1d9aeb73810720c2690016a05347e15fab5d00535fe1bc192305620b5fca58f881ea77fa114f5d2f6c41527a7dfc38cf53a7421dce4d658b9e61ba
+  metadata.gz: 2e173ea6f2d50139c1fbd143d2eedafc1e7ed8eb9c757b4f1cc177033c08676b9feca6c3f5bbf04a37e3a41b51abb0d52414aeab5957f42649d21a41d471bcb3
+  data.tar.gz: a17dbc4f7731d531b3603e2f57cab06636ded32fbe187902e930c786ba263d2be4405ad3de92c7e286f6a06c17c1968230d3e2f0ec26d1d7ba24242623a6bbea

data/.github/workflows/ruby.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     strategy:
       matrix:
-        ruby: [2.4, 2.5, 2.6, 2.7, 3.0]
+        ruby: [3.0, 3.1, 3.2]
     continue-on-error: false
       
     runs-on: ubuntu-latest    

data/CHANGELOG.md

@@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [9.0.0] - 2024-06-04
+### Changed
+- Updated Commander dependency to 5.0, to remove `abbrev` deprecation warning. 
+  **As a result, the minimum supported Ruby version is now 3.0.**
+
+## [8.1.0] - 2023-01-01
+### Added
+- Parsed method definitions can now have a modifier before the `def` keyword.
+
+### Fixed
+- Use `File#exist?` instead of `File#exists?` in CLI, fixing an exception on
+  Ruby 3.2.0.
+- Resolved incorrect code generation for `T::Enum`s with only one variant.
+
 ## [8.0.0] - 2022-05-10
 ### Changed
 - The parser now loads untyped methods named `initialize` as returning `void`, rather than

data/exe/parlour

@@ -18,7 +18,7 @@ command :run do |c|
     working_dir = Dir.pwd
     config_filename = File.join(working_dir, '.parlour')
 
-    if File.exists?(config_filename)
+    if File.exist?(config_filename)
       configuration = keys_to_symbols(YAML.load_file(config_filename))
     else
       configuration = {}

data/lib/parlour/rbi_generator/attribute.rb

@@ -36,11 +36,11 @@ module Parlour
         @class_attribute = class_attribute
         case kind
         when :accessor, :reader
-          super(generator, name, [], type, &block)
+          super(generator, name, [], type, &T.cast(block, T.nilable(T.proc.params(x: Method).void)))
         when :writer
           super(generator, name, [
             Parameter.new(name, type: type)
-          ], type, &block)
+          ], type, &T.cast(block, T.nilable(T.proc.params(x: Method).void)))
         else
           raise 'unknown kind'
         end

data/lib/parlour/rbi_generator/class_namespace.rb

@@ -31,7 +31,7 @@ module Parlour
       # @param block A block which the new instance yields itself to.
       # @return [void]
       def initialize(generator, name, final, sealed, superclass, abstract, &block)
-        super(generator, name, final, sealed, &block)
+        super(generator, name, final, sealed, &T.cast(block, T.nilable(T.proc.params(x: Namespace).void)))
         @superclass = superclass
         @abstract = abstract
       end

data/lib/parlour/rbi_generator/enum_class_namespace.rb

@@ -30,7 +30,7 @@ module Parlour
       # @param block A block which the new instance yields itself to.
       # @return [void]
       def initialize(generator, name, final, sealed, enums, abstract, &block)
-        super(generator, name, final, sealed, 'T::Enum', abstract, &block)
+        super(generator, name, final, sealed, 'T::Enum', abstract, &T.cast(block, T.nilable(T.proc.params(x: Namespace).void)))
         @enums = enums
       end
 

data/lib/parlour/rbi_generator/module_namespace.rb

@@ -31,7 +31,7 @@ module Parlour
       # @param block A block which the new instance yields itself to.
       # @return [void]
       def initialize(generator, name, final, sealed, interface, abstract, &block)
-        super(generator, name, final, sealed, &block)
+        super(generator, name, final, sealed, &T.cast(block, T.nilable(T.proc.params(x: Namespace).void)))
         @name = name
         @interface = interface
         @abstract = abstract

data/lib/parlour/rbi_generator/struct_class_namespace.rb

@@ -31,7 +31,7 @@ module Parlour
       # @param block A block which the new instance yields itself to.
       # @return [void]
       def initialize(generator, name, final, sealed, props, abstract, &block)
-        super(generator, name, final, sealed, 'T::Struct', abstract, &block)
+        super(generator, name, final, sealed, 'T::Struct', abstract, &T.cast(block, T.nilable(T.proc.params(x: Namespace).void)))
         @props = props
       end
 

data/lib/parlour/rbs_generator/attribute.rb

@@ -29,11 +29,11 @@ module Parlour
         @kind = kind
         case kind
         when :accessor, :reader
-          super(generator, name, [MethodSignature.new([], type)], &block)
+          super(generator, name, [MethodSignature.new([], type)], &T.cast(block, T.nilable(T.proc.params(x: Method).void)))
         when :writer
           super(generator, name, [MethodSignature.new([
             Parameter.new(name, type: type)
-          ], type)], &block)
+          ], type)], &T.cast(block, T.nilable(T.proc.params(x: Method).void)))
         else
           raise 'unknown kind'
         end

data/lib/parlour/rbs_generator/class_namespace.rb

@@ -25,7 +25,7 @@ module Parlour
       # @param block A block which the new instance yields itself to.
       # @return [void]
       def initialize(generator, name, superclass, &block)
-        super(generator, name, &block)
+        super(generator, name, &T.cast(block, T.nilable(T.proc.params(x: Namespace).void)))
         @superclass = superclass
       end
 

data/lib/parlour/type_parser.rb

@@ -245,7 +245,16 @@ module Parlour
             (body.type == :begin ? body.to_a : [body]).find { |x| x.type == :block && x.to_a[0].type == :send && x.to_a[0].to_a[1] == :enums }
 
           # Find the constant assigments within this block
-          constant_nodes = enums_node.to_a[2].to_a
+          # (If there's only one constant assignment, then that `casgn` node
+          # will be a direct child, not wrapped in a body)
+          enum_inner = enums_node.to_a[2]
+          if enum_inner.nil?
+            constant_nodes = []
+          elsif enum_inner.type == :begin
+            constant_nodes = enum_inner.to_a
+          else
+            constant_nodes = [enum_inner]
+          end
 
           # Convert this to an array to enums as EnumClassNamespace expects
           enums = constant_nodes.map do |constant_node|
@@ -490,6 +499,10 @@ module Parlour
       # A :def node represents a definition like "def x; end"
       # A :defs node represents a definition like "def self.x; end"
       def_node = path.sibling(1).traverse(ast)
+      if def_node.type == :send && [:def, :defs].include?(def_node.children.last.type)
+        # bypass inline modifier (e.g. "private")
+        def_node = def_node.children.last
+      end
       case def_node.type
       when :def
         class_method = false

data/lib/parlour/version.rb

@@ -1,5 +1,5 @@
 # typed: strong
 module Parlour
   # The library version.
-  VERSION = '8.0.0'
+  VERSION = '9.0.0'
 end

data/parlour.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sorbet-runtime", ">= 0.5"
   spec.add_dependency "rainbow", "~> 3.0"
-  spec.add_dependency "commander", "~> 4.5"
+  spec.add_dependency "commander", "~> 5.0"
   spec.add_dependency "parser"
 
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parlour
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Aaron Christiansen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A type information generator, merger and parser for Sorbet and Ruby 3/Steep