gem_hadar 1.21.0 → 1.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 410e007cfd4db6fe45a437edb7edb73c3cc501708e94fc8dfc81d950c423d011
-  data.tar.gz: c9861d9f19d895d0ded7b1d774906e0026fce892f68768ff7fa4658343212e5c
+  metadata.gz: 3a768e7d5674044f03e9bc6cdfc219b58a5bdbe6f80c197b801da5ee062089f4
+  data.tar.gz: c88d8239e6268e4ecb896d171d884cd6942253d9ec6b36cb64ece5196656dfb9
 SHA512:
-  metadata.gz: 1c187a124e2f34104d533e86f724a52d579f7b21fb2e4b5be64aa7205a3b3194b3d3aa74dde3beab66a85efc32bc617aafe911e41e8d31be456a11a15c9b4584
-  data.tar.gz: 8c9dba1c9a4778d6e76aa389fc95299bb84d7c5ca8a5b1dd932dec7ad4ef52c3bf16b52be18c1027af86ee75994efc6c743c58e7d996b0b136ad0e8e623c53dd
+  metadata.gz: 2c50c93ceebcc527a783bd797a81677f6ce547aabad29b37ff33e3f97b26b262a3f8c5691d4a0f33316e230010762e5dbe19118a87841a66d7054643bb0969c7
+  data.tar.gz: cedba171e91a7421452cd5a79e30b0b3ef8080314215f526a4784aa76e6512fdfe8733b9c7609fbe80ce46001d0517ef3b56a3fe2ada6f0b9636a9799b683580

data/VERSION

@@ -1 +1 @@
-1.21.0
+1.21.2

data/gem_hadar.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: gem_hadar 1.21.0 ruby lib
+# stub: gem_hadar 1.21.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "gem_hadar".freeze
-  s.version = "1.21.0".freeze
+  s.version = "1.21.2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.20".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.21".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.0".freeze])

data/lib/gem_hadar/github.rb

@@ -23,6 +23,7 @@ class GemHadar::GitHub::ReleaseCreator
     headers = {
       "Accept" => "application/vnd.github+json",
       "Authorization" => "Bearer #{@token}",
+      "Content-Type" => "application/json",
       "X-GitHub-Api-Version" => @api_version
     }
 
@@ -44,14 +45,15 @@ class GemHadar::GitHub::ReleaseCreator
 
     case response
     when Net::HTTPSuccess
-      puts "Release created successfully!"
-      response.body
+      JSON.parse(response.body, object_class: JSON::GenericObject)
     else
-      error_msg = "Failed to create release. Status: #{response.code}"
-      raise error_msg
+      error_data =
+        begin
+          JSON.pretty_generate(JSON.parse(response.body))
+        rescue
+          response.body
+        end
+      raise "Failed to create release. Status: #{response.code}\n\n#{error_data}"
     end
-  rescue => e
-    warn "Error creating release: #{e.message}"
-    nil
   end
 end

data/lib/gem_hadar/version.rb

@@ -1,6 +1,6 @@
 class GemHadar
   # GemHadar version
-  VERSION         = '1.21.0'
+  VERSION         = '1.21.2'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/gem_hadar.rb

@@ -152,11 +152,10 @@ class GemHadar
   dsl_accessor :path_module do path_name.camelize end
 
   dsl_accessor :version do
-    begin
-      File.read('VERSION').chomp
-    rescue Errno::ENOENT
-      has_to_be_set :version
-    end
+    v = ENV['VERSION'].full? and next v
+    File.read('VERSION').chomp
+  rescue Errno::ENOENT
+    has_to_be_set :version
   end
 
   dsl_accessor :version_epilogue
@@ -305,7 +304,7 @@ class GemHadar
           fail "Could not find #{from_version.inspect}."
         end
       end
-      `git log -p #{version_identifier(from_version)}..HEAD`
+      `git log -p #{version_tag(from_version)}..HEAD`
     else
       unless versions.find { |v| v == to_version }
         fail "Could not find #{to_version.inspect}."
