desklickrb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce7bc139bef0b1e3b315ac5337a0bff169bdbcb
-  data.tar.gz: ef4b093b5436c65dbad5b94254f4b28bc7f2a092
+  metadata.gz: e813cf97bd58e1daacedaf596cde45d0f269406e
+  data.tar.gz: 8e1998847806288f11180098ff963a1375197197
 SHA512:
-  metadata.gz: 4f28349514ed9248615d02fcd2b30fd0756fd7ed350b05d2c99723526763999e5aeed97e93353f3fe26c825b5fa014c6431add30acb392005f177d6938d6d689
-  data.tar.gz: 04d285c06be4b0993e27f53b4c80ace24280cf24eed8527e2ddecb70858adf3e0a3a2d6a4e7b5b1ef8c1f8d671df780e35fb4b215d577ba0fb66fb87b0ebc39b
+  metadata.gz: c43a301bfd9c7b6d2b57af4ec2003c05532a9d0d4912419e9c539eeeb4e43a4d6e3dd3a4c16e84d493c381bf2e9fc83559af667807d57da48e6546110982ac3b
+  data.tar.gz: e5baabf64d0b8031b0468e6b9520f5aac167c3034db062af56cd128eb1a64f722c19cb5596089343861b661577817bd02eb07540d89bc55e7ade07b825962930

data/bin/desklickrb

@@ -2,13 +2,15 @@
 
 require 'desklickrb'
 
+include Desklickrb
+
 USAGE =<<EOU
 #$0 [-v] [-k flickr-api-key] [-o filename] [gallery options]
 
   -v: verbose
   -k: API key created on https://www.flickr.com/services/apps/create/
   -u: download picture of user-id
-  -o: download picture to filename (default: #{@filename})
+  -o: download picture to filename (default: #{filename})
 
   gallery options:
      -u user-id: gallery of user-id
@@ -19,13 +21,12 @@ EOU
 abort USAGE unless params = ARGV.getopts('hk:u:o:t:v')
 abort USAGE if params['h']
 
-api_key = params['k']
-desklickrb = Desklickrb.new(api_key)
-desklickrb.verbose = params['v']
-desklickrb.user_id = params['u']
-desklickrb.tag = params['t']
-desklickrb.filename = params['o'] if params['o']
+@api_key = params['k']
+@verbose = params['v']
+@user_id = params['u']
+@tag = params['t']
+@filename = params['o'] if params['o']
 
-abort "no photos" unless size = desklickrb.choose_photo
-desklickrb.write_file(size)
-desklickrb.apply_desktop_picture
+abort "no photos" unless size = choose_photo
+write_file(size)
+apply_desktop_picture

data/lib/desklickrb/version.rb

@@ -1,3 +1,3 @@
-class Desklickrb
-  VERSION = "1.0.0"
+module Desklickrb
+  VERSION = "1.0.1"
 end

data/lib/desklickrb.rb

@@ -3,31 +3,31 @@ require 'optparse'
 require 'flickr.rb'
 require 'fileutils'
 
-class Desklickrb
+module Desklickrb
 
-  attr_accessor :filename
-  attr_accessor :tag
-  attr_accessor :verbose
-  attr_accessor :user_id
-
-  def initialize(api_key)
-    @filename = "/tmp/desklickrb.jpg"
+  def filename
+    @filename ||= "/tmp/desklickrb.jpg"
+  end
 
-    raise 'API Key must be created at https://www.flickr.com/services/apps/create/' unless api_key
-    @flickr = Flickr.new(api_key)
+  def flickr
+    unless @flickr
+      raise 'API Key must be created at https://www.flickr.com/services/apps/create/' unless @api_key
+      @flickr = Flickr.new(@api_key)
+    end
+    @flickr
   end
 
   def choose_photo
     if @tag
       puts "picking up a photo by a tag #{@tag}" if @verbose
-      photos = @flickr.tag(@tag)
+      photos = flickr.tag(@tag)
     elsif @user_id
       puts "picking up a photo of a user #{@user_id}" if @verbose
-      abort "unknown user: #{@user_id}" unless user = @flickr.users(@user_id)
+      abort "unknown user: #{@user_id}" unless user = flickr.users(@user_id)
       photos = user.photos
     else
       puts "picking up a photo from interestingness" if @verbose
-      photos = @flickr.photos_request('interestingness.getList')
+      photos = flickr.photos_request('interestingness.getList')
     end
 
     return nil if photos.size < 1
@@ -47,27 +47,27 @@ class Desklickrb
   end
 
   def write_file(size)
-    puts "downloading image file to #{@filename}" if @verbose
+    puts "downloading image file to #{filename}" if @verbose
     file = Net::HTTP.get_response(URI.parse(size['source'])).body
-    open(@filename, 'w') do |io|
+    open(filename, 'w') do |io|
       io.puts file
     end
   end
 
   def apply_desktop_picture
 
-    puts "applying desktop picture to #{@filename}" if @verbose
+    puts "applying desktop picture to #{filename}" if @verbose
 
     # set desktop picture with another filename because Dock does not change
     # the picture of the same filename with previous.
-    another_file = @filename + ".jpg"
-    FileUtils.cp(@filename, another_file)
+    another_file = filename + ".jpg"
+    FileUtils.cp(filename, another_file)
 
     IO.popen("/usr/bin/osascript", "r+") do |io|
       io.puts <<EOS
 tell application "System Events"
   set picture of every desktop to "#{another_file}"
-  set picture of every desktop to "#{@filename}"
+  set picture of every desktop to "#{filename}"
 end tell
 EOS
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: desklickrb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - fukuda, minoru