raketary 0.2.1 → 0.2.2

data/lib/raketary/cmd.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketary.
-# Copyright (c) 2019-2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketary 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.
-# 
-# Raketary 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 Raketary.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -27,7 +15,7 @@ require 'raketary/errors'
 
 module Raketary
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   class Cmd
@@ -35,70 +23,70 @@ module Raketary
     attr_reader :leftover_args
     attr_reader :name
     attr_reader :sub_cmds
-    
+
     def initialize(app,name)
       @app = app
       @leftover_args = []
       @name = name
       @sub_cmds = {}
     end
-    
+
     def parse!(is_app=false)
-      parser = OptionParser.new() do |op|
+      parser = OptionParser.new do |op|
         op.program_name = app.name
         op.version = app.version
-        
+
         op.banner = ''
         op.separator '' if is_app
-        
-        if !@sub_cmds.empty?()
+
+        if !@sub_cmds.empty?
           op.separator is_app ? 'Commands:' : "[#{@name}] Commands:"
-          
+
           @sub_cmds.each do |name,sub_cmd|
-            name_desc = ''.dup()
+            name_desc = ''.dup
             name_desc << op.summary_indent
             name_desc << ("%-#{op.summary_width}s #{sub_cmd.desc}" % [name])
-            
+
             op.separator name_desc
           end
           op.separator ''
         end
-        
+
         op.separator is_app ? 'Options:' : "[#{@name}] Options:"
-        
+
         op.on_tail('-h','--help','show this help')
-        
+
         yield op
       end
-      
+
       options = {}
-      @leftover_args = parser.order!(app.args,into: options).dup()
-      
-      options.keys.each do |key|
-        if (key_s = key.to_s()).include?('-')
-          options[key_s.gsub('-','_').to_sym()] = options[key]
+      @leftover_args = parser.order!(app.args,into: options).dup
+
+      options.each_key do |key|
+        if (key_s = key.to_s).include?('-')
+          options[key_s.gsub('-','_').to_sym] = options[key]
           options.delete(key)
         end
       end
       app.options.merge!(options)
-      
+
       app.parsers << parser
-      
-      if !app.args.nil?() && !(sub_cmd_name = app.args.shift()).nil?()
-        if !(sub_cmd = @sub_cmds[sub_cmd_name]).nil?()
+
+      if !app.args.nil? && !(sub_cmd_name = app.args.shift).nil?
+        if !(sub_cmd = @sub_cmds[sub_cmd_name]).nil?
           begin
-            sub_cmd.cmd_class.new(app,sub_cmd_name).run()
+            sub_cmd.cmd_class.new(app,sub_cmd_name).run
           rescue DoNotRunCmdError => e
             app.soft_error = e.soft_msg
           end
         end
       end
-      
+
       return parser
     end
-    
-    def run()
-      raise DoNotRunCmdError if app.options[:help] || app.ran_cmd?()
+
+    def run
+      raise DoNotRunCmdError if app.options[:help] || app.ran_cmd?
     end
   end
 end

data/lib/raketary/errors.rb

@@ -1,37 +1,25 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketary.
-# Copyright (c) 2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketary 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.
-# 
-# Raketary 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 Raketary.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
 module Raketary
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   class DoNotRunCmdError < StandardError
     attr_accessor :soft_msg
-    
+
     def initialize(msg=nil)
       super(msg)
-      
+
       @soft_msg = msg
     end
   end

data/lib/raketary/ghp_sync_cmd.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketary.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketary 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.
-# 
-# Raketary 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 Raketary.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -29,68 +17,68 @@ require 'yard_ghurt/ghp_sync_task'
 
 module Raketary
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.2.0
   ###
   class GHPSyncCmd < Cmd
     def initialize(*)
       super
-      
+
       # Kind of hacky, but necessary because sync_args can have a hyphen/dash.
-      app.args.each_with_index() do |arg,i|
-        arg = arg.strip()
-        
-        if arg == '-s' || arg.downcase() == '--sync-args'
+      app.args.each_with_index do |arg,i|
+        arg = arg.strip
+
+        if arg == '-s' || arg.downcase == '--sync-args'
           sync_args = app.args[i + 1] # If out of bounds, nil
-          
-          if !sync_args.nil?()
+
+          if !sync_args.nil?
             sync_args = Shellwords.split(sync_args)
-            sync_args = nil if sync_args.nil?() || sync_args.empty?()
-            
+            sync_args = nil if sync_args.nil? || sync_args.empty?
+
             app.options[:sync_args] = sync_args
           end
-          
+
           app.args.delete_at(i)
           app.args.delete_at(i) # If out of bounds, no error
-          
+
           break
         end
       end
-      
-      parse!() do |op|
+
+      parse! do |op|
         op.on('-g','--ghp-dir STR','the destination (GitHub Pages) directory to sync "doc/" to')
-        
+
         op.separator op.summary_indent
-        
+
         op.on('-d','--deploy',"actually deploy (don't just do a dry-run)")
         op.on('-s','--sync-args STR','additional args to pass to the sync command') do |sync_args|
           app.options[:sync_args] # Already processed above
         end
-        
+
         op.separator op.summary_indent
       end
     end
-    
-    def run()
+
+    def run
       super()
-      
+
       ghp_dir = app.options[:ghp_dir]
-      
+
       return unless ghp_dir
-      
+
       deploy = app.options[:deploy]
       sync_args = app.options[:sync_args]
-      
-      sync_task = YardGhurt::GHPSyncTask.new() do |task|
+
+      sync_task = YardGhurt::GHPSyncTask.new do |task|
         task.ghp_dir = ghp_dir
-        task.sync_args.push(*sync_args) unless sync_args.nil?()
+        task.sync_args.push(*sync_args) unless sync_args.nil?
       end
-      
+
       sync_task = Rake::Task[sync_task.name]
-      
-      sync_task.reenable()
+
+      sync_task.reenable
       sync_task.invoke(deploy)
-      
+
       app.ran_cmd = true
     end
   end

data/lib/raketary/github_pkg_cmd.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketary.
-# Copyright (c) 2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketary 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.
-# 
-# Raketary 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 Raketary.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2020-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -29,32 +17,32 @@ require 'raketeer/github_pkg_task'
 
 module Raketary
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.2
   ###
   class GitHubPkgCmd < Cmd
     def initialize(*)
       super
-      
-      parse!() do |op|
+
+      parse! do |op|
         op.on('-u','--user STR','set the GitHub username')
-        
+
         op.separator op.summary_indent
       end
     end
-    
-    def run()
+
+    def run
       super()
-      
-      ghpkg_task = Raketeer::GitHubPkgTask.new() do |task|
+
+      ghpkg_task = Raketeer::GitHubPkgTask.new do |task|
         task.username = app.options[:user]
       end
-      
+
       ghpkg_task = Rake::Task[ghpkg_task.name]
-      
-      ghpkg_task.reenable()
-      ghpkg_task.invoke()
-      
+
+      ghpkg_task.reenable
+      ghpkg_task.invoke
+
       app.ran_cmd = true
     end
   end

data/lib/raketary/irb_cmd.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketary.
-# Copyright (c) 2019-2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketary 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.
-# 
-# Raketary 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 Raketary.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -28,27 +16,27 @@ require 'raketeer/irb_task'
 
 module Raketary
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   class IRBCmd < Cmd
     def initialize(*)
       super
-      
-      parse!() do |op|
+
+      parse! do |op|
         #op.separator op.summary_indent
       end
     end
-    
-    def run()
+
+    def run
       super()
-      
-      irb_task = Raketeer::IRBTask.new()
+
+      irb_task = Raketeer::IRBTask.new
       irb_task = Rake::Task[irb_task.name]
-      
-      irb_task.reenable()
-      irb_task.invoke()
-      
+
+      irb_task.reenable
+      irb_task.invoke
+
       app.ran_cmd = true
     end
   end

data/lib/raketary/nokogiri_cmd.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of Raketary.
-# Copyright (c) 2019-2020 Jonathan Bradley Whited (@esotericpig)
-# 
-# Raketary 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.
-# 
-# Raketary 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 Raketary.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2019-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #++
 
 
@@ -28,16 +16,16 @@ require 'raketeer/nokogiri_install_tasks'
 
 module Raketary
   ###
-  # @author Jonathan Bradley Whited (@esotericpig)
+  # @author Jonathan Bradley Whited
   # @since  0.1.0
   ###
   class NokogiriCmd < Cmd
     def initialize(*)
       super
-      
+
       @main_opts = 0
-      
-      parse!() do |op|
+
+      parse! do |op|
         op.on('-a','--apt','install Nokogiri libs for Ubuntu/Debian') do
           @main_opts += 1
           true
@@ -53,28 +41,28 @@ module Raketary
         op.separator op.summary_indent
       end
     end
-    
-    def run()
+
+    def run
       super()
       return if @main_opts <= 0
-      
+
       if @main_opts >= 2
         raise DoNotRunCmdError,'Please choose only one platform to install the libs for.'
       end
-      
+
       install_task = nil
-      
+
       if app.options[:apt]
-        install_task = Raketeer::NokogiriAPTTask.new()
+        install_task = Raketeer::NokogiriAPTTask.new
       elsif app.options[:dnf]
-        install_task = Raketeer::NokogiriDNFTask.new()
+        install_task = Raketeer::NokogiriDNFTask.new
       elsif app.options[:other]
-        install_task = Raketeer::NokogiriOtherTask.new()
+        install_task = Raketeer::NokogiriOtherTask.new
       end
-      
-      if !install_task.nil?()
+
+      if !install_task.nil?
         install_task.run(install_task,nil)
-        
+
         app.ran_cmd = true
       end
     end