aoc_cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3acf7f6fddbd91d2dbdb7e3407eafd03cdb3881c4accd09449c6781f0079ab6b
-  data.tar.gz: d117b869b63189c82829f81009c6c9081bb1beb2c61575340c230275ec54c9c2
+  metadata.gz: bee1d6efc3fabf9d4f218f642989d57a3623de2726834c59ec71d4349958725f
+  data.tar.gz: bd8b87f6998e73b607f79e669c051071432ee8e5553171ad78976f8684f2748f
 SHA512:
-  metadata.gz: a1b18d80a79c09e48edc79d181cd3512cc274ab267f9d4448696f84db1e71a7a3a2c556f83044b15c538c2584e4a675cbdab3ab561c51b9f9e35de3d62b75455
-  data.tar.gz: 1ee697aa72eb8022b9fddf6d2a3b200c9ee548c56cbc32578330edc22c67ec1ec6e16255edcdbca741f382224a26dec4858a4b89a70d040f019634070bd32e8f
+  metadata.gz: 9af542a18643e3a8c642ef1ec70284e76b93b0aef184827f1510e9e02479649724e34fc219a3e193f17de01b07831a5361f4a6c40f30fea1df3de27ff0e11a84
+  data.tar.gz: a7eb8b816eb983a7a346d80ea81e2c711c3a1cc856b57541552de52c4a467170a0d18eed01d990ab5c6400a6c1774357c7f67a8bfe9040f7548be5b39c1cbab6

data/CHANGELOG.md

@@ -4,7 +4,7 @@
 	- Add user-agent
 
 ## 20-02-21 
-###0.2.0
+### 0.2.0
 	- Add calendar tables
 		- Star progress now based off this database rather than meta json
 	- Add cat of calendar from any directory
@@ -18,3 +18,8 @@
 		- Turn on/off leaderboard stats in calendar file
 	- Git integration
 	- General refactor
+
+## 22-02-21
+### 0.2.1
+	- Add day_dir_prefix option
+	- Add functionality to prevent duplicate incorrect attempts

data/README.md

@@ -74,7 +74,7 @@ aoc -k $your_key
 
 ```
 
-- AoC-cli stores this key under the alias 'main' if no custom alias is specified
+- aoc-cli stores this key under the alias 'main' if no custom alias is specified
 - To store the key under a different alias use the `-u` or `--user` flags followed by the desired alias.
 - Session keys are stored in the aoc config file located at `~/.config/aoc-cli/aoc.rc`.
 
@@ -94,7 +94,7 @@ cookie=>account2=>session=123abc
 
 aoc-cli allows for multiple keys to be stored within the config file. 
 
-To see which alias is currently deafult run `aoc -U` or `aoc --default`
+To see which alias is currently default run `aoc -U` or `aoc --default`
 
 - You can update the default alias by running 
 
@@ -139,7 +139,6 @@ There are two types of directories
 2. Day subdirectories
 	- These contain the puzzles, your input and your code
 
-
 ## Initialising the Year
 
 To begin using the cli you must first initialise the year directory. 
@@ -187,6 +186,7 @@ This command performs the following actions
 
 All puzzles and inputs are cached in aoc-cli on a per-user basis. This means that if you have previously initialised this day under the same alias before, your puzzle and input will be transferred from the cache locally rather than downloading from the aoc server.
 
+NB: if you wish to add a prefix to your day subdirectory names, you can add `day_dir_prefix=>$prefix` to your config file
 
 ## Solving Puzzles
 
@@ -196,16 +196,19 @@ From the day subdirectory you can attempt to solve puzzles by running the comman
 aoc -s $answer
 ```
 
-You will then receive one of three responses
+You will then receive one of four responses
 
 1. The answer is correct
 2. The answer is not correct
-3. You have time to wait before submitting an answer
+3. You have already tried this incorrect answer
+4. You have time to wait before submitting an answer
 
 If your answer is correct, aoc-cli will automatically update the puzzle instructions and your calendar file. Additionally aoc-cli will calculate how long and how many attempts it took to solve the puzzle (see the Tables section)
 
 Incorrect attempts will be logged along with any hint as to whether your answer was too high or too low. 
 
+Trying to answer with the same incorrect answer for the second time will throw an error
+
 If you have sent multiple incorrect attempts AoC will ask you to wait before trying again - be patient!
 
 
@@ -299,7 +302,7 @@ These settings can be configured in your config file (see configuration)
 
 ## Vim Integration
 
-if you use vim you may wish to set a keybinding to automatically run your code and submit it for validation once you have solved a puzzle.
+If you use vim you may wish to set a keybinding to automatically run your code and submit it for validation once you have solved a puzzle.
 
 Using Ruby as an example, you could add the following line to your .vimrc:
 
@@ -311,7 +314,7 @@ Executing leader + ac would then run your program and send the answer to the ser
  
 ## Configuration
 
-aoc-cli can be configured using a the config file at `~/.config/aoc-cli/aoc.rc`
+aoc-cli can be configured using the config file at `~/.config/aoc-cli/aoc.rc`
 
 To generate an example configuration file you can run `aoc -G` or `aoc --gen-config`. (Note this will throw an error if `~/.config/aoc-cli/aoc.rc` already exists)
 
@@ -330,6 +333,7 @@ Lines can be commented out of the rc file by prefixing with `//`
 | Flag              | Type   | Description                                                   | Default |
 |-------------------|--------|---------------------------------------------------------------|---------|
 | calendar_file     | bool   | Write calendar as a markdown file                             | true    |
+| day_dir_prefix    | string | Add prefix to day subdirectory nam                            | nil     |
 | default           | string | Default alias                                                 | main    |
 | ignore_md_files   | bool   | Auto add md files (calendar and puzzles) to gitignore         | true    |
 | ignore_meta_files | bool   | Auto add meta files to gitignore                              | true    |

data/lib/aoc_cli.rb

@@ -1,5 +1,4 @@
 require 'colorize'
-require 'sqlite3'
 
 require_relative 'aoc_cli/errors'
 require_relative 'aoc_cli/interface'
@@ -17,6 +16,4 @@ require_relative 'aoc_cli/tables'
 module AocCli
 	Metafile = AocCli::Files::Metafile
 	Prefs    = AocCli::Files::Config::Prefs
-	Validate = AocCli::Interface::Validate
-	E = AocCli::Errors
 end

data/lib/aoc_cli/database.rb

@@ -52,6 +52,10 @@ module AocCli
 					val:data << 0 << parse_hint(low:low, high:high))
 				self
 			end
+			def duplicate?(ans:)
+				db.select(t:"attempts", 
+						  where:where.merge({answer:ans})).count > 0
+			end
 			def parse_hint(low:, high:)
 				[ low ? 1 : 0, high ? 1 : 0 ]
 			end

data/lib/aoc_cli/errors.rb

@@ -182,5 +182,94 @@ module AocCli
 				error
 			end
 		end
+		class AtmptDup < StandardError
+			attr_reader :answer
+			def initialize(answer)
+				@answer = answer
+			end
+			def message
+				<<~error
+				#{ERROR}: You have already tried #{answer.red}
+				To see previous attempts run #{"aoc -a".yellow}
+				error
+			end
+		end
 	end 
+	class Validate
+		E = Errors
+		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 user_in_config?(user)
+			user
+		end
+		def self.set_user(user)
+			raise E::UserNil if user.nil?
+			raise E::UserDup.new(user) if user_in_config?(user)
+			user
+		end
+		def self.year(year)
+			raise E::YearNil if year.nil?
+			raise E::YearInv.new(year) if year.to_i < 2015 ||
+				year.to_i > 2020
+			year
+		end
+		def self.day(day)
+			raise E::DayNil if day.nil? || day == 0
+			raise E::DayInv.new(day) if day.to_i < 1 ||
+				day.to_i > 25
+			day
+		end
+		def self.part(part)
+			raise E::PartNil  if part.nil?
+			raise E::PuzzComp if part.to_i == 3
+			raise E::PartInv  if part.to_i < 1 || part.to_i > 2
+			part
+		end
+		def self.set_key(key)
+			raise E::KeyNil if key.nil?
+			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.key(key)
+			raise E::KeyNil if key.nil?
+			raise E::KeyInv unless valid_key?(key)
+			key
+		end
+		def self.ans(attempt:, ans:)
+			raise E::AnsNil if ans.nil?
+			raise E::AtmptDup.new(ans) if Database::Attempt
+				.new(attempt:attempt).duplicate?(ans:ans)
+			ans
+		end
+		def self.day_dir(day)
+			raise E::DayExist.new(day) if Dir.exist?(day)
+			day
+		end
+		def self.init(dir)
+			raise E::NotInit unless File.exist?("#{dir}/.meta")
+			dir
+		end
+		def self.not_init(dir:, year:)
+			raise E::AlrInit if File.exist?("#{dir}/.meta") && 
+				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

data/lib/aoc_cli/files.rb

@@ -53,6 +53,7 @@ module AocCli
 				private
 				def self.defaults
 					{ calendar_file:true,
+					  day_dir_prefix:"",
 					  ignore_md_files:true,
 					  ignore_meta_files:true,
 					  init_git:false,

data/lib/aoc_cli/interface.rb

@@ -3,14 +3,13 @@ module AocCli
 		class Query
 			def initialize
 				ARGV.size > 0 ? 
-					run(opts:Opts.new.parse_args) : Help.print
+					run(args:Args.new.parse) : Help.print
 				rescue StandardError => e
 					abort e.message
 			end
-			def run(opts:)
-				cmd = Commands.const_get(Validate.cmd(opts.cmd))
-					.new(opts.args)
-					.exec
+			def run(args:)
+				cmd = Commands.const_get(Validate.cmd(args.cmd))
+					.new(args.args).exec
 				cmd.respond if cmd.class
 					.instance_methods.include?(:respond)
 			end
@@ -20,12 +19,12 @@ module AocCli
 				require_relative "help.rb"
 			end
 		end
-		class Opts
+		class Args
 			attr_reader :cmd, :args
 			def initialize
 				@args = {}
 			end
-			def parse_args
+			def parse
 				while ARGV.size > 0
 					case ARGV.shift
 					when "-a", "--attempts"
@@ -57,7 +56,7 @@ module AocCli
 						@cmd = :OpenReddit
 					when "-s", "--solve"
 						@cmd = :DaySolve
-						args[:ans]  = Validate.ans(ARGV.shift)
+						args[:ans]  = ARGV.shift
 					when "-S", "--stats"
 						@cmd = :StatsTable
 					when "-u", "--user"
@@ -70,85 +69,11 @@ module AocCli
 						args[:year] = Validate.year(ARGV.shift.to_i)
 					when "-Y", "--year"
 						args[:year] = ARGV.shift.to_i
-					else raise E::FlagInv
+					else raise Errors::FlagInv
 					end 
 				end
 				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 user_in_config?(user)
-				user
-			end
-			def self.set_user(user)
-				raise E::UserNil if user.nil?
-				raise E::UserDup.new(user) if user_in_config?(user)
-				user
-			end
-			def self.year(year)
-				raise E::YearNil if year.nil?
-				raise E::YearInv.new(year) if year.to_i < 2015 ||
-					year.to_i > 2020
-				year
-			end
-			def self.day(day)
-				raise E::DayNil if day.nil? || day == 0
-				raise E::DayInv.new(day) if day.to_i < 1 ||
-					day.to_i > 25
-				day
-			end
-			def self.part(part)
-				raise E::PartNil  if part.nil?
-				raise E::PuzzComp if part.to_i == 3
-				raise E::PartInv  if part.to_i < 1 || part.to_i > 2
-				part
-			end
-			def self.set_key(key)
-				raise E::KeyNil if key.nil?
-				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.key(key)
-				raise E::KeyNil if key.nil?
-				raise E::KeyInv unless valid_key?(key)
-				key
-			end
-			def self.ans(ans)
-				raise E::AnsNil if ans.nil?
-				ans
-			end
-			def self.day_dir(day)
-				raise E::DayExist.new(day) if Dir.exist?(day)
-				day
-			end
-			def self.init(dir)
-				raise E::NotInit unless File.exist?("#{dir}/.meta")
-				dir
-			end
-			def self.not_init(dir:, year:)
-				raise E::AlrInit if File.exist?("#{dir}/.meta") && 
-					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

@@ -37,6 +37,9 @@ module AocCli
 			def create_cache
 				FileUtils.mkdir_p(cache_dir) unless Dir.exist?(cache_dir)
 			end
+			def prefix
+				Prefs.string(key:"day_dir_prefix")
+			end
 			def filename(f:)
 				case f.to_sym
 				when :Input  then "input"
@@ -48,7 +51,9 @@ module AocCli
 				Metafile.type == :DAY 
 			end
 			def day_dir
-				day.to_i < 10 ? "0#{day}" : day.to_s
+				day.to_i < 10 ? 
+					"#{prefix}0#{day}" : 
+					"#{prefix}#{day}"
 			end
 			def local_dir
 				in_day? ? "." : "#{day_dir}"

data/lib/aoc_cli/solve.rb

@@ -13,7 +13,10 @@ module AocCli
 				@year   = Validate.year(y)
 				@day    = Validate.day(d)
 				@part   = Validate.part(p)
-				@answer = Validate.ans(a)
+				@answer = Validate.ans(attempt:self, ans:a)
+			end
+			def exists?
+				Database::Attempt.new(attempt:self)
 			end
 			def raw
 				@raw ||= Tools::Post.new(u:user, y:year, d:day, 

data/lib/aoc_cli/version.rb

@@ -1,3 +1,3 @@
 module AocCli
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aoc_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Christian Welham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize