aoc_cli 0.1.3 → 0.2.0

data/lib/aoc_cli/tools.rb

@@ -28,7 +28,7 @@ module AocCli
 			end
 			private
 			def cookie
-				Files::Cookie.new(u:user).key
+				Files::Config::Cookie.key(user:user)
 			end
 			def url
 				case page.to_sym
@@ -75,11 +75,8 @@ module AocCli
 		end
 		class Get < Convert
 			def initialize(u:Metafile.get(:user),
-						   y:Metafile.get(:year),
-						   d:nil, p:)
-				@input = Request
-					.new(u:u, y:y, d:d, p:p)
-					.get
+						   y:Metafile.get(:year), d:nil, p:)
+				@input = Request.new(u:u, y:y, d:d, p:p).get
 			end
 		end
 		class Post < Convert
@@ -92,5 +89,32 @@ module AocCli
 					.post(data:data)
 			end
 		end
+		class Reddit
+			attr_reader :year, :day, :uniq, :browser
+			def initialize(y:Metafile.get(:year), 
+						   d:Metafile.get(:day), 
+						   b:Prefs.bool(key:"reddit_in_browser"))
+				@year = Validate.year(y)
+				@day  = Validate.day(d)
+				@uniq = Database::Query
+					.new(path:Paths::Database.root("reddit"))
+					.select(t:"'#{year}'", where:{day:"'#{day}'"})
+					.flatten[1]
+				@browser = b
+			end
+			def open
+				system("#{browser ? "open" : cmd} #{link}")
+			end
+			def cmd
+				["ttrv", "rtv"]
+					.map{|cli| cli unless `which #{cli}`.empty?}
+					.reject{|cmd| cmd.nil?}&.first || "open"
+			end
+			def link
+				"https://www.reddit.com/r/"\
+				"adventofcode/comments/#{uniq}/"\
+				"#{year}_day_#{day}_solutions"
+			end
+		end
 	end 
 end

data/lib/aoc_cli/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module AocCli
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/aoc_cli/year.rb

@@ -2,13 +2,13 @@ module AocCli
 	module Year
 		def self.refresh
 			puts "- Updating calendar...".blue
-			Year::Init.new.write
-			Year::Stars.new.write.update_meta
+			Year::Meta.new.write
+			Year::Progress.new.write
 		end
-		class Init
+		class Meta
 			attr_reader :user, :year, :paths
-			def initialize(u:Files::Config.new.def_acc,
-						   y:Metafile.get(:year), dir:".")
+			def initialize(u:Prefs.default_alias,
+						   y:Metafile.get(:year))
 				@user  = Validate.user(u)
 				@year  = Validate.year(y)
 				@paths = Paths::Year.new(u:user, y:year)
@@ -18,37 +18,32 @@ module AocCli
 					Metafile.year(u:user, y:year))
 			end
 		end
-		class Stars < Init
-			attr_reader :stats, :cal
-			def initialize(u:Metafile.get(:user), 
-						   y:Metafile.get(:year))
-				super(u:u, y:y)
-				@stats = Data::Stats.new(u:user, y:year)
-				@cal   = Data::Calendar.new(u:user, y:year)
+		class Progress < Meta
+			def stats
+				@stats ||= Requests::Stats.new(u:user, y:year)
+			end
+			def cal
+				@cal ||= Requests::Calendar.new(u:user, y:year)
 					.fill(stars:stats.stars)
 			end
+			def file
+				Files::Calendar.new(stats:stats, cal:cal).make
+			end
+			def write?
+				Prefs.bool(key:"calendar_file")
+			end
 			def write
-				File.write(paths.local(f:"Stars"), file)
+				File.write(paths.local(f:"Stars"), file) if write?
 				self
 			end
-			def update_meta
-				Metafile.add(path:paths.local(f:"meta"), hash:{
-					stars:stats.stars.to_json, 
-					total:stats.total_stars})
-			end
-			private
-			def file
-				text = <<~file
-					Year #{year}: #{stats.total_stars}/50 *
-					#{"-" * (cal.data[0].to_s.length + 2)}
-					#{cal.data.join("\n")}\n
-				file
-				text += stats.data.join("\n") if stats.total_stars > 0
-				text
+			def init_calendar_db
+				Database::Calendar::Init
+					.new(u:user, y:year, stars:stats.stars)
+					.insert
 			end
 		end
-		module Data
-			class YearObject < Init
+		module Requests
+			class Request < Meta
 				attr_reader :data
 				def initialize(u:Metafile.get(:user),
 							   y:Metafile.get(:year))
@@ -57,10 +52,11 @@ module AocCli
 				end
 				private
 				def fetch
-					Tools::Get.new(u:user, y:year, p:page).plain.split("\n")
+					Tools::Get.new(u:user, y:year, p:page)
+						.plain.split("\n")
 				end
 			end
-			class Calendar < YearObject
+			class Calendar < Request
 				def page
 					:Calendar
 				end
@@ -74,7 +70,7 @@ module AocCli
 					self
 				end
 			end
-			class Stats < YearObject
+			class Stats < Request
 				def page
 					:Stats
 				end
@@ -94,5 +90,26 @@ module AocCli
 				end
 			end
 		end
+		class GitWrap
+			require 'git'
+			attr_reader :git
+			def initialize
+				@git = Git.init 
+				File.write(".gitignore", ignore)
+				git.add(".gitignore")
+			end
+			def ignore_md?
+				Prefs.bool(key:"ignore_md_files")
+			end
+			def ignore_meta?
+				Prefs.bool(key:"ignore_meta_files")
+			end
+			def ignore
+				<<~ignore
+				#{".meta\n**/.meta" if ignore_meta?}#{
+				  "\n*.md\n**/*.md" if ignore_md?}
+				ignore
+			end
+		end
 	end 
 end

data/sample/aoc.rc

@@ -0,0 +1,21 @@
+//aoc-cli example config
+//See the github repo for more information on configuring aoc-cli
+//https://github.com/apexatoll/aoc-cli
+
+[General]
+//Print table in unicode rather than ascii
+unicode_tables=>true
+//Open Reddit in browser rather than use a Reddit CLI
+reddit_in_browser=>false
+
+[Initialise Year]
+//Create a calendar file 
+calendar_file=>true
+//Initialise git repo on year initialisation
+init_git=>false
+//Add calendar and puzzle files to gitignore
+ignore_md_files=>true
+//Add .meta files to gitignore
+ignore_meta_files=>true
+//Include leaderboard stats in calendar file
+lb_in_calendar=>true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aoc_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Christian Welham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +129,7 @@ files:
 - lib/aoc_cli/tools.rb
 - lib/aoc_cli/version.rb
 - lib/aoc_cli/year.rb
-- pkg/aoc_cli-0.1.2.gem
+- sample/aoc.rc
 homepage: https://github.com/apexatoll/aoc-cli
 licenses:
 - MIT