apt-spy2 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8bc5fe05fc150dd3297f51674ebb8bfafbd2d97b
+  data.tar.gz: ea7179bfa2d4eca39e3507542c0ed040da70344c
+SHA512:
+  metadata.gz: ff651b447123c72f61d37aaf4fcb1bc5d09026bc68bd4c89c1ce3c113af8b2be2423ac77298376a2ce1fe895a01683222139a6ba9e73673bc35b23914f765c83
+  data.tar.gz: 7fcdd35d05da224b3c6e11a9e72a67bbb44f7326493ce1b72f67dd2c8e9a9ea034de5cbd161be139d11379e2722a23e19a0b97ebfc525181ed75ce32446b0f07

data/.dockerignore

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

data/.gitignore

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

data/.travis.yml

@@ -1,6 +1,8 @@
+dist: bionic
+
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.5.1
 
 script:
   - bundle exec rake test

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,11 @@
+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
+
+WORKDIR /work
+COPY . /work
+
+CMD ["ruby", "-v"]

data/Gemfile.lock

@@ -1,29 +1,64 @@
 PATH
   remote: .
   specs:
-    apt-spy2 (0.5.0)
+    apt-spy2 (0.6.0)
       colored (>= 1.2)
       json
-      nokogiri (~> 1.6.0)
+      nokogiri (>= 1.6, < 1.11)
       thor (>= 0.18.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     colored (1.2)
-    json (1.8.0)
-    mini_portile (0.5.1)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    json (2.2.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mini_portile2 (2.4.0)
     minitest (5.0.8)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    rake (10.1.0)
-    thor (0.18.1)
+    multi_json (1.8.0)
+    netrc (0.11.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    rake (12.3.3)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.20.3)
+    tins (0.11.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   apt-spy2!
-  bundler (~> 1.3)
+  bundler (~> 2.0)
+  coveralls
   minitest (~> 5.0.8)
   rake
+
+BUNDLED WITH
+   2.0.2

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

@@ -5,6 +5,7 @@
 [![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)
 [![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
@@ -80,14 +81,3 @@ Generally, `apt-spy2` plays especially nice in a non-interactive environment and
 ## License
 
 [New BSD License](http://opensource.org/licenses/BSD-2-Clause)
-
-## Contributions are welcome
-
-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.

data/Rakefile

@@ -1,5 +1,8 @@
+require "coveralls"
+Coveralls.wear!
+
 require "bundler/gem_tasks"
-require 'minitest/autorun'
+require "minitest/autorun"
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8

data/apt-spy2.gemspec

@@ -21,9 +21,10 @@ 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.11'
 
-  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 "coveralls"
 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,10 +94,10 @@ class AptSpy2 < Thor
     mirrors.each do |mirror|
       data = {"mirror" => mirror }
       begin
-        mirror_status = open(mirror)
+        open(mirror)
         data["status"] = "up"
         working_mirrors << mirror
-      rescue OpenURI::HTTPError => the_error
+      rescue OpenURI::HTTPError
         data["status"] = "broken"
       rescue Errno::ECONNREFUSED
         data["status"] = "down"
@@ -129,7 +135,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,11 +144,10 @@ 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
   end
-end
+end

data/lib/apt/spy2/version.rb

@@ -1,5 +1,5 @@
 module Apt
   module Spy2
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,128 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: apt-spy2
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - till
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2019-08-26 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.11'
   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.11'
 - !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.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.8
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Keep your /etc/apt/sources.list up to date
 email:
 - till@php.net
@@ -131,13 +136,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".dockerignore"
+- ".gitignore"
+- ".travis.yml"
+- CONTRIBUTING.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
+- LICENSE
+- Makefile
 - README.md
 - Rakefile
-- Vagrantfile
 - apt-spy2.gemspec
 - bin/apt-spy2
 - lib/apt/spy2.rb
@@ -154,26 +163,25 @@ files:
 homepage: https://github.com/lagged/apt-spy2
 licenses:
 - BSD
+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'
 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: 2.5.2.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: apt-spy2, or apt-spy for ubuntu
 test_files: []

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