@@ -324,7 +323,7 @@ class GemHadar
           fail "Could not find #{from_version.inspect}."
         end
       end
-      `git log -p #{version_identifier(from_version)}..#{version_identifier(to_version)}`
+      `git log -p #{version_tag(from_version)}..#{version_tag(to_version)}`
     end
   end
 
@@ -339,10 +338,11 @@ class GemHadar
 
       desc "Displaying the diff from env var VERSION to the next version or HEAD"
       task :diff do
-        arg_version = version_identifier(ENV.fetch('VERSION', version))
-        my_versions = versions.map { version_identifier(_1) } + %w[ HEAD ]
-        start_version, end_version = my_versions[my_versions.index(arg_version), 2]
-        puts color(172) {"Showing diff from version %s to %s:" % [ start_version, end_version ]}
+        version_tags = versions.map { version_tag(_1) } + %w[ HEAD ]
+        found_version_tag = version_tags.index(version_tag(version))
+        found_version_tag.nil? and fail "cannot find version tag #{version_tag(version)}"
+        start_version, end_version = version_tags[found_version_tag, 2]
+        puts color(172) { "Showing diff from version %s to %s:" % [ start_version, end_version ] }
         puts `git diff --color=always #{start_version}..#{end_version}`
       end
     end
@@ -487,7 +487,7 @@ class GemHadar
       task :tag do
         force = ENV['FORCE'].to_i == 1
         begin
-          sh "git tag -a -m 'Version #{version}' #{'-f' if force} #{version_identifier(version)}"
+          sh "git tag -a -m 'Version #{version}' #{'-f' if force} #{version_tag(version)}"
         rescue RuntimeError
           if `git diff v#{version}..HEAD`.empty?
             puts "Version #{version} is already tagged, but it's no different"
@@ -664,7 +664,7 @@ class GemHadar
       desc "Create a new GitHub release for the current version with a changelog"
       task :release do
         yes = ask?(
-          "Do you want to publish a release message on github? (y/n, %{default}) ",
+          "Do you want to publish a release message on github? (y/n%{default}) ",
           /\Ay/i, default: ENV['GITHUB_RELEASE_ENABLED']
         )
         unless yes
@@ -673,11 +673,16 @@ class GemHadar
         end
         if %r(\A/*(?<owner>[^/]+)/(?<repo>[^/.]+)) =~ github_remote_url&.path
           rc = GitHub::ReleaseCreator.new(owner:, repo:, token: github_api_token)
-          tag_name         = version_identifier(version)
+          tag_name         = version_tag(version)
           target_commitish = `git rev-parse #{tag_name.inspect}`.chomp
           body             = edit_temp_file(create_body)
           if body.present?
-            rc.perform(tag_name:, target_commitish:, body:)
+            begin
+              response = rc.perform(tag_name:, target_commitish:, body:)
+              puts "Release created successfully! See #{response.html_url}"
+            rescue => e
+              warn e.message
+            end
           else
             warn "Skipping creation of github release message."
           end
@@ -956,8 +961,12 @@ class GemHadar
   #
   # @return [ MatchData, nil ] the result of the pattern match or nil if no match
   def ask?(prompt, pattern, default: nil)
-    if prompt.include?('%{default}') && default.present?
-       prompt = prompt % { default: "default is #{default.inspect}" }
+    if prompt.include?('%{default}')
+      if default.present?
+        prompt = prompt % { default: ", default is #{default.inspect}" }
+      else
+        prompt = prompt % { default: '' }
+      end
     end
     STDOUT.print prompt
     answer = STDIN.gets.chomp
@@ -994,12 +1003,12 @@ class GemHadar
     }.sort_by(&:version)
   end
 
-  # The version_identifier method prepends a 'v' prefix to the given version
+  # The version_tag method prepends a 'v' prefix to the given version
   # string.
   #
   # @param version [String] the version string to modify
   # @return [String] the modified version string with a 'v' prefix
-  def version_identifier(version)
+  def version_tag(version)
     version.dup.prepend ?v
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem_hadar
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.21.2
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement