apt-spy2 0.7.3 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89ef6a24eb7eafd20007b54eadeeeea4ffa0c10114dca7efd62d4a8b7adff3c7
-  data.tar.gz: e129a99d18c3e17262f7b3e0c04aafef66041861bf6fd5d144fd7d139e254f0c
+  metadata.gz: 7622e67a84b791b9ff1e03931d4b216d5a2bd879b0ac9334ee6ccc140e1c16b9
+  data.tar.gz: a5fc5ef8e9fc0a98e7448253d0e95dc6a55113b3586ae7fbfabb260d78f0c6ff
 SHA512:
-  metadata.gz: 33df33456da6b923723eb9253ca7c774b35bb42306d27ab00fddaf861f758fe6fe6e7d9f0993d5c4481cc0b818b859589cb3c85a8e199ee79f4da12275fb8ece
-  data.tar.gz: bcffd1814b734650587939c66c6c545b76c171920db3558b5551b1ddd7b657e0b5a9429842403aff1a4b976ea16c77c462f191c444a7c58414d59ef6b87a2bbd
+  metadata.gz: 3f4fd668a86d485758610e2870cd7650c5875671711a027f6149a80ce63134f817b41087aa795ff40106ee39041f78f333224b5285c90d769ee4142a225f3693
+  data.tar.gz: d6be7ad7b4db2471f3ef28d5ae6efc4bd9e44fb09c8f3fb337330c42aed0913c784e501eab6bdc6d8f7ac252da759336d06cb2034158c4d221dce21f4fb464b9

data/.github/dependabot.yml

@@ -7,3 +7,9 @@ updates:
   open-pull-requests-limit: 10
   assignees:
   - till
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+  assignees:
+  - till

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@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      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@v2
+
+    # ℹ️ 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@v2

data/.github/workflows/pr.yml

@@ -11,12 +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 }}
@@ -26,8 +26,24 @@ jobs:
       - run: ls -lah ./pkg/apt-spy2*
       - run: gem install pkg/apt-spy2*
       - run: apt-spy2 check
+      - run: sudo env "PATH=$PATH" apt-spy2 fix --commit
       - 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
+      - run: sudo env "PATH=$PATH" apt-spy2 fix --commit --strict
+
 

data/.github/workflows/release.yml

@@ -10,7 +10,8 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - run: git config --global --add safe.directory /github/workspace
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.0

data/Dockerfile

@@ -1,4 +1,13 @@
-FROM ruby:2.6-slim
+FROM ubuntu:22.10
+
+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,25 +1,45 @@
 PATH
   remote: .
   specs:
-    apt-spy2 (0.7.3)
+    apt-spy2 (0.8.2)
       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)
-    mini_portile2 (2.6.1)
+    json (2.6.3)
+    mini_portile2 (2.8.1)
     minitest (5.15.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.14.1)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    racc (1.6.0)
+    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)
@@ -27,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
@@ -37,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

@@ -3,20 +3,20 @@
 … or: "apt-spy for Ubuntu"
 
 [![pr](https://github.com/lagged/apt-spy2/actions/workflows/pr.yml/badge.svg)](https://github.com/lagged/apt-spy2/actions/workflows/pr.yml)
-[![Gem Version](https://badge.fury.io/rb/apt-spy2.svg)](https://badge.fury.io/rb/apt-spy2)
+![apt-spy2 (including prereleases)](https://img.shields.io/gem/v/apt-spy2?include_prereleases)
 [![Code Climate](https://codeclimate.com/github/lagged/apt-spy2.png)](https://codeclimate.com/github/lagged/apt-spy2)
 [![Coverage Status](https://coveralls.io/repos/lagged/apt-spy2/badge.png)](https://coveralls.io/r/lagged/apt-spy2)
 
 
 ## Installation
 
-```
+```sh
 gem install apt-spy2
 ```
 
 ## Usage
 
-```
+```sh
 $ apt-spy2                                                                                                                                                         [21:03:52]
 apt-spy2 commands:
   apt-spy2 check           # Evaluate mirrors
@@ -30,27 +30,28 @@ apt-spy2 commands:
 Displays a list of currently available mirrors. These mirrors are automatically selected via
 [ubuntu-mirrors](http://mirrors.ubuntu.com) using your IP's location.
 
-```
+```sh
 $ apt-spy2 list
 ...
 ```
 
 Since `mirrors.ubuntu.com` is frequently down, you can the list on [Launchpad](launchpad.net/ubuntu/+archivemirrors):
 
-```
+```sh
 $ 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.
 
-```
+```sh
 $ apt-spy2 check
 ...
-$ apt-spy2 list --launchpad --country=US
+$ apt-spy2 check --launchpad --country=US
 ...
+$ apt-spy2 check --strict
 ```
 
 ### fix command
@@ -69,10 +70,10 @@ See `apt-spy2 help list|check|fix` for available options.
 
 ### exit codes
 
- * 0 - all went well
- * 1 - some kind of error
+* 0 - all went well
+* 1 - some kind of error
 
-### output and non-interactiveness
+### output and non-interactive behavior
 
 See `apt-spy2 help COMMAND` for more information.
 
@@ -84,6 +85,7 @@ Generally, `apt-spy2` plays especially nice in a non-interactive environment and
 
 ### 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`
+* update version in `lib/apt/spy2/version.rb`
+* `bundle install`
+* `git commit -a 'Prep x.y.z'
+* `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,33 +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.required_ruby_version = '>= 2.6', '< 3.2'
+  spec.required_ruby_version = '>= 2.7', '< 3.3'
 
-  spec.files         = `git ls-files`.split($/)
+  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 URI.open(@url, :read_timeout => 10).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,33 @@
+# 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)
+
+        # sets hopefully sensible timeouts for read and connection
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.read_timeout = 10
+        http.open_timeout = 10
+        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