curdle 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f51e6195b3478041471186b67ca85a68682bfa2ed6f7b490a5800b13f524487
-  data.tar.gz: 9c55ab910394076e0794af90f8b9747ae975a9d9b3a8470a251baea994e4f90c
+  metadata.gz: 195a0930e5cbce6e206f577e35c286cbc9b1c57d84e18594412792db71b753b9
+  data.tar.gz: 866f827ef6d8a0822f9ebd55e7d456a86667bf91472e9eb4ae482c9e4743211d
 SHA512:
-  metadata.gz: d433bffd0e919e9cba5886e93f2be4b0f2d4f1829048454bb69b9332ad5db9510513df280760c1bd0c9c27203aee51ceb36331a787f44ec25230effc2797a443
-  data.tar.gz: debba06457a021859c2ab14b5205a020fbc5b9867196fe561f99ced9a2b111849701e6258b31b828219b104a7a0e1e7a9f03556c46a0d67196c7297fe9b9a241
+  metadata.gz: ecc51aed0dce73751efa2b4ec194c3e11a78f228c4bdb1e268caf6ed32f78d7a753df4f3c730e33dfbb3e969c56b0e5d111a5a3e516b1c66d80033f7ab89ee8f
+  data.tar.gz: e16de4232d759cd98108c29abfaf607abb4bf7409369dd9c84890ac367c8f36064133edb358bf0b9944b404efaa78baa01164a9305c8257abbdf0945c9d37626

data/CHANGELOG.md

@@ -1,5 +1,15 @@
-## 1.0.0
-* Birthday!
+## 1.2.2
+* More fixes for the aforementioned bug in `gem build`.
+  - We need to use `Dir.chdir` instead of relying on `-C` at all.
+
+## 1.2.1
+* Fix bug caused by older versions of `gem build` ignoring the `-C` flag.
+
+## 1.2.0
+* Add support for block-based `type_member` calls.
 
 ## 1.1.0
 * Add support for removing `T::Sig::WithoutRuntime.sig` calls.
+
+## 1.0.0
+* Birthday!

data/lib/curdle/remove_sorbet.rb

@@ -142,12 +142,22 @@ module Curdle
 
     def remove_type_member(casgn_node)
       _, _const_name, value_node = *casgn_node
-      return false unless value_node.type == :send
 
-      receiver, name = *value_node
-      return false unless receiver.nil? && name == :type_member
+      case value_node.type
+        when :send
+          receiver, name = *value_node
+          return false unless receiver.nil? && name == :type_member
 
-      comment_out_node(casgn_node)
+          comment_out_node(casgn_node)
+        when :block
+          send_node, = *value_node
+          receiver, name, _ = *send_node
+          return false unless receiver.nil? && name == :type_member
+
+          comment_out_node(casgn_node)
+        else
+          return false
+      end
 
       true
     end

data/lib/curdle/tasks.rb

@@ -24,12 +24,15 @@ module Curdle
               end
             end
 
-            system("gem build --silent -C #{build_dir}")
-            artifact = Dir.glob(File.join(build_dir, "#{spec.name}*.gem")).first
+            Dir.chdir(build_dir) do
+              system("gem build --silent")
+            end
+
+            artifact = File.join(build_dir, "#{spec.name}-#{spec.version}.gem")
 
             FileUtils.mkdir_p('pkg')
             artifact_dest = File.join('pkg', File.basename(artifact))
-            FileUtils.cp(artifact, artifact_dest)
+            FileUtils.mv(artifact, artifact_dest)
 
             puts "#{spec.name} #{spec.version} built to #{artifact_dest}."
           end

data/lib/curdle/version.rb

@@ -1,3 +1,3 @@
 module Curdle
-  VERSION = '1.1.0'
+  VERSION = '1.2.2'
 end

data/spec/curdle_spec.rb

@@ -157,6 +157,22 @@ describe Curdle do
     END2
   end
 
+  it 'removes block-based type_members' do
+    verify(<<~END1, <<~END2)
+      class Foo
+        extend T::Generic
+
+        Elem = type_member { { fixed: Bar } }
+      end
+    END1
+      class Foo
+        # extend T::Generic
+
+        # Elem = type_member { { fixed: Bar } }
+      end
+    END2
+  end
+
   it 'removes type_aliases' do
     verify(<<~END1, <<~END2)
       class Foo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curdle
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser