apt-spy2 0.2.3 → 0.3.0

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    apt-spy2 (0.2.2)
+    apt-spy2 (0.3.0)
       colored (>= 1.2)
+      json
       thor (>= 0.18.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     colored (1.2)
+    json (1.8.0)
     rake (10.1.0)
     thor (0.18.1)
 

data/README.md

@@ -1,5 +1,8 @@
 # apt-spy2 or, "apt-spy for ubuntu"
 
+[![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)
+
 
 ## setup
 

data/apt-spy2.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor', '>= 0.18.1'
   spec.add_dependency 'colored', '>= 1.2'
+  spec.add_dependency 'json'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/bin/apt-spy2

@@ -1,12 +1,5 @@
 #!/usr/bin/env ruby
 
-#require 'rubygems'
-#require 'bundler/setup'
-
-require 'thor'
-require 'open-uri'
-require 'colored'
-require 'fileutils'
 require 'apt/spy2'
 
 AptSpy2.start

data/lib/apt/spy2/version.rb

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

data/lib/apt/spy2/writer.rb

@@ -0,0 +1,51 @@
+require 'colored'
+require 'json'
+
+module Apt
+  module Spy2
+    class Writer
+      def initialize(format)
+
+        if !["json", "shell"].include?(format)
+          raise "Unknown format: #{format}"
+        end
+
+        @format = format
+        @complete = []
+      end
+
+      def echo(data)
+        if @format == 'json'
+          @complete.push(data)
+          return
+        end
+
+        print "Mirror: #{data["mirror"]} - "
+
+        case data["status"]
+        when "up"
+          puts data["status"].upcase.green
+        when "down"
+          puts data["status"].upcase.red
+        when "broken"
+          puts data["status"].upcase.yellow
+        else
+          puts "Unknown status: #{data["status"]}".white_on_red
+        end
+      end
+
+      def json?
+        if @format == 'json'
+          return true
+        end
+
+        return false
+      end
+
+      def to_json
+        JSON.generate(@complete)
+      end
+
+    end
+  end
+end

data/lib/apt/spy2.rb

@@ -1,3 +1,9 @@
+require 'thor'
+require 'open-uri'
+require 'colored'
+require 'fileutils'
+require 'apt/spy2/writer'
+
 class AptSpy2 < Thor
   package_name "apt-spy2"
 
@@ -19,9 +25,15 @@ class AptSpy2 < Thor
   desc "check", "Evaluate mirrors"
   option :country, :default => "mirrors"
   option :output, :type => :boolean, :default => true
+  option :format, :default => "shell"
   def check
+
+    @writer = Apt::Spy2::Writer.new(options[:format])
+
     mirrors = retrieve(options[:country])
-    return filter(mirrors, options[:output])
+    filter(mirrors, options[:output])
+
+    puts @writer.to_json if @writer.json?
   end
 
   desc "list", "List the currently available mirrors"
@@ -60,16 +72,18 @@ class AptSpy2 < Thor
     working_mirrors = []
 
     mirrors.each do |mirror|
-      print "Mirror: #{mirror} - " if output
+      data = {"mirror" => mirror }
       begin
         mirror_status = open(mirror)
-        puts "UP".green if output
+        data["status"] = "up"
         working_mirrors << mirror
       rescue OpenURI::HTTPError => the_error
-        puts "BROKEN: #{the_error.io.status[0]}".yellow_on_red if output
+        data["status"] = "broken"
       rescue Errno::ECONNREFUSED
-        puts "DOWN".red if output
+        data["status"] = "down"
       end
+
+      @writer.echo(data) if output
     end
 
     return working_mirrors

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apt-spy2
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +109,7 @@ files:
 - bin/apt-spy2
 - lib/apt/spy2.rb
 - lib/apt/spy2/version.rb
+- lib/apt/spy2/writer.rb
 homepage: https://github.com/lagged/apt-spy2
 licenses:
 - BSD