nokaya 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c1c8545782a4967ed49ae24e36af26da579d3f2
-  data.tar.gz: b9e882f85dfa3d2d5a04c79473b7028e6241660b
+  metadata.gz: 9f31b2704253ab50e0843244c13b03c6c0610a20
+  data.tar.gz: 5813f6bf4336a993604b8bcdb3e3ae7d1b0ed173
 SHA512:
-  metadata.gz: f7e0c47f94bd19ab9eed7a04e84b732ae4e8118bcf6e47ff385f68164efcd67549d0c17f2d874ad78338a84e5bd017073b116ba0cb3df80f6d7b2a8fe9464d61
-  data.tar.gz: d22521d67712ecc3e6d178f01662c9306a591e1ea4aea36d8836f409325e74b8954c14f178431fa4dd057487fe931bc2de57f2233f9750daa49f79e327e1f4c6
+  metadata.gz: 993d92e4409efc6f832109092737213023ae367a4fc5c969de362c8db2101bf70a3828ea29119149118f9623e1479eb0cf59abfb95106271ede1805e64f5e0af
+  data.tar.gz: 7d64dac6459b889d3e2dbeeda91f9466dd00b3ccc2a6a4e9768490bb14e16cba5c506ce0c01ffdc0b26cfb9a0cac7d29bd86df34f4bd9c5fb286aaa451a0a1ca

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.8
+
+- Option: specify an output path
+
 # 0.0.7
 
 - Download each album in a unique folder

data/README.md

@@ -127,3 +127,29 @@ Example:
 `nokaya adn https://photos.app.net/30055986/1`  
 
 `nokaya adn https://photos.app.net/30055986/1 -n random`
+
+## Options
+
+### Name
+
+`--name` or `-n`
+
+Specify a name (without extension).
+
+`nokaya -i http://instagram.com/p/noANAfjJ7B/ -n happy_dog`
+
+### Output
+
+`--output` or `-o`
+
+Specify an output path.
+
+`nokaya -i http://instagram.com/p/noANAfjJ7B/ -o ~/Pics`
+
+The picture(s) will be downloaded in '~/Downloads' if no output specified.
+
+### Both
+
+Specify both.
+
+`nokaya -i http://instagram.com/p/noANAfjJ7B/ -o ~/Pics -n happy_dog`    

data/lib/nokaya/app.rb

@@ -9,6 +9,7 @@ module Nokaya
     desc "instagram", "Get the original picture from an Instagram page (nokaya -i url)"
     map "-i" => :instagram
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def instagram *args
       check_args args
       nokaya = Getter.new options, :instagram, args
@@ -17,6 +18,7 @@ module Nokaya
 
     desc "favd", 'Get the picture from a Favd page (nokaya favd url)'
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def favd *args
       check_args args
       nokaya = Getter.new options, :favd, args
@@ -27,6 +29,7 @@ module Nokaya
 
     desc "adn", "Get the picture from a photos.app.net page (nokaya adn url)"
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def adn *args
       check_args args
       nokaya = Getter.new options, :adn, args
@@ -36,6 +39,7 @@ module Nokaya
     desc "tumblr", "Get the picture from a Tumblr post (nokaya -tu url)"
     map "-tu" => :tumblr
     option :name, aliases: "-n", type: :string, desc: "Specify a file name without extension"
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def tumblr *args
       check_args args
       nokaya = Getter.new options, :tumblr, args
@@ -44,6 +48,7 @@ module Nokaya
 
     desc "tumblr_album", "Get all pictures from a Tumblr page (nokaya -tal url)"
     map "-tal" => :tumblr_album
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def tumblr_album *args
       check_args args
       nokaya = Getter.new options, :tumblr_album, args
@@ -54,6 +59,7 @@ module Nokaya
 
     desc "imgur_album", "Get all pictures from an Imgur album (nokaya -ial url)"
     map "-ial" => :imgur_album
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def imgur_album *args
       check_args args
       nokaya = Getter.new options, :imgur_album, args
@@ -64,6 +70,7 @@ module Nokaya
 
     desc "flickr_album", "Get all pictures from a Flickr album (nokaya -fal url)"
     map "-fal" => :flickr_album
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def flickr_album *args
       check_args args
       nokaya = Getter.new options, :flickr_album, args
@@ -74,6 +81,7 @@ module Nokaya
 
     desc "photonet", "Get all pictures from a Photo.net page (nokaya -pnet url)"
     map "-pnet" => :photonet
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def photonet *args
       check_args args
       nokaya = Getter.new options, :photonet, args
@@ -84,6 +92,7 @@ module Nokaya
 
     desc "deviantart", "Get all pictures from a Deviantart gallery (nokaya -dart url)"
     map "-dart" => :deviantart
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def deviantart *args
       check_args args
       nokaya = Getter.new options, :deviantart, args
@@ -94,6 +103,7 @@ module Nokaya
 
     desc "imageshack_user", "Get all pictures from an Imageshack user gallery (nokaya -ishu url)"
     map "-ishu" => :imageshack_user
+    option :output, aliases: "-o", type: :string, desc: "Specify an output path"
     def imageshack_user *args
       check_args args
       nokaya = Getter.new({name: "#{args[0].split("/").last}"}, :imageshack_user, args)

data/lib/nokaya/getter.rb

@@ -1,33 +1,42 @@
 # encoding: utf-8
 module Nokaya
   class Getter
+
     def initialize *args
       @args = OpenStruct.new options: args[0], type: args[1], url: args[2][0]
     end
+
     def args
       @args.inspect
     end
+
     def options
       @args.options
     end
+
     def type
       @args.type
     end
+
     def url
       @args.url
     end
+
     def get_basic page
       page.xpath("//meta[@property='og:image']/@content").first
     end
+
     def get_favd page
       page.css('#largeImage')[0]['src']
     end
+
     def get_deviantart page
       refs = page.css('a.thumb')
       links = []
       refs.each {|li| links << li['data-super-img']}
       links
     end
+
     def get_imageshack_user page
       refs = page.css('a.hero-wrapper')
       temp = []
@@ -42,12 +51,14 @@ module Nokaya
       end
       links
     end
+
     def get_imgur_album page
       refs = page.css('#imagelist .posts .post a')
       links = []
       refs.each {|l| links << "http:#{l['href']}"}
       links
     end
+
     def get_tumblr_album page
       queries = ['img.photo', '.post .photo a img', '.entry img', 'article img', '.image img', '.item_content img', 'img.post-image', '.box img', '#allposts img', '.media img', '.wide img', '.big img', '.large img', '.gallery img', '.photos img', '.content img', 'img']
       queries.each do |query|
@@ -64,12 +75,14 @@ module Nokaya
       end
       links
     end
+
     def get_flickr_album page
       refs = page.css('.pc_img')
       links = []
       refs.each {|l| links << l['data-defer-src']}
       links
     end
+
     def get_photonet_album page
       refs = page.css '.trp-top a'
       links = []
@@ -78,8 +91,10 @@ module Nokaya
       end
       links
     end
+
     def parse_page
       Nokogiri::HTML(open @args.url)
     end
+
   end
 end

data/lib/nokaya/image.rb

@@ -1,19 +1,23 @@
 # encoding: utf-8
 module Nokaya
   class Image
+
     def self.photo_name nokaya
-      unless nokaya.options[:name]
-        Dir.home + "/Downloads/#{nokaya.type.to_s}-#{Time.now.to_i}.jpg"
+      path = self.out nokaya
+      if nokaya.options[:name]
+        "#{path}/#{nokaya.type.to_s}-#{nokaya.options[:name]}.jpg"
       else
-        Dir.home + "/Downloads/#{nokaya.type.to_s}-#{nokaya.options[:name]}.jpg"
+        "#{path}/#{nokaya.type.to_s}-#{Time.now.to_i}.jpg"
       end
     end
+
     def self.save_image path, link
       content = self.get_image link
       f = File.new(path, "wb")
         f.puts(content)
       f.close
     end
+
     def self.get_image img_link
       begin
         open(img_link).read
@@ -21,5 +25,16 @@ module Nokaya
         abort Status.no_can_do
       end
     end
+
+    private
+
+    def self.out nokaya
+      if nokaya.options[:output]
+        nokaya.options[:output]
+      else
+        Dir.home + "/Downloads"
+      end
+    end
+
   end
 end

data/lib/nokaya/version.rb

@@ -1,3 +1,3 @@
 module Nokaya
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokaya
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor