tg_fibonacci 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4891e515933b584f6c6bd450eb36fce0abd101ddfe382a70d700e40846577771
-  data.tar.gz: 79de5032e64f4e6cdb0d3b303c5946490898820cd3a8830d2814f798482f6a51
+  metadata.gz: 0bb801573867cfcfbe4ab1ff92dae470768edf287ecb25678411c18d68cc5035
+  data.tar.gz: ae5137e44143717c4b85a5e65efc0db191b8298d2b0a9871004023e1d3a3b7d9
 SHA512:
-  metadata.gz: 1975d5e7543ebd3a5a049a7fe6593e1466911357981d4814ace88f487055ab4258e080f3e24af82de73fecb4411d210c19094a64afe60d815cfa500efa7750d7
-  data.tar.gz: 1ddf4385463bdfdd11b9d567ff04b079e40aa393a662e4feba738174dc28911e93a1f44fcc229f29afedbffb354fa71380ae16ff04b4137da4ba7903074c15a0
+  metadata.gz: 80f080cb5d01f96fcbcc8259aa803f13b0d7c649cb132d2fbe4b6e1c15e9b67ab37ed7b3b52cd5c83cbeb2dc558e1b1ea564980707ac28774d6ab41d50f8bb7c
+  data.tar.gz: 72520302b550674acc31ec9e4361e31e24bc9aaa8d0d6a03f21dcbfa736b33dfe92a96c2ff0de67a27a8de59b993cf0a05f6da7d871fa5e51f5c7fd9e4a32544

data/bin/tg_fib

@@ -1,67 +1,95 @@
 #!/usr/bin/env ruby
 
+require 'io/console'
+require 'thor'
 require_relative '../lib/fibonacci/fibonacci'
 
-def help_cli
-    <<-END_OF_STRING
-    tg_fib              Compute fibonacci numbers
+class TgFib < Thor
+  desc "term N", "Compute fibonacci sequence up to the Nth term"
+  def term(n)
+    puts term_seq(n)
+  end
 
-    Usage:
-    tg_fib help         Show this help menu
-    tg_fib [number]     Compute the fibonacci number
-    tg_fib              Enter interactive mode
-    END_OF_STRING
-end
+  desc "max N", "Compute fibonacci sequence up to a maximum of N"
+  def max(n)
+    puts max_seq(n)
+  end
 
-def help_interactive
-    <<-END_OF_STRING
-    Interactive help:
+  desc "repl", "Run in a read-eval-print loop (default)"
+  def repl
+    loop do
+      puts "\nPlease enter a command: (h)elp, (q)uit"
+      print "> "
+      command = STDIN.gets.chomp.downcase
+      case command
+      when /^m\s+\d+$/, /^max\s+\d+$/
+        puts max_seq(command.split(' ').last)
+      when /^t\s+\d+$/, /^term\s+\d+$/
+        puts term_seq(command.split(' ').last)
+      when 'h', 'help'
+        puts interactive_help
+      when 'q', 'quit', 'exit'
+        break
+      else
+        puts "Please a valid command"
+      end
+    end
+  end
 
-    Commands:
-    (h)elp      Show this help menu
-    (q)uit      Quit the program
+  default_task :repl
 
-    Usage:
-    Enter a non-negative integer to compute that fibonacci number.
+  no_commands do
+    def sequence(number)
+      Fibonacci::Fibonacci.sequence(Integer(number))
+    end
 
-    Example:
-    > 5
-    # => fib(5) = 1, 1, 2, 3, 5, 8
-    END_OF_STRING
-end
+    def upto(number)
+      Fibonacci::Fibonacci.upto(Integer(number))
+    end
 
-def repl
-    loop do
-        puts "\nPlease enter a non-negative integer: (h)elp, (q)uit"
-        print "> "
-        command = gets.chomp.downcase
-        case command
-        when /^\d+$/
-            puts run(command)
-        when 'h', 'help'
-            puts help_interactive
-        when 'q', 'quit', 'exit'
-            break
-        else
-            puts "Please enter a number or a valid command"
-        end
+    def term_seq(number)
+      format(sequence(number))
     end
-end
 
-def run(number)
-    Fibonacci::Fibonacci.seq_string(Integer(number))
-end
+    def max_seq(number)
+      format(upto(number))
+    end
+
+    def format(sequence)
+      "{ #{sequence.join(', ')} }"
+    end
+
+    def interactive_help
+      <<~HELP
+      #{divider}
+      Interactive help:
+
+      Commands:
+      (h)elp      # Show this help menu
+      (q)uit      # Quit the program
+      (m)ax N     # Compute fibonacci sequence up to a maximum of N
+      (t)erm N    # Compute fibonacci sequence up to the Nth term"
+
+      Examples:
+      > max 6
+      # => { 1, 1, 2, 3, 5 }
+
+      > m 6
+      # => { 1, 1, 2, 3, 5 }
+
+      > term 6
+      # => { 1, 1, 2, 3, 5, 8 }
+
+      > t 6
+      # => { 1, 1, 2, 3, 5, 8 }
+      #{divider}
+      HELP
+    end
 
-def start
-    argument = ARGV.shift
-    case argument
-    when 'help'
-        puts help_cli
-    when /^\d+$/
-        puts run(argument)
-    else
-        repl
+    def divider
+      '=' * IO.console.winsize[1]
     end
+  end
 end
 
-start
+TgFib.start(ARGV)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tg_fibonacci
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ian Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec