apt-spy2 0.5.0 → 0.7.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 89ef6a24eb7eafd20007b54eadeeeea4ffa0c10114dca7efd62d4a8b7adff3c7
+  data.tar.gz: e129a99d18c3e17262f7b3e0c04aafef66041861bf6fd5d144fd7d139e254f0c
+SHA512:
+  metadata.gz: 33df33456da6b923723eb9253ca7c774b35bb42306d27ab00fddaf861f758fe6fe6e7d9f0993d5c4481cc0b818b859589cb3c85a8e199ee79f4da12275fb8ece
+  data.tar.gz: bcffd1814b734650587939c66c6c545b76c171920db3558b5551b1ddd7b657e0b5a9429842403aff1a4b976ea16c77c462f191c444a7c58414d59ef6b87a2bbd

data/.dockerignore

@@ -0,0 +1 @@
+vendor/bundle

data/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  assignees:
+  - till

data/.github/workflows/pr.yml

@@ -0,0 +1,33 @@
+---
+name: pr
+
+on:
+  pull_request
+
+jobs:
+  test:
+    name: "test-${{ matrix.ruby-version }}"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          - '3.1'
+          - '3.0'
+          - 2.7
+          - 2.6
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - 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
+      - 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/.gitignore

@@ -1,2 +1,5 @@
 .vagrant
 pkg
+vendor
+coverage
+.bundle

data/.ruby_version

@@ -0,0 +1 @@
+2.6.3-p62

data/CONTRIBUTING.md

@@ -0,0 +1,22 @@
+# Contribute!
+
+First off: all contributions are welcome and thanks for taking the time!
+
+## Setup
+
+Clone the repository and install the dependencies:
+
+```
+gem install bundler
+bundle install --dev
+```
+
+## Submit
+
+ 1. Make a feature branch (`topics/foo` or `bugfix/foo`).
+ 2. Run `bundle exec rake test`.
+ 3. Send a pull-request.
+
+## Testing
+
+If applicable, please add a new test. :)

data/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:2.6-slim
+
+WORKDIR /work
+COPY . /work
+
+CMD ["ruby", "-v"]

data/Gemfile.lock

@@ -1,29 +1,44 @@
 PATH
   remote: .
   specs:
-    apt-spy2 (0.5.0)
+    apt-spy2 (0.7.3)
       colored (>= 1.2)
       json
-      nokogiri (~> 1.6.0)
+      nokogiri (>= 1.6, < 1.13)
       thor (>= 0.18.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     colored (1.2)
-    json (1.8.0)
-    mini_portile (0.5.1)
-    minitest (5.0.8)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    rake (10.1.0)
-    thor (0.18.1)
+    docile (1.4.0)
+    json (2.6.1)
+    mini_portile2 (2.6.1)
+    minitest (5.15.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    racc (1.6.0)
+    rake (13.0.6)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.3)
+    thor (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   apt-spy2!
-  bundler (~> 1.3)
-  minitest (~> 5.0.8)
+  bundler (~> 2.0)
+  minitest (~> 5.15.0)
   rake
+  simplecov (~> 0.18)
+  simplecov-lcov (~> 0.8.0)
+
+BUNDLED WITH
+   2.2.32

data/LICENSE

@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2013-2019, Till Klampaeckel
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/Makefile

@@ -0,0 +1,11 @@
+install:
+	bundle install --path ./vendor/bundle
+
+release:
+	bundle exec rake release
+
+docker-build:
+	docker build -t lagged/apt-spy2:dev .
+
+docker-run: docker-build
+	docker run -it lagged/apt-spy2:dev bash

data/README.md

@@ -2,9 +2,10 @@
 
 … or: "apt-spy for Ubuntu"
 
-[![Build Status](https://travis-ci.org/lagged/apt-spy2.png?branch=master)](https://travis-ci.org/lagged/apt-spy2)
-[![Gem Version](https://badge.fury.io/rb/apt-spy2.png)](http://badge.fury.io/rb/apt-spy2)
+[![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)
 [![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
@@ -81,13 +82,8 @@ Generally, `apt-spy2` plays especially nice in a non-interactive environment and
 
 [New BSD License](http://opensource.org/licenses/BSD-2-Clause)
 
-## Contributions are welcome
+### Release (procedure)
 
-Clone the repository and install the dependencies:
-
-```
-gem install bundler
-bundle install --dev
-```
-
-Make a feature branch (`topics/foo` or `bugfix/foo`) and send a pull-request.
+ - 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,10 +1,22 @@
 require "bundler/gem_tasks"
-require 'minitest/autorun'
+require "minitest/autorun"
+require "simplecov"
+require "simplecov-lcov"
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
 task :test do
+  ENV['COVERAGE'] = 'true'
+
+  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

data/apt-spy2.gemspec

@@ -11,7 +11,9 @@ Gem::Specification.new do |spec|
   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"
+  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) }
@@ -21,9 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '>= 0.18.1'
   spec.add_dependency 'colored', '>= 1.2'
   spec.add_dependency 'json'
-  spec.add_dependency 'nokogiri', '~> 1.6.0'
+  spec.add_dependency 'nokogiri', '>= 1.6', '< 1.13'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 5.0.8"
+  spec.add_development_dependency "minitest", "~> 5.15.0"
+  spec.add_development_dependency "simplecov", "~> 0.18"
+  spec.add_development_dependency "simplecov-lcov", "~> 0.8.0"
 end

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.5.0"
+    VERSION = "0.7.3"
   end
 end

data/lib/apt/spy2.rb

@@ -18,7 +18,7 @@ class AptSpy2 < Thor
   def fix
     working = filter(retrieve(options[:country], use_launchpad?(options)), false)
     print "The closest mirror is: "
-    puts "#{working[0]}".white_on_green
+    puts "#{working[0]}".bold.magenta
     if !options[:commit]
       puts "Run with --commit to adjust /etc/apt/sources.list".yellow
     else
@@ -57,6 +57,12 @@ class AptSpy2 < Thor
     puts mirrors if !@writer.json?
   end
 
+  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)
 
@@ -88,12 +94,13 @@ class AptSpy2 < Thor
     mirrors.each do |mirror|
       data = {"mirror" => mirror }
       begin
-        mirror_status = open(mirror)
+        URI.open(mirror)
         data["status"] = "up"
         working_mirrors << mirror
-      rescue OpenURI::HTTPError => the_error
+      rescue OpenURI::HTTPError
         data["status"] = "broken"
-      rescue Errno::ECONNREFUSED
+      rescue
+        # this is a catch-all for everything else
         data["status"] = "down"
       end
 
@@ -129,7 +136,7 @@ class AptSpy2 < Thor
     end
 
     puts "Updated '#{apt_sources}' with #{mirror}".green
-    puts "Run `apt-get update` to update".red_on_yellow
+    puts "Run `apt-get update` to update".black_on_yellow
   end
 
   private
@@ -138,9 +145,8 @@ class AptSpy2 < Thor
       return false
     end
 
-
     if options[:country] && options[:country] == 'mirrors'
-      raise "Please supply a --country. Launchpad cannot guess!"
+      raise "Please supply a `--country=foo`. Launchpad cannot guess!"
     end
 
     return true

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,128 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: apt-spy2
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.7.3
 platform: ruby
 authors:
 - till
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     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: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: Keep your /etc/apt/sources.list up to date
 email:
 - till@php.net
@@ -131,13 +150,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".dockerignore"
+- ".github/dependabot.yml"
+- ".github/workflows/pr.yml"
+- ".github/workflows/release.yml"
+- ".gitignore"
+- ".ruby_version"
+- CONTRIBUTING.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
+- LICENSE
+- Makefile
 - README.md
 - Rakefile
-- Vagrantfile
 - apt-spy2.gemspec
 - bin/apt-spy2
 - lib/apt/spy2.rb
@@ -148,32 +174,34 @@ 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
 homepage: https://github.com/lagged/apt-spy2
 licenses:
-- BSD
+- BSD-2-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.2.32
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: apt-spy2, or apt-spy for ubuntu
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-
-script:
-  - bundle exec rake test

data/Vagrantfile

@@ -1,11 +0,0 @@
-Vagrant::Config.run do |config|
-
-    config.vm.box = "precise64"
-    config.vm.box_url = "http://dl.dropbox.com/u/1537815/precise64.box"
-
-    config.vm.customize [
-        "modifyvm", :id,
-        "--name", "apt-spy2 testbox",
-        "--memory", "128"
-    ]
-end