bashly 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13bbac52a39c2f6afb768d043911861a31f8e6abc8ff1472340a13c2834d5944
-  data.tar.gz: 54c4fea2c664dcd0c6aace3360004d715d87b5d4ed98ffd7d3ccdc6c0a120406
+  metadata.gz: 53a5744ae1746cdd47de191ea91539ab7336aca894f583384ef0b170c03a746e
+  data.tar.gz: 0e1e9bc417d3947bcce84c3c6f44df87521dfeeae2329cc736a53816cb66cba3
 SHA512:
-  metadata.gz: f1c273771d9048c074fb9551ba4521e9cb38c98a819f53647186822155898f767b7dd95093642e01464788378833d4dd9e408efecf304a9feb1ba09ebf2edef3
-  data.tar.gz: efbdad6c22cfe1b7fbb46533db42f4c14b828259efeb5ede1099e20980ad505773af36897e27f8c6c7b25538a523427e63c1a5dac7ff958d753ae3810caf5eb9
+  metadata.gz: 72154aafdc3c3787b4d23a2935192a92c21b94b830d7fb01c22057ed839d30120d8a31a8962b7b075110551d034b2c971b92010e55c88a17d4e9041ecb309ad7
+  data.tar.gz: a02638101b685d5e9de575fe4537991c558c462dc030355b5e8ab6ffe4f32b8018c510afb516f51c02d4412a20c21a3703b5dc5872a0f377baa343345f045605

data/lib/bashly/cli.rb

@@ -10,6 +10,7 @@ module Bashly
 
       runner.route 'init',      to: Commands::Init
       runner.route 'preview',   to: Commands::Preview
+      runner.route 'validate',  to: Commands::Validate
       runner.route 'generate',  to: Commands::Generate
       runner.route 'add',       to: Commands::Add
 

data/lib/bashly/commands/add.rb

@@ -32,27 +32,27 @@ module Bashly
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
 
       def strings_command
-        add_lib Library::Strings.new
+        add_lib 'strings'
       end
 
       def lib_command
-        add_lib Library::Sample.new
+        add_lib 'lib'
       end
 
       def config_command
-        add_lib Library::Config.new
+        add_lib 'config'
       end
 
       def colors_command
-        add_lib Library::Colors.new
+        add_lib 'colors'
       end
 
       def yaml_command
-        add_lib Library::YAML.new
+        add_lib 'yaml'
       end
 
       def validations_command
-        add_lib Library::Validations.new
+        add_lib 'validations'
       end
 
       def comp_command
@@ -60,35 +60,24 @@ module Bashly
         output = args['OUTPUT']
 
         case format
-        when "script"
-          path = output || "#{Settings.target_dir}/completions.bash"
-          add_lib Library::CompletionsScript.new(path)
-        
-        when "function"
-          function = output || "send_completions"
-          path = "#{Settings.source_dir}/lib/#{function}.sh"
-          add_lib Library::CompletionsFunction.new(path, function: function)
-
-        when "yaml"
-          path = output || "#{Settings.target_dir}/completions.yml"
-          add_lib Library::CompletionsYAML.new(path)
-        
-        else
-          raise Error, "Unrecognized format: #{format}"
-
+        when "script"   then add_lib 'completions_script', output
+        when "function" then add_lib 'completions', output
+        when "yaml"     then add_lib 'completions_yaml', output
+        else            raise Error, "Unrecognized format: #{format}"
         end
 
       end
 
     private
 
-      def add_lib(handler)
+      def add_lib(name, *args)
+        library = Bashly::Library.new name, *args
         files_created = 0
-        handler.files.each do |file|
+        library.files.each do |file|
           created = safe_write file[:path], file[:content]
           files_created += 1 if created
         end
-        message = handler.post_install_message
+        message = library.post_install_message
         say "\n#{message}" if message and files_created > 0
       end
 

data/lib/bashly/commands/generate.rb

@@ -1,6 +1,8 @@
 module Bashly
   module Commands
     class Generate < Base
+      using ComposeRefinements
+
       help "Generate the bash script and required files"
 
       usage "bashly generate [--force --quiet --upgrade --wrap FUNCTION]"
@@ -13,6 +15,7 @@ module Bashly
 
       environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
       environment "BASHLY_TARGET_DIR", "The path to use for creating the bash script [default: .]"
+      environment "BASHLY_STRICT", "When not empty, enable bash strict mode (set -euo pipefail)"
 
       example "bashly generate --force"
       example "bashly generate --wrap my_function"
@@ -35,20 +38,9 @@ module Bashly
           content = File.read file
           
           if content =~ /\[@bashly-upgrade (.+)\]/
-            lib = $1
-            
-            case lib
-            when "colors"
-              upgrade file, Library::Colors.new
-            when "config"
-              upgrade file, Library::Config.new
-            when "yaml"
-              upgrade file, Library::YAML.new
-            when "validations"
-              upgrade file, Library::Validations.new
-            when /completions (.+)/
-              upgrade file, Library::CompletionsFunction.new(file, function: $1)
-            end
+            args = $1.split ' '
+            library_name = args.shift
+            upgrade file, library_name, *args
           end
         end
       end
@@ -57,8 +49,17 @@ module Bashly
         Dir["#{Settings.source_dir}/**/*.*"].sort
       end
 
-      def upgrade(existing_file, handler)
-        file = handler.files.select { |f| f[:path] == existing_file }.first
+      def upgrade(existing_file, library_name, *args)
+        if Library.exist? library_name
+          upgrade! existing_file, library_name, *args
+        else
+          quiet_say "!txtred!warning!txtrst! not upgrading !txtcyn!#{existing_file}!txtrst!, unknown library '#{library_name}'"
+        end
+      end
+
+      def upgrade!(existing_file, library_name, *args)
+        library = Bashly::Library.new library_name, *args
+        file = library.find_file existing_file
 
         if file
           File.deep_write file[:path], file[:content]
@@ -117,7 +118,7 @@ module Bashly
       end
 
       def config
-        @config ||= Config.new "#{Settings.source_dir}/bashly.yml"
+        @config ||= Config.new("#{Settings.source_dir}/bashly.yml").compose
       end
 
       def command

data/lib/bashly/commands/validate.rb

@@ -0,0 +1,19 @@
+module Bashly
+  module Commands
+    class Validate < Base
+      help "Scan the configuration file for errors"
+
+      usage "bashly validate"
+      usage "bashly validate (-h|--help)"
+
+      environment "BASHLY_SOURCE_DIR", "The path containing the bashly configuration and source files [default: src]"
+
+      def run
+        config = Config.new "#{Settings.source_dir}/bashly.yml"
+        validator = ConfigValidator.new config
+        validator.validate
+        say "!txtgrn!OK"
+      end
+    end
+  end
+end

data/lib/bashly/config_validator.rb

@@ -0,0 +1,135 @@
+module Bashly
+  class ConfigValidator
+    attr_reader :data
+
+    def initialize(data)
+      @data = data
+    end
+
+    def validate
+      assert_command "root", data
+    end
+
+  private
+
+    def assert(valid, message)
+      raise ConfigurationError, message unless valid
+    end
+
+    def refute(invalid, message)
+      assert !invalid, message
+    end
+
+    def assert_string(key, value)
+      assert value.is_a?(String), "#{key} must be a string"
+    end
+
+    def assert_optional_string(key, value)
+      assert_string key, value if value
+    end
+
+    def assert_boolean(key, value)
+      assert [true, false, nil].include?(value), "#{key} must be a boolean" 
+    end
+
+    def assert_array(key, value, of: nil)
+      return unless value
+      assert value.is_a?(Array), "#{key} must be an array"
+      if of
+        value.each_with_index do |val, i|
+          send "assert_#{of}".to_sym, "#{key}[#{i}]", val
+        end
+      end
+    end
+
+    def assert_hash(key, value)
+      assert value.is_a?(Hash), "#{key} must be a hash"
+    end
+
+    def assert_version(key, value)
+      return unless value
+      assert [String, Integer, Float].include?(value.class),
+        "#{key} must be a string or a number" 
+    end
+
+    def assert_catch_all(key, value)
+      return unless value
+      assert [TrueClass, String, Hash].include?(value.class),
+        "#{key} must be a boolean, a string or a hash" 
+
+      assert_catch_all_hash key, value if value.is_a? Hash
+    end
+
+    def assert_catch_all_hash(key, value)
+      assert_string "#{key}.label", value['label']
+      assert_optional_string "#{key}.help", value['help']
+      assert_boolean "#{key}.required", value['required']
+    end
+
+    def assert_extensible(key, value)
+      return unless value
+      assert [TrueClass, String].include?(value.class),
+        "#{key} must be a boolean or a string" 
+    end
+
+    def assert_arg(key, value)
+      assert_hash key, value
+      assert_string "#{key}.name", value['name']
+      assert_optional_string "#{key}.help", value['help']
+      assert_optional_string "#{key}.default", value['default']
+      assert_optional_string "#{key}.validate", value['validate']
+      assert_boolean "#{key}.required", value['required']
+      
+      assert_array "#{key}.allowed", value['allowed'], of: :string
+    end
+
+    def assert_flag(key, value)
+      assert_hash key, value
+      assert value['short'] || value['long'], "#{key} must have at least one of long or short name"
+
+      assert_optional_string "#{key}.long", value['long']
+      assert_optional_string "#{key}.short", value['short']
+      assert_optional_string "#{key}.help", value['help']
+      assert_optional_string "#{key}.arg", value['arg']
+      assert_optional_string "#{key}.default", value['default']
+      assert_optional_string "#{key}.validate", value['validate']
+      
+      assert_boolean "#{key}.required", value['required']
+      assert_array "#{key}.allowed", value['allowed'], of: :string
+    end
+
+    def assert_env_var(key, value)
+      assert_hash key, value
+      assert_string "#{key}.name", value['name']
+      assert_optional_string "#{key}.help", value['help']
+      assert_optional_string "#{key}.default", value['default']
+      assert_boolean "#{key}.required", value['required']
+    end
+
+    def assert_command(key, value)
+      assert_hash key, value
+
+      refute value['commands'] && value['args'], "#{key} cannot have both commands and args"
+      refute value['commands'] && value['flags'], "#{key} cannot have both commands and flags"
+      
+      assert_string "#{key}.name", value['name']
+      assert_optional_string "#{key}.short", value['short']
+      assert_optional_string "#{key}.help", value['help']
+      assert_optional_string "#{key}.footer", value['footer']
+      assert_optional_string "#{key}.group", value['group']
+
+      assert_boolean "#{key}.default", value['default']
+      assert_version "#{key}.version", value['version']
+      assert_catch_all "#{key}.catch_all", value['catch_all']
+      assert_extensible "#{key}.extensible", value['extensible']
+      
+      assert_array "#{key}.args", value['args'], of: :arg
+      assert_array "#{key}.flags", value['flags'] , of: :flag
+      assert_array "#{key}.commands", value['commands'], of: :command
+      assert_array "#{key}.completions", value['completions'], of: :string
+      assert_array "#{key}.dependencies", value['dependencies'], of: :string
+      assert_array "#{key}.environment_variables", value['environment_variables'], of: :env_var
+      assert_array "#{key}.examples", value['examples'], of: :string
+    end
+  end
+end

data/lib/bashly/extensions/string.rb

