biscotti 0.1.3 → 0.1.4

data/exe/biscotti

@@ -12,36 +12,19 @@ $LOAD_PATH.unshift("#{__dir__}/../lib")
 require 'biscotti'
 require 'biscotti/cli'
 
-require 'optparse'
-
-OptionParser.new do |opts|
-  opts.banner = 'Usage: bundle exec biscotti [--version] [--help] <letters>'
+BISCOTTI_HOME = File.realpath(File.join(File.dirname(__FILE__), '..'))
 
-  opts.on('-V', '--version', 'Print version info') do
-    $stdout.puts("biscotti version #{Biscotti::VERSION}")
-    exit(0)
-  end
+begin
+  options = Biscotti::CLI::OptParser.parse!(ARGV)
 
-  # TODO: Print dictionary
-  # TODO: Minimum character count
-  # TODO: Provide a custom dictionary
-  # TODO: Output as a grouped list by word length
-  # TODO: Verbose mode to emit more than just the list
-  # TODO: Alternative formats mode: JSON, Yaml, Text (default)
+  dictionary_file = options.fetch(:dictionary, File.join(BISCOTTI_HOME, 'data', 'biscotti', 'words.lst')).freeze
 
-  opts.on_tail('-h', '--help', 'Show this message') do
-    warn(opts)
-    exit(0)
-  end
-end.parse!
+  # Raise error if dictionary file doesn't exist or cannot be read.
 
-# raise 'File not processable' unless Biscotti::CLI.processable?
+  dictionary = Biscotti.load_dictionary(dictionary_file).freeze
 
-BISCOTTI_HOME = File.realpath(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  dictionary = Biscotti.load_dictionary(File.join(BISCOTTI_HOME, 'data', 'biscotti', 'words.lst').freeze)
   letters = ARGV.flat_map { |word| word.downcase.split('') }.sort.join
+
   min_word_length = 2
 
   output = Biscotti.find_words(

data/lib/biscotti.rb

@@ -34,10 +34,12 @@ module Biscotti
       w.concat(letters.permutation(letter_count).to_a.map(&:join))
     end
 
+    letters_count = letters.count
+    word_length_range = (min_word_length..letters_count).freeze
+
     words & dictionary
             .map(&:chomp)
-            .select { |word| word.length >= min_word_length }
-            .select { |word| word.length <= letters.count }
+            .select { |word| word_length_range.include?(word.length) }
             .map { |word| word.strip.downcase.split('') }
             .select { |word| (word - letters).empty? }
             .select { |word| word.all? { |l0| word.count { |l1| l1 == l0 } <= letters_frequency_idx[l0] } }

data/lib/biscotti/cli.rb

@@ -1,13 +1,50 @@
 # frozen_string_literal: true
 
+require 'optparse'
+
 module Biscotti
   module CLI
-    def self.run(app, io)
-      # app.new(railroad: Sodor::Railroad::Marshal.load(io))
-    end
+    class OptParser
+      def self.parse!(args)
+        options = {}
+
+        parser = OptionParser.new do |opts|
+          opts.banner = 'Usage: bundle exec biscotti [--version] [--help] [--dictionary=/path/to/words.lst] <letters>'
+
+          opts.on('-V', '--version', 'Print version info') do
+            $stdout.puts("biscotti version #{Biscotti::VERSION}")
+            exit(0)
+          end
+
+          opts.on('-D', '--dictionary=DICTIONARY', 'Path to the words list') do |dictionary|
+            options[:dictionary] = dictionary
+          end
+
+          # TODO: Print dictionary
+          # TODO: Minimum character count
+          # TODO: Provide a custom dictionary
+          # TODO: Output as a grouped list by word length
+          # TODO: Verbose mode to emit more than just the list
+          # TODO: Alternative formats mode: JSON, Yaml, Text (default)
+
+          opts.on_tail('-h', '--help', 'Show this message') do
+            warn(opts)
+            exit(0)
+          end
+        end
+
+        begin
+          parser.parse!(args)
+        rescue StandardError => e
+          puts e.message
+
+          exit(1)
+        end
+
+        options[:letters] = ARGV
 
-    def self.processable?
-      ARGF.filename != '-' || !(STDIN.tty? || STDIN.closed?)
+        options
+      end
     end
   end
 end

data/lib/biscotti/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Biscotti
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biscotti
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mike Hall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Totally not a way to cheat at letter scramble games.