raketeer 0.2.8 → 0.2.13

data/lib/raketeer/sem_ver.rb

@@ -1,47 +1,35 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketeer.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketeer is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Raketeer is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Raketeer.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
 module Raketeer
   ###
   # Semantic Version
-  # 
+  #
   # This is a non-strict version of Semantic Versioning v2.0.0.
-  # 
-  # @author Jonathan Bradley Whited (@esotericpig)
+  #
+  # @author Jonathan Bradley Whited
   # @since  0.2.4
   # @see    https://semver.org
   ###
   class SemVer
-    REGEX = /\d+(\.\d+)?(\.\d+)?(\-[0-9A-Za-z\-\.]+)?(\+[0-9A-Za-z\-\.]+)?/
-    STRICT_REGEX = /\d+\.\d+\.\d+(\-[0-9A-Za-z\-\.]+)?(\+[0-9A-Za-z\-\.]+)?/
-    
+    REGEX = /\d+(\.\d+)?(\.\d+)?(\-[0-9A-Za-z\-\.]+)?(\+[0-9A-Za-z\-\.]+)?/.freeze
+    STRICT_REGEX = /\d+\.\d+\.\d+(\-[0-9A-Za-z\-\.]+)?(\+[0-9A-Za-z\-\.]+)?/.freeze
+
     attr_accessor :build_meta
     attr_accessor :major
     attr_accessor :minor
     attr_accessor :patch
     attr_accessor :prerelease
     attr_accessor :version # If not +nil+, {to_s} will only return this.
-    
+
     def initialize(major: nil,minor: nil,patch: nil,prerelease: nil,build_meta: nil)
       @build_meta = build_meta
       @major = major
@@ -50,12 +38,12 @@ module Raketeer
       @prerelease = prerelease
       @version = nil
     end
-    
+
     def initialize_copy(orig)
       super(orig)
-      
-      copy = caller[0].to_s().include?('clone') ? :clone : :dup
-      
+
+      copy = caller[0].to_s.include?('clone') ? :clone : :dup
+
       @build_meta = @build_meta.__send__(copy)
       @major = @major.__send__(copy)
       @minor = @minor.__send__(copy)
@@ -63,72 +51,72 @@ module Raketeer
       @prerelease = @prerelease.__send__(copy)
       @version = @version.__send__(copy)
     end
-    
+
     def self.parse(str)
       # Parsing backwards makes the logic easier
       build_meta = str.split('+',2)
       prerelease = build_meta[0].split('-',2)
       numbers = prerelease[0].split('.',3)
-      
-      sem_ver = SemVer.new()
-      sem_ver.major = numbers[0].to_i() # There must always be a major version
-      
+
+      sem_ver = SemVer.new
+      sem_ver.major = numbers[0].to_i # There must always be a major version
+
       if numbers.length >= 2
-        minor = numbers[1].strip()
-        sem_ver.minor = minor.to_i() unless minor.empty?()
-        
+        minor = numbers[1].strip
+        sem_ver.minor = minor.to_i unless minor.empty?
+
         if numbers.length == 3
-          patch = numbers[2].strip()
-          sem_ver.patch = patch.to_i() unless patch.empty?()
+          patch = numbers[2].strip
+          sem_ver.patch = patch.to_i unless patch.empty?
         end
       end
-      
+
       if prerelease.length == 2
-        prerelease = prerelease[1].strip()
-        sem_ver.prerelease = prerelease unless prerelease.empty?()
+        prerelease = prerelease[1].strip
+        sem_ver.prerelease = prerelease unless prerelease.empty?
       end
-      
+
       if build_meta.length == 2
-        build_meta = build_meta[1].strip()
-        sem_ver.build_meta = build_meta unless build_meta.empty?()
+        build_meta = build_meta[1].strip
+        sem_ver.build_meta = build_meta unless build_meta.empty?
       end
-      
+
       return sem_ver
     end
-    
+
     def self.parse_line(line,strict: false)
       str = line[regex(strict)]
-      
-      return nil if str.nil?() || (str = str.strip()).empty?()
+
+      return nil if str.nil? || (str = str.strip).empty?
       return parse(str)
     end
-    
-    def empty?()
-      return @build_meta.nil?() &&
-             @major.nil?() &&
-             @minor.nil?() &&
-             @patch.nil?() &&
-             @prerelease.nil?() &&
-             @version.nil?()
+
+    def empty?
+      return @build_meta.nil? &&
+             @major.nil? &&
+             @minor.nil? &&
+             @patch.nil? &&
+             @prerelease.nil? &&
+             @version.nil?
     end
-    
+
     def self.regex(strict=false)
       return strict ? STRICT_REGEX : REGEX
     end
-    
-    def to_s()
-      s = ''.dup()
-      
-      if !@version.nil?()
-        s << @version.to_s()
-      elsif !@major.nil?()
-        s << @major.to_s()
-        s << ".#{@minor.to_s()}" unless @minor.nil?()
-        s << ".#{@patch.to_s()}" unless @patch.nil?()
-        s << "-#{@prerelease.to_s()}" unless @prerelease.nil?()
-        s << "+#{@build_meta.to_s()}" unless @build_meta.nil?()
+
+    def to_s
+      s = ''.dup
+
+      if !@version.nil?
+        s << @version.to_s
+      elsif !@major.nil?
+        s << @major.to_s
+        s << ".#{@minor}" unless @minor.nil?
+        s << ".#{@patch}" unless @patch.nil?
+        s << "-#{@prerelease}" unless @prerelease.nil?
+        s << "+#{@build_meta}" unless @build_meta.nil?
       end
-      
+
       return s
     end
   end

data/lib/raketeer/util.rb

@@ -1,98 +1,86 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketeer.
-# Copyright (c) 2019-2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketeer is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Raketeer is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Raketeer.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
 module Raketeer
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.2.2
   ###
   module Util
     # @since 0.2.4
-    TRUE_BOOLS = ['1','on','t','true','y','yes'].freeze()
-    
+    TRUE_BOOLS = %w[ 1 on t true y yes ].freeze
+
     # This is pretty hacky...
-    # 
+    #
     # @since 0.2.8
-    def self.find_github_username()
+    def self.find_github_username
       Dir.glob('*.gemspec') do |file|
         File.foreach(file) do |line|
           md = line.match(%r{(github\.com/)([^/]+)}i)
-          
-          next if md.nil?() || md.length < 3
-          
+
+          next if md.nil? || md.length < 3
+
           return md[2].gsub(/\s+/,'')
         end
       end
-      
+
       return nil
     end
-    
+
     def self.find_main_executable(bin_dir='bin')
       # Try the bin/ dir
       main_exe = Dir.glob(File.join(bin_dir,'*'))
-      
+
       return File.basename(main_exe[0]) if main_exe.length == 1
-      
+
       # Try using the main module
-      main_mod = find_main_module()
-      
-      if !main_mod.nil?()
+      main_mod = find_main_module
+
+      if !main_mod.nil?
         main_exe = File.join(bin_dir,main_mod)
-        
+
         return main_mod if File.exist?(main_exe)
       end
-      
+
       return nil
     end
-    
+
     def self.find_main_module(lib_dir='lib')
       # Try the lib/ dir
       main_file = Dir.glob(File.join(lib_dir,'*.rb'))
-      
+
       return File.basename(main_file[0],'.*') if main_file.length == 1
-      
+
       # Try the Gemspec
       main_file = Dir.glob('*.gemspec')
-      
+
       return File.basename(main_file[0],'.*') if main_file.length == 1
-      
+
       return nil
     end
-    
+
     # @since 0.2.7
     def self.get_env_bool(env_name,def_value=nil)
       value = ENV[env_name]
-      
-      if value.nil?() || (value = value.to_s().strip()).empty?()
+
+      if value.nil? || (value = value.to_s.strip).empty?
         return def_value
       end
-      
+
       return to_bool(value)
     end
-    
+
     # @since 0.2.4
     def self.to_bool(obj)
-      return TRUE_BOOLS.include?(obj.to_s().downcase())
+      return TRUE_BOOLS.include?(obj.to_s.downcase)
     end
   end
 end

data/lib/raketeer/version.rb

@@ -1,40 +1,26 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketeer.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketeer is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Raketeer is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Raketeer.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
 module Raketeer
-  VERSION = '0.2.8'
-  
+  VERSION = '0.2.13'
+
   # @since 0.2.4
   DEP_VERSIONS = {
-    'irb' => '~> 1.0'
-  }
-  
+    'irb' => '>= 1.0'
+  }.freeze
+
   # @since 0.2.4
   def self.try_require_dev(gem_name)
-    begin
-      require gem_name
-    rescue LoadError => e
-      raise e.exception("Add development dependency: '#{gem_name}','#{DEP_VERSIONS[gem_name]}'")
-    end
+    require gem_name
+  rescue LoadError => e
+    raise e.exception("Add development dependency: '#{gem_name}','#{DEP_VERSIONS[gem_name]}'")
   end
 end

data/raketeer.gemspec

@@ -1,74 +1,58 @@
 # encoding: UTF-8
 # frozen_string_literal: true
 
-#--
-# This file is part of Raketeer.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketeer is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# Raketeer is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public License
-# along with Raketeer.  If not, see <https://www.gnu.org/licenses/>.
-#++
-
 
 lib = File.expand_path(File.join('..','lib'),__FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'raketeer/version'
 
-Gem::Specification.new() do |spec|
+Gem::Specification.new do |spec|
   spec.name        = 'raketeer'
   spec.version     = Raketeer::VERSION
-  spec.authors     = ['Jonathan Bradley Whited (@esotericpig)']
-  spec.email       = ['bradley@esotericpig.com']
+  spec.authors     = ['Jonathan Bradley Whited']
+  spec.email       = ['code@esotericpig.com']
   spec.licenses    = ['LGPL-3.0-or-later']
   spec.homepage    = 'https://github.com/esotericpig/raketeer'
   spec.summary     = 'Extra Ruby Rake Tasks.'
-  spec.description = 'Extra Ruby Rake Tasks for IRB, Nokogiri, running, bumping the version, etc.'
-  
+  spec.description = <<-DESC
+Extra Ruby Rake Tasks for bumping the version, GitHub Packages, Nokogiri, IRB, running, etc.
+  DESC
+
   spec.metadata = {
     'bug_tracker_uri' => 'https://github.com/esotericpig/raketeer/issues',
     'changelog_uri'   => 'https://github.com/esotericpig/raketeer/blob/master/CHANGELOG.md',
     'homepage_uri'    => 'https://github.com/esotericpig/raketeer',
     'source_code_uri' => 'https://github.com/esotericpig/raketeer'
   }
-  
+
   spec.require_paths = ['lib']
-  
+
   spec.files = Dir.glob(File.join("{#{spec.require_paths.join(',')}}",'**','*.{erb,rb}')) +
                Dir.glob(File.join('{test,yard}','**','*.{erb,rb}')) +
-               %W( Gemfile #{spec.name}.gemspec Rakefile ) +
-               %w( CHANGELOG.md LICENSE.txt README.md )
-  
+               %W[ Gemfile #{spec.name}.gemspec Rakefile ] +
+               %w[ CHANGELOG.md LICENSE.txt README.md ]
+
   spec.required_ruby_version = '>= 2.1.10'
-  
+
   # TODO: also add the below comment to the README & reword for user
-  # 
+  #
   # If it is a dependency specific to a task, then it should probably be added
   # as a development dependency (not a runtime dependency) so that a bunch of
   # non-essential dependencies (to the user) are not added.
-  # 
+  #
   # For example, if the user only uses the Nokogiri tasks, then they don't need
   # the IRB dependency.
-  # 
+  #
   # Therefore, it is up to the user to add the dependencies they need.
   # If the user uses the IRB task, then they will have to add 'irb' as a
   # development dependency in their own project's Gemspec.
-  
+
   dv = Raketeer::DEP_VERSIONS
-  
-  spec.add_runtime_dependency 'rake' #,'~> 12.3'
-  
-  spec.add_development_dependency 'bundler','~> 1.17'
+
+  spec.add_runtime_dependency 'rake'
+
+  spec.add_development_dependency 'bundler','~> 2.2'
   spec.add_development_dependency 'irb'    ,dv['irb'] # For IRBTask
   spec.add_development_dependency 'yard'   ,'~> 0.9'  # For documentation
 end