shelldon 0.0.1 → 0.0.7

data/lib/shell/shell_factory.rb

@@ -1,38 +1,111 @@
 module Shelldon
   class ShellFactory
     def initialize(name, &block)
-      if Shelldon[name]
-        @shell = Shelldon[name]
-      else
-        @shell = Shell.new(name)
-      end
+      @name = name
+      setup_vars
+      register(Shell.new(name)) unless Shelldon[name]
       instance_eval(&block)
+      make_it_rain
+    end
+
+    def setup_vars
+      @new_opts        = []
+      @new_configs     = []
+      @new_on_opts     = []
+      @new_commands    = []
+      @new_script_dirs = []
+    end
+
+    def make_it_rain
+      make_opts
+      make_configs
+      make_on_opts
+      make_commands
+      make_scripts
+      make_command_missing
+    end
+
+    def register(shell)
+      Shelldon::ShellIndex << shell
     end
 
-    def register
-      Shelldon::ShellIndex << @shell
+    def this_shell
+      Shelldon[@name]
     end
 
     def shell(&block)
-      @shell.setup(&block)
+      this_shell.setup(&block)
     end
 
     def command(name, &block)
-      cmd = Shelldon::Command.new(name, @shell.command_list, &block)
-      @shell.command_list.register(cmd)
+      @new_commands << [name, block]
+    end
+
+    def make_commands
+      @new_commands.each do |(name, block)|
+        cmd = Shelldon::Command.new(name, this_shell.command_list, &block)
+        this_shell.command_list.register(cmd)
+      end
+    end
+
+    def script(dir)
+      @new_script_dirs << dir
+    end
+
+    def make_scripts
+      @new_script_dirs.each do |dir|
+        Shelldon::Script.from_dir(dir, this_shell).each do |cmd|
+          this_shell.command_list.register(cmd)
+        end
+      end
     end
 
+    alias_method :scripts, :script
+
     def config(&block)
-      Shelldon::ConfigFactory.create(@shell, &block)
+      @new_configs << block
+    end
+
+    def make_configs
+      @new_configs.each do |block|
+        Shelldon::ConfigFactory.create(this_shell, &block)
+      end
     end
 
     def opts(&block)
-      OptFactory.new(&block)
+      @new_opts << block
+    end
+
+    def make_opts
+      @new_opts.each { |block| OptFactory.new(@name, &block) }
     end
 
     def command_missing(&block)
-      cmd = Shelldon::Command.new(:not_found, @shell, &block)
-      @shell.command_list.register_default(cmd)
+      @new_command_missing = block if block_given?
+    end
+
+    def make_command_missing
+      return unless @new_command_missing
+      cmd = Shelldon::Command.new(:not_found, this_shell, &@new_command_missing.to_proc)
+      this_shell.command_list.register_default(cmd)
+    end
+
+    def on_opt(opt, &block)
+      @new_on_opts << [opt, block]
+    end
+
+    def make_on_opts
+      @new_on_opts.each do |(opt, block)|
+        if this_shell.on_opts.key?(opt)
+          this_shell.on_opts[opt] << block
+        else
+          this_shell.on_opts[opt] = [block]
+        end
+      end
+    end
+
+    def on_pipe(&block)
+      this_shell.on_pipe = block
     end
   end
 end

data/lib/shell/shell_index.rb

@@ -22,12 +22,22 @@ module Shelldon
       @shell_index[key.to_sym]
     end
 
+    def has_key?(key)
+      @shell_index.key?(key)
+    end
+
     def <<(shell)
       if shell.is_a?(Shelldon::Shell)
+        @first = shell.name if @shell_index.empty?
         @shell_index[shell.name] = shell
       else
-        fail StandardError
+        fail Shelldon::NotAShellError
       end
     end
+
+    def first?(sym)
+      sym = sym.to_sym unless sym.is_a?(Symbol)
+      sym == @first
+    end
   end
 end

data/lib/shelldon.rb

@@ -3,20 +3,21 @@ require 'singleton'
 require 'readline'
 require 'getopt/long'
 require 'yaml'
-
+require 'fuzzy_match'
+require 'shell/shell_index'
+require 'dsl'
 require 'shell/shell'
 require 'config/config'
 require 'config/param'
 require 'config/param/string_param'
 require 'config/param/boolean_param'
 require 'config/param/number_param'
-require 'dsl'
-require 'shell/shell_index'
 require 'shell/shell_factory'
 require 'config/config_factory'
 require 'opts/opt_factory'
 require 'config/param_factory'
 require 'command/command'
+require 'command/script'
 require 'command/command_list'
 require 'file_management/file_manager'
 require 'file_management/yaml_manager'
@@ -24,3 +25,7 @@ require 'file_management/config_file_manager'
 require 'exceptions/error_factory'
 require 'opts/opts'
 require 'file_management/history_file'
+require 'helpers/timer'
+require 'exceptions/exceptions'
+require 'helpers/confirmation'
+require 'logger'

data/lib/shelldon/version.rb

@@ -1,3 +1,3 @@
 module Shelldon
-  VERSION = '0.0.1'
+  VERSION = '0.0.7'
 end

data/shelldon.gemspec

@@ -4,25 +4,32 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'shelldon/version'
 
 Gem::Specification.new do |spec|
-  spec.name    = 'shelldon'
-  spec.version = Shelldon::VERSION
-  spec.authors = ['Wesley Boynton']
-  spec.email   = ['wes@boynton.io']
-  spec.homepage = "https://github.com/wwboynton/shelldon"
+  spec.name     = 'shelldon'
+  spec.version  = Shelldon::VERSION
+  spec.authors  = ['Wesley Boynton']
+  spec.email    = ['wes@boynton.io']
+  spec.homepage = 'https://github.com/wwboynton/shelldon'
 
   spec.summary     = 'An expressive DSL for building interactive command-line apps'
   spec.description = "Shelldon is an expressive DSL for build interactive command-line apps (REPLs)\
 with minimal effort. It supports all kinds of fun features, like config/history management, \
 error handling, subcommands, subshells, and more!"
-      spec.license = 'MIT'
+  spec.license = 'MIT'
 
-
-  spec.files         = Dir["#{File.dirname(__FILE__)}/**/**/**/**/*"].reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # spec.files         = Dir["#{File.dirname(__FILE__)}/**/**/**/**/*"].reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'bin'
   spec.executables   = 'shelldon'
   spec.require_paths = %w(lib bin)
 
+  # spec.add_runtime_dependency 'terminal-table', '~> 1.10'
+  # spec.add_runtime_dependency 'rb-readline', '~> 0.5.3'
+  spec.add_runtime_dependency 'getopt', '~> 1.4.2'
+  # spec.add_runtime_dependency 'byebug', '~> 8.2.1'
+  spec.add_runtime_dependency 'fuzzy_match'
+
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop', '~> 0.33.0'
+  # spec.add_development_dependency 'byebug', '~> 8.2.1'
 end

data/test_shell/Gemfile

@@ -1,3 +1,2 @@
+source 'https://rubygems.org'
 gem 'shelldon', path: '/Users/wwboynton/repositories/shelldon/'
-gem 'getopt'
-gem 'byebug'

data/test_shell/Gemfile.lock

@@ -1,20 +1,21 @@
 PATH
   remote: /Users/wwboynton/repositories/shelldon
   specs:
-    shelldon (0.0.1)
+    shelldon (0.0.7)
+      fuzzy_match
+      getopt (~> 1.4.2)
 
 GEM
+  remote: https://rubygems.org/
   specs:
-    byebug (8.2.1)
-    getopt (1.4.2)
+    fuzzy_match (2.1.0)
+    getopt (1.4.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
-  getopt
   shelldon!
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/test_shell/dependency_test/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'shelldon', path: '/Users/wwboynton/repositories/shelldon/'

data/test_shell/dependency_test/Gemfile.lock

@@ -0,0 +1,21 @@
+PATH
+  remote: /Users/wwboynton/repositories/shelldon
+  specs:
+    shelldon (0.0.7)
+      fuzzy_match
+      getopt (~> 1.4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    fuzzy_match (2.1.0)
+    getopt (1.4.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  shelldon!
+
+BUNDLED WITH
+   1.11.2

data/test_shell/dependency_test/dependency_test.rb

@@ -0,0 +1,20 @@
+require 'shelldon'
+require 'pp'
+require 'auto_complete'
+Shelldon.shell :test do
+  command_missing do
+    action { |cmd| puts "No such command \"#{cmd}\"" }
+  end
+
+  shell do
+    prompt 'shelldon> '
+    home '~/.shelldon-test'
+    history true
+    history_file '.shelldon-history'
+
+    errors do
+      accept StandardError
+      # accept(Interrupt) { puts '^C' }
+    end
+  end
+end

data/test_shell/dependency_test/dt_commands.rb

@@ -0,0 +1,66 @@
+Shelldon.shell :test do
+  scripts '~/test/test-scripts'
+
+  command :script do
+    action { '' }
+    scripts '~/test/scripts2'
+  end
+
+  command :arg do
+    help 'Show your args off!'
+    action { |args| puts args }
+  end
+
+  command :blah do
+    action { puts config[:value] }
+    autocomplete %w(dingus dugbus)
+
+    subcommand :swiggity do
+      action { puts 'beh' }
+    end
+
+    subcommand :swag do
+      action { puts 'SWIGGITY SWAG!!!!' }
+
+      subcommand :foobar do
+        action { puts 'BUNGIS' }
+      end
+    end
+  end
+
+  command :help do
+    action { |args| pp command_list.help(args) }
+    help 'Show help. Optionally specify specific command for more information.'
+    usage 'help [cmd]'
+    examples ['help', 'help quit']
+  end
+
+  command :config do
+    help 'Show the configuration of the current session.'
+    usage 'config'
+
+    action do |args|
+      if args.empty?
+        pp config.to_a
+      else
+        param = config.find(args.to_sym)
+        puts "#{param.name}: #{param.val}"
+      end
+    end
+
+    subcommand :save do
+      help 'Save your current configuration'
+      usage 'config save'
+      action { config.save }
+    end
+  end
+
+  command :set do
+    help 'Set a configuration option for the remainder of the session.'
+
+    action do |args|
+      tokens                   = args.split(' ')
+      config[tokens[0].to_sym] = tokens[1]
+    end
+  end
+end

data/test_shell/dependency_test/dt_config.rb

@@ -0,0 +1,31 @@
+
+Shelldon.shell :test do
+  config do
+    config_file '.shelldon_config'
+
+    param :debug_mode do
+      type :boolean
+      default false
+      opt 'd'
+    end
+
+    param :'-o' do
+      type :string
+      default 'emacs'
+      adjust { |s| s.to_s.downcase.strip.gsub('vim', 'vi') }
+      validate do |s|
+        return false unless s == 'emacs' || s == 'vi'
+        if s == 'emacs'
+          Readline.emacs_editing_mode; true
+        else
+          Readline.vi_editing_mode; true
+        end
+      end
+    end
+
+    param :value do
+      type :string
+      default 'This is the default value!'
+    end
+  end
+end

data/test_shell/dependency_test/dt_opts.rb

@@ -0,0 +1,11 @@
+Shelldon.shell :test do
+  opts do
+    opt '--debug', '-d', :boolean
+    opt '--help', '-h', :boolean
+  end
+
+  on_opt 'help' do
+    puts "Here's some help!"
+    exit 0
+  end
+end

data/test_shell/dependency_test/dt_runner.rb

@@ -0,0 +1,11 @@
+# This is a split-up version of the test_shell.rb
+# It exists so you can screw around with when the different parts are required and ensure that
+#   the order doesn't matter.
+
+require 'shelldon'
+require_relative 'dependency_test'
+require_relative 'dt_commands'
+require_relative 'dt_opts'
+require_relative 'dt_config'
+
+Shelldon[:test].run

data/test_shell/simple_shell.rb

@@ -1,7 +1,7 @@
 require 'shelldon'
 require 'pp'
 
-Shelldon.shell do
+Shelldon.shell :test do
   opts do
     opt '--myopt', '-m', :boolean
   end
@@ -34,7 +34,6 @@ Shelldon.shell do
     end
   end
 
-
   # Here's a simplification of grabbing args for use in an action
   command :arg do
     help 'Show your args off!'
@@ -64,7 +63,6 @@ Shelldon.shell do
     end
   end
 
-
   # This will show all that nice help information we've been defining.
   #   This produces a two-dimensional array, so you could make it into a table with some
   #   table-printing gem if you wanted.
@@ -82,9 +80,9 @@ Shelldon.shell do
 
   # LASTLY, define some basic shell properties. The shell will run at the end of this block.
   shell do
-    # You can make your prompt a string or a block
-    prompt 'shelldon> '          # This is okay
-    prompt { "shelldon#{4+2}>" } # This is okay too
+    # You can make your prompt a string or a block!
+    # prompt { "shelldon#{4 + 2}> " } # This is okay
+    prompt 'shelldon> ' # This is okay too
 
     # This is the "home" directory of your shell, used for config files, history files, etc.
     home '~/.my-test'
@@ -104,3 +102,5 @@ Shelldon.shell do
     end
   end
 end
+
+Shelldon[:test].run