tapioca 0.11.3 → 0.11.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/tapioca/dsl/helpers/active_record_column_type_helper.rb +2 -2
  3. data/lib/tapioca/dsl.rb +1 -0
  4. data/lib/tapioca/helpers/gem_helper.rb +6 -1
  5. data/lib/tapioca/helpers/sorbet_helper.rb +3 -1
  6. data/lib/tapioca/version.rb +1 -1
  7. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '0409ff7f6d35e2767d201fc3b920d9c3febdd94017dd2f51dda7ddbade8cf322'
4
- data.tar.gz: 2a328485d2bd7b961531edd123e8f9b88172078d32f63dcf1bc7d8d120725640
3
+ metadata.gz: 97f174e338dbb90c09c1771832fa2ac9883a7bd0ed12a63db26d43d99f899c67
4
+ data.tar.gz: 4bd1517cba1b4e7883f828250a647ba1ec9eadf00a4065994a74418d100f1029
5
5
  SHA512:
6
- metadata.gz: f815bf33068255e641484a8e642c665a782416a08d5b0c4ca7e30690a0ae2034a34fb7a75a2ed159bddaf9271e103f62dadaf16642adc918a3be81b1853efdf2
7
- data.tar.gz: 88d826dc3de171edca2dd81d4157ba6c91d6c0177b2a354aa7ccd3b9b9bac35030213f03b1fc256abd91b35f671ce370dd579d3c9c829ef82a5b750b0d4fe28c
6
+ metadata.gz: e07bc3e08067de7327b0a05dff6fbe07ad9cf488cc57bc23111ee8a0834276b508ee90f0f0613224241eefe2d3f15abd0f9abb16387754e35fa89229dd7a25f1
7
+ data.tar.gz: edce4b934a9f58ae032c93f1585c50f7dd845045503d03333ba437b8fd1d4c5105d488bf032ae7005080de74005bed22ede14c21896267cd6e5437745bf00d90
data/lib/tapioca/dsl/helpers/active_record_column_type_helper.rb CHANGED
@@ -69,10 +69,10 @@ module Tapioca
69
69
  "::String"
70
70
  when ActiveRecord::Type::Serialized
71
71
  serialized_column_type(column_type)
72
- when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL) &&
72
+ when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore) &&
73
73
  ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore
74
74
  "T::Hash[::String, ::String]"
75
- when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL) &&
75
+ when defined?(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array) &&
76
76
  ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array
77
77
  "T::Array[#{type_for_activerecord_value(column_type.subtype)}]"
78
78
  else
data/lib/tapioca/dsl.rb CHANGED
@@ -2,6 +2,7 @@
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require "rbi"
5
+ require "spoom"
5
6
 
6
7
  require "tapioca"
7
8
  require "tapioca/runtime/reflection"
data/lib/tapioca/helpers/gem_helper.rb CHANGED
@@ -10,7 +10,7 @@ module Tapioca
10
10
  app_dir = to_realpath(app_dir)
11
11
  full_gem_path = to_realpath(full_gem_path)
12
12
 
13
- !gem_in_bundle_path?(full_gem_path) && path_in_dir?(full_gem_path, app_dir)
13
+ !gem_in_bundle_path?(full_gem_path) && !gem_in_ruby_path?(full_gem_path) && path_in_dir?(full_gem_path, app_dir)
14
14
  end
15
15
 
16
16
  sig { params(full_gem_path: String).returns(T::Boolean) }
@@ -18,6 +18,11 @@ module Tapioca
18
18
  path_in_dir?(full_gem_path, Bundler.bundle_path) || path_in_dir?(full_gem_path, Bundler.app_cache)
19
19
  end
20
20
 
21
+ sig { params(full_gem_path: String).returns(T::Boolean) }
22
+ def gem_in_ruby_path?(full_gem_path)
23
+ path_in_dir?(full_gem_path, RbConfig::CONFIG["rubylibprefix"])
24
+ end
25
+
21
26
  sig { params(path: T.any(String, Pathname)).returns(String) }
22
27
  def to_realpath(path)
23
28
  path_string = path.to_s
data/lib/tapioca/helpers/sorbet_helper.rb CHANGED
@@ -19,6 +19,8 @@ module Tapioca
19
19
 
20
20
  SORBET_PAYLOAD_URL = "https://github.com/sorbet/sorbet/tree/master/rbi"
21
21
 
22
+ SPOOM_CONTEXT = T.let(Spoom::Context.new("."), Spoom::Context)
23
+
22
24
  FEATURE_REQUIREMENTS = T.let(
23
25
  {
24
26
  # feature_name: ::Gem::Requirement.new(">= ___"), # https://github.com/sorbet/sorbet/pull/___
@@ -29,7 +31,7 @@ module Tapioca
29
31
 
30
32
  sig { params(sorbet_args: String).returns(Spoom::ExecResult) }
31
33
  def sorbet(*sorbet_args)
32
- Spoom::Sorbet.srb(sorbet_args.join(" "), sorbet_bin: sorbet_path, capture_err: true)
34
+ SPOOM_CONTEXT.srb(sorbet_args.join(" "), sorbet_bin: sorbet_path)
33
35
  end
34
36
 
35
37
  sig { returns(String) }
data/lib/tapioca/version.rb CHANGED
@@ -2,5 +2,5 @@
2
2
  # frozen_string_literal: true
3
3
 
4
4
  module Tapioca
5
- VERSION = "0.11.3"
5
+ VERSION = "0.11.4"
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tapioca
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.3
4
+ version: 0.11.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: exe
13
13
  cert_chain: []
14
- date: 2023-03-21 00:00:00.000000000 Z
14
+ date: 2023-03-31 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: bundler
@@ -95,20 +95,20 @@ dependencies:
95
95
  requirements:
96
96
  - - "~>"
97
97
  - !ruby/object:Gem::Version
98
- version: 1.1.0
98
+ version: 1.2.0
99
99
  - - ">="
100
100
  - !ruby/object:Gem::Version
101
- version: 1.1.11
101
+ version: 1.2.0
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
105
105
  requirements:
106
106
  - - "~>"
107
107
  - !ruby/object:Gem::Version
108
- version: 1.1.0
108
+ version: 1.2.0
109
109
  - - ">="
110
110
  - !ruby/object:Gem::Version
111
- version: 1.1.11
111
+ version: 1.2.0
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: thor
114
114
  requirement: !ruby/object:Gem::Requirement
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
281
281
  - !ruby/object:Gem::Version
282
282
  version: '0'
283
283
  requirements: []
284
- rubygems_version: 3.3.3
284
+ rubygems_version: 3.4.9
285
285
  signing_key:
286
286
  specification_version: 4
287
287
  summary: A Ruby Interface file generator for gems, core types and the Ruby standard