spud 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b52bb3b0a406042b1c0feaf8c6952974992b1c79586eb372417c03253367db
-  data.tar.gz: 366ce2813f418f1b0a5795a28c73f37128ef3a82c0dff95809877ab5dca5783e
+  metadata.gz: fb821b1f4c184c6f4fda6e5fe02f17807786cbae5d2678f5ce63d154e8986e29
+  data.tar.gz: 9db7fac77dcd10a339c6f5ded2136b36801b547abee13ee73d062674f8a949f6
 SHA512:
-  metadata.gz: 1fe21ca0d2b91d02c995deb4515382e5a59ee54160bcee71af23608cb634962b3beb16c764193ee9ff46314d8f7251d5fdc40ae1a535a5646362ba208784c7a7
-  data.tar.gz: e7f16245115ca30d84585c5fee030e1be064dff6e38fd67196f5423501699242a132f7dab0e58885d7f6d24c54f16828960a23b7cba9e65dfc648bfe835e8f02
+  metadata.gz: 37572660fdd244779b01427399527d1ec89f7533657f0e9b2ec8e620efc2ba3111dc6c3b5f12429270dddfbb9f46a018a5745934684581ea1af4b6eed11558c5
+  data.tar.gz: 40247e664b05f7e059c3b676e0465bab1b03927dceda1ffaf6fd6991c145ce2afc76d8780bb856ab5ddf923271febfb689956a7d0057b3768b944c6c598488f5

data/lib/build_tools/build_rule.rb

@@ -8,6 +8,14 @@ module Spud
       def filename
         raise NotImplementedError
       end
+
+      def positional_params
+        []
+      end
+
+      def keyword_params
+        []
+      end
     end
   end
 end

data/lib/build_tools/spud/rule.rb

@@ -21,9 +21,9 @@ module Spud::BuildTools
       def invoke(*args, **kwargs)
         raise Spud::Error, "'#{@name}' is up to date" if up_to_date?
 
-        missing = required_params.length - args.length
+        missing = positional_params.length - args.length
         if missing > 0
-          names = required_params.map { |name| "'#{name}'" }.join(', ')
+          names = positional_params.map { |name| "'#{name}'" }.join(', ')
           arguments = missing > 1 ? 'arguments' : 'argument'
           raise Spud::Error, "invocation of '#{@name}' missing required #{arguments} #{names}"
         end
@@ -37,6 +37,15 @@ module Spud::BuildTools
         end
       end
 
+      # Params
+      def positional_params
+        @positional_params ||= params.select { |p| p.first == :req }.map(&:last)
+      end
+
+      def keyword_params
+        @keyword_params ||= params.select { |p| p.first == :key }.map(&:last)
+      end
+
       private
 
       # Up to date checking
@@ -86,11 +95,11 @@ module Spud::BuildTools
 
       # Lambda
       def key_params?
-        lam.parameters.map(&:first).include?(:key)
+        @key_params ||= !keyword_params.empty?
       end
 
-      def required_params
-        lam.parameters.select { |p| p.first == :req }.map(&:last)
+      def params
+        @params ||= lam.parameters
       end
 
       def lam

data/lib/build_tools/spud/rule_context.rb

@@ -16,10 +16,6 @@ module Spud::BuildTools
         end
       end
 
-      def __shell(cmd, params = {})
-        @__process = Spud::Shell.new(cmd, params)
-      end
-
       def sh(cmd)
         out = sh?(cmd)
         raise ShellError unless out.status.exitstatus.zero?
@@ -29,7 +25,7 @@ module Spud::BuildTools
 
       def sh?(cmd)
         puts cmd
-        __shell(cmd)
+        Spud::Shell.new(cmd)
       end
 
       def shh(cmd)
@@ -40,7 +36,7 @@ module Spud::BuildTools
       end
 
       def shh?(cmd)
-        __shell(cmd)
+        Spud::Shell.new(cmd)
       end
 
       def shhh(cmd)
@@ -51,7 +47,7 @@ module Spud::BuildTools
       end
 
       def shhh?(cmd)
-        __shell(cmd, silent: true)
+        Spud::Shell.new(cmd, silent: true)
       end
 
       def invoke(name, *args, **kwargs)

data/lib/spud.rb

@@ -91,20 +91,73 @@ module Spud
     end
 
     def print_rules!
-      table = rules.map { |name, rule| [name, rule.filename] }
+      #table = rules.map { |name, rule| { name: name, filename: rule.filename } }
+
+      longest_name = 0
+      longest_filename = 0
+      longest_positional = 0
+      longest_keyword = 0
+      table = []
+      rules.each do |name, rule|
+        longest_name = name.length if name.length > longest_name
+
+        positional = rule.positional_params.map(&method(:wrap_param)).join(' ')
+        longest_positional = positional.length if positional.length > longest_positional
+
+        keyword = rule.keyword_params.map(&method(:prefix_param)).join(' ')
+        longest_keyword = keyword.length if keyword.length > longest_keyword
+
+        longest_filename = rule.filename.length if rule.filename.length > longest_filename
+
+        table << [name, positional, keyword, rule.filename]
+      end
+
+      table.each do |(name, positional, keyword, filename)|
+        fields = [name.ljust(longest_name)]
+        fields << positional.ljust(longest_positional) unless longest_positional == 0
+        fields << keyword.ljust(longest_keyword) unless longest_keyword == 0
+        fields << filename.ljust(longest_filename)
+
+        puts fields.join('  ')
+      end
+
+      return
 
       longest_rule = 0
       longest_filename = 0
+      longest_positional = 0
+      longest_keyword = 0
       table.each do |(rule, filename)|
         longest_rule = rule.length if rule.length > longest_rule
         longest_filename = filename.length if filename.length > longest_filename
+
+        positional = rule.positional_params.map(&method(:wrap_param)).join(' ')
+        longest_positional = positional.length if positional.length > longest_positional
+
+        keyword = rule.keyword_params.map(&method(:prefix_param)).join(' ')
+        longest_keyword = keyword.length if keyword.length > longest_keyword
       end
 
       table.each do |(rule, filename)|
+        [
+          [rule, longest_rule],
+          [positional, longest_positional],
+          [filename, longest_filename],
+          [filename, longest_filename],
+        ]
+
         puts "#{rule.ljust(longest_rule)}  #{filename.ljust(longest_filename)}"
       end
     end
 
+    def wrap_param(name)
+      "<#{name}>"
+    end
+
+    def prefix_param(name)
+      name.length == 1 ? "-#{name}" : "--#{name}"
+    end
+
     # Help
     def print_help!
       help = StringIO.new

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Spud
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Andrew Booth