mmi 0.1.3 → 0.2.1

data/lib/mmi/interactive/updater.rb

@@ -1,6 +1,14 @@
+require 'cli/ui'
+
+require 'mmi/interactive/modloader'
+require 'mmi/interactive/assets'
+
 module Mmi
 	module Interactive
 		class Updater
+			include Modloader
+			include Assets
+			
 			attr_accessor :processor
 			attr_accessor :file_path
 			
@@ -10,157 +18,36 @@ module Mmi
 			end
 			
 			def run!
-				while true
+				loop do
 					to_update = CLI::UI::Prompt.ask('What do you want to update?') do |handler|
 						[
-							['assets'                , :assets      ],
-							['quit & save changes'   , :quit_save   ],
+							['modloader',              :modloader   ],
+							['assets',                 :assets      ],
+							['quit & save changes',    :quit_save   ],
 							['quit & discard changes', :quit_discard],
 						].each do |name, result|
-							handler.option(name) do |s|
+							handler.option(name) do
 								result
 							end
 						end
 					end
 					
 					case to_update
-					when :assets
-						update_assets
-					when :quit_save
-						file_path = CLI::UI::Prompt.ask('Filename', default: self.file_path, is_file: true)
-						yaml      = self.processor.content.to_yaml
-						
-						File.write(File.expand_path(file_path, Dir.pwd), yaml)
-						break
-					when :quit_discard
-						break
-					else
-						raise 'Consider yourself lucky, you found a bug.'
-					end
-				end
-			end
-			
-			def update_assets
-				while true
-					assets = processor.assets.assets
-					
-					choice = CLI::UI::Prompt.ask('Which asset do you want to change?') do |handler|
-						assets.each do |asset|
-							handler.option(asset.display_name) do |s|
-								asset
-							end
-						end
-						
-						handler.option('add' , &:to_sym)
-						handler.option('quit', &:to_sym)
-					end
-					
-					case choice
-					when :quit
-						break
-					when :add
-						add_asset
-					else
-						update_asset(choice)
-					end
-				end
-			end
-			
-			def add_asset
-				source_type = CLI::UI::Prompt.ask('Choose a source type.') do |handler|
-					[
-						'github',
-					].each do |type|
-						handler.option(type, &:to_sym)
-					end
-					
-					handler.option('quit', &:to_sym)
-				end
-				
-				case source_type
-				when :quit
-					false
-				when :github
-					options = {
-						'source' => {
-							'type'     => 'github',
-							'asset_id' => 0,
-						}
-					}
-					
-					options['source']['owner'      ] = CLI::UI::Prompt.ask('Who is the owner of the source repository?').strip
-					options['source']['repo'       ] = CLI::UI::Prompt.ask('What is the name of the source repository?').strip
-					options['source']['install_dir'] = CLI::UI::Prompt.ask('In which directory should the asset be placed?', default: 'mods').strip
-					options['source']['filename'   ] = CLI::UI::Prompt.ask('Under which filename should the asset be saved? (leave empty for release asset name)', allow_empty: true).strip.then do |filename|
-						filename == '' ? nil : filename
-					end
-					
-					options['source'].compact!
-					
-					source = Mmi::Source::Github.new(options['source'])
-					
-					if update_asset(source)
-						self.processor.content['assets'] ||= []
-						
-						self.processor.content['assets'].push(options)
-						self.processor.assets.assets.push(source)
-						
-						true
-					else
-						CLI::UI.puts('Aborting asset addition. No change will be made.', color: CLI::UI::Color::RED)
-						
-						false
-					end
-				end
-			end
-			
-			def update_asset(asset)
-				case asset
-				when Mmi::Source::Github
-					releases = ::Github::Client::Repos::Releases.new.list(owner: asset.owner, repo: asset.repo, per_page: 100)
-					
-					release = CLI::UI::Prompt.ask('Choose a release.') do |handler|
-						releases.select do |release|
-							release.assets.any?
-						end.each do |release|
-							handler.option(release.name) do |s|
-								release
-							end
-						end
-						
-						handler.option('quit', &:to_sym)
-					end
-					
-					case release
-					when :quit
-						false
-					else
-						release_asset = CLI::UI::Prompt.ask('Choose an asset.') do |handler|
-							release.assets.each do |a|
-								handler.option(a.name) do |s|
-									a
-								end
-							end
+						when :modloader
+							update_modloader
+						when :assets
+							update_assets
+						when :quit_save
+							file_path = CLI::UI::Prompt.ask('Filename', default: self.file_path, is_file: true)
+							yaml      = self.processor.options.to_yaml
 							
-							handler.option('quit', &:to_sym)
-						end
-						
-						case release_asset
-						when :quit
-							false
+							File.write(File.expand_path(file_path, Dir.pwd), yaml)
+							break
+						when :quit_discard
+							break
 						else
-							asset.options.delete('release')
-							asset.options.delete('file'   )
-							
-							asset.options['asset_id'] = release_asset.id
-							
-							true
-						end
+							raise 'Consider yourself lucky, you found a bug.'
 					end
-				else
-					CLI::UI.puts('This asset cannot be updated.', color: CLI::UI::Color::RED)
-					
-					false
 				end
 			end
 		end

data/lib/mmi/interactive.rb

@@ -1,10 +1,9 @@
-require 'cli/ui'
 require 'mmi'
 require 'mmi/interactive/updater'
 
 module Mmi
 	module Interactive
-		class << self;
+		class << self
 			def update(file_path, processor)
 				Updater.new(file_path, processor).run!
 			end

data/lib/mmi/mod_file_processor.rb

@@ -1,50 +1,63 @@
+require 'mmi/assets_processor'
 require 'mmi/modloader/none'
 require 'mmi/modloader/fabric'
-require 'mmi/assets_processor'
+require 'mmi/option_attributes'
 require 'mmi/semver'
 
 module Mmi
 	class ModFileProcessor
-		attr_reader :content
+		include OptionAttributes
 		
-		attr_reader :version
-		attr_reader :profile_dir
+		opt_accessor :version
+		opt_accessor :modloader
+		opt_accessor :assets
 		
-		attr_reader :modloader
-		attr_reader :assets
+		attr_reader :parsed_modloader
+		attr_reader :parsed_assets
 		
-		def initialize(content)
-			@content = content
-			
-			@version     = content['version'    ]
-			@profile_dir = content['profile_dir'] || Mmi.minecraft_dir
+		def initialize(options)
+			@options = options
 			
+			parse!
+		end
+		
+		def parse!
 			version     = Semver.parse(self.version)
 			lib_version = Semver.parse(Mmi::VERSION)
 			
 			if self.version
 				if version.major <= lib_version.major
 					if version.minor > lib_version.minor
-						Mmi.warn %Q{Config file specified "version" #{version}, but MMI is at #{lib_version}. Some features might not be supported.}
+						Mmi.warn %Q(Config file specified "version" #{version}, but MMI is at #{lib_version}. Some features might not be supported.)
 					end
 					
-					ml         = content['modloader']
-					@modloader = if ml
-						case ml['name']
-						when 'none'
-							Modloader::None.new(ml)
-						when 'fabric'
-							Modloader::Fabric.new(ml)
+					ml = self.modloader
+					@parsed_modloader =
+						if ml
+							case ml['name']
+								when 'none'
+									Modloader::None.new(ml)
+								when 'fabric'
+									Modloader::Fabric.new(ml)
+								else
+									raise Mmi::InvalidAttributeError, "Unkown modloader #{ml['name'].inspect}."
+							end
 						else
-							raise Mmi::InvalidAttributeError, %Q{Unkown modloader #{ml['name'].inspect}.}
+							Modloader::None.new
+						end
+					
+					
+					if self.assets
+						if self.assets.is_a?(Hash)
+							@parsed_assets = AssetsProcessor.new(self.assets)
+						else
+							raise Mmi::InvalidAttributeError, %Q(Invalid "assets": expected Hash but received #{self.assets.inspect})
 						end
 					else
-						Modloader::None.new
+						raise Mmi::MissingAttributeError, 'Missing "assets".'
 					end
-					
-					@assets = AssetsProcessor.new(self.profile_dir, content['assets'])
 				else
-					raise Mmi::InvalidAttributeError, %Q{Config file specified "version" #{version}, but MMI is at #{lib_version}.}
+					raise Mmi::InvalidAttributeError, %Q(Config file specified "version" #{version}, but MMI is at #{lib_version}.)
 				end
 			else
 				raise Mmi::MissingAttributeError, 'Missing "version".'
@@ -52,8 +65,8 @@ module Mmi
 		end
 		
 		def install
-			self.modloader.install
-			self.assets.install
+			self.parsed_modloader.install
+			self.parsed_assets.install
 		end
 	end
 end

data/lib/mmi/modloader/fabric.rb

@@ -1,31 +1,41 @@
+require 'fileutils'
+require 'nokogiri'
+
+require 'mmi/cached_download'
+require 'mmi/option_attributes'
+
 module Mmi
 	module Modloader
 		class Fabric
-			attr_reader :options
+			include Mmi::OptionAttributes
 			
-			attr_reader :version
-			attr_reader :install_type
-			attr_reader :mcversion
-			attr_reader :install_dir
+			opt_accessor :version
+			opt_accessor :install_type
+			opt_accessor :mcversion,    'minecraft_version'
+			opt_accessor(:install_dir                       ) { Mmi.minecraft_dir }
+			opt_accessor(:download_mc,  'download_minecraft') { false             }
 			
 			def initialize(options)
 				@options = options
 				
-				@version      = options['version'          ]
-				@install_type = options['install_type'     ]
-				@mcversion    = options['minecraft_version']
-				@install_dir  = options['install_dir'      ] || Mmi.minecraft_dir
-				
+				parse!
+			end
+			
+			def parse!
 				if self.version
 					if self.install_type
-						if ['client', 'server'].include?(self.install_type)
+						if allowed_install_types.include?(self.install_type)
 							if self.mcversion
-								# Pass.
+								if [true, false].include?(self.download_mc)
+									# Pass.
+								else
+									raise Mmi::InvalidAttributeError, %Q(Invalid "modloader.download_minecraft". Expecting true or false, got #{self.download_mc.inspect}.)
+								end
 							else
 								raise Mmi::MissingAttributeError, 'Missing "modloader.minecraft_version".'
 							end
 						else
-							raise Mmi::InvalidAttributeError, %Q{Invalid "modloader.install_type". Expecting "client" or "server", got #{self.install_type.inspect}.}
+							raise Mmi::InvalidAttributeError, %Q(Invalid "modloader.install_type". Expecting "client" or "server", got #{self.install_type.inspect}.)
 						end
 					else
 						raise Mmi::MissingAttributeError, 'Missing "modloader.install_type".'
@@ -35,8 +45,31 @@ module Mmi
 				end
 			end
 			
+			def allowed_install_types
+				%w[
+					client
+					server
+				]
+			end
+			
+			def base_uri
+				'https://maven.fabricmc.net/net/fabricmc/fabric-installer'
+			end
+			
+			def metadata_uri
+				File.join(base_uri, 'maven-metadata.xml')
+			end
+			
+			def metadata_sha512sum_uri
+				"#{metadata_uri}.sha512"
+			end
+			
+			def metadata_path
+				File.join(Mmi.cache_dir, 'fabric_maven_metadata.xml')
+			end
+			
 			def installer_uri
-				"https://maven.fabricmc.net/net/fabricmc/fabric-installer/#{self.version}/fabric-installer-#{self.version}.jar"
+				File.join(base_uri, self.version, "fabric-installer-#{self.version}.jar")
 			end
 			
 			def installer_sha512sum_uri
@@ -55,34 +88,16 @@ module Mmi
 				Mmi.info "Downloading fabric-installer version #{self.version.inspect}."
 				
 				begin
-					FileUtils.mkdir_p(Mmi.cache_dir)
-					
-					expected_hexdigest = URI.open(installer_sha512sum_uri).read
-					
-					if !File.exists?(installer_path) || expected_hexdigest != Digest::SHA512.hexdigest(File.read(installer_path))
-						stream = URI.open(installer_uri)
-						
-						IO.copy_stream(stream, installer_path)
-						
-						actual_hexdigest = Digest::SHA512.hexdigest(File.read(installer_path))
-						
-						if expected_hexdigest == actual_hexdigest
-							# Pass.
-						else
-							Mmi.fail! "Expected fabric installer to have SHA512 sum #{expected_hexdigest.inspect} but received #{actual_hexdigest.inspect}."
-						end
-					else
-						Mmi.info 'Using cached fabric-installer.'
-					end
+					Mmi::CachedDownload.download_cached(installer_uri, installer_path, sha512_uri: installer_sha512sum_uri)
 				rescue OpenURI::HTTPError => e
-					Mmi.fail! %Q{Error when requesting fabric installer. Maybe "modloader.version" == #{version.inspect} is invalid.\n#{e.inspect}}
+					Mmi.fail! %Q(Error when requesting fabric installer. Maybe "modloader.version" == #{version.inspect} is invalid.\n#{e.inspect})
 				end
 			end
 			
 			def run_installer
 				FileUtils.mkdir_p(absolute_install_dir)
 				
-				if system('java', '-jar', installer_path, self.install_type, '-dir', absolute_install_dir, '-noprofile', '-mcversion', self.mcversion)
+				if system('java', '-jar', installer_path, self.install_type, '-dir', absolute_install_dir, '-noprofile', '-mcversion', self.mcversion, self.download_mc ? '-downloadMinecraft' : '')
 					# Pass.
 				else
 					Mmi.fail! 'Failed to install Fabric modloader.'
@@ -93,6 +108,20 @@ module Mmi
 				download_installer
 				run_installer
 			end
+			
+			def available_versions
+				begin
+					Mmi::CachedDownload.download_cached(metadata_uri, metadata_path, sha512_uri: metadata_sha512sum_uri)
+				rescue OpenURI::HTTPError => e
+					Mmi.fail! "Error when requesting available fabric installer versions.\n#{e.inspect}"
+				end
+				
+				xml = File.open(metadata_path) do |f|
+					Nokogiri::XML(f)
+				end
+				
+				xml.xpath('/metadata/versioning/versions/version').map(&:inner_html)
+			end
 		end
 	end
-end
+end

data/lib/mmi/modloader/none.rb

@@ -2,10 +2,12 @@ module Mmi
 	module Modloader
 		class None
 			def initialize(options=nil)
+				# Not installing anything requires no configuration or setup.
 			end
 			
 			def install
+				# Nothing to do.
 			end
 		end
 	end
-end
+end

data/lib/mmi/modrinth_api.rb

@@ -0,0 +1,14 @@
+require 'json'
+require 'open-uri'
+
+module Mmi
+	module ModrinthApi
+		BASE_URL = URI('https://api.modrinth.com/v2/')
+		
+		class << self
+			def project_versions(mod_slug)
+				JSON.parse((BASE_URL + "project/#{mod_slug}/version").open.read)
+			end
+		end
+	end
+end

data/lib/mmi/option_attributes.rb

@@ -0,0 +1,38 @@
+module Mmi
+	module OptionAttributes
+		attr_reader :options
+		
+		def self.included(klass)
+			klass.extend(ClassMethods)
+		end
+		
+		module ClassMethods
+			def opt_reader(attr, name=attr.to_s, &block)
+				define_method(:"#{attr.to_sym}") do
+					result = self.options[name]
+					
+					if result.nil? && block_given?
+						block.call
+					else
+						result
+					end
+				end
+			end
+			
+			def opt_writer(attr, name=attr.to_s)
+				define_method(:"#{attr.to_sym}=") do |value|
+					if value.nil?
+						self.options.delete(name)
+					else
+						self.options[name] = value
+					end
+				end
+			end
+			
+			def opt_accessor(attr, name=attr.to_s, &block)
+				opt_reader(attr, name, &block)
+				opt_writer(attr, name        )
+			end
+		end
+	end
+end

data/lib/mmi/semver.rb

@@ -10,11 +10,11 @@ module Mmi
 			self.patch = patch
 		end
 		
-		def self.parse(s)
-			if m = /\A(?<major>\d+)(\.(?<minor>\d+))?(\.(?<patch>\d+))?\z/.match(s.strip)
-				new(m[:major], m[:minor], m[:patch])
+		def self.parse(version)
+			if (m = /\A(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)\z/.match(version.strip))
+				new(m[:major].to_i, m[:minor].to_i, m[:patch].to_i)
 			else
-				raise "Version string not in valid format: #{s.inspect}"
+				raise "Version string not in valid format: #{version.inspect}"
 			end
 		end
 	end

data/lib/mmi/source/github.rb

@@ -1,43 +1,43 @@
+require 'fileutils'
+require 'open-uri'
+
+require 'mmi/github_api'
+require 'mmi/option_attributes'
+
 module Mmi
 	module Source
 		class Github
-			attr_reader :options
+			include Mmi::OptionAttributes
 			
-			attr_reader :owner
-			attr_reader :repo
-			attr_reader :install_dir
-			attr_reader :filename
+			opt_accessor :owner
+			opt_accessor :repo
+			opt_accessor :install_dir
+			opt_accessor :filename
 			
-			attr_reader :asset_id
-			attr_reader :release
-			attr_reader :file
+			opt_accessor :asset_id
+			opt_accessor :release
+			opt_accessor :file
 			
 			def initialize(options)
 				@options = options
 				
-				@owner       = options['owner'      ]
-				@repo        = options['repo'       ]
-				@asset_id    = options['asset_id'   ]
-				@release     = options['release'    ]
-				@file        = options['file'       ]
-				@install_dir = options['install_dir']
-				@filename    = options['filename'   ]
-				
+				parse!
+			end
+			
+			def parse!
 				if self.owner
 					if self.repo
 						if self.install_dir
 							if self.asset_id
 								# Pass.
-							else
-								if self.release
-									if self.file
-										# Pass.
-									else
-										raise Mmi::MissingAttributeError, 'Missing "source.file" from asset because "source.asset_id" is not provided.'
-									end
+							elsif self.release
+								if self.file
+									# Pass.
 								else
-									raise Mmi::MissingAttributeError, 'Missing "source.release" from asset because "source.asset_id" is not provided.'
+									raise Mmi::MissingAttributeError, 'Missing "source.file" from asset because "source.asset_id" is not provided.'
 								end
+							else
+								raise Mmi::MissingAttributeError, 'Missing "source.release" from asset because "source.asset_id" is not provided.'
 							end
 						else
 							raise Mmi::MissingAttributeError, 'Missing "source.install_dir" from asset.'
@@ -55,7 +55,7 @@ module Mmi
 			end
 			
 			def cached_asset_response
-				@asset_get ||= ::Github::Client::Repos::Releases::Assets.new.get(owner: self.owner, repo: self.repo, id: self.asset_id)
+				@cached_asset_response ||= Mmi::GithubApi.client.release_asset("/repos/#{self.owner}/#{self.repo}/releases/assets/#{self.asset_id}")
 			end
 			
 			def download_url
@@ -75,11 +75,11 @@ module Mmi
 				FileUtils.mkdir_p(install_dir)
 				
 				begin
-					stream = URI.open(download_url)
+					stream = URI.parse(download_url).open
 					
 					IO.copy_stream(stream, filepath)
 				rescue OpenURI::HTTPError => e
-					Mmi.fail! %Q{Error when requesting asset.\n#{e.inspect}}
+					Mmi.fail! "Error when requesting asset.\n#{e.inspect}"
 				end
 			end
 			
@@ -88,4 +88,4 @@ module Mmi
 			end
 		end
 	end
-end
+end