gem_hadar 2.20.1 → 2.22.0

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c0832906e2ba1374928e13c97602aad459c0782bf64ba3ad1f1db8d76278f035
4
- data.tar.gz: 518191418d27d67163e6f1bb0003db49b70862dd6ebb6adc8402d1874f481fef
3
+ metadata.gz: 0b31fc2a08c11070f3ed7fba48b5b8a0fd460ce44c24f8d340b38ddf5ea255b0
4
+ data.tar.gz: 741113b9853aeca1e0f982cecbbc2e3e891ffa99320c56cad5980dd888bb0afc
5
5
  SHA512:
6
- metadata.gz: f0cf46fc929fc1d88ced5e104e346f08816d18043f223111a80909faa327d416972fa4af1aa021777e1078f3c179838b4b3238559366c8fce14642d8b632475e
7
- data.tar.gz: dcc91442ee2ff98ef452b9ec119ec12d2ba1c6524c2b936748e5aebedd8d4e557863f60b1df7efc004606d5fccf9645df93eb7130c6c45b78da31041e175fce8
6
+ metadata.gz: 72128d2cd4dee622591a12369daaf72471504a5765f867fdb91953cfe40913895859a0b0dd9f0d6b7864849cccc165c2db458b62fe1a3d2c550e21455dc6286f
7
+ data.tar.gz: cad140d7c46230baf8bd6e8e3159c9835b185bb59ef9f92b389169ef39a6e73dd3b21fb291c557a171d12f562410a5f70238bcdf805c78ec8f5e8410bc6ba341
data/Gemfile CHANGED
@@ -1,5 +1,3 @@
1
- # vim: set filetype=ruby et sw=2 ts=2:
2
-
3
1
  source 'https://rubygems.org'
4
2
 
5
3
  gemspec
data/Rakefile CHANGED
@@ -24,7 +24,7 @@ GemHadar do
24
24
 
25
25
  dependency 'tins', '~> 1.56'
26
26
  dependency 'term-ansicolor', '~> 1.0'
27
- dependency 'ollama-ruby', '~> 1.17'
27
+ dependency 'ollama-ruby', '~> 1.26'
28
28
  dependency 'infobar', '~> 0.11'
29
29
  dependency 'mize'
30
30
  dependency 'rake'
data/gem_hadar.gemspec CHANGED
@@ -1,9 +1,9 @@
1
1
  # -*- encoding: utf-8 -*-
2
- # stub: gem_hadar 2.20.1 ruby lib
2
+ # stub: gem_hadar 2.22.0 ruby lib
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = "gem_hadar".freeze
6
- s.version = "2.20.1".freeze
6
+ s.version = "2.22.0".freeze
7
7
 
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
9
9
  s.require_paths = ["lib".freeze]
@@ -17,19 +17,19 @@ Gem::Specification.new do |s|
17
17
  s.homepage = "https://github.com/flori/gem_hadar".freeze
18
18
  s.licenses = ["MIT".freeze]
19
19
  s.rdoc_options = ["--title".freeze, "GemHadar - Library for the development of Ruby Gems".freeze, "--main".freeze, "README.md".freeze]
20
- s.rubygems_version = "4.0.22".freeze
20
+ s.rubygems_version = "4.0.24".freeze
21
21
  s.summary = "Library for the development of Ruby Gems".freeze
22
22
  s.test_files = ["spec/gem_hadar_spec.rb".freeze, "spec/spec_helper.rb".freeze]
23
23
 
24
24
  s.specification_version = 4
25
25
 
26
- s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.20.0".freeze])
26
+ s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.21.0".freeze])
27
27
  s.add_development_dependency(%q<all_images>.freeze, [">= 0".freeze])
28
28
  s.add_development_dependency(%q<rspec>.freeze, ["~> 3.13".freeze])
29
29
  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
30
30
  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.56".freeze])
31
31
  s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.0".freeze])
32
- s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.17".freeze])
32
+ s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.26".freeze])
33
33
  s.add_runtime_dependency(%q<infobar>.freeze, ["~> 0.11".freeze])
34
34
  s.add_runtime_dependency(%q<mize>.freeze, [">= 0".freeze])
35
35
  s.add_runtime_dependency(%q<rake>.freeze, [">= 0".freeze])
@@ -17,7 +17,7 @@ module GemHadar::OllamaSupport
17
17
  #
18
18
  # @return [ Ollama::Client ] a configured Ollama client instance ready for use
19
19
  def ollama
20
- base_url = ENV['OLLAMA_URL'] || "http://%s" % ENV.fetch('OLLAMA_HOST', 'localhost:11434')
20
+ base_url = Ollama.base_url(ENV['OLLAMA_URL'] || ENV.fetch('OLLAMA_HOST', 'localhost:11434'))
21
21
  client_config = {
22
22
  base_url: base_url,
23
23
  read_timeout: 600,
@@ -5,7 +5,7 @@
5
5
  # by hand; it is rewritten on every `rake version` invocation.
6
6
  class GemHadar
7
7
  # The current version of the GemHadar gem as a String.
8
- VERSION = '2.20.1'
8
+ VERSION = '2.22.0'
9
9
  VERSION_ARRAY = VERSION.split('.').map(&:to_i) # :nodoc:
10
10
  VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
11
11
  VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
data/lib/gem_hadar.rb CHANGED
@@ -1980,24 +1980,26 @@ class GemHadar
1980
1980
  memoize method: :version_tag_list, freeze: true
1981
1981
 
1982
1982
  # The write_gemfile method creates and writes the default Gemfile content if
1983
- # it doesn't exist. If a custom Gemfile exists, it only displays a warning.
1983
+ # it doesn't exist. If a Gemfile exists with the obsolete vim modeline that
1984
+ # GemHadar previously generated, it strips those two lines automatically.
1985
+ # If a custom Gemfile exists that differs from the default, it displays a
1986
+ # warning.
1984
1987
  def write_gemfile
1985
1988
  default_gemfile =<<~EOT
1986
- # vim: set filetype=ruby et sw=2 ts=2:
1987
-
1988
1989
  source 'https://rubygems.org'
1989
1990
 
1990
1991
  gemspec
1991
1992
  EOT
1992
- current_gemfile = File.exist?('Gemfile') && File.read('Gemfile')
1993
- case current_gemfile
1994
- when false
1995
- secure_write('Gemfile') do |output|
1996
- output.write default_gemfile
1997
- end
1998
- when default_gemfile
1999
- ;;
2000
- else
1993
+ modeline = "# vim: set filetype=ruby et sw=2 ts=2:\n\n"
1994
+ unless File.exist?('Gemfile')
1995
+ secure_write('Gemfile') { |f| f.write default_gemfile }
1996
+ return
1997
+ end
1998
+ current = File.read('Gemfile')
1999
+ if current.start_with?(modeline)
2000
+ secure_write('Gemfile') { |f| f.write current.sub(modeline, '', 1) }
2001
+ puts "Removed obsolete vim modeline from Gemfile."
2002
+ elsif current != default_gemfile
2001
2003
  warn "INFO: Current Gemfile differs from default Gemfile."
2002
2004
  end
2003
2005
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gem_hadar
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.20.1
4
+ version: 2.22.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
15
15
  requirements:
16
16
  - - ">="
17
17
  - !ruby/object:Gem::Version
18
- version: 2.20.0
18
+ version: 2.21.0
19
19
  type: :development
20
20
  prerelease: false
21
21
  version_requirements: !ruby/object:Gem::Requirement
22
22
  requirements:
23
23
  - - ">="
24
24
  - !ruby/object:Gem::Version
25
- version: 2.20.0
25
+ version: 2.21.0
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: all_images
28
28
  requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
99
99
  requirements:
100
100
  - - "~>"
101
101
  - !ruby/object:Gem::Version
102
- version: '1.17'
102
+ version: '1.26'
103
103
  type: :runtime
104
104
  prerelease: false
105
105
  version_requirements: !ruby/object:Gem::Requirement
106
106
  requirements:
107
107
  - - "~>"
108
108
  - !ruby/object:Gem::Version
109
- version: '1.17'
109
+ version: '1.26'
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: infobar
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
319
319
  - !ruby/object:Gem::Version
320
320
  version: '0'
321
321
  requirements: []
322
- rubygems_version: 4.0.22
322
+ rubygems_version: 4.0.24
323
323
  specification_version: 4
324
324
  summary: Library for the development of Ruby Gems
325
325
  test_files: