aoc_cli 0.1.3 → 0.2.0

data/lib/aoc_cli/help.rb

@@ -8,8 +8,9 @@ def flag(short, full)
 		str += "\t\t"
 	str
 end
-puts <<~help
-Advent of Code - cli, version 0.1.0
+
+help = <<~help
+Advent of Code - cli, version #{AocCli::VERSION}
 #{"C. Welham Feb 2021".italic}
 
 #{title("Usage")}
@@ -17,12 +18,16 @@ Advent of Code - cli, version 0.1.0
 
 #{title("Setup")}
 - Store session cookie keys to access AoC
-#{flag("-k", "--key")}Store a session cookie to use the cli.
-#{flag("-u", "--user")}Set alias for key (default: "main")
+
+#{flag("-k","--key")}Store a session cookie to use the cli.
+#{flag("-u","--user")}Set alias for key (default: "main")
+#{flag("-U","--default")}Get/set default alias
+#{flag("-h","--help")}Print this screen
 
 #{title("Year Directory")}
 - Initialise a year directory to use aoc-cli.
 - If no alias is passed, the default key is used
+
 #{flag("-y","--init-year")}Initialise directory and fetch calendar
 #{flag("-u","--user")}Specify alias for initialisation
 #{flag("-d","--init-day")}Create day subdirectory, fetch puzzle and input
@@ -30,16 +35,21 @@ Advent of Code - cli, version 0.1.0
  
 #{title("Day Subdirectory")}
 - These commands can be run from the day subdirectory
+
 #{flag("-s","--solve")}Attempt puzzle
-#{flag("-r","--refresh")}Refresh puzzle
-#{flag("-a","--attempts")}Prints previous attempt table
 #{flag("-p","--part")}Specify part (attempts)
+#{flag("-r","--refresh")}Refresh puzzle
+
+#{title("Reddit")}
+- Defaults to a Reddit CLI if one is installed
+
 #{flag("-R","--reddit")}Open Reddit solution megathread
-#{flag("-b","--browser")}Open Reddit thread in browser 
+#{flag("-B","--browser")}Open Reddit thread in browser 
 
 #{title("Manual Usage")}
 - AocCli uses metadata so that these flags do not need to be entered.
 - Command flags can be entered manually, but this is not recommended
+
 #{flag("-u","--user")}Specify user
 #{flag("-Y","--year")}Specify year
 #{flag("-D","--day")}Specify day
@@ -48,6 +58,17 @@ Advent of Code - cli, version 0.1.0
 #{title("Configuration")}
 - Pass with a value to update setting
 - Pass without an argument to display current setting. 
-#{flag("-B","--browser")}Always open Reddit in browser (default: false)
-#{flag("-U","--default")}Default key alias to use (default: "main")
+
+#{flag("-U","--default")}Default key alias to use 
+#{flag("-G","--gen-config")}Creates an example config file
+
+#{title("Tables")}
+- Print stats in a terminal-friendly table
+
+#{flag("-a","--attempts")}Prints previous attempts for puzzle (part needed)
+#{flag("-c","--simple-cal")}Prints your progress
+#{flag("-C","--fancy-cal")}Prints your calendar file
+#{flag("-S","--stats")}Prints your stats (time taken, number of attempts)
+
 help
+system("echo '#{help}' | less -r")

data/lib/aoc_cli/interface.rb

@@ -3,17 +3,16 @@ module AocCli
 		class Query
 			def initialize
 				ARGV.size > 0 ? 
-					run(opts:Opts.new.parse_args) : 
-					puts(Help.print)
+					run(opts:Opts.new.parse_args) : Help.print
 				rescue StandardError => e
 					abort e.message
 			end
 			def run(opts:)
-				cmd = Object
-					.const_get("AocCli::Commands::#{opts.cmd}")
+				cmd = Commands.const_get(Validate.cmd(opts.cmd))
 					.new(opts.args)
 					.exec
-				cmd.respond if cmd.class.instance_methods.include?(:respond)
+				cmd.respond if cmd.class
+					.instance_methods.include?(:respond)
 			end
 		end
 		class Help
@@ -31,60 +30,65 @@ module AocCli
 					case ARGV.shift
 					when "-a", "--attempts"
 						@cmd = :AttemptsTable
-					when "-b", "--browser"
+					when "-B", "--browser"
+						@cmd = :OpenReddit
 						args[:browser] = true
+					when "-c", "--simple-cal"
+						@cmd = :CalendarTable
+					when "-C", "--fancy-cal"
+						@cmd = :PrintCal
 					when "-d", "--init-day"
 						@cmd = :DayInit
 						args[:day]  = Validate.day(ARGV.shift.to_i)
+					when "-D", "--day"
+						args[:day]  = ARGV.shift.to_i
+					when "-G", "--gen-config"
+						@cmd = :GenerateConfig
 					when "-h", "--help"
 						exit Help.print
 					when "-k", "--key"
 						@cmd = :KeyStore
 						args[:key]  = Validate.set_key(ARGV.shift)
 					when "-p", "--part"
-						args[:part] = Validate.part(ARGV.shift.to_i)
+						args[:part] = ARGV.shift.to_i
 					when "-r", "--refresh"
 						@cmd = :Refresh
+					when "-R", "--reddit"
+						@cmd = :OpenReddit
 					when "-s", "--solve"
 						@cmd = :DaySolve
 						args[:ans]  = Validate.ans(ARGV.shift)
+					when "-S", "--stats"
+						@cmd = :StatsTable
 					when "-u", "--user"
 						args[:user] = ARGV.shift
+					when "-U", "--default"
+						@cmd = :DefaultAlias
+						args[:user] = ARGV.shift
 					when "-y", "--init-year"
 						@cmd = :YearInit
 						args[:year] = Validate.year(ARGV.shift.to_i)
-					when "-B", "--browser"
-						@cmd = :DefaultReddit
-						args[:value] = ARGV.shift
-					when "-D", "--day"
-						args[:day]  = Validate.day(ARGV.shift.to_i)
-					when "-R", "--reddit"
-						@cmd = :OpenReddit
-					when "-S", "--stats"
-						@cmd = :StatsTable
-					when "-U", "--default-user"
-						@cmd = :DefaultUser
-						args[:user] = ARGV.shift
 					when "-Y", "--year"
-						args[:year] = Validate.year(ARGV.shift.to_i)
+						args[:year] = ARGV.shift.to_i
 					else raise E::FlagInv
 					end 
 				end
-				raise E::NoCmd if cmd.nil?
 				self
 			end
 		end
 		class Validate
+			def self.cmd(cmd)
+				raise E::CmdNil if cmd.nil?
+				cmd
+			end
 			def self.user(user)
 				raise E::UserNil if user.nil?
-				raise E::UserInv.new(user) unless Files::Config
-					.new.is_set?(key:"cookie=>#{user}")
+				raise E::UserInv.new(user) unless user_in_config?(user)
 				user
 			end
 			def self.set_user(user)
 				raise E::UserNil if user.nil?
-				raise E::UserDup if Files::Config.new
-					.is_set?(key:"cookie=>#{user}")
+				raise E::UserDup.new(user) if user_in_config?(user)
 				user
 			end
 			def self.year(year)
@@ -107,12 +111,14 @@ module AocCli
 			end
 			def self.set_key(key)
 				raise E::KeyNil if key.nil?
-				raise E::KeyDup if Files::Config
-					.new.is_set?(val:key)
+				raise E::KeyDup.new(key) if Files::Config::Tools
+					.is_set?(val:"#{key}(\b|$)")
+				raise E::KeyInv unless valid_key?(key)
 				key
 			end
-			def self.get_key(key)
+			def self.key(key)
 				raise E::KeyNil if key.nil?
+				raise E::KeyInv unless valid_key?(key)
 				key
 			end
 			def self.ans(ans)
@@ -132,6 +138,17 @@ module AocCli
 					Metafile.get(:year) != year.to_s
 				dir
 			end
+			def self.no_config
+				raise E::ConfigExist if File.exist?(Paths::Config.path)
+				Paths::Config.path
+			end
+			private
+			def self.valid_key?(key)
+				/session=(?:[a-f0-9]){96}/.match?(key)
+			end
+			def self.user_in_config?(user)
+				Files::Config::Tools.is_set?(key:"cookie=>#{user}")
+			end
 		end
 	end 
 end

data/lib/aoc_cli/paths.rb

@@ -1,16 +1,29 @@
 module AocCli
 	module Paths
-		class Config
-			def self.create
-				FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
-				File.write(path, "", mode:"a") unless File
-					.exist?(path)
+		require 'fileutils'
+		class Year
+			attr_reader :user, :year
+			def initialize(u:Metafile.get(:user),
+						   y:Metafile.get(:year))
+				@user = Validate.user(u)
+				@year = Validate.year(y)
 			end
-			def self.dir
-				"#{Dir.home}/.config/aoc-cli"
+			def in_year?
+				File.exist?("./.meta") ? 
+					Metafile.type == :ROOT : true
 			end
-			def self.path
-				"#{dir}/aoc.rc"
+			def year_dir
+				in_year? ? "." : ".."
+			end
+			def local(f:)
+				"#{Validate.not_init(dir:year_dir, 
+					year:year)}/#{filename(f:f)}"
+			end
+			def filename(f:)
+				case f.to_sym
+				when :Stars then "#{year}.md"
+				when :meta  then ".meta"
+				end
 			end
 		end
 		class Day
@@ -21,6 +34,9 @@ module AocCli
 				@year = Validate.year(y)
 				@day  = Validate.day(d)
 			end
+			def create_cache
+				FileUtils.mkdir_p(cache_dir) unless Dir.exist?(cache_dir)
+			end
 			def filename(f:)
 				case f.to_sym
 				when :Input  then "input"
@@ -51,29 +67,16 @@ module AocCli
 				[cache_path(f:f), local(f:f)]
 			end
 		end
-		class Year
-			attr_reader :user, :year
-			def initialize(u:Metafile.get(:user),
-						   y:Metafile.get(:year))
-				@user = Validate.user(u)
-				@year = Validate.year(y)
-			end
-			def in_year?
-				File.exist?("./.meta") ? 
-					Metafile.type == :ROOT : true
-			end
-			def year_dir
-				in_year? ? "." : ".."
+		class Config
+			def self.create
+				FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+				File.write(path, "", mode:"a") unless File.exist?(path)
 			end
-			def local(f:)
-				"#{Validate.not_init(dir:year_dir, 
-					year:year)}/#{filename(f:f)}"
+			def self.dir
+				"#{Dir.home}/.config/aoc-cli"
 			end
-			def filename(f:)
-				case f.to_sym
-				when :Stars then "#{year}.md"
-				when :meta  then ".meta"
-				end
+			def self.path
+				"#{dir}/aoc.rc"
 			end
 		end
 		class Database < Config

data/lib/aoc_cli/solve.rb

@@ -16,10 +16,8 @@ module AocCli
 				@answer = Validate.ans(a)
 			end
 			def raw
-				@raw ||= Tools::Post
-					.new(u:user, y:year, d:day, 
-						 data:{level:part, answer:answer})
-					.plain
+				@raw ||= Tools::Post.new(u:user, y:year, d:day, 
+					 data:{level:part, answer:answer}).plain
 			end
 			def check
 				case raw
@@ -29,8 +27,7 @@ module AocCli
 				end
 			end
 			def respond
-				Object
-					.const_get("AocCli::Solve::Respond::#{check}")
+				Respond.const_get(check)
 					.new(attempt:self)
 					.respond
 					.react
@@ -45,44 +42,35 @@ module AocCli
 			end
 			class Correct < Response
 				def react
-					log = Database::Log
-						.new(attempt:attempt)
-						.correct
-					Database::Stats::Complete
-						.new(n:log.count_attempts)
-						.update
+					Database.correct(attempt:attempt)
 					Year.refresh
-					Day.refresh
-					Database::Stats::Init.new.init 
+					Day.refresh(files:[:Puzzle])
 				end
 				def respond
-					response = "#{"Correct!".bold.green} "
-					response += case attempt.part
-						when "1" then next_part
-						when "2" then complete end
-					puts response
+					puts <<~response
+					#{"Correct!".bold.green} #{ 
+					case attempt.part
+					when "1" then "Downloading part two..."
+					when "2" then "This day is now complete!".green
+					end }
+					response
 					self
 				end
-				private 
-				def next_part
-					"Downloading part two.."
-				end
-				def complete
-					"This day is now complete!".green
-				end
 			end
 			class Incorrect < Response
 				def react
-					Database::Log
+					Database::Attempt
 						.new(attempt:attempt)
 						.incorrect(high:high, low:low)
 				end
 				def respond
-					response =  "#{"Incorrect".red.bold}: "\
-						"You guessed - #{attempt.answer.to_s.red}\n"
-					response += "This answer is too high\n" if high
-					response += "This answer is too low\n"  if low
-					puts response
+					puts <<~response
+					#{"Incorrect".red.bold}: You guessed - #{attempt
+						.answer.to_s.red} #{
+					high ? "(too high)" : 
+					low  ? "(too low)"  : ""}
+					#{"Please wait".yellow} #{wait_time} before answering again
+					response
 					self
 				end
 				def high
@@ -91,12 +79,16 @@ module AocCli
 				def low
 					/too low/.match?(attempt.raw)
 				end
+				def wait_time
+					attempt.raw.scan(/(?:(one minute|\d+ minutes))/)
+						.first.first.to_s
+				end
 			end
 			class Wait < Response
 				def respond
-					response = "#{"Please wait".yellow.bold}: "\
-								"You have #{time.to_s} to wait"
-					puts response
+					puts <<~response
+					#{"Please wait".yellow.bold}: #{time.to_s} 
+					response
 					self
 				end
 				def time

data/lib/aoc_cli/tables.rb

@@ -1,34 +1,47 @@
 module AocCli
 	module Tables
-		class Attempts
+		class Table
 			require 'terminal-table'
-			attr_reader :user, :year, :day, :part, :db
-			def initialize(u:Metafile.get(:user),
-						   y:Metafile.get(:year),
-						   d:Metafile.get(:day),
-						   p:Metafile.get(:part))
+			attr_reader :user, :year, :table, :cols, :where
+			def initialize(u:Metafile.get(:user), y:Metafile.get(:year))
 				@user = Validate.user(u)
 				@year = Validate.year(y)
-				@day  = Validate.day(d)
-				@part = Validate.part(p)
-				@db   = Database::Query
+			end
+			def border
+				Prefs.bool(key:"unicode_tables") ? :unicode : :ascii
+			end
+			def data
+				Database::Query
 					.new(path:Paths::Database.cfg(user))
+					.select(t:table, cols:cols, where:where)
 			end
-			def show
-				puts rows.count > 0 ? table : 
-					"You have not attempted this puzzle yet!"
+			def print
+				puts rows.count > 0 ? make : nil_message
 			end
-			private
-			def table
+			def make
 				tab = Terminal::Table.new(
 					:headings  => headings,
 					:rows      => rows,
 					:title     => title)
 				tab.style = {
-					:border    => :unicode, 
+					:border    => border, 
 					:alignment => :center}
 				tab
 			end
+		end
+		class Attempts < Table
+			attr_reader :day, :part 
+			def initialize(u:Metafile.get(:user),
+						   y:Metafile.get(:year),
+						   d:Metafile.get(:day),
+						   p:Metafile.get(:part))
+				super(u:u, y:y)
+				@day   = Validate.day(d)
+				@part  = Validate.part(p)
+				@table = :attempts
+				@cols  = "time, answer, high, low, correct"
+				@where = {year:year, day:day, part:part}
+			end
 			def title
 				"#{year} - Day #{day}:#{part}".bold
 			end
@@ -36,56 +49,33 @@ module AocCli
 				["Answer", "Time", "Hint"]
 			end
 			def rows
-				@rows ||= attempts
-					.map{|a| [parse_ans(a), parse_time(a), parse_hint(a)]}
-			end
-			def attempts 
-				db.select(
-					t:"attempts", 
-					cols:"time, answer, high, low, correct", 
-					data:{year:year, day:day, part:part})
-			end
-			def parse_ans(attempt)
-				attempt[4] == 1 ? 
-					attempt[1].to_s.green :
-					attempt[1].to_s.red
-			end
-			def parse_time(attempt)
-				DateTime
-					.strptime(attempt[0], "%Y-%m-%d %H:%M:%S %Z")
+				@rows ||= data.map do |d|
+					[parse_ans(d), parse_time(d), parse_hint(d)]
+				end
+			end
+			def parse_ans(row)
+				row[4] == 1 ?  row[1].to_s.green : row[1].to_s.red
+			end
+			def parse_time(row)
+				DateTime.strptime(row[0], "%Y-%m-%d %H:%M:%S %Z")
 					.strftime("%H:%M - %d/%m/%y")
 			end
-			def parse_hint(attempt)
-				attempt[2] == 1 ? "low" : 
-				attempt[3] == 1 ? "high" : "-"
+			def parse_hint(row)
+				row[3] == 1 ? "low" : 
+					row[2] == 1 ? "high" : "-"
+			end
+			def nil_message
+				"You have not attempted part #{part} yet!"
 			end
 		end
 		module Stats
-			class Year
-				attr_reader :user, :year, :db
+			class Year < Table
 				def initialize(u:Metafile.get(:user),
 							   y:Metafile.get(:year))
-					@user = Validate.user(u)
-					@year = Validate.year(y)
-					@db = Database::Query
-						.new(path:Paths::Database.cfg(user))
-				end
-				def print
-					puts rows.count > 0 ? table : 
-						"You have not completed any puzzles yet"
-				end
-				def rows
-					@rows ||= stats.map{|s| [s[0], s[1], s[2], s[3]]}
-				end
-				def table
-					tab = Terminal::Table.new(
-						:headings  => headings,
-						:rows      => rows,
-						:title     => title)
-					tab.style = {
-						:border    => :unicode, 
-						:alignment => :center}
-					tab
+					super(u:u, y:y)
+					@table = :stats
+					@cols  = "day, part, attempts, elapsed"
+					@where = {year:"'#{year}'", correct:"'1'"}
 				end
 				def title
 					"Year #{year}"
@@ -93,15 +83,11 @@ module AocCli
 				def headings
 					["Day", "Part", "Attempts", "Time (h:m:s)"]
 				end
-				def stats
-					@stats ||= db.select(
-						t:"stats", 
-						cols:"day, part, attempts, elapsed",
-						data:where)
+				def rows
+					@rows ||= data.map{|d| [d[0], d[1], d[2], d[3]]}
 				end
-				def where
-					{year:"'#{year}'",
-					 correct:"'1'"}
+				def nil_message
+					"You have not completed any puzzles yet"
 				end
 			end
 			class Day < Year
@@ -111,9 +97,10 @@ module AocCli
 							   d:Metafile.get(:day))
 					super(u:u, y:y)
 					@day = Validate.day(d)
-				end
-				def rows
-					@rows ||= stats.map{|s| [s[0], s[1], s[2]]}
+					@cols = "part, attempts, elapsed"
+					@where = { year:"'#{year}'", 
+							   day:"'#{day}'", 
+							   correct:"'1'" }
 				end
 				def title
 					"Year #{year}: Day #{day}"
@@ -121,18 +108,31 @@ module AocCli
 				def headings
 					["Part", "Attempts", "Time (h:m:s)"]
 				end
-				def stats
-					@stats ||= db.select(
-						t:"stats", 
-						cols:"part, attempts, elapsed",
-						data:where)
-				end
-				def where
-					{year:"'#{year}'",
-					  day:"'#{day}'",
-					 correct:"'1'"}
+				def rows
+					@rows ||= data.map{|d| [d[0], d[1], d[2]]}
 				end
 			end
 		end
+		class Calendar < Table
+			def initialize(u:Metafile.get(:user),
+						   y:Metafile.get(:year))
+				super(u:u, y:y)
+				@table = :calendar
+				@cols  = "*"
+				@where = {year:year}
+			end
+			def title
+				"#{user}: #{year}"
+			end
+			def headings
+				["Day", "Stars"]
+			end
+			def rows
+				@rows ||= data.map{|d| [d[1], parse_stars(d[2])]}
+			end
+			def parse_stars(day)
+				day.to_i == 0 ? ".." : ("*" * day.to_i).ljust(2, ".")
+			end
+		end
 	end
 end