bashly 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b90c79b66c9396dc7fda026e19761818e7db33c8b19b0e0501486b3cdf7f1e0
-  data.tar.gz: be2b5e3ae996189263e604421910ebc3b8a597e3cf9c525cf19b94e2e4434fd3
+  metadata.gz: 8c219a4bf3f32f47434d1a855a620ea62caaafe336a8647e8ef84529eb7023b8
+  data.tar.gz: d18b7f6bdfeb43fc4a27fb9e5f617d1c0c9c6f5783f5c7dc1df8f6eff575c8ab
 SHA512:
-  metadata.gz: 1414d602e5fabf5e9b98dfb1811276601f01de83dc0c866ce155ab22a2246122c9a6a2605c9f83dedc70f21a47c5f397b5ed59339412d8eccf09a319429b7271
-  data.tar.gz: 8bef6713c24b2a2d24d0ef97b54c1fd957ad8ff28e041ec08fdfa96c3bedc22a5a41c6b4691367357e63e404ba87dbd9599d7eddd0102cbe9bac9184f0d1dcee
+  metadata.gz: 38cf3b1d1c49c447f0e2817b57cb03362e528cefe22dc0f4d9c1dcfcb7b52859c034bc012bfb7ec769b6c94801c102bfe74d9c336e0dbc8ee060027c10b1b242
+  data.tar.gz: e64ced05cc15cd4cb66cc2dc6696cb522db87843c9fc8826d69500cfb1aafb8aa3ad13ccf36bca806ce262cece7c30763229d82f297bbf471ee71ca5807eaaec

data/lib/bashly/cli.rb

@@ -15,6 +15,7 @@ module Bashly
       runner.route 'generate',  to: Commands::Generate
       runner.route 'add',       to: Commands::Add
       runner.route 'doc',       to: Commands::Doc
+      runner.route 'shell',     to: Commands::Shell unless ENV['BASHLY_SHELL']
 
       runner
     end

data/lib/bashly/commands/doc.rb

@@ -2,7 +2,6 @@ module Bashly
   module Commands
     class Doc < Base
       summary 'Show bashly reference documentation'
-      help 'This command displays bite-sized help for all the bashly configuration options in the terminal.'
 
       usage 'bashly doc [SEARCH] [--index]'
       usage 'bashly doc (-h|--help)'

data/lib/bashly/commands/init.rb

@@ -2,7 +2,7 @@ module Bashly
   module Commands
     class Init < Base
       summary 'Initialize a new workspace'
-      help 'This command will create the source folder, and place a template configuration file in it.'
+      help 'Create the bashly source folder, and place a template configuration file in it'
 
       usage 'bashly init [--minimal]'
       usage 'bashly init (-h|--help)'

data/lib/bashly/commands/shell.rb

@@ -0,0 +1,40 @@
+module Bashly
+  module Commands
+    class Shell < Base
+      summary 'Start an interactive bashly shell'
+      help 'Start an interactive shell where you can run bashly commands'
+
+      usage 'bashly shell'
+      usage 'bashly shell (-h|--help)'
+
+      def run
+        ENV['BASHLY_SHELL'] = '1'
+        terminal.start
+      end
+
+    private
+
+      def terminal
+        @terminal ||= begin
+          terminal = MisterBin::Terminal.new runner, {
+            autocomplete: autocomplete,
+            show_usage:   true,
+            prompt:       "\n\e[33m\e[1mbashly\e[0m > ",
+          }
+
+          terminal.on('help') { runner.run %w[--help] }
+          terminal.on('version') { runner.run %w[--version] }
+          terminal
+        end
+      end
+
+      def runner
+        @runner ||= Bashly::CLI.runner
+      end
+
+      def autocomplete
+        @autocomplete ||= %w[help version] + runner.commands.keys
+      end
+    end
+  end
+end

data/lib/bashly/concerns/completions.rb

@@ -29,7 +29,7 @@ module Bashly
           end
         end
 
-        commands.each do |command|
+        public_commands.each do |command|
           result.merge! command.completion_data(with_version: false)
         end
 
@@ -62,7 +62,7 @@ module Bashly
       end
 
       def completion_flag_names
-        flags.map(&:name) + flags.map(&:short)
+        public_flags.map(&:name) + public_flags.map(&:short)
       end
 
       def completion_allowed_args
@@ -73,7 +73,7 @@ module Bashly
         trivial_flags = %w[--help -h]
         trivial_flags += %w[--version -v] if with_version
         all = (
-          command_aliases + trivial_flags +
+          public_command_aliases + trivial_flags +
           completion_flag_names + completion_allowed_args
         )
 

data/lib/bashly/script/command.rb

@@ -223,6 +223,11 @@ module Bashly
         commands.reject(&:private)
       end
 
+      # Returns a full list of the public Command names and aliases combined
+      def public_command_aliases
+        public_commands.map(&:aliases).flatten
+      end
+
       # Returns only environment variables that are not private
       def public_environment_variables
         environment_variables.reject(&:private)

data/lib/bashly/settings.rb

@@ -56,9 +56,9 @@ module Bashly
       end
 
       def strict_string
-        if Settings.strict.is_a? String
-          Settings.strict
-        elsif Settings.strict
+        if strict.is_a? String
+          strict
+        elsif strict
           'set -euo pipefail'
         else
           'set -e'
@@ -101,7 +101,13 @@ module Bashly
       end
 
       def user_settings_path
-        ENV['BASHLY_SETTINGS_PATH'] || 'settings.yml'
+        @user_settings_path ||= if ENV['BASHLY_SETTINGS_PATH']
+          ENV['BASHLY_SETTINGS_PATH']
+        elsif File.exist? 'bashly-settings.yml'
+          'bashly-settings.yml'
+        else
+          'settings.yml'
+        end
       end
 
       def defsult_settings

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.0.3'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-08 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -131,6 +131,7 @@ files:
 - lib/bashly/commands/generate.rb
 - lib/bashly/commands/init.rb
 - lib/bashly/commands/preview.rb
+- lib/bashly/commands/shell.rb
 - lib/bashly/commands/validate.rb
 - lib/bashly/concerns/asset_helper.rb
 - lib/bashly/concerns/completions.rb
@@ -262,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Bash Command Line Tool Generator