@@ -27,4 +27,8 @@ class String
     gsub(/\s+\n/m, "\n\n").lines.reject { |l| l =~ /^\s*##/ }.join ""
   end
 
+  def remove_front_matter
+    split(/^---\s*/).last
+  end
+
 end

data/lib/bashly/libraries/base.rb

@@ -0,0 +1,19 @@
+module Bashly
+  module Libraries
+    class Base
+      attr_reader :args
+
+      def initialize(*args)
+        @args = args
+      end
+
+      def files
+        raise NotImplementedError, "Please implement #files"
+      end
+
+      def post_install_message
+        nil
+      end
+    end
+  end
+end

data/lib/bashly/libraries/completions.rb

@@ -0,0 +1,14 @@
+module Bashly
+  module Libraries
+    class Completions < Base
+    protected
+      def command
+        @command ||= Script::Command.new config
+      end
+
+      def config
+        @config ||= Bashly::Config.new "#{Settings.source_dir}/bashly.yml"
+      end
+    end
+  end
+end

data/lib/bashly/{library → libraries}/completions_function.rb

@@ -1,11 +1,13 @@
 module Bashly
-  module Library
+  module Libraries
     class CompletionsFunction < Completions
-      def file_content
+      def files
         [
-          "# [@bashly-upgrade completions #{function_name}]",
-          command.completion_function(function_name)
-        ].join "\n"
+          {
+            path: "#{Settings.source_dir}/lib/#{function_name}.sh",
+            content: completions_function_code(function_name)
+          }
+        ]
       end
 
       def post_install_message
@@ -18,9 +20,19 @@ module Bashly
         EOF
       end
 
+    private
+
       def function_name
-        options[:function]
+        @function_name ||= args[0] || 'send_completions'
       end
+
+      def completions_function_code(function_name)
+        [
+          "## [@bashly-upgrade completions #{function_name}]",
+          command.completion_function(function_name)
+        ].join "\n"
+      end
+
     end
   end
 end

data/lib/bashly/libraries/completions_script.rb

@@ -0,0 +1,29 @@
+module Bashly
+  module Libraries
+    class CompletionsScript < Completions
+      def files
+        [
+          {
+            path: target_path,
+            content: command.completion_script
+          }
+        ]
+      end
+
+      def post_install_message
+        <<~EOF
+          In order to enable completions, run:
+
+            !txtpur!$ source #{target_path}
+        EOF
+      end
+
+    private
+
+      def target_path
+        @target_path ||= args[0] || "#{Settings.target_dir}/completions.bash"
+      end
+
+    end
+  end
+end

data/lib/bashly/libraries/completions_yaml.rb

@@ -0,0 +1,27 @@
+module Bashly
+  module Libraries
+    class CompletionsYAML < Completions
+      def files
+        [
+          {
+            path: target_path,
+            content: command.completion_data.to_yaml
+          }
+        ]
+      end
+
+      def post_install_message
+        <<~EOF
+          This file can be converted to a completions script using the !txtgrn!completely!txtrst! gem.
+        EOF
+      end
+
+    private
+
+      def target_path
+        @target_path ||= args[0] || "#{Settings.target_dir}/completions.yml"
+      end
+
+    end
+  end
+end

data/lib/bashly/libraries.yml

@@ -0,0 +1,39 @@
+colors:
+  files:
+    - source: "templates/lib/colors.sh"
+      target: "%{user_source_dir}/lib/colors.sh"
+
+config:
+  files:
+    - source: "templates/lib/config.sh"
+      target: "%{user_source_dir}/lib/config.sh"
+
+yaml:
+  files:
+    - source: "templates/lib/yaml.sh"
+      target: "%{user_source_dir}/lib/yaml.sh"
+
+lib:
+  files:
+    - source: "templates/lib/sample_function.sh"
+      target: "%{user_source_dir}/lib/sample_function.sh"
+
+strings:
+  files:
+    - source: "templates/strings.yml"
+      target: "%{user_source_dir}/bashly-strings.yml"
+
+validations:
+  files:
+    - source: "templates/lib/validations/validate_dir_exists.sh"
+      target: "%{user_source_dir}/lib/validations/validate_dir_exists.sh"
+    - source: "templates/lib/validations/validate_file_exists.sh"
+      target: "%{user_source_dir}/lib/validations/validate_file_exists.sh"
+    - source: "templates/lib/validations/validate_integer.sh"
+      target: "%{user_source_dir}/lib/validations/validate_integer.sh"
+    - source: "templates/lib/validations/validate_not_empty.sh"
+      target: "%{user_source_dir}/lib/validations/validate_not_empty.sh"
+
+completions: :CompletionsFunction
+completions_script: :CompletionsScript
+completions_yaml: :CompletionsYAML

data/lib/bashly/library.rb

@@ -0,0 +1,63 @@
+module Bashly
+  class Library
+    class << self
+      def exist?(name)
+        config.has_key? name.to_s
+      end
+
+      def config
+        @config ||= YAML.load_file(config_path)
+      end
+
+      def config_path
+        @config_path ||= File.expand_path 'libraries.yml', __dir__
+      end
+    end
+
+    include AssetHelper
+    attr_reader :name, :args
+
+    def initialize(name, *args)
+      @name, @args = name.to_s, args
+    end
+
+    def files
+      if custom_handler
+        custom_handler.files
+
+      else
+        config['files'].map do |file|
+          { path: file['target'] % target_file_args,
+            content: asset_content(file['source']) }
+        end
+      end
+    end
+
+    def post_install_message
+      if custom_handler
+        custom_handler.post_install_message
+      else
+        config['post_install_message']
+      end
+    end
+
+    def find_file(path)
+      files.select { |f| f[:path] == path }.first
+    end
+
+  private
+
+    def custom_handler
+      return nil unless config.is_a? Symbol
+      @custom_handler ||= Bashly::Libraries.const_get(config).new(*args)
+    end
+
+    def config
+      @config ||= self.class.config[name]
+    end
+
+    def target_file_args
+      { user_source_dir: Settings.source_dir }
+    end
+  end
+end

data/lib/bashly/refinements/compose_refinements.rb

@@ -0,0 +1,45 @@
+require 'yaml'
+
+module ComposeRefinements
+  refine Hash do
+    def compose(keyword = 'import')
+      result = {}
+      each do |k, v|
+        if k.to_s == keyword
+          sub = safe_load_yaml(v).compose keyword
+          if sub.is_a? Array
+            result = sub
+          else
+            result.merge! sub
+          end
+        elsif v.respond_to? :compose
+          result[k] = v.compose keyword
+        else
+          result[k] = v
+        end
+      end
+      result
+    end
+
+    def safe_load_yaml(path)
+      loaded = YAML.load_file path
+      return loaded if loaded.is_a? Array or loaded.is_a? Hash
+      raise Bashly::ConfigurationError, "Cannot find a valid YAML in !txtgrn!#{path}"
+
+    rescue Errno::ENOENT
+      raise Bashly::ConfigurationError, "Cannot find import file !txtgrn!#{path}"
+    end
+  end
+
+  refine Array do
+    def compose(keyword = 'import')
+      map do |x|
+        if x.respond_to? :compose
+          x.compose keyword
+        else
+          x
+        end
+      end
+    end
+  end
+end

data/lib/bashly/script/base.rb

@@ -23,6 +23,7 @@ module Bashly
         long
         name
         parent_name
+        private
         required
         short
         validate
@@ -32,7 +33,7 @@ module Bashly
       def initialize(options)
         raise Error, "Invalid options provided" unless options.respond_to? :keys
         @options = options
-        verify if respond_to? :verify
+        validate_options if respond_to? :validate_options
       end
 
       def optional

data/lib/bashly/script/command.rb

@@ -32,18 +32,15 @@ module Bashly
 
       # Returns a label for the catch_all directive
       def catch_all_label
