curdle 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03619ba9f0f656e0ecb014f9e363d30489dcdf5e0ba644ca6cfcd97d07ce117f'
-  data.tar.gz: f77085d060179a1d04ab0c1c7c7d33452d999dc076eba557a782ab16955ba339
+  metadata.gz: b27f36e9bd65cf14cfc619c5e7d92ac15b107a0900f3fc4275cffce065c04251
+  data.tar.gz: 953a301a0ddd9dee2d219824d7c6eaafb2635f6009c87b9997ffb3602d8341e7
 SHA512:
-  metadata.gz: 822585de86c1001268f0124c8b9fb88f8b6fc7b1fcbc73ed36196fef1bdc3fe7caa1cd1ce2c5d6bc4767d3e1f47a030c55bd9e153e593891b735ce08c101252a
-  data.tar.gz: e5f2be2f8e08e34a495965df1359f6fa25a5b9bd5c5c53866192fc6a65218bcc7a11fc1c9846cdce876c3b035f1ce6c3db6ec2485b2f6426aeca5b5186b80a19
+  metadata.gz: fffcaf7485ba575617da03bbf67d2decde7707527c24a894121dc34557891ba300d859cc3acfb1f7e22d1a78ee8d1e90ff7c88ab86ab2f3d1b60b7d5d33e966a
+  data.tar.gz: 43181b73fe13324e8f686c7ef9d970047f24096f5244059b13dbdfc4b7255922e3fca4325ecac70430dc5c80533bfde420e2389088c465721ba5a60a6be57207

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## 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

@@ -49,7 +49,9 @@ module Curdle
     def remove_sig(block_node)
       send_node, = *block_node
       receiver, name, *args = *send_node
-      return false unless receiver.nil? && name == :sig && args.empty?
+
+      return false unless receiver.nil? || receiver.location.expression.is?('T::Sig::WithoutRuntime')
+      return false unless name == :sig && args.empty?
 
       comment_out_node(block_node)
 
@@ -140,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

@@ -25,11 +25,17 @@ module Curdle
             end
 
             system("gem build --silent -C #{build_dir}")
-            artifact = Dir.glob(File.join(build_dir, "#{spec.name}*.gem")).first
+            artifact = Dir.glob(File.join(build_dir, "#{spec.name}-#{spec.version}.gem")).first
+
+            # some versions of Rubygems simply ignore the -C flag and build the gem in
+            # the current directory instead
+            unless artifact
+              artifact = Dir.glob("#{spec.name}-#{spec.version}.gem").first
+            end
 
             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.0.0'
+  VERSION = '1.2.1'
 end

data/spec/curdle_spec.rb

@@ -77,6 +77,26 @@ describe Curdle do
     END2
   end
 
+  it 'removes T::Sig::WithoutRuntime sigs' do
+    verify(<<~END1, <<~END2)
+      class Foo
+        T::Sig::WithoutRuntime.sig {
+          params(bar: String, baz: Integer).returns(String)
+        }
+        def foo(bar, baz)
+        end
+      end
+    END1
+      class Foo
+        # T::Sig::WithoutRuntime.sig {
+        #   params(bar: String, baz: Integer).returns(String)
+        # }
+        def foo(bar, baz)
+        end
+      end
+    END2
+  end
+
   it 'removes T.let assigned to an instance variable' do
     verify(<<~END1, <<~END2)
       class Foo
@@ -137,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.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -46,6 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - Rakefile