apt-spy2 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91d09bec4d6918e39405d38ee164b8215c6e04d778887c0e570bdab6cc39592e
-  data.tar.gz: d2f69bf166ca8bf79fff732e30184270dfbc0422a41dbe616afc9ddd56b21641
+  metadata.gz: 456003f4c6ac4e210a1cd7ebe44888b8a58d3b9fac87d1b68f03e9b3d8c45bdf
+  data.tar.gz: 907656e6cf49fe081152826de58348ff75d3f2ff1014f5af854dfb24f86e421d
 SHA512:
-  metadata.gz: 931ef089f949e870538b77887a7825a42647bcc8a4ef577118a12b51112bcba1b1a63c235d2bbe0e1fed348608d84954c6a44c7f16a578e42c29e198a4403619
-  data.tar.gz: 956aa4b5d89409a4366549b84846a42b95c46f7013197182fdfd22956ba07e60fddccf5f210a5eb85d0c09f3e8ff15cc730642ea1afb66b9fee81703cb172da3
+  metadata.gz: 5a2c12f506751914dc44243f88ecef036e7a5ca41cab0f6595c70e4c61d7d68e3da6cc304f9879a8b4f8b36fd2daa96b664a8fd91cf5a5a9cf64a06c2723cd10
+  data.tar.gz: '0815dfcb1e3b857aac1a30a8d0cee549e3c4a8a95ee0213e227b6747bb88939813118fbbaffc3d44ed1de663963c2ab22d7a7f03f552d4cbcd2e744183461fcb'

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '43 11 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/.github/workflows/pr.yml

@@ -11,11 +11,12 @@ jobs:
     strategy:
       matrix:
         ruby-version:
+          - '3.2'
+          - '3.1'
           - '3.0'
-          - 2.7
-          - 2.6
+          - '2.7'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
@@ -24,9 +25,23 @@ jobs:
       - run: bundle exec rake build
       - run: ls -lah ./pkg/apt-spy2*
       - run: gem install pkg/apt-spy2*
-      - run: apt-spy2
+      - run: apt-spy2 check
       - uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
+  test_strict:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+      - run: bundle install
+      - run: bundle exec rake test
+      - run: bundle exec rake build
+      - run: ls -lah ./pkg/apt-spy2*
+      - run: gem install pkg/apt-spy2*
+      - run: apt-spy2 check --strict
+
 

data/.github/workflows/release.yml

@@ -0,0 +1,22 @@
+---
+name: release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+      - run: bundle install
+      - uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+          RELEASE_COMMAND: bundle exec rake release

data/Dockerfile

@@ -1,9 +1,13 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.10
 
-RUN apt-get update -y \
-	&& apt-get install -y ruby ruby-dev git gcc g++ make zlib1g-dev lsb-release \
-	&& gem install bundler \
-	&& mkdir -p /work
+RUN apt update -y \
+	&& apt install -y \
+		ruby3.0 \
+		ruby-dev \
+		ruby-bundler \
+		git \
+		lsb-release \
+		build-essential
 
 WORKDIR /work
 COPY . /work

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,23 +1,45 @@
 PATH
   remote: .
   specs:
-    apt-spy2 (0.7.2)
+    apt-spy2 (0.8.0)
       colored (>= 1.2)
       json
-      nokogiri (>= 1.6, < 1.13)
+      nokogiri (~> 1.14.1)
       thor (>= 0.18.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.2)
     colored (1.2)
     docile (1.4.0)
-    json (2.6.1)
+    json (2.6.3)
+    mini_portile2 (2.8.1)
     minitest (5.15.0)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.14.1)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    racc (1.5.2)
+    parallel (1.22.1)
+    parser (3.2.1.0)
+      ast (~> 2.4.1)
+    racc (1.6.2)
+    rainbow (3.1.1)
     rake (13.0.6)
+    regexp_parser (2.7.0)
+    rexml (3.2.5)
+    rubocop (1.45.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -25,7 +47,8 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.3)
-    thor (1.1.0)
+    thor (1.2.1)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -35,6 +58,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   minitest (~> 5.15.0)
   rake
+  rubocop
   simplecov (~> 0.18)
   simplecov-lcov (~> 0.8.0)
 

data/Makefile

@@ -1,11 +1,29 @@
+.PHONY: clean install release docker-build docker-run
+
+IMAGE?=lagged/apt-spy2:dev
+
+container:=apt-spy2
+
+clean:
+	docker rm -f $(container) || true
+
 install:
 	bundle install --path ./vendor/bundle
 
 release:
 	bundle exec rake release
 
+lint:
+	bundle exec rubocop .
+
+test: install
+	bundle exec rake test
+
 docker-build:
-	docker build -t lagged/apt-spy2:dev .
+	docker build -t $(IMAGE) .
 
-docker-run: docker-build
-	docker run -it lagged/apt-spy2:dev bash
+docker-run: clean docker-build
+	docker run --rm -it \
+		--name $(container) \
+		-v $(CURDIR):/work \
+		$(IMAGE) bash

data/README.md

@@ -44,13 +44,14 @@ $ apt-spy2 list --launchpad --country=Germany
 
 ### check command
 
-`check` works like `list`, but also determines if the servers returned are working. It supports Launchpad as well.
+`check` works like `list`, but also determines if the servers returned are working. It supports the flag `--launchpad` as well and additionally a flag `--strict` which checks if a mirror carries a certain release and distribution.
 
 ```
 $ apt-spy2 check
 ...
-$ apt-spy2 list --launchpad --country=US
+$ apt-spy2 check --launchpad --country=US
 ...
+$ apt-spy2 check --strict
 ```
 
 ### fix command
