gem_hadar 1.21.1 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b87e2b5371fa3f1260204c5d71a43d793516d5d734f7b3f0ef3846f696d8b98
-  data.tar.gz: 3ea0ff7dc2ea379f270716b8d46dda9fe7901ebaaadf1e76ee713324674fb262
+  metadata.gz: 2343ba88fe5c77cf509057f36a014fe040453644b486a3d7d5e91bb0c661a8f5
+  data.tar.gz: 6655f8071bbd12a5a626a0d6fe995b117f67e5fd5846ef60cf04db14856186d8
 SHA512:
-  metadata.gz: d0ca8414e965de5954624b7d2467317fe7dedff4578ea1f7ce8d6e7c9eb9c95693cc65907172dce03ed58678f0bdd0e2a961709e91154d3e3a92a95cfa530bca
-  data.tar.gz: 492ed0f4757edf87d56f4b10074a76eff4220dc43b7f78e696bf7f1abfa1ebc986439aefc7de1825c893c1a98f7bbd4dc8c981873d92ecb7ce1e49e339858bc4
+  metadata.gz: 0241d742376be00f99b47ac6432353cf090760e53cd1674a680da38dbf431edbf608dddb86660ceaa04ea4c0217d09d8690f8ea000d89942fee4a9601a869be7
+  data.tar.gz: 673bd469e9d5c40c16a469019de33df01476e986b0e732b4cfb5e7d83addd006374597c9263bce750822d4156170e51794cac432c9b202105ccc7a64f363229c

data/VERSION

@@ -1 +1 @@
-1.21.1
+1.22.0

data/gem_hadar.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: gem_hadar 1.21.1 ruby lib
+# stub: gem_hadar 1.22.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "gem_hadar".freeze
-  s.version = "1.21.1".freeze
+  s.version = "1.22.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".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
     }
 
@@ -52,11 +53,7 @@ class GemHadar::GitHub::ReleaseCreator
         rescue
           response.body
         end
-      error_msg = "Failed to create release. Status: #{response.code}\n\n#{error_data}"
-      raise error_msg
+      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.1'
+  VERSION         = '1.22.0'
   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"
@@ -673,12 +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?
-            response = rc.perform(tag_name:, target_commitish:, body:)
-            puts "Release created successfully! See #{response['html_url']}"
+            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
@@ -999,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.1
+  version: 1.22.0
 platform: ruby
 authors:
 - Florian Frank