wip-runner 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64b6f78c5e647a9466ebd60985ac716ded1bf9f
-  data.tar.gz: ef987404e179109f39e0d70bef78b7926428b21f
+  metadata.gz: 1f477879c1c21aefbb14a98a5b81adbec74aa359
+  data.tar.gz: 5476e96fb0f8bd8a7235e7ac22d7e8386ba2cdcd
 SHA512:
-  metadata.gz: 289d7586526bc1634e9303ddd1d9dde0b4110f1434fd270e059b1a7ab35af9c4407efef24bc14739bc598d5d13a806c79bc355cefd3f8d896cf7b36dd5333235
-  data.tar.gz: df6f588f1eac45e2e11567812981b36e96162cc3c1b5e95cd68a4a3eeed741980d1a27250fa5fe14021a12362d42fd56fdc2925f81214088a5c2e30b3d162ef8
+  metadata.gz: 2c5f6158af88078c592cabbdc937287abfb40f5b34f70be01471ec571ef19b37c0b3b71223f1ac331fd74e7f6c589696d188d0a16fdba8bdf3d2cae94b03a25a
+  data.tar.gz: 3a7515d2f1463bff01978b09e40575a97bfecb414a3036d59d7a31df465651e1306b445a08a9c881ebb256d1ad5387dee5efc6c63eb7160c3f96ec96b3dad46f

data/lib/wip/runner/cli.rb

@@ -10,6 +10,8 @@ module WIP
             if File.exist?("#{extension}.rb")
               $:.push(File.join(extension, 'lib'))
               require extension
+
+              templates(File.join(extension, 'templates'))
             end
           end
         end
@@ -29,6 +31,14 @@ module WIP
         def namespace
           @namespace || WIP::Runner
         end
+
+        def templates(*paths)
+          @templates ||= []
+          unless paths.empty?
+            @templates = (@templates + paths.flatten).uniq
+          end
+          @templates
+        end
       end
 
       def initialize(io = HighLine.new)
@@ -43,7 +53,8 @@ module WIP
         exit
       end
 
-      def run(args = [])
+      def run(argv = [])
+        args      = argv.dup
         recipient = (command(args) || @parser)
         recipient.run(args)
       rescue InvalidCommand => e

data/lib/wip/runner/command.rb

@@ -51,21 +51,25 @@ module WIP
       end
 
       def run(argv = [])
-        parser.run(argv) do |command, arguments, options|
-          if command.nil?
-            if options.help
-              parser.help
-              return
+        begin
+          parser.run(argv) do |command, arguments, options|
+            if command.nil?
+              if options.help
+                parser.help
+                return
+              end
+
+              validate!(arguments)
+              execute(arguments, options)
+            else
+              # TODO: add a spec for the help path.
+              command.match(/^-/) ? parser.help : delegate(command, argv)
             end
-
-            validate!(arguments)
-            execute(arguments, options)
-          else
-            # TODO: add a spec for the help path.
-            command.match(/^-/) ? parser.help : delegate(command, argv)
           end
+        rescue OptionParser::InvalidOption => e
+          raise InvalidOption, e.args.join(' ')
         end
-      rescue OptionParser::InvalidOption, InvalidArguments, InvalidCommand => e
+      rescue InvalidArgument, InvalidArguments, InvalidCommand, InvalidOption, InvalidOptions => e
         print_error(e)
       end
 
@@ -77,13 +81,11 @@ module WIP
 
       def validate!(arguments)
         unless parser.arguments.empty? || parser.config.no_validate
-          if parser.arguments.keys.any? { |key| arguments[key].nil? }
-            lines = []
-            arguments.each_pair do |key, value|
-              lines << "  - #{key} ... (missing)" if value.nil?
-            end
-            raise InvalidArguments, %Q{\n#{lines.join("\n")}}
+          missing = parser.arguments.keys.inject({}) do |memo, key|
+            memo[key] = nil if arguments[key].nil?
+            memo
           end
+          raise InvalidArguments, missing unless missing.empty?
         end
       end
 
@@ -95,7 +97,7 @@ module WIP
       end
 
       def print_error(e)
-        @io.say(e.message.capitalize)
+        @io.say(e.message)
         @io.newline
         parser.help
       end

data/lib/wip/runner/errors.rb

@@ -10,15 +10,62 @@ module WIP
   #   - OptionParser::InvalidOption
    module Runner
     class Error < StandardError
+      def initialize(message = nil)
+        super
+        @message = message
+      end
+
       def message
-        prefix = self.class.name.split('::').last
-          .gsub(/([A-Z])/, " \\1")
+        "#{prefix.capitalize}: #{format(super)}".sub(/\s\n/, "\n")
+      end
+
+      private
+
+      def format(original)
+        if @message.is_a?(Array)
+          values = @message.map(&:to_s)
+          width  = values.sort { |a, b| b.size <=> a.size }[0].size
+          lines  = []
+          values.each do |value|
+            lines << sprintf("    - %-#{width}s", value)
+          end
+          "\n#{lines.join("\n")}"
+        elsif @message.respond_to?(:each) # e.g., Hash, WIP::Runner::Options
+          keys  = @message.keys.map(&:to_s)
+          width = keys.sort { |a, b| b.size <=> a.size }[0].size
+          lines = []
+          @message.each do |key, value|
+            lines << [
+              sprintf("    - %-#{width}s", key.to_s),
+              format_value(value)
+            ].join(' ... ')
+          end
+          "\n#{lines.join("\n")}"
+        else
+          format_value(@message)
+        end
+      end
+
+      def format_value(value)
+        case value
+        when nil
+          '(missing)'
+        else
+          value
+        end
+      end
+
+      def prefix
+        self.class.name.split('::').last.gsub(/([A-Z])/, " \\1")
           .strip
           .capitalize
-        "#{prefix}: #{super}".sub(/\s\n/, "\n")
       end
     end
-    class InvalidArguments < Error; end
-    class InvalidCommand   < Error; end
+
+    class InvalidArgument  < Error ; end
+    class InvalidArguments < Error ; end
+    class InvalidCommand   < Error ; end
+    class InvalidOption    < Error ; end
+    class InvalidOptions   < Error ; end
   end
 end

data/lib/wip/runner/options.rb

@@ -2,6 +2,18 @@ require 'ostruct'
 
 module WIP
   module Runner
-    class Options < OpenStruct ; end
+    class Options < OpenStruct
+      def each(&block)
+        self.to_h.each(&block)
+      end
+
+      def keys
+        self.to_h.keys
+      end
+
+      def values
+        self.to_h.values
+      end
+    end
   end
 end

data/lib/wip/runner/parser/option_parser.rb

@@ -0,0 +1,41 @@
+module WIP
+  module Runner
+    class Parser
+      class OptionParser < ::OptionParser
+        def list(items, mode = :rows, option = nil, pad = true)
+          if (mode == :rows)
+            items   = items.map { |item| "#{option} #{item}" } if option
+            items.join("\n#{pad ? padding : nil}")
+          else
+            HighLine.new.list(items, mode, option)
+          end
+        end
+
+        def wrap(text, mode = :description, line_width = 80)
+          indented = false
+
+          if mode == :description
+            line_width -= indentation
+            indented = true
+          end
+
+          wrapped = text.split("\n").collect! do |line|
+            line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
+          end * "\n"
+
+          indented ? wrapped.split("\n").join("\n#{padding}") : wrapped
+        end
+
+        private
+
+        def indentation
+          @indentation ||= summary_indent.length + summary_width + 1
+        end
+
+        def padding
+          @padding ||= ' ' * indentation
+        end
+      end
+    end
+  end
+end

data/lib/wip/runner/parser.rb

@@ -1,3 +1,5 @@
+require 'wip/runner/parser/option_parser'
+
 module WIP
   module Runner
     class Parser
@@ -12,7 +14,7 @@ module WIP
       def run(argv)
         unless commands.empty?
           command = argv.shift
-          raise InvalidCommand, '(missing)' if command.nil?
+          raise InvalidCommand if command.nil?
           yield(command, nil, nil)
         else
           remaining = options.parse!(argv)
@@ -82,9 +84,10 @@ module WIP
           parser.separator ''
           parser.separator heading
 
-          pairs.each do |name, details|
-            padding = ' ' * (parser.summary_width - name.length + 1)
-            parser.separator [parser.summary_indent, name, padding, details[:overview]].join('')
+          pairs.each do |name, definition|
+            padding   = ' ' * (parser.summary_width - name.length + 1)
+            overview  = definition[:overview]
+            parser.separator [parser.summary_indent, name, padding, overview].join('')
           end
         end
       end

data/lib/wip/runner/renderer/context.rb

@@ -0,0 +1,24 @@
+module WIP::Runner::Renderer
+  class Context
+    class << self
+      def for(context = {})
+        self.new(context).send(:__binding__)
+      end
+    end
+
+    def initialize(context)
+      context.each do |key, value|
+        if value.is_a?(Module)
+          value = Helper.for(self, value)
+        end
+        self.class.send(:define_method, key.intern, Proc.new { value })
+      end
+    end
+
+    private
+
+    def __binding__
+      binding
+    end
+  end
+end

data/lib/wip/runner/renderer/handlers/erb.rb

@@ -0,0 +1,22 @@
+require 'erb'
+
+module WIP::Runner::Renderer
+  class Handlers::ERB
+    def initialize(template)
+      @template = clean(template)
+    end
+
+    def render(context)
+      ::ERB.new(@template).result(context)
+    end
+
+    private
+
+    def clean(string)
+      return if string.nil?
+
+      indent = (string.scan(/^[ \t]*(?=\S)/).min || '').size
+      string.gsub(/^[ \t]{#{indent}}/, '').strip
+    end
+  end
+end

data/lib/wip/runner/renderer/handlers.rb

@@ -0,0 +1,5 @@
+module WIP::Runner::Renderer
+  module Handlers ; end
+end
+
+Dir[File.expand_path('../handlers/*.rb', __FILE__)].each { |f| require(f) }

data/lib/wip/runner/renderer/helper.rb

@@ -0,0 +1,26 @@
+module WIP::Runner::Renderer
+  class Helper
+    def self.for(context, mod)
+      self.instance_eval { include mod }
+      self.new(context)
+    end
+
+    def initialize(context)
+      @context = context
+    end
+
+    protected
+
+    def method_missing(method_name, *args, &block)
+      if @context.respond_to?(method_name)
+        @context.send(method_name, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      @context.respond_to?(method_name) || super
+    end
+  end
+end

data/lib/wip/runner/renderer.rb

@@ -0,0 +1,33 @@
+module WIP
+  module Runner
+    module Renderer
+      # TODO: allow handler configuration/option
+      def render(content, context = {})
+        content = path?(content) ? template(content) : content
+        handler(:ERB, content).render(Context.for(context))
+      end
+
+      def template(path)
+        base_paths = WIP::Runner::CLI.templates
+        base_paths.each do |base|
+          file = File.join("#{base}/#{path}")
+          return File.read(file) if File.exist?(file)
+        end
+
+        raise WIP::Runner::InvalidArgument, "#{path} not found in:\n#{base_paths.map { |base| "    - #{base}" }.join("\n")}"
+      end
+
+      private
+
+      def path?(content)
+        File.extname(content).match(/\.[a-z]+$/)
+      end
+
+      def handler(key, content)
+        Handlers::const_get(key).new(content)
+      end
+    end
+  end
+end
+
+Dir[File.expand_path('../renderer/*.rb', __FILE__)].each { |f| require(f) }

data/lib/wip/runner/version.rb

@@ -1,5 +1,5 @@
 module WIP
   module Runner
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/wip/runner.rb

@@ -11,7 +11,7 @@ require 'wip/runner/cli/version'
 require 'wip/runner/shell'
 require 'wip/runner/workflow'
 require 'wip/runner/commands'
-require 'wip/runner/renderers'
+require 'wip/runner/renderer'
 
 module WIP
   module Runner ; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wip-runner
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Corey Innis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -95,8 +95,12 @@ files:
 - lib/wip/runner/errors.rb
 - lib/wip/runner/options.rb
 - lib/wip/runner/parser.rb
-- lib/wip/runner/renderers.rb
-- lib/wip/runner/renderers/erb.rb
+- lib/wip/runner/parser/option_parser.rb
+- lib/wip/runner/renderer.rb
+- lib/wip/runner/renderer/context.rb
+- lib/wip/runner/renderer/handlers.rb
+- lib/wip/runner/renderer/handlers/erb.rb
+- lib/wip/runner/renderer/helper.rb
 - lib/wip/runner/shell.rb
 - lib/wip/runner/shell/handlers.rb
 - lib/wip/runner/shell/handlers/base.rb

data/lib/wip/runner/renderers/erb.rb

@@ -1,34 +0,0 @@
-require 'erb'
-
-module WIP
-  module Runner
-    module Renderers
-      module ERB
-        def self.included(base)
-          base.extend(ClassMethods)
-        end
-
-        def render(template, context)
-          if (file = File.join("#{self.class.templates}/#{template}.erb")) && File.exist?(file)
-            template = File.read(file)
-          end
-          ::ERB.new(clean(template)).result(context)
-        end
-
-        def clean(string)
-          return if string.nil?
-
-          indent = (string.scan(/^[ \t]*(?=\S)/).min || '').size
-          string.gsub(/^[ \t]{#{indent}}/, '').strip
-        end
-
-        module ClassMethods
-          def templates(value = nil)
-            @templates = value unless value.nil?
-            @templates
-          end
-        end
-      end
-    end
-  end
-end

data/lib/wip/runner/renderers.rb

@@ -1,7 +0,0 @@
-module WIP
-  module Runner
-    module Renderers ; end
-  end
-end
-
-Dir[File.expand_path('../renderers/*.rb', __FILE__)].each { |f| require(f) }