-        return nil unless catch_all
-
-        if catch_all.is_a? String
-          "#{catch_all.upcase}..."
-        elsif catch_all.is_a?(Hash) and catch_all['label'].is_a?(String)
-          "#{catch_all['label'].upcase}..."
-        else
-          "..."
+        case catch_all
+        when nil then nil
+        when String then "#{catch_all.upcase}..."
+        when Hash then "#{catch_all['label'].upcase}..."
+        else "..."
         end
       end
 
-      # Returns a used defined help string for the catch_all directive
+      # Returns a user defined help string for the catch_all directive
       def catch_all_help
         return nil unless catch_all
 
@@ -154,7 +151,7 @@ module Bashly
         default_content = placeholder ? "echo \"error: cannot load file\"" : ''
 
         content = if File.exist? path
-          File.read path
+          File.read(path).remove_front_matter
         else 
           default_content
         end
@@ -213,9 +210,9 @@ module Bashly
       end
 
       # Raise an exception if there are some serious issues with the command
-      # definition.
-      def verify
-        verify_commands if commands.any?
+      # definition. This is called by Base#initialize.
+      def validate_options
+        Bashly::ConfigValidator.new(options).validate
       end
 
       # Returns an array of all the args with a whitelist
@@ -228,14 +225,6 @@ module Bashly
         flags.select &:allowed
       end
 
-    private
-
-      def verify_commands
-        if args.any? or flags.any?
-          raise ConfigurationError, "Error in the !txtgrn!#{full_name}!txtrst! command.\nThe !txtgrn!commands!txtrst! key cannot be at the same level as the !txtgrn!args!txtrst! or !txtgrn!flags!txtrst! keys."
-        end
-      end
-
     end
   end
 end

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/bashly/views/command/command_filter.erb

@@ -1,6 +1,6 @@
 # :command.command_filter
 % if commands.any?
-action=$1
+action=${1:-}
 
 case $action in
 -* )

data/lib/bashly/views/command/default_assignments.erb

@@ -1,7 +1,7 @@
 # :command.default_assignments
 % default_args.each do |arg|
-[[ -n ${args[<%= arg.name %>]} ]] || args[<%= arg.name %>]="<%= arg.default %>"
+[[ -n ${args[<%= arg.name %>]:-} ]] || args[<%= arg.name %>]="<%= arg.default %>"
 % end
 % default_flags.each do |flag|
-[[ -n ${args[<%= flag.long %>]} ]] || args[<%= flag.long %>]="<%= flag.default %>"
+[[ -n ${args[<%= flag.long %>]:-} ]] || args[<%= flag.long %>]="<%= flag.default %>"
 % end

data/lib/bashly/views/command/default_initialize_script.erb

@@ -1,6 +1,6 @@
-# Code here runs inside the initialize() function
-# Use it for anything that you need to run before any other function, like
-# setting environment vairables:
-# CONFIG_FILE=settings.ini
-#
-# Feel free to empty (but not delete) this file.
+## Code here runs inside the initialize() function
+## Use it for anything that you need to run before any other function, like
+## setting environment vairables:
+## CONFIG_FILE=settings.ini
+##
+## Feel free to empty (but not delete) this file.

data/lib/bashly/views/command/environment_variables_filter.erb

@@ -6,7 +6,7 @@ export <%= env_var.name.upcase %>="${<%= env_var.name.upcase %>:-<%= env_var.def
 % end
 % if required_environment_variables.any?
 % required_environment_variables.each do |env_var|
-if [[ -z "$<%= env_var.name.upcase %>" ]]; then
+if [[ -z "${<%= env_var.name.upcase %>:-}" ]]; then
   printf "<%= strings[:missing_required_environment_variable] % { var: env_var.name.upcase } %>\n"
   exit 1
 fi

data/lib/bashly/views/command/fixed_flags_filter.erb

