apt-spy2 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91d09bec4d6918e39405d38ee164b8215c6e04d778887c0e570bdab6cc39592e
-  data.tar.gz: d2f69bf166ca8bf79fff732e30184270dfbc0422a41dbe616afc9ddd56b21641
+  metadata.gz: 89ef6a24eb7eafd20007b54eadeeeea4ffa0c10114dca7efd62d4a8b7adff3c7
+  data.tar.gz: e129a99d18c3e17262f7b3e0c04aafef66041861bf6fd5d144fd7d139e254f0c
 SHA512:
-  metadata.gz: 931ef089f949e870538b77887a7825a42647bcc8a4ef577118a12b51112bcba1b1a63c235d2bbe0e1fed348608d84954c6a44c7f16a578e42c29e198a4403619
-  data.tar.gz: 956aa4b5d89409a4366549b84846a42b95c46f7013197182fdfd22956ba07e60fddccf5f210a5eb85d0c09f3e8ff15cc730642ea1afb66b9fee81703cb172da3
+  metadata.gz: 33df33456da6b923723eb9253ca7c774b35bb42306d27ab00fddaf861f758fe6fe6e7d9f0993d5c4481cc0b818b859589cb3c85a8e199ee79f4da12275fb8ece
+  data.tar.gz: bcffd1814b734650587939c66c6c545b76c171920db3558b5551b1ddd7b657e0b5a9429842403aff1a4b976ea16c77c462f191c444a7c58414d59ef6b87a2bbd

data/.github/workflows/pr.yml

@@ -11,6 +11,7 @@ jobs:
     strategy:
       matrix:
         ruby-version:
+          - '3.1'
           - '3.0'
           - 2.7
           - 2.6
@@ -24,7 +25,7 @@ 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 }}

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,4 @@
-FROM ubuntu:18.04
-
-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
+FROM ruby:2.6-slim
 
 WORKDIR /work
 COPY . /work

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apt-spy2 (0.7.2)
+    apt-spy2 (0.7.3)
       colored (>= 1.2)
       json
       nokogiri (>= 1.6, < 1.13)
@@ -13,10 +13,12 @@ GEM
     colored (1.2)
     docile (1.4.0)
     json (2.6.1)
+    mini_portile2 (2.6.1)
     minitest (5.15.0)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    racc (1.5.2)
+    racc (1.6.0)
     rake (13.0.6)
     simplecov (0.21.2)
       docile (~> 1.1)

data/README.md

@@ -81,3 +81,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/apt-spy2.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/lagged/apt-spy2"
   spec.license       = 'BSD-2-Clause'
 
+  spec.required_ruby_version = '>= 2.6', '< 3.2'
+
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/lib/apt/spy2/downloader.rb

@@ -14,7 +14,7 @@ module Apt
         raise "Please supply a url." if url.nil?
 
         begin
-          return open(@url).read
+          return URI.open(@url, :read_timeout => 10).read
         rescue OpenURI::HTTPError => the_error
           case the_error.io.status[0]
           when "404"

data/lib/apt/spy2/version.rb

@@ -1,5 +1,5 @@
 module Apt
   module Spy2
-    VERSION = "0.7.2"
+    VERSION = "0.7.3"
   end
 end

data/lib/apt/spy2.rb

@@ -94,7 +94,7 @@ class AptSpy2 < Thor
     mirrors.each do |mirror|
       data = {"mirror" => mirror }
       begin
-        open(mirror)
+        URI.open(mirror)
         data["status"] = "up"
         working_mirrors << mirror
       rescue OpenURI::HTTPError

data/tests/downloader_test.rb

@@ -0,0 +1,15 @@
+require 'apt/spy2/downloader'
+
+class DownloaderTest < Minitest::Test
+  # this is an integration test (needs interwebs)
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apt-spy2
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - till
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -153,6 +153,7 @@ files:
 - ".dockerignore"
 - ".github/dependabot.yml"
 - ".github/workflows/pr.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".ruby_version"
 - CONTRIBUTING.md
@@ -173,6 +174,7 @@ files:
 - lib/apt/spy2/version.rb
 - lib/apt/spy2/writer.rb
 - tests/country_test.rb
+- tests/downloader_test.rb
 - tests/fixtures/launchpad.html
 - tests/launchpad_test.rb
 - var/country-names.txt
@@ -180,7 +182,7 @@ homepage: https://github.com/lagged/apt-spy2
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -188,7 +190,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -196,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.32
-signing_key:
+signing_key: 
 specification_version: 4
 summary: apt-spy2, or apt-spy for ubuntu
 test_files: []