takelage 0.20.2 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f755a130345b2343101f6ad38a711d11b8d15413506465534737b09ddd0459f
-  data.tar.gz: 75fd7eb711147a14896a635751e0d544fc57e490b11546d90cb82ce1858aec43
+  metadata.gz: eb34019e556b714fcd893cf3141e23a1fbf63aad8bb695e2b205cfffb657a2ee
+  data.tar.gz: a0a2b8c6b6987f52057042ef410b2a94fb5628d519aa9f3c7ede9d4831d04a0d
 SHA512:
-  metadata.gz: a8e3e1a324bfeade0a331f89de454de9909b8ad564d16849d56e5dc624dacf69d7c79c46547bee630f6fef9ad89f3275b5811203c93288dcdf5548c975e26ab7
-  data.tar.gz: 5f4bcd4c8f6a688f78add975c78cfcb6995b0777ab73f38beae6f4f2760b70816a39fc9af56952c43c81ba691e9336a51745fe4ddb2745cafc999d084794cb38
+  metadata.gz: 0ef2f83567050eaf5578f793417ca4f65de20ce9d1409bef4503793a58b0ba0b8ad9fac6e889c19f33ebb3d20617519714a93e7db92b6e06283520281690ccab
+  data.tar.gz: ba45ccafbddeeda014a74eed0fcad687ad6d2287773cadb7d0aafde9854bc381d8003aea47965196f7faf5f7b3c8205daef0c03696eb0b0328d18838093f030f

data/README.md

@@ -186,8 +186,11 @@ source <(tau completion bash)
 
 ### Software Tests
 
+*takelage-cli* uses
+[minitest](https://github.com/seattlerb/minitest) unit tests.
+
 *takelage-cli* ships with 
-[cucumber](https://github.com/cucumber/cucumber) ruby tests.
+[cucumber](https://github.com/cucumber/cucumber) ruby system tests.
 It uses cucumber's 
 [aruba](https://github.com/cucumber/aruba) extension and especially its
 [filesystem](https://relishapp.com/cucumber/aruba/v/0-11-0/docs/filesystem)

data/lib/takelage/lib/config.rb

@@ -93,9 +93,7 @@ module ConfigModule
 
     return {} unless File.exist? home_file
 
-    home_yaml = read_yaml_file(home_file) || {}
-
-    home_yaml.sort.to_h
+    (read_yaml_file(home_file) || {}).sort.to_h
   end
 
   # Read custom config file in project root.
@@ -104,9 +102,7 @@ module ConfigModule
 
     return {} unless File.exist? project_file
 
-    project_yaml = read_yaml_file(project_file) || {}
-
-    project_yaml.sort.to_h
+    (read_yaml_file(project_file) || {}).sort.to_h
   end
 
   # Merge active config.

data/lib/takelage/lib/project.rb

@@ -34,24 +34,24 @@ module ProjectModule
 
   # Read main YAML file.
   def _project_read_main
-    @path = TakelageProject.instance.config.active['project_root_dir']
-    main_file = "#{@path}/" \
+    path = TakelageProject.instance.config.active['project_root_dir']
+    main_file = "#{path}/" \
         "#{TakelageProject.instance.config.active['info_project_main']}"
 
     return {} unless File.exist? main_file
 
-    read_yaml_file(main_file).sort.to_h || {}
+    (read_yaml_erb_file(main_file) || {}).sort.to_h
   end
 
   # Read private YAML file.
   def _project_read_private
-    @path = TakelageProject.instance.config.active['project_root_dir']
-    private_file = "#{@path}/" \
+    path = TakelageProject.instance.config.active['project_root_dir']
+    private_file = "#{path}/" \
         "#{TakelageProject.instance.config.active['info_project_private']}"
 
     return {} unless File.exist? private_file
 
-    private_yaml = read_yaml_file(private_file) || {}
+    private_yaml = read_yaml_erb_file(private_file) || {}
 
     private_yaml.sort.to_h
   end

data/lib/takelage/lib/system.rb

@@ -20,7 +20,19 @@ module SystemModule
     log.debug "Reading YAML file \"#{file}\""
     return nil unless _file_exists? file
     return nil unless _file_read file
-    return nil unless _parse_yaml @content_yaml
+    return nil unless _parse_yaml file, @content_file
+
+    @content
+  end
+
+  # Read yaml file with erb templates.
+  # @return [Hash] content of yaml file
+  def read_yaml_erb_file(file)
+    log.debug "Reading YAML ERB file \"#{file}\""
+    return nil unless _file_exists? file
+    return nil unless _file_read file
+    return nil unless _parse_erb file, @content_file
+    return nil unless _parse_yaml file, @content_yaml
 
     @content
   end
@@ -82,7 +94,7 @@ module SystemModule
   # Read yaml file.
   def _file_read(file)
     begin
-      @content_yaml = File.read file
+      @content_file = File.read file
     rescue SystemCallError
       log.debug "Unable to read file \"#{file}\""
       return false
@@ -90,8 +102,21 @@ module SystemModule
     true
   end
 
+  # Parse erb file.
+  def _parse_erb(file, content_erb)
+    begin
+      @content_yaml = ERB.new(content_erb).result
+    rescue StandardError => e
+      log.debug e.class
+      log.debug "Invalid ERB in YAML file \"#{file}\". " \
+        "#{e.class}: \"#{e.message}\""
+      return false
+    end
+    true
+  end
+
   # Parse yaml file.
-  def _parse_yaml(content_yaml)
+  def _parse_yaml(file, content_yaml)
     begin
       @content = YAML.safe_load content_yaml
     rescue Psych::SyntaxError

data/lib/takelage/self/list.rb

@@ -4,6 +4,13 @@
 module SelfList
   # Backend method for config self.
   def self_list
+    _manipulate_output_(_get_thor_list_)
+  end
+
+  private
+
+  # Get output of thor list command.
+  def _get_thor_list_
     # use Thorfile which requires relative takelage.rb
     thorfile_dir = "#{File.dirname(__FILE__)}/../"
 
@@ -12,20 +19,17 @@ module SelfList
         "cd #{thorfile_dir} && " \
         'thor list' \
         "'"
-    thor_list = `#{cmd_thor_list}`
 
-    # manipulate thor list output
-    _manipulate_output_(thor_list)
+    # call thor list command
+    `#{cmd_thor_list}`
   end
 
-  private
-
   # Manipulate output of thor list command.
   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/, '')
+    tau_list = thor_list.gsub("takelage\n", '')
+    tau_list.gsub!("------\n", '')
+    tau_list.gsub!('thor ', 'tau ')
+    tau_list.gsub!(/(.*)takelage:c_l_i:(.*)#(.*)/, '\1\2               #\3')
+    tau_list.gsub!(/.*COMMAND.*\n/, '')
   end
 end

data/lib/takelage/version

@@ -1 +1 @@
-0.20.2
+0.21.0

metadata

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