@@ -81,3 +82,9 @@ Generally, `apt-spy2` plays especially nice in a non-interactive environment and
 ## License
 
 [New BSD License](http://opensource.org/licenses/BSD-2-Clause)
+
+### Release (procedure)
+
+ - update version in `lib/apt/spy2/version.rb`
+ - `bundle install`
+ - `git commit -a -m 'New release' && git tag -a vVERSION && git push --tags`

data/Rakefile

@@ -1,24 +1,17 @@
-require "bundler/gem_tasks"
-require "minitest/autorun"
-require "simplecov"
-require "simplecov-lcov"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
-task :test do
+Rake::TestTask.new do |t|
   ENV['COVERAGE'] = 'true'
+  t.pattern = 'tests/*_test.rb'
 
-  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
-  SimpleCov::Formatter::LcovFormatter.config do |c|
-    c.output_directory = './coverage'
-    c.report_with_single_file = true
-    c.single_report_path = './coverage/lcov.info'
-  end
-  SimpleCov.start
-
-  $LOAD_PATH.unshift('lib', 'tests')
-  Dir.glob('./tests/*_test.rb') do |f|
-    require f
-  end
+  # $LOAD_PATH.unshift('lib', 'tests')
+  # Dir.glob('./tests/*_test.rb').sort.each do |f|
+  #   require f
+  # end
 end

data/apt-spy2.gemspec

@@ -1,31 +1,36 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+# require 'English'
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'apt/spy2/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "apt-spy2"
+  spec.name          = 'apt-spy2'
   spec.version       = Apt::Spy2::VERSION
-  spec.authors       = ["till"]
-  spec.email         = ["till@php.net"]
-  spec.description   = "Keep your /etc/apt/sources.list up to date"
-  spec.summary       = "apt-spy2, or apt-spy for ubuntu"
-  spec.homepage      = "https://github.com/lagged/apt-spy2"
+  spec.authors       = ['till']
+  spec.email         = ['till@php.net']
+  spec.description   = 'Keep your /etc/apt/sources.list up to date'
+  spec.summary       = 'apt-spy2, or apt-spy for ubuntu'
+  spec.homepage      = 'https://github.com/lagged/apt-spy2'
   spec.license       = 'BSD-2-Clause'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.required_ruby_version = '>= 2.7', '< 3.3'
+
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency 'thor', '>= 0.18.1'
   spec.add_dependency 'colored', '>= 1.2'
   spec.add_dependency 'json'
-  spec.add_dependency 'nokogiri', '>= 1.6', '< 1.13'
+  spec.add_dependency 'nokogiri', '~> 1.14.1'
+  spec.add_dependency 'thor', '>= 0.18.1'
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 5.15.0"
-  spec.add_development_dependency "simplecov", "~> 0.18"
-  spec.add_development_dependency "simplecov-lcov", "~> 0.8.0"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'minitest', '~> 5.15.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov', '~> 0.18'
+  spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
 end

data/bin/apt-spy2

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'apt/spy2'
 require 'colored'
@@ -8,7 +9,7 @@ Encoding.default_internal = Encoding::UTF_8
 
 begin
   AptSpy2.start
-rescue => the_error
-  puts the_error.to_s.white_on_red
+rescue StandardError => e
+  puts e.to_s.white_on_red
   exit 1
 end

data/lib/apt/spy2/country.rb

@@ -1,33 +1,32 @@
+# frozen_string_literal: true
+
 module Apt
   module Spy2
+    # lookup a country based on code
     class Country
-
       def initialize(country_database)
         @database = country_database
       end
 
       def to_country_name(code)
         code = code.upcase
-        return capitalize(code) unless code.length == 2
+        return capitalize!(code) unless code.length == 2
 
         File.open(@database).each do |line|
           country, tld = line.split(';', 2)
           tld.gsub!(/\n/, '')
 
-          if code == tld
-            return capitalize(country)
-          end
-
+          return capitalize!(country) if code == tld
         end
 
         raise "Could not look up: #{code}"
       end
 
       private
-      def capitalize(str)
-        return str.split(" ").map(&:capitalize).join(" ")
-      end
 
+      def capitalize!(str)
+        str.split(' ').map(&:capitalize).join(' ')
+      end
     end
   end
 end

data/lib/apt/spy2/downloader.rb

@@ -1,30 +1,27 @@
-require 'open-uri'
+# frozen_string_literal: true
+
+require 'apt/spy2/request'
 
 module Apt
   module Spy2
+    # download url (e.g. mirror list or launchpad page)
     class Downloader
-
-      def initialize(url = nil)
-        @url = url if !url.nil?
-      end
-
       def do_download(url = nil)
-        @url = url if !url.nil?
+        raise 'Please supply a url.' if url.nil?
 
-        raise "Please supply a url." if url.nil?
+        req = Apt::Spy2::Request.new(url)
 
         begin
-          return open(@url).read
-        rescue OpenURI::HTTPError => the_error
-          case the_error.io.status[0]
-          when "404"
-            raise "The URL #{@url} does not exist."
-          else
-            raise "Status: #{the_error.io.status[0]}"
-          end
+          response = req.get
+          return response.body if response.code == '200'
+
+          raise "The URL #{@url} does not exist." if response.code == '404'
+
+          raise "Status code: #{response.code}"
+        rescue StandardError => e
+          raise e
         end
       end
-
     end
   end
 end

data/lib/apt/spy2/launchpad.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 
 module Apt
   module Spy2
+    # parse launchpad output
     class Launchpad
-
       def initialize(download)
         @launchpad = download
       end
 
-      def get_mirrors(country)
-
+      def mirrors(country)
         mirrors = []
 
         document = Nokogiri::HTML(@launchpad)
@@ -27,10 +28,8 @@ module Apt
           end
         end
 
-        return mirrors
-
+        mirrors
       end
-
     end
   end
 end

data/lib/apt/spy2/request.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'net/https'
+require 'uri'
+
+module Apt
+  module Spy2
+    # make requests
+    class Request
+      def initialize(url)
+        uri = URI(url)
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true if uri.scheme == 'https'
+
+        @http = http
+        @request_uri = uri.request_uri
+      end
+
+      def get
+        @http.request(Net::HTTP::Get.new(@request_uri))
+      end
+
+      def head
+        @http.request(Net::HTTP::Head.new(@request_uri))
+      end
+    end
+  end
+end

data/lib/apt/spy2/ubuntu_mirrors.rb

@@ -1,19 +1,17 @@
+# frozen_string_literal: true
+
 module Apt
   module Spy2
+    # wraps around the \n delimited list of mirrors
     class UbuntuMirrors
-
       def initialize(download)
         @ubuntu_mirrors = download
       end
 
-      def get_mirrors(country)
-
+      def mirrors(_country)
         mirrors = @ubuntu_mirrors
-        mirrors = mirrors.split(/\n/)
-        return mirrors
-
+        mirrors.split(/\n/)
       end
-
     end
   end
 end

data/lib/apt/spy2/url.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Apt
+  module Spy2
+    # build mirror url
+    class Url
+      def initialize(strict)
+        @strict = strict
+      end
+
+      def adjust!(mirror)
+        return mirror unless @strict
+
+        "#{mirror}dists/#{release}/Contents-#{arch}.gz"
+      end
+
+      private
+
+      def arch
+        `dpkg --print-architecture`.strip
+      end
+
+      def release
+        `lsb_release -c`.split(' ')[1].strip
+      end
+    end
+  end
+end

data/lib/apt/spy2/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Apt
   module Spy2
-    VERSION = "0.7.2"
+    VERSION = '0.8.0'
   end
 end

data/lib/apt/spy2/writer.rb

@@ -1,20 +1,20 @@
+# frozen_string_literal: true
+
 require 'colored'
 require 'json'
 
 module Apt
   module Spy2
+    # abstracted puts or json
     class Writer
       def initialize(format)
-
-        if !["json", "shell"].include?(format)
-          raise "Unknown format: #{format}"
-        end
+        raise "Unknown format: #{format}" unless %w[json shell].include?(format)
 
         @format = format
         @complete = []
       end
 
-      def set_complete(complete)
+      def complete(complete)
         @complete = complete
       end
 
@@ -24,32 +24,29 @@ module Apt
           return
         end
 
-        print "Mirror: #{data["mirror"]} - "
+        print "Mirror: #{data['mirror']} - "
 
-        case data["status"]
-        when "up"
-          puts data["status"].upcase.green
-        when "down"
-          puts data["status"].upcase.red
-        when "broken"
-          puts data["status"].upcase.yellow
+        case data['status']
+        when 'up'
+          puts data['status'].upcase.green
+        when 'down'
+          puts data['status'].upcase.red
+        when 'broken'
+          puts data['status'].upcase.yellow
         else
-          puts "Unknown status: #{data["status"]}".white_on_red
+          puts "Unknown status: #{data['status']}".white_on_red
         end
       end
 
       def json?
-        if @format == 'json'
-          return true
-        end
+        return true if @format == 'json'
 
-        return false
+        false
       end
 
-      def to_json
+      def to_json(*_args)
         JSON.generate(@complete)
       end
-
     end
   end
 end

data/lib/apt/spy2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'open-uri'
 require 'colored'
@@ -7,116 +9,126 @@ require 'apt/spy2/country'
 require 'apt/spy2/downloader'
 require 'apt/spy2/ubuntu_mirrors'
 require 'apt/spy2/launchpad'
+require 'apt/spy2/request'
+require 'apt/spy2/url'
 
+# apt-spy2 command interface
 class AptSpy2 < Thor
-  package_name "apt-spy2"
+  package_name 'apt-spy2'
+  class_option :country, default: 'mirrors'
+  class_option :launchpad, type: :boolean, banner: "Use launchpad's mirror list"
 
-  desc "fix", "Set the closest/fastest mirror"
-  option :country, :default => "mirrors"
-  option :commit, :type => :boolean
-  option :launchpad, :type => :boolean, :banner => "Use launchpad's mirror list"
+  desc 'fix', 'Set the closest/fastest mirror'
+  option :commit, type: :boolean
+  option :strict, type: :boolean
   def fix
-    working = filter(retrieve(options[:country], use_launchpad?(options)), false)
-    print "The closest mirror is: "
-    puts "#{working[0]}".bold.magenta
-    if !options[:commit]
-      puts "Run with --commit to adjust /etc/apt/sources.list".yellow
-    else
-      puts "Updating /etc/apt/sources.list".yellow
-      update(working[0])
+    mirrors = retrieve(options[:country], use_launchpad?(options))
+    working = filter(mirrors, options[:strict], false)
+    print 'The closest mirror is: '
+    puts (working[0]).to_s.bold.magenta
+    unless options[:commit]
+      puts 'Run with --commit to adjust /etc/apt/sources.list'.yellow
+      return
     end
+
+    puts 'Updating /etc/apt/sources.list'.yellow
+    update(working[0])
   end
 
-  desc "check", "Evaluate mirrors"
-  option :country, :default => "mirrors"
-  option :output, :type => :boolean, :default => true
-  option :format, :default => "shell"
-  option :launchpad, :type => :boolean, :banner => "Use launchpad's mirror list"
+  desc 'check', 'Evaluate mirrors'
+  option :output, type: :boolean, default: true
+  option :format, default: 'shell'
+  option :strict, type: :boolean
   def check
-
     @writer = Apt::Spy2::Writer.new(options[:format])
 
     mirrors = retrieve(options[:country], use_launchpad?(options))
-    filter(mirrors, options[:output])
+    filter(mirrors, options[:strict], options[:output])
 
     puts @writer.to_json if @writer.json?
   end
 
-  desc "list", "List the currently available mirrors"
-  option :country, :default => "mirrors"
-  option :format, :default => "shell"
-  option :launchpad, :type => :boolean, :banner => "Use launchpad's mirror list"
+  desc 'list', 'List the currently available mirrors'
+  option :format, default: 'shell'
   def list
     mirrors = retrieve(options[:country], use_launchpad?(options))
 
     @writer = Apt::Spy2::Writer.new(options[:format])
 
-    @writer.set_complete(mirrors)
+    @writer.complete(mirrors)
 
     puts @writer.to_json if @writer.json?
-    puts mirrors if !@writer.json?
+    puts mirrors unless @writer.json?
   end
 
-  desc "version", "Show which version of apt-spy2 is installed"
+  desc 'version', 'Show which version of apt-spy2 is installed'
   def version
     puts Apt::Spy2::VERSION
     exit
   end
 
   private
-  def retrieve(country = "mirrors", launchpad = false)
 
+  def retrieve(country = 'mirrors', launchpad = false)
     downloader = Apt::Spy2::Downloader.new
 
-    if launchpad === true
-      csv_path = File.expand_path(File.dirname(__FILE__) + "/../../var/country-names.txt")
+    if launchpad
+      csv_path = File.expand_path("#{File.dirname(__FILE__)}/../../var/country-names.txt")
       country  = Apt::Spy2::Country.new(csv_path)
       name     = country.to_country_name(options[:country])
 
       launchpad = Apt::Spy2::Launchpad.new(downloader.do_download('https://launchpad.net/ubuntu/+archivemirrors'))
-      return launchpad.get_mirrors(name)
+      return launchpad.mirrors(name)
     end
 
     country.upcase! if country.length == 2
 
     ubuntu_mirrors = Apt::Spy2::UbuntuMirrors.new(downloader.do_download("http://mirrors.ubuntu.com/#{country}.txt"))
-    mirrors = ubuntu_mirrors.get_mirrors(country)
-    return mirrors
-
+    ubuntu_mirrors.mirrors(country)
   end
 
-  private
-  def filter(mirrors, output = true)
+  def filter(mirrors, strict = false, output = true)
     # f me :)
 
     working_mirrors = []
 
+    url = Apt::Spy2::Url.new(strict)
+
     mirrors.each do |mirror|
-      data = {"mirror" => mirror }
-      begin
-        open(mirror)
-        data["status"] = "up"
-        working_mirrors << mirror
-      rescue OpenURI::HTTPError
-        data["status"] = "broken"
-      rescue
-        # this is a catch-all for everything else
-        data["status"] = "down"
-      end
+      data = { 'mirror' => mirror }
+
+      check = url.adjust!(mirror)
+
+      status = broken?(check)
+
+      data['status'] = status
+
+      working_mirrors << mirror if status == 'up'
 
       @writer.echo(data) if output
     end
 
-    return working_mirrors
+    working_mirrors
+  end
+
+  def broken?(url)
+    begin
+      req = Apt::Spy2::Request.new(url)
+      response = req.head
+      return 'up' if response.code == '200'
+
+      return 'broken' if response.code == '404'
+    rescue StandardError
+      # connection errors, ssl errors, etc.
+    end
 
+    'down'
   end
 
-  private
   def update(mirror)
-
     t = Time.now
-    r = `lsb_release -c`.split(" ")[1]
-    sources = "## Updated on #{t.to_s} by apt-spy2\n"
+    r = `lsb_release -c`.split(' ')[1]
+    sources = "## Updated on #{t} by apt-spy2\n"
     sources << "deb #{mirror} #{r} main restricted universe multiverse\n"
     sources << "deb #{mirror} #{r}-updates main restricted universe multiverse\n"
     sources << "deb #{mirror} #{r}-backports main restricted universe multiverse\n"
@@ -129,26 +141,23 @@ class AptSpy2 < Thor
       File.open(apt_sources, 'w') do |f|
         f.write(sources)
       end
-    rescue
+    rescue StandardError
       msg  = "Failed updating #{apt_sources}!"
-      msg << "You probably need sudo!"
+      msg << 'You probably need sudo!'
       raise msg
     end
 
     puts "Updated '#{apt_sources}' with #{mirror}".green
-    puts "Run `apt-get update` to update".black_on_yellow
+    puts 'Run `apt-get update` to update'.black_on_yellow
   end
 
-  private
   def use_launchpad?(options)
-    if !options[:launchpad]
-      return false
-    end
+    return false unless options[:launchpad]
 
     if options[:country] && options[:country] == 'mirrors'
-      raise "Please supply a `--country=foo`. Launchpad cannot guess!"
+      raise 'Please supply a `--country=foo`. Launchpad cannot guess!'
     end
 
-    return true
+    true
   end
 end

data/test_helper.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+require 'simplecov-lcov'
+
+if ENV['CI']
+  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
+  SimpleCov::Formatter::LcovFormatter.config do |c|
+    c.output_directory = './coverage'
+    c.report_with_single_file = true
+    c.single_report_path = './coverage/lcov.info'
+  end
+else
+  SimpleCov.formatter SimpleCov::Formatter::MultiFormatter.new([
+                                                                 SimpleCov::Formatter::SimpleFormatter,
+                                                                 SimpleCov::Formatter::HTMLFormatter
+                                                               ])
+end
+
+SimpleCov.profiles.define 'apt-spy2' do
+  add_filter '/tests/'
+  add_filter '/pkg/'
+  add_filter '/vendor/'
+  add_filter '/var'
+
+  add_group 'lib', 'lib/apt'
+  add_group 'bin', 'bin'
+end
+SimpleCov.start 'apt-spy2'
+require 'minitest/autorun'

data/tests/country_test.rb

@@ -1,12 +1,15 @@
-require 'apt/spy2/country'
+# frozen_string_literal: true
 
+require_relative '../test_helper'
+require_relative '../lib/apt/spy2/country'
+
+# test the name resolution
 class CountryTest < Minitest::Test
   def setup
-    @country_list = File.expand_path(File.dirname(__FILE__) + "/../var/country-names.txt")
+    @country_list = File.expand_path("#{File.dirname(__FILE__)}/../var/country-names.txt")
   end
 
-  def test_tld_to_name()
-
+  def test_tld_to_name
     # fixtures for people who don't want to read about rails
     data = {
       'de' => 'Germany',
@@ -22,6 +25,5 @@ class CountryTest < Minitest::Test
     data.each_pair do |code, expected|
       assert_equal(expected, c.to_country_name(code))
     end
-
   end
 end

data/tests/downloader_test.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative '../test_helper'
+require_relative '../lib/apt/spy2/downloader'
+
+# this is an integration test (needs interwebs)
+class DownloaderTest < Minitest::Test
+  def test_do
+    downloader = Apt::Spy2::Downloader.new
+    data = downloader.do_download('http://mirrors.ubuntu.com/DE.txt')
+    assert(!data.empty?, 'There should have been a response, unless the mirrors are down.')
+  end
+
+  def test_do_wrong_countrys
+    downloader = Apt::Spy2::Downloader.new
+    assert_raises(RuntimeError) { downloader.do_download('http://mirrors.ubuntu.com/de.txt') }
+  end
+end

data/tests/launchpad_test.rb

@@ -1,13 +1,17 @@
-require 'apt/spy2/launchpad'
+# frozen_string_literal: true
 
+require_relative '../test_helper'
+require_relative '../lib/apt/spy2/launchpad'
+
+# test to confirm launchpad format (HTML) is parsed
 class LaunchpadTest < Minitest::Test
   def setup
-    @download_fixture = File.read(File.expand_path(File.dirname(__FILE__) + "/fixtures/launchpad.html"))
+    @download_fixture = File.read(File.expand_path("#{File.dirname(__FILE__)}/fixtures/launchpad.html"))
   end
 
   def test_german_mirrors
     lp = Apt::Spy2::Launchpad.new(@download_fixture)
-    mirrors = lp.get_mirrors('Germany')
+    mirrors = lp.mirrors('Germany')
     assert_equal(false, mirrors.empty?)
   end
 end

data/tests/ubuntu_mirrors_test.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative '../test_helper'
+require_relative '../lib/apt/spy2/ubuntu_mirrors'
+
+# test to confirm launchpad format (HTML) is parsed
+class UbuntuMirrorsTest < Minitest::Test
+  def test_mirrors
+    expected = ['http://example.org', 'http://example.de']
+    fixture = expected.join("\n")
+
+    m = Apt::Spy2::UbuntuMirrors.new(fixture)
+    assert_equal(expected, m.mirrors('country'))
+  end
+end

data/tests/url_test.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative '../test_helper'
+require_relative '../lib/apt/spy2/url'
+
+# test to check request lib
+class UrlTest < Minitest::Test
+  def test_non_strict
+    expected = 'http://example.org'
+
+    url = Apt::Spy2::Url.new(false)
+    assert_equal(expected, url.adjust!(expected))
+  end
+
+  # def strict
+  #   skip "Test only runs on ubuntu" if OS.unix? and not OS.mac?
+
+  #   expected = 'http://example.org'
+
+  #   url = Apt::Spy2::Url.new(true)
+  #   assert_not_equal(expected, url.mirror)
+  # end
+end

data/tests/writer_test.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative '../test_helper'
+require_relative '../lib/apt/spy2/writer'
+require 'json'
+
+# test to check request lib
+class WriterTest < Minitest::Test
+  def test_json
+    fixture = { 'mirror': 'http://example.org', 'status': 'up' }
+
+    w = Apt::Spy2::Writer.new('json')
+    w.echo(fixture)
+
+    # json string
+    j = w.to_json
+
+    assert_equal(true, w.json?)
+    assert_equal(true, j.is_a?(String))
+    assert_equal(true, JSON.parse(j).is_a?(Array))
+  end
+
+  def test_no_json
+    w = Apt::Spy2::Writer.new('shell')
+    assert_equal(false, w.json?)
+  end
+end

metadata

@@ -1,77 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: apt-spy2
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - till
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2023-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.14.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.15.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.15.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.15.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +160,9 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".github/dependabot.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/pr.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".ruby_version"
 - CONTRIBUTING.md
@@ -169,12 +179,19 @@ files:
 - lib/apt/spy2/country.rb
 - lib/apt/spy2/downloader.rb
 - lib/apt/spy2/launchpad.rb
+- lib/apt/spy2/request.rb
 - lib/apt/spy2/ubuntu_mirrors.rb
+- lib/apt/spy2/url.rb
 - lib/apt/spy2/version.rb
 - lib/apt/spy2/writer.rb
+- test_helper.rb
 - tests/country_test.rb
+- tests/downloader_test.rb
 - tests/fixtures/launchpad.html
 - tests/launchpad_test.rb
+- tests/ubuntu_mirrors_test.rb
+- tests/url_test.rb
+- tests/writer_test.rb
 - var/country-names.txt
 homepage: https://github.com/lagged/apt-spy2
 licenses:
@@ -188,14 +205,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: apt-spy2, or apt-spy for ubuntu