looks 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmM3OWZlZjA5YTg2NTRkY2I5ZmExMTJhZjI4YTM0MDlhYzg4MDFkOQ==
+  data.tar.gz: !binary |-
+    ZTE3MDRmYjBkNDlkYWRiNDAwODVkNmY5Mzc3YTQ1Yzk5MTcwY2ZmYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTg5NWI2N2MzYmJlN2RiYjZiNmJkM2YzYWFlNGRiNGU3ZDZmMDEwZGFmZjdk
+    NDcwNGU0Mzk2MDQzMmNkZDg2ZDM0NzEyNjJjMDY1M2JjZDc5MzMzZGU2MzJl
+    NjRmMDQ3MDMzMWE4YjQwYzljZWFhMGUyNTZjZmIwMmFlNDIyZmQ=
+  data.tar.gz: !binary |-
+    YTAzNmM1MDAwOTAyM2E0NDE2YTY4NzM0OGZjZmI4YzY1ZTZiMmVlOTY4ZDNk
+    YTg5MmRlZjcxY2MzZTg3NmNmNTA0ODE4YWM1NDZhMTc2Y2U4NDQ1NWNhOWY5
+    MWU3ZjU1OGIxNTQ1YWM4YWE2NDkyOTIzZWMxZDgxOGIyOGFiNWU=

data/README.md

@@ -9,7 +9,7 @@ Looks is a command line interface to [Gravatar][].
 Installation
 ------------
 
-Installing Looks requires [Ruby 1.9.3 or newer][Ruby].
+Installing Looks requires [Ruby][].
 
   [Ruby]: http://ruby-lang.org/
 

data/lib/looks/cli.rb

@@ -2,29 +2,33 @@ require 'looks/command'
 require 'looks/config'
 require 'looks/error'
 
-module Looks 
+module Looks
   module CLI
 
     USAGE = <<-EOF
 Usage: looks <command> [arguments]
 
 Commands:
-  add        Upload an image
   addresses  List email addresses
   config     Configure the default account
   images     List uploaded images
+  pull       Download an image
+  push       Upload an image
   rm         Remove an uploaded image
   set        Set the image for an email address
+  unset      Unset the image for an email address
 
     EOF
 
     COMMANDS = {
-      'add'       => Command::Add,
       'addresses' => Command::Addresses,
       'config'    => Command::Config,
       'images'    => Command::Images,
+      'pull'      => Command::Pull,
+      'push'      => Command::Push,
       'rm'        => Command::Rm,
-      'set'       => Command::Set
+      'set'       => Command::Set,
+      'unset'     => Command::Unset
     }
 
     def self.start(args)

data/lib/looks/command.rb

@@ -1,8 +1,10 @@
 require 'looks/command/account_management'
-require 'looks/command/add'
 require 'looks/command/addresses'
 require 'looks/command/base'
 require 'looks/command/config'
 require 'looks/command/images'
+require 'looks/command/pull'
+require 'looks/command/push'
 require 'looks/command/rm'
 require 'looks/command/set'
+require 'looks/command/unset'

data/lib/looks/command/base.rb

@@ -1,4 +1,4 @@
-require 'looks/cli'
+require 'looks/error'
 require 'looks/version'
 
 require 'optparse'
@@ -22,7 +22,7 @@ module Looks
         begin
           @opts.parse! args
         rescue OptionParser::ParseError => e
-          CLI.error(e)
+          raise Error, e
         end
 
         usage unless args.length == arguments.length

data/lib/looks/command/pull.rb

@@ -0,0 +1,29 @@
+require 'looks/command/base'
+require 'looks/error'
+require 'looks/gravatar'
+
+module Looks
+  module Command
+    class Pull < Base
+
+      def arguments
+        [ '<address>', '<filename>' ]
+      end
+
+      def execute(args)
+        super
+
+        address, filename = args
+
+        begin
+          File.open(filename, 'wb') do |file|
+            file.write(Gravatar.get(address))
+          end
+        rescue IOError, SystemCallError
+          raise Error, "#{filename}: Cannot write file"
+        end
+      end
+
+    end
+  end
+end

data/lib/looks/command/{add.rb → push.rb}

@@ -4,7 +4,7 @@ require 'looks/gravatar'
 
 module Looks
   module Command
-    class Add < AccountManagement
+    class Push < AccountManagement
 
       def arguments
         [ '<filename>' ]
@@ -19,7 +19,7 @@ module Looks
 
         begin
           File.open(filename) do |file|
-            puts Gravatar::Account.new(config).add(file.read)
+            puts Gravatar::Account.new(config).save_data(file.read)
           end
         rescue IOError, SystemCallError
           raise Error, "#{filename}: Cannot read file"

data/lib/looks/command/rm.rb

@@ -15,7 +15,7 @@ module Looks
         id = args.first
 
         begin
-          Gravatar::Account.new(config).remove(id)
+          Gravatar::Account.new(config).delete_image(id)
         rescue Gravatar::IncorrectMethodParameterError
           raise Error, "#{id}: Unknown identifier"
         end

data/lib/looks/command/set.rb

@@ -18,7 +18,7 @@ module Looks
         account = Gravatar::Account.new(config)
 
         begin
-          account.set(address, id)
+          account.use_image(address, id)
         rescue Gravatar::IncorrectMethodParameterError
           addresses = account.addresses.map { |address| address.email }
 

data/lib/looks/command/unset.rb

@@ -0,0 +1,29 @@
+require 'looks/command/account_management'
+require 'looks/error'
+require 'looks/gravatar'
+
+module Looks
+  module Command
+    class Unset < AccountManagement
+
+      def arguments
+        [ '<address>' ]
+      end
+
+      def execute(args)
+        super
+
+        address = args.first
+
+        account = Gravatar::Account.new(config)
+
+        begin
+          account.remove_image(address)
+        rescue Gravatar::IncorrectMethodParameterError
+          raise Error, "#{address}: Unknown email address"
+        end
+      end
+
+    end
+  end
+end

data/lib/looks/error.rb

@@ -1,6 +1,4 @@
 module Looks
-
   class Error < StandardError
   end
-
 end

data/lib/looks/gravatar.rb

@@ -4,18 +4,28 @@ require 'looks/gravatar/errors'
 require 'looks/gravatar/image'
 
 require 'digest/md5'
+require 'net/http'
+require 'uri'
 
 module Looks
   module Gravatar
 
-    URL = ENV['LOOKS_GRAVATAR_URL'] || 'https://secure.gravatar.com/xmlrpc'
+    DEFAULT_API_URL      = 'https://secure.gravatar.com/xmlrpc'
+    DEFAULT_DOWNLOAD_URL = 'http://gravatar.com/avatar'
+
+    API_URL      = ENV['LOOKS_GRAVATAR_API_URL']      || DEFAULT_API_URL
+    DOWNLOAD_URL = ENV['LOOKS_GRAVATAR_DOWNLOAD_URL'] || DEFAULT_DOWNLOAD_URL
+
+    def self.get(email)
+      Net::HTTP.get(URI("#{DOWNLOAD_URL}/#{hash(email)}.jpg"))
+    end
 
     def self.hash(email)
       Digest::MD5.hexdigest(email.strip.downcase)
     end
 
     def self.url(email)
-      "#{URL}?user=#{hash(email)}"
+      "#{API_URL}?user=#{hash(email)}"
     end
 
   end

data/lib/looks/gravatar/account.rb

@@ -1,3 +1,4 @@
+require 'looks/error'
 require 'looks/gravatar/address'
 require 'looks/gravatar/errors'
 require 'looks/gravatar/image'
@@ -34,23 +35,29 @@ module Looks
         images.sort
       end
 
-      def add(image)
+      def save_data(image)
         data = Base64.encode64(image)
 
         call('grav.saveData', { 'data' => data, 'rating' => 0 })
       end
 
-      def remove(image)
+      def delete_image(image)
         call('grav.deleteUserimage', { 'userimage' => image })
       end
 
-      def set(address, id)
+      def use_image(address, id)
         call('grav.useUserimage', {
           'userimage' => id,
           'addresses' => [ address ]
         })
       end
 
+      def remove_image(address)
+        call('grav.removeImage', {
+          'addresses' => [ address ]
+        })
+      end
+
       private
 
       def call(method, args = {})
@@ -58,6 +65,8 @@ module Looks
 
         begin
           @server.call(method, args)
+        rescue SocketError, SystemCallError
+          raise Error, "Unable to connect to Gravatar server"
         rescue XMLRPC::FaultException => fault
           handle fault
         end

data/lib/looks/version.rb

@@ -1,3 +1,3 @@
 module Looks
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: looks
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Jussi Virtanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,23 +69,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dimensions
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -135,13 +120,15 @@ files:
 - bin/looks
 - lib/looks/cli.rb
 - lib/looks/command/account_management.rb
-- lib/looks/command/add.rb
 - lib/looks/command/addresses.rb
 - lib/looks/command/base.rb
 - lib/looks/command/config.rb
 - lib/looks/command/images.rb
+- lib/looks/command/pull.rb
+- lib/looks/command/push.rb
 - lib/looks/command/rm.rb
 - lib/looks/command/set.rb
+- lib/looks/command/unset.rb
 - lib/looks/command.rb
 - lib/looks/config.rb
 - lib/looks/error.rb
@@ -155,26 +142,25 @@ files:
 homepage: http://github.com/jvirtanen/looks
 licenses:
 - MIT
+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: 1.9.3
 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.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command line interface to Gravatar
 test_files: []