@@ -1,5 +1,5 @@
 # :command.fixed_flag_filter
-case "$1" in
+case "${1:-}" in
 % if short_flag_exist? "-v"
 --version )
 % else

data/lib/bashly/views/command/initialize.erb

@@ -2,7 +2,7 @@
 initialize() {
   version="<%= version %>"
   long_usage=''
-  set -e
+  <%= ENV['BASHLY_STRICT'] ? "set -euo pipefail" : "set -e" %>
 
 <%= load_user_file("initialize.sh", placeholder: false).indent 2 %>
 }

data/lib/bashly/views/command/run.erb

@@ -1,15 +1,15 @@
 # :command.run
 run() {
-  declare -A args
-  declare -a other_args
-  declare -a input
+  declare -A args=()
+  declare -a other_args=()
+  declare -a input=()
   normalize_input "$@"
   parse_requirements "${input[@]}"
 
   <%- condition = "if" -%>
   <%- deep_commands.each do |command| -%>
   <%= condition %> [[ $action == "<%= command.action_name %>" ]]; then
-    if [[ ${args[--help]} ]]; then
+    if [[ ${args[--help]:-} ]]; then
       long_usage=yes
       <%= command.function_name %>_usage
     else

data/lib/bashly/views/command/usage_commands.erb

@@ -3,7 +3,7 @@
 printf "<%= strings[:commands] %>\n"
 % end
 % maxlen = command_names.map(&:size).max
-% commands.each do |command|
+% commands.reject(&:private).each do |command|
 % summary = command.summary
 % summary = strings[:default_command_summary] % { summary: summary } if command.default
 % if command.group

data/lib/bashly.rb

@@ -9,7 +9,8 @@ requires 'bashly/concerns'
 
 requires 'bashly/settings'
 requires 'bashly/exceptions'
+requires 'bashly/refinements'
 requires 'bashly/script/base'
 requires 'bashly/commands/base'
-requires 'bashly/library/base'
+requires 'bashly/libraries/base'
 requires 'bashly'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -82,26 +82,25 @@ files:
 - lib/bashly/commands/generate.rb
 - lib/bashly/commands/init.rb
 - lib/bashly/commands/preview.rb
+- lib/bashly/commands/validate.rb
 - lib/bashly/concerns/asset_helper.rb
 - lib/bashly/concerns/completions.rb
 - lib/bashly/concerns/renderable.rb
 - lib/bashly/config.rb
+- lib/bashly/config_validator.rb
 - lib/bashly/exceptions.rb
 - lib/bashly/extensions/array.rb
 - lib/bashly/extensions/file.rb
 - lib/bashly/extensions/string.rb
-- lib/bashly/library/base.rb
-- lib/bashly/library/colors.rb
-- lib/bashly/library/completions.rb
-- lib/bashly/library/completions_function.rb
-- lib/bashly/library/completions_script.rb
-- lib/bashly/library/completions_yaml.rb
-- lib/bashly/library/config.rb
-- lib/bashly/library/sample.rb
-- lib/bashly/library/strings.rb
-- lib/bashly/library/validations.rb
-- lib/bashly/library/yaml.rb
+- lib/bashly/libraries.yml
+- lib/bashly/libraries/base.rb
+- lib/bashly/libraries/completions.rb
+- lib/bashly/libraries/completions_function.rb
+- lib/bashly/libraries/completions_script.rb
+- lib/bashly/libraries/completions_yaml.rb
+- lib/bashly/library.rb
 - lib/bashly/message_strings.rb
+- lib/bashly/refinements/compose_refinements.rb
 - lib/bashly/script/argument.rb
 - lib/bashly/script/base.rb
 - lib/bashly/script/command.rb

data/lib/bashly/library/base.rb

@@ -1,57 +0,0 @@
-module Bashly
-  module Library
-    class Base
-      include AssetHelper
-
-      attr_reader :target_path, :options
-
-      def initialize(target_path = nil, options = nil)
-        @target_path = target_path || Settings.source_dir
-        @options = options || {}
-      end
-
-      def files
-        case content
-        when String then content_from_string content
-        when Hash then [content]
-        else content
-        end
-      end
-
-      def post_install_message
-        nil
-      end
-
-      def content
-        raise NotImplementedError, "Please implement either #content"
-      end
-
-    private
-
-      def content_from_string(string)
-        if File.directory? asset("templates/lib/#{string}")
-          content_for_dir string
-        else
-          [content_for_file(string)]
-        end
-      end
-
-      def content_for_file(file)
-        {
-          path: "#{target_path}/lib/#{file}",
-          content: asset_content("templates/lib/#{file}")
-        }
-      end
-
-      def content_for_dir(dir)
-        Dir[asset("templates/lib/#{dir}/*.sh")].sort.map do |file|
-          {
-            path: "#{target_path}/lib/#{dir}/#{File.basename file}",
-            content: File.read(file)
-          }
-        end
-      end
-
-    end
-  end
-end

data/lib/bashly/library/colors.rb

@@ -1,9 +0,0 @@
-module Bashly
-  module Library
-    class Colors < Base
-      def content
-        "colors.sh"
-      end
-    end
-  end
-end

data/lib/bashly/library/completions.rb

@@ -1,28 +0,0 @@
-module Bashly
-  module Library
-    class Completions < Base
-      def content
-        { path: target_path, content: file_content }
-      end
-
-      def file_content
-        raise NotImplementedError, "Please implement #file_content"
-      end
-
-    protected
-
-      def completions
-        @completions ||= command.completion_data
-      end
-
-      def config
-        @config ||= Bashly::Config.new "#{Settings.source_dir}/bashly.yml"
-      end
-
-      def command
-        @command ||= Script::Command.new config
-      end
-   
-    end
-  end
-end

data/lib/bashly/library/completions_script.rb

@@ -1,17 +0,0 @@
-module Bashly
-  module Library
-    class CompletionsScript < Completions
-      def file_content
-        command.completion_script
-      end
-
-      def post_install_message
-        <<~EOF
-          In order to enable completions, run:
-
-            !txtpur!$ source #{target_path}
-        EOF
-      end
-    end
-  end
-end

data/lib/bashly/library/completions_yaml.rb

@@ -1,15 +0,0 @@
-module Bashly
-  module Library
-    class CompletionsYAML < Completions
-      def file_content
-        completions.to_yaml
-      end
-
-      def post_install_message
-        <<~EOF
-          This file can be converted to a completions script using the !txtgrn!completely!txtrst! gem.
-        EOF
-      end
-    end
-  end
-end

data/lib/bashly/library/config.rb

@@ -1,9 +0,0 @@
-module Bashly
-  module Library
-    class Config < Base
-      def content
-        "config.sh"
-      end
-    end
-  end
-end

data/lib/bashly/library/sample.rb

@@ -1,9 +0,0 @@
-module Bashly
-  module Library
-    class Sample < Base
-      def content
-        "sample_function.sh"
-      end
-    end
-  end
-end

data/lib/bashly/library/strings.rb

@@ -1,12 +0,0 @@
-module Bashly
-  module Library
-    class Strings < Base
-      def content
-        {
-          path: "#{target_path}/bashly-strings.yml",
-          content: asset_content("templates/strings.yml")
-        }
-      end
-    end
-  end
-end

data/lib/bashly/library/validations.rb

@@ -1,9 +0,0 @@
-module Bashly
-  module Library
-    class Validations < Base
-      def content
-        "validations"
-      end
-    end
-  end
-end

data/lib/bashly/library/yaml.rb

@@ -1,9 +0,0 @@
-module Bashly
-  module Library
-    class YAML < Base
-      def content
-        "yaml.sh"
-      end
-    end
-  end
-end