rankmirror 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69987a6f2bf817b2ff3779548e775e3c86042b00
-  data.tar.gz: fc92243a24cf327ada2a959163911ea6a968f8b2
+  metadata.gz: 4c0ef931391e3d8af93db3d5fb0a414ba38608c6
+  data.tar.gz: 81a3a3c891c9a191901e964994b9feee06c3b3c7
 SHA512:
-  metadata.gz: 468c53d68cb63777996a305174670af8be0de74f155ac31330ed9389fa0349abf21a6bcb426b5eaac8524a0726b3b3d7c1a59b53654d6e0fb5d7a2872c5229de
-  data.tar.gz: d71507f6738690b169adceb79e60d56570e6f717e97da0d6cec166d9c9547bdd75127aa71c236f77bf40ff9e762b3c2b3edfaa8fc1d2196978ad58fc20ab8efa
+  metadata.gz: 5fff68ae4d4124727c0fa0d4377171d57034328959e619e4c19c89c88ee79820dabd1818ed51e87235b1b72f858fa4acb93a8d05205b491219daa1ca6a3f464d
+  data.tar.gz: 4ec878e794686d8855b2da2ed24ea95de0373e69b976eeb4f8417143f28b1c51ddcc04196ec7f7f6afd9c7174df00debd5c0a529aaadf62a20a890efe479a8f3

data/Gemfile

@@ -3,5 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in rankmirror.gemspec
 gemspec
 gem 'nokogiri', '>= 1.6.0'
-gem 'colorize', '>= 0.8.0'
 gem 'curb', '>= 0.9.0'

data/README.md

@@ -10,12 +10,14 @@ RankMirror is a ruby implementation of `rankmirrors` in ArchLinux but for all mo
 
     $ rankmirror --help
 
-eg. `rankmirror -o opensuse --flavor tumbleweed --continent asia` will get you: the fastest Tumbleweed mirror located in Asia. Those 3 options
-are mandatory for openSUSE.
+eg. `rankmirror -o opensuse --flavor tumbleweed --continent asia`, the fastest openSUSE Tumbleweed mirror in Asia.
+
+`rankmirror -o fedora --flavor 25 --country cn`, the fastest Fedora 25 mirror in China.
+
+`rankmirror -o epel --flavor 7 --country cn`, the fastest EPEL 7 mirror in China.
 
 `rankmirror -o packman -s` will get you: the fastest Packman mirror from the World. And save that to a packman.mirrorlist in your `~/.rankmirror`.
 Next time, just `rankmirror -l -o packman -s`, which is faster^2. Because most of the times, there're only a few mirrors that are fast to you.
-This technology applies to openSUSE too.
 
 ## License
 

data/TODO

@@ -1,3 +1,2 @@
 * archlinux
-* fedora
 * ubuntu

data/bin/rankmirror

@@ -4,9 +4,15 @@ $:.push(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
 require 'rankmirror'
 require 'optparse'
-require 'colorize'
 
 options = RankMirror::Options.new
+options.local = false
+options.os = "opensuse"
+options.continent = "asia"
+options.flavor = "leap4220"
+options.quick = true
+options.path = nil
+options.file = "repomd.xml"
 
 parser = OptionParser.new do |opts|
 	opts.banner = "Usage: rankmirror [options]"
@@ -19,21 +25,23 @@ parser = OptionParser.new do |opts|
 	end
 
 	opts.on("-o", "--os [Distribution]", 
-		"Check mirrors for this distro. Now supported: 'opensuse', 'packman'.") do |os|
+		"Check mirrors for this distro. Now supported: 'opensuse', 'packman', 'fedora', 'epel'.") do |os|
 		case os
 		when "opensuse"
 			options.os = "opensuse"
-			options.path = "tumbleweed/repo/oss/suse/repodata/"
+			options.path = "tumbleweed/repo/oss/suse/repodata/" 
 		when "packman"
 			options.os = "packman"
 			options.path = "openSUSE_Tumbleweed/Essentials/repodata/"
+		when "fedora"
+			options.os = "fedora"
+		when "epel"
+			options.os = "epel"
+		when nil
+			raise RankMirror::MandatoryOptionNotSpecified
 		else
 			raise RankMirror::DistributionNotImplemented
 		end
-
-		if options.os.nil?
-			raise RankMirror::MandatoryOptionNotSpecified
-		end
 	end
 
 	opts.on("--continent [Continent]", "Check mirrors on this continent. openSUSE ONLY.
@@ -41,15 +49,27 @@ parser = OptionParser.new do |opts|
 		'southamerica', 'oceania'.") do |cont|
 		unless options.os != "opensuse"
 			options.continent = cont.downcase.delete("\s")
+			raise RankMirror::MandatoryOptionNotSpecified if options.continent.nil?
 		else
-			raise RankMirror::SuboptionNotSupported
+			raise RankMirror::DistributionNotImplemented
+		end
+	end
+
+	opts.on("--country [Country]", "Check mirrors in this country. Fedora/EPEL ONLY.") do |country|
+		case options.os
+		when "fedora","epel"
+			options.country = country.downcase
+			raise RankMirror::MandatoryOptionNotSpecified if options.country.nil?
+		else
+			raise RankMirror::DistributionNotImplemented
 		end
 	end
 
-	opts.on("--flavor [Flavor]","Check mirrors for this flavor. openSUSE ONLY.
-		Now supported: '4220', '4210', 'tumbleweed'.") do |flavor|
+	opts.on("--flavor [Flavor]","Check mirrors for this flavor.
+		Now supported: openSUSE: '4220', '4210', 'tumbleweed'; Fedora: 20-25 ; epel: 4-7.") do |flavor|
 		case options.os
 		when "opensuse","packman"
+			options.keys = ["name","continent","country","http","tumbleweed","leap4220","leap4210","leap4230"]
 			case flavor
 			when "4220"
 				options.flavor = "leap4220"
@@ -57,15 +77,27 @@ parser = OptionParser.new do |opts|
 				options.flavor = "leap4210"
 			when "tumbleweed","tw"
 				options.flavor = "tumbleweed"
+			when nil
+				raise RankMirror::MandatoryOptionNotSpecified
 			else
 				raise RankMirror::FlavorNotImplemented
 			end
+		when "fedora"
+			options.flavor = "fedora" + flavor
+			options.path = "releases/" + flavor + "/Everything/x86_64/os/repodata/"
+			options.keys = ["name","country","http","fedora25","fedora24","fedora23","fedora22","fedora21","fedora20"]
+			raise RankMirror::MandatoryOptionNotSpecified if options.flavor.nil?
+		when "epel"
+			options.flavor = "epel" + flavor
+			options.path = flavor + "/x86_64/repodata/"
+			options.keys = ["name","country","http","epel7","epel6","epel5","epel4"]
+			raise RankMirror::MandatoryOptionNotSpecified if options.flavor.nil?
 		else
 			raise RankMirror::DistributionNotImplemented
 		end
 	end
 
-	opts.on("-q", "--quick [1/0]", "Check mirrors quickly/slowly.
+	opts.on("-q", "--quick [1/0]", "Check mirrors quickly/slowly. openSUSE/Packman ONLY.
 		The quick check will download a tiny file from the mirror, thus
 		response quickly but the result will be less accurate. Default: 1") do |quick|
 		unless quick.to_i > 0
@@ -122,6 +154,22 @@ when "packman"
 		  else
 			local
 		  end
+when "fedora"
+	local = RankMirror::LocalFedora.new(config.path,options).sort
+	mirrors = unless options.local
+		  	remote = RankMirror::RemoteFedora.new(options).fetch
+			remote.concat(local)
+		  else
+			local
+		  end
+when "epel"
+	local = RankMirror::LocalEPEL.new(config.path,options).sort
+	mirrors = unless options.local
+			remote = RankMirror::RemoteFedora.new(options).fetch
+			remote.concat(local)
+		  else
+			local
+		  end
 else
 	raise RankMirror::DistributionNotImplemented
 end
@@ -129,7 +177,7 @@ end
 sorted = RankMirror::Mirrors.new(mirrors).sort_by_speed(options).select {|k,v| v > 0}
 
 if options.save
-	config.save(sorted.keys)
+	config.save(sorted.keys,options.keys)
 end
 
 i = 1
@@ -137,11 +185,11 @@ i = 1
 sorted.each do |k,v|
 	speed = v.round(2)
 	if i < 4
-		puts "#{i}\t#{k}\t#{speed}\sKiB/s".green
+		puts "\033[0;32m#{i}\t#{k}\t#{speed}\sKiB/s\033[0m"
 	elsif i > 3 && i < 6
-		puts "#{i}\t#{k}\t#{speed}\sKiB/s".yellow
+		puts "\033[1;33m#{i}\t#{k}\t#{speed}\sKiB/s\033[0m"
 	else
-		puts "#{i}\t#{k}\t#{speed}\sKiB/s".red
+		puts "\033[0;31m#{i}\t#{k}\t#{speed}\sKiB/s\033[0m"
 	end
 	i += 1
 end

data/lib/rankmirror.rb

@@ -4,11 +4,13 @@ require 'rankmirror/reachable'
 require 'rankmirror/speed'
 require 'rankmirror/options'
 require 'rankmirror/mirrors'
-require 'rankmirror/remoteoss'
-require 'rankmirror/localoss'
 require 'rankmirror/cache'
-require 'rankmirror/remotepackman'
-require 'rankmirror/localpackman'
 require 'rankmirror/status'
 require 'rankmirror/config'
-
+require 'rankmirror/distro/remote/oss.rb'
+require 'rankmirror/distro/remote/packman.rb'
+require 'rankmirror/distro/remote/fedora.rb'
+require 'rankmirror/distro/local/oss.rb'
+require 'rankmirror/distro/local/packman.rb'
+require 'rankmirror/distro/local/fedora.rb'
+require 'rankmirror/distro/local/epel.rb'

data/lib/rankmirror/config.rb

@@ -9,23 +9,15 @@ module RankMirror
 			@options = options
 			@name = @options.os
 			@file = @name + ".mirrorlist"
-			@systempath = File.expand_path(File.dirname(__FILE__))
+			@systempath = File.expand_path(File.join(File.dirname(__FILE__),"mirrorlists"))
 			@localpath = ENV['HOME'] + "/.rankmirror/"
 		end
 
-		def localconfig
-			File.join(@localpath,@file)
-		end
-
-		def systemconfig
-			File.join(@systempath,@file)
-		end
-
 		def path
 			if File.exist?(systemconfig) && File.readable?(systemconfig)
 				if File.exist?(localconfig)
 					m = merge(systemconfig,localconfig)
-					write(m,localconfig)
+					write(m,localconfig,@options.keys)
 					localconfig
 				else
 					systemconfig
@@ -38,16 +30,53 @@ module RankMirror
 				end
 			end
 		end
+        
+		def save(array,header)
+			FileUtils.mkdir_p @localpath unless File.directory?(@localpath)
+			mirrors_array = array.map! do |uri|
+				mirror = RankMirror::Status.new(uri,@name).get
+				mirror.name = URI.parse(uri).host if mirror.name.nil?
+				mirror.continent = "world" if ["opensuse","packman"].include?(@name)
+				mirror.country = "world"
+				mirror.http = uri
+				mirror
+			end
+			write(mirrors_array,localconfig,header)
+		end
 
+		def parse(config,args)
+			f = open(config)
+			mirrors = f.readlines.map!{|l|
+				unless l.start_with?("#")
+					elements = l.strip.split("\t")
+					mirror = OpenStruct.new
+					args.each_with_index {|arg,index| mirror[arg] = elements[index] }
+					mirror
+				end
+			}.compact
+			f.close
+			return mirrors
+		end
+
+		private
+
+		def localconfig
+			File.join(@localpath,@file)
+		end
+
+		def systemconfig
+			File.join(@systempath,@file)
+		end
+        
 		def merge(systemconfig,localconfig)
-			system_mirrors = parse(systemconfig)
-			local_mirrors = parse(localconfig)
+			system_mirrors = parse(systemconfig,@options.keys)
+			local_mirrors = parse(localconfig,@options.keys)
 			system_mirrors.each do |system_mirror|
 				http_match = false
 				local_mirrors.each do |local_mirror|
 					if system_mirror.http == local_mirror.http
 						http_match = true
-						local_mirror.continent = system_mirror.continent
+						local_mirror.continent = system_mirror.continent if ["opensuse","packman"].include?(@name)
 						local_mirror.country = system_mirror.country
 					end
 				end
@@ -58,50 +87,35 @@ module RankMirror
 			return local_mirrors
 		end
 
-		def parse(config)
-			f = open(config)
-			mirrors = f.readlines.map!{|l|
-				unless l.start_with?("#")
-					elements = l.strip.split("\t")
-					mirror = OpenStruct.new
-					mirror.name = elements[0]
-					mirror.continent = elements[1]
-					mirror.country = elements[2]
-					mirror.http = elements[3]
-					mirror.tumbleweed = elements[4]
-					mirror.leap4220 = elements[5]
-					mirror.leap4210 = elements[6]
-					mirror.leap4230 = elements[7]
-					mirror
-				end
-				}.compact!
-			f.close
-			return mirrors
-		end
-
-		def write(mirrors_array,file)
+		def write(mirrors_array,file,header)
 			f = open(file,'w')
-			f.write "#sitename\tcontinent\tcountry\thttp\ttumbleweed\tleap4220\tleap4210\tleap4230\n"
-			mirrors_array.each do |mirror_struct|
+			f.write process_header(header)
+			mirrors_array.each do |m|
 				str = String.new
-				m = mirror_struct
-				str = m.name + "\t" + m.continent + "\t" + m.country + "\t" + m.http + "\t" + m.tumbleweed.to_s + "\t" + m.leap4220.to_s + "\t" + m.leap4210.to_s + "\t" + m.leap4230.to_s + "\n"
+				header.each do |item|
+					if header.index(item) == header.size - 1
+						str << m[item].to_s + "\n"
+					else
+						str << m[item].to_s + "\t"
+					end
+				end
 				f.write str
 			end
 			f.close
 		end
-        
-		def save(array)
-			FileUtils.mkdir_p @localpath unless File.directory?(@localpath)
-			mirrors_array = array.map! do |uri|
-				mirror = RankMirror::Status.new(uri,@options.os).get
-				mirror.name = URI.parse(uri).host if mirror.name.nil?
-				mirror.continent = "world"
-				mirror.country = "world"
-				mirror
+
+		def process_header(header)
+			str = "#"
+			header.each do |title|
+				if title == header[header.size - 1]
+					str << title + "\n"
+				else
+					str << title + "\t"
+				end
 			end
-			write(mirrors_array,localconfig)
+			return str
 		end
+
 	end
-end
 
+end

data/lib/rankmirror/distro/local/epel.rb

@@ -0,0 +1,15 @@
+module RankMirror
+	class LocalEPEL
+		def initialize(mirrorlist,options)
+			@options = options
+			@mirrorlist = RankMirror::Config.new(@options).parse(mirrorlist,@options.keys)
+		end
+
+		def sort
+			sorted = @mirrorlist.map!{|m|
+					m.http if @options.country == m.country && m[@options.flavor] == "true"
+			}.compact
+			return sorted
+		end
+	end
+end

data/lib/rankmirror/distro/local/fedora.rb

@@ -0,0 +1,15 @@
+module RankMirror
+	class LocalFedora
+		def initialize(mirrorlist,options)
+			@options = options
+			@mirrorlist = RankMirror::Config.new(@options).parse(mirrorlist,@options.keys)
+		end
+
+		def sort
+			sorted = @mirrorlist.map!{|m|
+				m.http if @options.country == m.country && m[@options.flavor] == "true"
+				}.compact
+			return sorted
+		end
+	end
+end

data/lib/rankmirror/{localoss.rb → distro/local/oss.rb}

@@ -1,18 +1,15 @@
-require 'ostruct'
-
 module RankMirror
 	class LocalOSS
 		def initialize(mirrorlist,options)
 			@options = options
-			@mirrorlist = RankMirror::Config.new(@options).parse(mirrorlist)
+			@mirrorlist = RankMirror::Config.new(@options).parse(mirrorlist,@options.keys)
 		end
 
 		def sort
 			sorted = @mirrorlist.map! { |m|
 				m.http if @options.continent == m.continent && m[@options.flavor] == "true"
-			}.compact!
+			}
 			return sorted
 		end
 	end
 end
-

data/lib/rankmirror/{localpackman.rb → distro/local/packman.rb}

@@ -1,10 +1,8 @@
-require 'ostruct'
-
 module RankMirror
 	class LocalPackman
 		def initialize(mirrorlist,options)
 			@options = options
-			@mirrorlist = RankMirror::Config.new(@options).parse(mirrorlist)	
+			@mirrorlist = RankMirror::Config.new(@options).parse(mirrorlist,@options.keys)
 		end
 
 		def sort

data/lib/rankmirror/distro/remote/fedora.rb

@@ -0,0 +1,38 @@
+require 'nokogiri'
+
+module RankMirror
+	class RemoteFedora
+		def initialize(options)
+			@mirrors = Array.new
+			@options = options
+		end
+
+		def fetch
+			cache = RankMirror::Cache.new("https://admin.fedoraproject.org/mirrormanager/mirrors").fetch
+			doc = Nokogiri::HTML(open(cache))
+			doc.xpath("//tr").each do |tr|
+				country = tr.element_children[0].content.downcase!
+				unless country == "country" || @options.country != country
+					tr.element_children[3].element_children.each do |a|
+						if a.content == "http"
+							if @options.os == "fedora"
+								unless a["href"].index("epel")
+									status = RankMirror::Status.new(a["href"],@options.os).get
+									@mirrors << a["href"] if status[@options.flavor] == true
+								end
+							else
+								if a["href"].index("epel")
+									# neu.edu.cn has a wrong epel url on fedora mirror site
+									uri = a["href"].index("neu.edu.cn") ? a["href"].sub("fedora/epel","fedora-epel") : a["href"]
+									status = RankMirror::Status.new(uri,@options.os).get
+									@mirrors << a["href"] if status[@options.flavor] == true
+								end
+							end
+						end
+					end
+				end
+			end
+			return @mirrors
+		end
+	end
+end

data/lib/rankmirror/{remoteoss.rb → distro/remote/oss.rb}

@@ -41,6 +41,7 @@ module RankMirror
 					end
 				end
 			end
+
 			return @mirrors
 		end
 	end

data/lib/rankmirror/exception.rb

@@ -1,12 +1,6 @@
 module RankMirror
-	class DistributionNotImplemented < StandardError
-	end
-	class MandatoryOptionNotSpecified < StandardError
-	end
-	class SuboptionNotSupported < StandardError
-	end
-	class FlavorNotImplemented < StandardError
-	end
-	class ConfigurationNotFound < StandardError
-	end
+	DistributionNotImplemented = Class.new(StandardError)
+	MandatoryOptionNotSpecified = Class.new(StandardError)
+	FlavorNotImplemented = Class.new(StandardError)
+	ConfigurationNotFound = Class.new(StandardError)
 end

data/lib/rankmirror/mirrorlists/epel.mirrorlist

@@ -0,0 +1,13 @@
+# sitename	country		http		7	6	5	4
+Aliyun	cn	http://mirrors.aliyun.com/epel/	true	true	true	true
+Capital Online	cn	http://mirrors.yun-idc.com/epel/	true	true	true	true
+Northeastern University	cn	http://mirror.neu.edu.cn/fedora-epel	true	true	true	true
+SJTU	cn	http://ftp.sjtu.edu.cn/fedora/epel/	true	true	true	true
+USTC	cn	http://mirrors.ustc.edu.cn/epel/	true	true	true	true
+Neusoft	cn	http://mirrors.neusoft.edu.cn/epel/	true	true	true	true
+Zhejiang University	cn	http://mirrors.zju.edu.cn/epel/	true	true	true	true
+Lanzhou University	cn	http://mirror.lzu.edu.cn/epel/	true	true	true	true
+Bit	cn	http://mirror.bit.edu.cn/fedora/epel/	true	true	true	true
+Hust	cn	http://mirrors.hust.edu.cn/epel/	true	true	true	true
+Chongqing University	cn	http://b.mirrors.lanunion.org/epel/	true	true	true	true
+Dalian University of Technology	cn	http://mirror.dlut.edu.cn/epel/	true	true	true	true

data/lib/rankmirror/mirrorlists/fedora.mirrorlist

@@ -0,0 +1,9 @@
+# sitename	country		http		25	24	23	22	21	20
+Aliyun	cn	http://mirrors.aliyun.com/fedora/	true	true	true	true	true	true
+Capital Online	cn	http://mirrors.yun-idc.com/fedora/	true	true	true	true	true	true
+Northeastern University	cn	http://mirror.neu.edu.cn/fedora/linux/	false	false	true	true	true	true
+SJTU	cn	http://ftp.sjtu.edu.cn/fedora/linux/	true	true	true	true	true	true
+USTC	cn	http://mirrors.ustc.edu.cn/fedora/	true	true	true	true	true	true
+Zhejiang University	cn	http://mirrors.zju.edu.cn/fedora/	true	true	true	true	true	true
+Lanzhou University	cn	http://mirror.lzu.edu.cn/fedora/	true	true	true	true	true	true
+Bit	cn	http://mirror.bit.edu.cn/fedora/linux/	true	true	true	true	true	true

data/lib/rankmirror/{opensuse.mirrorlist → mirrorlists/opensuse.mirrorlist}

@@ -1,8 +1,12 @@
 # sitename	continent	country		http	tumbleweed	leap-4220	leap-4210	leap 4230
 Aliyun	asia	china	http://mirrors.aliyun.com/opensuse	true	true	true	false
 Capital Online	asia	china	http://mirrors.yun-idc.com/opensuse	true	true	true	true
-Beijing Institute of Techfalselogy	asia	china	http://mirror.bit.edu.cn/opensuse	true	true	true	true
+Beijing Institute of Technology	asia	china	http://mirror.bit.edu.cn/opensuse	true	true	true	true
 Zhejiang University	asia	china	http://mirrors.zju.edu.cn/opensuse	true	true	true	true
 Xiamen University	asia	china	http://mirrors.xmu.edu.cn/opensuse	true	false	true	false
 Zhengzhou University	asia	china	https://mirrors.zzu.edu.cn/opensuse	true	true	true	false
 Chongqing University	asia	china	https://mirrors.cqu.edu.cn/opensuse	true	true	true	false
+Lanzhou University	asia	china	http://mirror.lzu.edu.cn/opensuse	true	true	true	false
+BJTU	asia	china	http://mirror.bjtu.edu.cn/opensuse	true	true	true	false
+SJTU	asia	china	http://ftp.sjtu.edu.cn/opensuse	true	true	true	true
+SYSU	asia	china	http://mirror.sysu.edu.cn/opensuse	true	true	true	true

data/lib/rankmirror/{packman.mirrorlist → mirrorlists/packman.mirrorlist}

@@ -1,2 +1,3 @@
 # sitename	continent	country		http		tumbleweed	leap4220	leap4210	leap4230
 Aliyun	asia	china	http://mirrors.aliyun.com/packman/	true	true	true	false
+BJTU	asia	china	http://mirror.bjtu.edu.cn/packman/suse/	true	true	true	false

data/lib/rankmirror/options.rb

@@ -1,100 +1,4 @@
 require 'ostruct'
-
 module RankMirror
-	class Options
-		def initialize
-			@options = OpenStruct.new
-			@options.local = false
-			@options.os = "opensuse"
-			@options.continent = "asia"
-			@options.flavor = "leap4220"
-			@options.quick = true
-			@options.path = nil
-			@options.file = "repomd.xml"
-		end
-
-		def show
-			return @options
-		end
-
-		def add(k,v)
-			@options[k] = v
-			return @options
-		end
-
-		def delete_by_key(key)
-			@options.delete_field(key)
-			return @options
-		end
-
-		def delete_by_value(value)
-			h = @options.to_h
-			@options.delete_field(h.key(value))
-			return @options
-		end
-
-		def local=(v)
-			@options.local = v
-		end
-
-		def local
-			@local ||= @options.local
-		end
-
-		def os=(v)
-			@options.os = v
-		end
-
-		def os
-			@os ||= @options.os
-		end
-
-		def continent=(v)
-			@options.continent = v
-		end
-
-		def continent
-			@continent ||= @options.continent
-		end
-
-		def flavor=(v)
-			@options.flavor = v
-		end
-
-		def flavor
-			@flavor ||= @options.flavor
-		end
-
-		def quick=(v)
-			@options.quick = v
-		end
-
-		def quick
-			@quick ||= @options.quick
-		end
-
-		def path=(v)
-			@options.path = v
-		end
-
-		def path
-			@path ||= @options.path
-		end
-
-		def file=(v)
-			@options.file = v
-		end
-
-		def file
-			@file ||= @options.file
-		end
-
-		def save=(v)
-			@options.save = v
-		end
-
-		def save
-			@save ||= @options.save
-		end
-	end
+	Options = Class.new(OpenStruct)
 end

data/lib/rankmirror/speed.rb

@@ -11,12 +11,13 @@ module RankMirror
 				r = Curl::Easy.new(@uri)
 				r.perform
 				return r.download_speed / 1024.0
-			#else
+			else
 				# usually in this case, the mirror is online but:
 				# 1. has bad repodata. eg. not fully rsync the origin, or even empty. 
 				# 2. volatile. sometimes at good speed, sometimes unreachable.
 				# 3. too slow. takes more than 5 seconds to start a download.
 				# not break here because we're about to find out the good mirrors, not the bad ones.
+				return 0
 			end
 		end
 	end

data/lib/rankmirror/status.rb

@@ -19,7 +19,6 @@ module RankMirror
 					
 					checklist = {"tumbleweed"=>tumbleweed,"leap4220"=>leap4220,"leap4210"=>leap4210,"leap4230"=>leap4230}
 					mirror = OpenStruct.new
-					mirror.http = @uri
 					
 					checklist.each do |k,v|
 						if RankMirror::Reachable.new(@uri + v,500).reachable?
@@ -37,7 +36,6 @@ module RankMirror
 					checklist = {"tumbleweed"=>tumbleweed,"leap4220"=>leap4220,"leap4210"=>leap4210,"leap4230"=>leap4230}
 
 					mirror = OpenStruct.new
-					mirror.http = @uri
 
 					checklist.each do |k,v|
 						if RankMirror::Reachable.new(@uri + "openSUSE_" + v + "/Essentials/repodata/",500).reachable?
@@ -47,6 +45,28 @@ module RankMirror
 						end
 					end
 					return mirror
+				when "fedora"
+					mirror = OpenStruct.new
+					check = ["20","21","22","23","24","25"]
+					check.each do |k|
+						if RankMirror::Reachable.new(@uri + "releases/" + k + "/Everything/x86_64/os/repodata/repomd.xml",500).reachable?
+							mirror["fedora" + k] = true
+						else
+							mirror["fedora" + k] = false
+						end
+					end
+					return mirror
+				when "epel"
+					mirror = OpenStruct.new
+					check = ["4","5","6","7"]
+					check.each do |k|
+						if RankMirror::Reachable.new(@uri + "/" + k + "/x86_64/repodata/repomd.xml",500).reachable?
+							mirror["epel" + k] = true
+						else
+							mirror["epel" + k] = false
+						end
+					end
+					return mirror
 				else
 				end
 			else

data/lib/rankmirror/version.rb

@@ -1,3 +1,3 @@
 module RankMirror
-	VERSION = '1.0.0'
+	VERSION = '1.1.0'
 end

data/rankmirror.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "nokogiri", ">= 1.6.0"
-  spec.add_runtime_dependency "colorize", ">= 0.8.0"
   spec.add_runtime_dependency "curb", ">= 0.9.0"
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rankmirror
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - marguerite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -116,16 +102,21 @@ files:
 - lib/rankmirror.rb
 - lib/rankmirror/cache.rb
 - lib/rankmirror/config.rb
+- lib/rankmirror/distro/local/epel.rb
+- lib/rankmirror/distro/local/fedora.rb
+- lib/rankmirror/distro/local/oss.rb
+- lib/rankmirror/distro/local/packman.rb
+- lib/rankmirror/distro/remote/fedora.rb
+- lib/rankmirror/distro/remote/oss.rb
+- lib/rankmirror/distro/remote/packman.rb
 - lib/rankmirror/exception.rb
-- lib/rankmirror/localoss.rb
-- lib/rankmirror/localpackman.rb
+- lib/rankmirror/mirrorlists/epel.mirrorlist
+- lib/rankmirror/mirrorlists/fedora.mirrorlist
+- lib/rankmirror/mirrorlists/opensuse.mirrorlist
+- lib/rankmirror/mirrorlists/packman.mirrorlist
 - lib/rankmirror/mirrors.rb
-- lib/rankmirror/opensuse.mirrorlist
 - lib/rankmirror/options.rb
-- lib/rankmirror/packman.mirrorlist
 - lib/rankmirror/reachable.rb
-- lib/rankmirror/remoteoss.rb
-- lib/rankmirror/remotepackman.rb
 - lib/rankmirror/speed.rb
 - lib/rankmirror/status.rb
 - lib/rankmirror/version.rb