mister_bin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6758cdef54004ba6fc9f83f4b73f318213919800393c072f00d6b21daef46b
-  data.tar.gz: 665a7f2759ac11bf3f7850cfbc2319cded0009f4776806f821c01b1b77691f26
+  metadata.gz: f9ead1a61f1fa10257fdada263fe53831d50eb347cb72511b9a84380f22c1fa0
+  data.tar.gz: 98d279539bbcefe16e28a29d8106fbac79613ce6eb9a8adf80359a7204c5933c
 SHA512:
-  metadata.gz: 1c493f1c9e7e104be1c95d86baa4c3a806ae90272e592938787d17ae363b82a442265f7984ff32ba4708bc764124563a534b029f15180ba852430cc8d0b35e63
-  data.tar.gz: 600cda0b6a7faaa6b98a32eb970cfcc19e725dcf4402eb741d29ce036568c062e64a07602b580d1330191e87fe99b9a4c816fd6ceb8356c78d264336b2eb5fc3
+  metadata.gz: c43175939978e46c952ca8d89b02111e8a5f6c001d1c973e6c18bed8da09cc81d2aa3fbb186896bf94bc0d7459d050ecac7972aefa899803f18282b9740110e0
+  data.tar.gz: 977f09d4e624c8870c0011a22d4cf6143751246b21b0dcdc19e81a225c6400abdb0e8e6fff4bb82d1c9a1c5c91cc05341c8a242d7e564017f5dbaf6661f08fa0

data/README.md

@@ -239,4 +239,3 @@ end
 
 
 [1]: http://docopt.org/
-

data/lib/mister_bin/command.rb

@@ -9,13 +9,17 @@ module MisterBin
     end
 
     def run(argv=[])
-      script = Script.new file
-      script.build_docopt
       script.execute argv
     end
 
-    # def argv
-    #   command.split ' '
-    # end
+    def metadata
+      script.evaluate
+    end
+
+    private
+
+    def script
+      @script ||= Script.new file
+    end
   end
 end

data/lib/mister_bin/commands.rb

@@ -1,8 +1,13 @@
+require 'forwardable'
+
 module MisterBin
 
   # This class handles listing and finding command files
   class Commands
+    extend Forwardable
+    
     attr_reader :basename, :basedir, :isolate
+    def_delegators :all, :[], :<<, :each, :size, :keys, :values, :empty?
 
     def initialize(basename, basedir='.', isolate: false)
       @basename = basename
@@ -14,12 +19,8 @@ module MisterBin
       @all ||= all!
     end
 
-    def names
-      all.keys.sort
-    end
-
     def find(command, subcommand=nil)
-      if subcommand and names.include? "#{command} #{subcommand}"
+      if subcommand and keys.include? "#{command} #{subcommand}"
         all["#{command} #{subcommand}"]
       else
         all["#{command}"]
@@ -38,7 +39,7 @@ module MisterBin
         end
         result[command] = Command.new command, file
       end
-      result
+      result.sort.to_h
     end
 
     def files

data/lib/mister_bin/docopt_maker.rb

@@ -1,4 +1,3 @@
-require 'singleton'
 require 'colsole'
 
 module MisterBin
@@ -6,17 +5,12 @@ module MisterBin
   # This singleton class is responsible for generating a text string ready to be used
   # by Docopt. 
   class DocoptMaker
-    include Singleton
     include Colsole
 
     attr_reader :usages, :options, :examples, :params
     attr_accessor :help, :version
 
     def initialize
-      reset
-    end
-
-    def reset
       @usages = []
       @options = []
       @params = []

data/lib/mister_bin/runner.rb

@@ -40,18 +40,31 @@ module MisterBin
     end
 
     def show_subs
-      if commands.all.empty?
-        puts "No subcommands found"
+      if commands.empty?
+        say "No subcommands found"
       else
-        say "#{header}\n" if header
-        puts "Commands:"
-        commands.names.each { |command| puts "  #{name} #{command}" }
-        say "\n#{footer}" if footer
+        show_subs!
       end
 
       return 1
     end
 
+    def show_subs!
+      longest_key = commands.keys.max_by(&:size).size
+      max_summary_size = terminal_width - longest_key - 6
+
+      say "#{header}\n" if header
+      
+      say "Commands:"
+      commands.each do |key, command|
+        summary = command.metadata[:summary] || ''
+        summary = summary[0..max_summary_size].strip
+        say "  !bldgrn!#{key.ljust longest_key}  !txtrst!#{summary}"
+      end
+
+      say "\n#{footer}" if footer
+    end
+
     def commands
       @commands ||= Commands.new name, basedir, isolate: isolate
     end

data/lib/mister_bin/script.rb

@@ -13,14 +13,9 @@ module MisterBin
       @file = file
     end
 
-    def build_docopt
-      DocoptMaker.instance.reset
-      instance_eval script
-      docopt
-    end
-
     def execute(argv=[])
-      args = Docopt.docopt docopt, version: DocoptMaker.instance.version, argv: argv
+      build_docopt
+      args = Docopt.docopt docopt, version: maker.version, argv: argv
       exitcode = action_block.call args if action_block
       exitcode.is_a?(Numeric) ? exitcode : 0
     rescue Docopt::Exit => e
@@ -28,34 +23,43 @@ module MisterBin
       1
     end
 
+    def evaluate
+      instance_eval script
+      metadata
+    end
+
     def docopt
-      DocoptMaker.instance.docopt
+      maker.docopt
+    end
+
+    def metadata
+      { summary: help, version: version }
     end
 
     # DSL
 
-    def help(text)
-      DocoptMaker.instance.help = text
+    def help(text=nil)
+      text ? maker.help = text : maker.help
+    end
+
+    def version(text=nil)
+      text ? maker.version = text : maker.version
     end
 
     def usage(text)
-      DocoptMaker.instance.usages << text
+      maker.usages << text
     end
 
     def option(flags, text)
-      DocoptMaker.instance.options << [flags, text]
+      maker.options << [flags, text]
     end
 
     def param(param, text)
-      DocoptMaker.instance.params << [param, text]
+      maker.params << [param, text]
     end
 
     def example(text)
-      DocoptMaker.instance.examples << text
-    end
-
-    def version(text)
-      DocoptMaker.instance.version = text
+      maker.examples << text
     end
 
     def action(&block)
@@ -64,6 +68,16 @@ module MisterBin
 
     private
 
+    def build_docopt
+      @maker = nil
+      instance_eval script
+      docopt
+    end
+
+    def maker
+      @maker ||= DocoptMaker.new
+    end
+
     def script
       @script ||= File.read file
     end

data/lib/mister_bin/version.rb

@@ -1,3 +1,3 @@
 module MisterBin
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mister_bin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole