apt-spy2 0.3.0 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apt-spy2 (0.3.0)
+    apt-spy2 (0.4.0)
       colored (>= 1.2)
       json
       thor (>= 0.18.1)

data/bin/apt-spy2

@@ -1,5 +1,11 @@
 #!/usr/bin/env ruby
 
 require 'apt/spy2'
+require 'colored'
 
-AptSpy2.start
+begin
+  AptSpy2.start
+rescue => the_error
+  puts the_error.to_s.white_on_red
+  exit 1
+end

data/lib/apt/spy2.rb

@@ -3,6 +3,7 @@ require 'open-uri'
 require 'colored'
 require 'fileutils'
 require 'apt/spy2/writer'
+require 'json'
 
 class AptSpy2 < Thor
   package_name "apt-spy2"
@@ -38,9 +39,16 @@ class AptSpy2 < Thor
 
   desc "list", "List the currently available mirrors"
   option :country, :default => "mirrors"
+  option :format, :default => "shell"
   def list
+
     mirrors = retrieve(options[:country])
-    puts mirrors
+    @writer = Apt::Spy2::Writer.new(options[:format])
+
+    @writer.set_complete(mirrors)
+
+    puts @writer.to_json if @writer.json?
+    puts mirrors if !@writer.json?
   end
 
   private
@@ -53,11 +61,9 @@ class AptSpy2 < Thor
     rescue OpenURI::HTTPError => the_error
       case the_error.io.status[0]
       when "404"
-        puts "The country code '#{country}' is incorrect.".red
-        exit 1
+        raise "The country code '#{country}' is incorrect."
       else
-        puts "Status: #{the_error.io.status[0]}".red
-        exit 1
+        raise "Status: #{the_error.io.status[0]}"
       end
     end
 
@@ -109,9 +115,9 @@ class AptSpy2 < Thor
         f.write(sources)
       end
     rescue
-      puts "Failed updating #{apt_sources}!".red_on_white
-      puts "You probably need sudo!".red
-      exit 1
+      msg  = "Failed updating #{apt_sources}!"
+      msg << "You probably need sudo!"
+      raise msg
     end
 
     puts "Updated '#{apt_sources}' with #{mirror}".green

data/lib/apt/spy2/version.rb

@@ -1,5 +1,5 @@
 module Apt
   module Spy2
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/apt/spy2/writer.rb

@@ -14,6 +14,10 @@ module Apt
         @complete = []
       end
 
+      def set_complete(complete)
+        @complete = complete
+      end
+
       def echo(data)
         if @format == 'json'
           @complete.push(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apt-spy2
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors: