takelage 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63e3f97142ec8fbf49c1b753986ca84d80a5e9fc8069d9168b0f927bc22a3e2d
-  data.tar.gz: 41ee3b0215e955d565a10293d3fecd8c14aaf704f6403c5757051cd10c79d06a
+  metadata.gz: 337297c4c2bddafbc782a8a1241b70b276959717258d8d7d6a365c4df2523a38
+  data.tar.gz: f17a44b356298c310ea70b07b2ed689bb191cbbe87595a469e5519e7fb8ba360
 SHA512:
-  metadata.gz: 5d4c7d1c8041ea86afb80d64c1db124ebae6c5d067afef21d8d9ed9f4a2c42176047df7014c152cd3123b1c28570d59ccd2d371180ef5683513422081305a7c9
-  data.tar.gz: f6abded50f6115a53c9da2e16bfd5a59e3450fa99e9ae57538011d69fa4bd9284b1454e2783bd2f923a22a4de087ffc0220dd3951099d0125a61aa41594ddac5
+  metadata.gz: 15b06d0393821300f660ce4ef12337d1431207db7d47c7a3ea466d0794554adf32b37f1d478e7b4d363c9a9ee11adcb567b4fa311661e20242f5e3a8201374be
+  data.tar.gz: baf0b65c9a25f5c1e16bb6d00f149921c95cfee379eb641d6a637b46c2784fa7e8cd36d8194d09edc18d8b73b41f2e2939d0eed207c4b6d5868424caeb25da51

data/lib/takelage/lib/project.rb

@@ -1,9 +1,7 @@
 # takelage project module
 module ProjectModule
-
   # takelage config class.
   class TakelageProject
-
     include LoggingModule
     include SystemModule
     include ConfigModule
@@ -22,21 +20,20 @@ module ProjectModule
 
   # Initialze project
   def initialize_project
-
-    rakefile, path = Rake.application.find_rakefile_location
+    _rakefile, path = Rake.application.find_rakefile_location
 
     main_file = "#{path}/#{@@project.config.active['info_project_main']}"
     private_file = "#{path}/#{@@project.config.active['info_project_private']}"
 
     # read main project info
     if File.exist? main_file
-      @@project.main = read_yaml_file(main_file) || Hash.new
+      @@project.main = read_yaml_file(main_file) || {}
       @@project.main = @@project.main.sort.to_h
     end
 
     # read private project info
     if File.exist? private_file
-      @@project.private = read_yaml_file(private_file) || Hash.new
+      @@project.private = read_yaml_file(private_file) || {}
       @@project.private = @@project.private.sort.to_h
     end
 

data/lib/takelage/lib/subcmd.rb

@@ -1,13 +1,14 @@
 # Thor with subcommands that work correctly with help
 class SubCommandBase < Thor
-
   # Set the subcommand banner
-  def self.banner(command, namespace = nil, subcommand = false)
+  def self.banner(command, _namespace = nil, _subcommand = false)
     "#{basename} #{subcommand_prefix} #{command.usage}"
   end
 
   # Set the subcommand prefix
   def self.subcommand_prefix
-    self.name.gsub(%r{.*::}, '').gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| " #{match[0].downcase}" }
+    name.gsub(/.*::/, '')
+        .gsub(/^[A-Z]/) { |match| match[0].downcase }
+        .gsub(/[A-Z]/) { |match| " #{match[0].downcase}" }
   end
 end

data/lib/takelage/lib/system.rb

@@ -2,40 +2,38 @@ require 'pathname'
 require 'open3'
 require 'yaml'
 
-
 # Interaction with the operating system
 module SystemModule
-
   # Print hash as yaml.
   def hash_to_yaml(hash)
-    if hash == {}
-      return nil.to_yaml
-    end
-    hash.to_yaml(options = {:line_width => -1})
+    return nil.to_yaml if hash == {}
+
+    hash.to_yaml({ line_width: -1 })
   end
 
   # @return [Hash] content of yaml file
+  # rubocop:disable Metrics/MethodLength
   def read_yaml_file(file)
     log.debug "Reading YAML file \"#{file}\""
 
-    # Check file existenc
-    unless File.exists? file
+    # Check file existence
+    unless File.exist? file
       log.debug "File \"#{file}\" doesn't exist"
       return nil
     end
 
     # Read file
     begin
-      content_yaml =  File.read file
-    rescue
+      content_yaml = File.read file
+    rescue SystemCallError
       log.debug "Unable to read file \"#{file}\""
       return nil
     end
 
     # Parse YAML
     begin
-      content = YAML.load content_yaml
-    rescue
+      content = YAML.safe_load content_yaml
+    rescue Psych::SyntaxError
       log.debug "Invalid YAML file \"#{file}\""
       log.debug "Try: yamllint #{file}"
       return nil
@@ -43,6 +41,7 @@ module SystemModule
 
     content
   end
+  # rubocop:enable Metrics/MethodLength
 
   # Remove directory tree.
   def rm_fr(directory)
@@ -56,9 +55,9 @@ module SystemModule
 
   # Run a command and return the standard output.
   # @return [String] stdout of command
-  def run(command, realtime=false)
+  def run(command)
     log.debug "Running command \"#{command}\""
-    stdout_str, stderr_str, status = Open3.capture3 command
+    stdout_str, = Open3.capture3 command
     log.debug "Command \"#{command}\" has stdout:\n\"\"\"\n#{stdout_str}\"\"\""
     stdout_str
   end
@@ -82,7 +81,7 @@ module SystemModule
   # @return [Boolean] success of command run
   def try(command)
     log.debug "Running command \"#{command}\""
-    stdout_str, stderr_str, status = Open3.capture3 command
+    _, _, status = Open3.capture3 command
     log.debug "Command \"#{command}\" has exit status \"#{status.exitstatus}\""
     status
   end

data/lib/takelage/self/cli.rb

@@ -1,11 +1,9 @@
 module Takelage
-
   # semantic version number
   VERSION = (File.read "#{File.dirname(__FILE__)}/../version").chomp
 
   # takelage self
   class Self < SubCommandBase
-
     include LoggingModule
     include SelfModule
 

data/lib/takelage/self/config/cli.rb

@@ -1,8 +1,6 @@
 module Takelage
-
   # takelage bit
   class SelfConfig < SubCommandBase
-
     include LoggingModule
     include SystemModule
     include ConfigModule
@@ -34,7 +32,7 @@ module Takelage
     desc 'home', 'Print takelage home config file configuration'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Print takelage home config file configuration
-    This command will print the configuration read from the takelage 
+    This command will print the configuration read from the takelage
     configuration file in your home directory ~/.takelage.yml).
     LONGDESC
     # Print takelage home config file configuration.
@@ -51,7 +49,7 @@ module Takelage
     desc 'project', 'Print takelage project config file configuration'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Print takelage project config file configuration
-    This command will print the configuration read from the takelage 
+    This command will print the configuration read from the takelage
     configuration file .takelage.yml in your home directory).
     LONGDESC
     # Print takelage home config file configuration.
@@ -68,7 +66,7 @@ module Takelage
     desc 'active', 'Print active takelage configuration'
     long_desc <<-LONGDESC.gsub("\n", "\x5")
     Print active takelage configuration
-    This command will print the configuration read from the takelage 
+    This command will print the configuration read from the takelage
     configuration file (which is by default ~/.takelage.yml).
     LONGDESC
     # Print active takelage configuration.

data/lib/takelage/self/module.rb

@@ -1,26 +1,28 @@
 # takelage self
 module SelfModule
-
   # Backend method for config self.
   def self_list
-
     # use Thorfile which requires relative takelage.rb
     thorfile_dir = "#{File.dirname(__FILE__)}/../"
 
     # use thor list to get the list of commands and subcommands
-    cmd_thor_list = "bash -c '" +
-        "cd #{thorfile_dir} && " +
-        "thor list" +
+    cmd_thor_list = "bash -c '" \
+        "cd #{thorfile_dir} && " \
+        'thor list' \
         "'"
     thor_list = `#{cmd_thor_list}`
 
     # manipulate thor list output
-    thor_list.gsub! "takelage\n", ''
-    thor_list.gsub! "------\n", ''
-    thor_list.gsub! 'thor ', 'tau '
-    thor_list.gsub! /(.*)takelage:c_l_i:(.*)#(.*)/, '\1\2               #\3'
-    thor_list.gsub! /.*COMMAND.*\n/, ''
+    _manipulate_output_(thor_list)
+  end
+
+  private
 
-    thor_list
+  def _manipulate_output_(thor_list)
+    thor_list.gsub!("takelage\n", '')
+    thor_list.gsub!("------\n", '')
+    thor_list.gsub!('thor ', 'tau ')
+    thor_list.gsub!(/(.*)takelage:c_l_i:(.*)#(.*)/, '\1\2               #\3')
+    thor_list.gsub!(/.*COMMAND.*\n/, '')
   end
 end

data/lib/takelage/version

@@ -1 +1 @@
-0.13.1
+0.13.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Geospin