twitter_images 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2efcf33670803f3ef9bb96883e19350d8c64aa1
-  data.tar.gz: c00d26f7028c0f8691af0d17175ac2600e5d5587
+  metadata.gz: 680f11ce26e7df87577faabdc26ad693666aab6a
+  data.tar.gz: cd696a0c46369e957d9090a248685ea950765caf
 SHA512:
-  metadata.gz: 62a688ae4b999dc38232e9d4d1cef356ab2b3de75d45545dc4f1cee9ab3b628f5f265e0c792cdb39a924991bc019b701bba0d4b2cd7a8ef65bcc7c4097983639
-  data.tar.gz: 3369306d11cb49cc8cc60cf076cbf558094fdea04dab12d4e16059d860a4c555669d765d81a47635bf0f6bb836267457548508d39dfa32c3f4d1262b3ed82bc8
+  metadata.gz: f95223c9dcf5183030b9573a4ace1356fb1e996885bb36b08a278f2a7b779d8d1375cef0b270298b16f1bb897032e30efeb6866ba136b8257fa341d3fb3d878c
+  data.tar.gz: a7008e590ab5b044b3a936e005641354adfac80ea4dc2a3e4aa90238a32bb47ef50af06f6e38dbf5f4bb0562d7ab8ef5efc374a83c98dba456f32f67d7b10f53

data/lib/twitter_images.rb

@@ -6,10 +6,13 @@ require "oauth"
 require "ruby-progressbar"
 require "typhoeus"
 require "optparse"
+require "launchy"
 
 require "twitter_images/cli"
 require "twitter_images/configuration"
+require "twitter_images/authorizer"
 require "twitter_images/requester"
 require "twitter_images/parser"
 require "twitter_images/downloader"
 require "twitter_images/version"
+require "twitter_images/consumer"

data/lib/twitter_images/authorizer.rb

@@ -0,0 +1,55 @@
+module TwitterImages
+  class Authorizer
+    attr_reader :oauth, :request_token, :pin, :access_token_object, :access_token, :access_secret
+
+    def authorize
+      get_request_token
+      visit_url
+      get_pin
+      authorize_with_pin
+      set_credentials
+      puts "Authorization successful. Credentials have been written to #{ENV['HOME']}/.twitter_imagesrc"
+    end
+
+    def access_token
+      if File.exist?(ENV["HOME"] + "/.twitter_imagesrc")
+        @access_token = IO.readlines(ENV["HOME"] + "/.twitter_imagesrc")[0].chomp
+      end
+    end
+
+    def access_secret
+      if File.exist?(ENV["HOME"] + "/.twitter_imagesrc")
+        @access_secret = IO.readlines(ENV["HOME"] + "/.twitter_imagesrc")[1].chomp
+      end
+    end
+
+    private
+
+    def get_request_token
+      @oauth = OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET, :site => "https://api.twitter.com")
+      @request_token = oauth.get_request_token
+    end
+
+    def visit_url
+      puts "Please visit this url in your browser: https://twitter.com/oauth/authorize?oauth_token=#{request_token.token}&oauth_callback=oob"
+      Launchy.open("https://twitter.com/oauth/authorize?oauth_token=#{request_token.token}&oauth_callback=oob")
+    end
+
+    def get_pin
+      puts "Please enter your pin here: "
+      @pin = gets.chomp
+    end
+
+    def authorize_with_pin
+      @access_token_object = request_token.get_access_token(:oauth_verifier => @pin)
+    end
+
+    def set_credentials
+      File.open(ENV["HOME"] + "/.twitter_imagesrc", "w") do |file|
+        file.puts(access_token_object.token)
+        file.puts(access_token_object.secret)
+        file.close
+      end
+    end
+  end
+end

data/lib/twitter_images/cli.rb

@@ -1,6 +1,6 @@
 module TwitterImages
   class CLI
-    attr_reader :configuration
+    attr_reader :configuration, :options
 
     def initialize(argv)
       @argv = argv
@@ -35,6 +35,11 @@ module TwitterImages
           puts opts
           exit
         end
+
+        opts.on("-a", "--authorize", "Run this first to authorize the app with Twitter") do
+          Authorizer.new.authorize
+          exit
+        end
       end
     end
   end

data/lib/twitter_images/configuration.rb

@@ -8,6 +8,7 @@ module TwitterImages
     end
 
     def prepare(options)
+      check_auth
       set_directory(options[:path])
       get_search(options[:term])
       get_amount(options[:amount])
@@ -16,17 +17,15 @@ module TwitterImages
 
     private
 
-    def set_directory(dir)
-      @directory = File.expand_path(dir)
-      raise StandardError, "Directory doesn't exist" unless directory_exists?
-      change_directory
-    end
-
-    def directory_exists?
-      Dir.exist?(@directory)
+    def check_auth
+      unless File.exist?(ENV["HOME"] + "/.twitter_imagesrc")
+        raise StandardError, "No configuration file was found, please run `twitter_images -auth`"
+      end
     end
 
-    def change_directory
+    def set_directory(dir)
+      @directory = File.expand_path(dir)
+      raise StandardError, "Directory doesn't exist" unless Dir.exist?(@directory)
       Dir.chdir(@directory)
     end
 

data/lib/twitter_images/consumer.rb

@@ -0,0 +1,4 @@
+module TwitterImages
+  CONSUMER_KEY = "0ZVaXLwlzqgEt2PJuXKk9lmWq"
+  CONSUMER_SECRET = "TWUOoXtBf0Nnw4ZzcQdYdfYG5gu9ZA3SGsj1yp008W6hE783ti"
+end

data/lib/twitter_images/downloader.rb

@@ -15,7 +15,7 @@ module TwitterImages
     end
 
     def save_images(parsed_links)
-      progressbar = ProgressBar.create(:total => parsed_links.count)
+      progressbar = ProgressBar.create(:total => parsed_links.count, :format => "%a |%b>>%i| %p%% %t")
       hydra = Typhoeus::Hydra.new
 
       parsed_links.each do |src|

data/lib/twitter_images/requester.rb

@@ -1,15 +1,15 @@
 module TwitterImages
   class Requester
-    attr_reader   :consumer_key, :access_token, :downloader, :search, :parser
+    attr_reader   :consumer_key, :access_token, :downloader, :search, :parser, :authorizer
     attr_accessor :https, :address, :response
 
     def initialize
       @downloader = Downloader.new
       @parser = Parser.new
+      @authorizer = Authorizer.new
     end
 
     def start(search, amount)
-      check_env
       get_links(search, amount)
       download
     end
@@ -40,22 +40,11 @@ module TwitterImages
     end
 
     def consumer_key
-      OAuth::Consumer.new(ENV["CONSUMER_KEY"], ENV["CONSUMER_SECRET"])
+      OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET)
     end
 
     def access_token
-      OAuth::Token.new(ENV["ACCESS_TOKEN"], ENV["ACCESS_SECRET"])
-    end
-
-    def check_env
-      if ENV.key?("CONSUMER_KEY") &&
-          ENV.key?("CONSUMER_SECRET") &&
-          ENV.key?("ACCESS_TOKEN") &&
-          ENV.key?("ACCESS_SECRET")
-        return true
-      else
-        puts "The credentials have not been correctly set up in your ENV"
-      end
+      OAuth::Token.new(authorizer.access_token, authorizer.access_secret)
     end
 
     def setup_https

data/lib/twitter_images/version.rb

@@ -1,3 +1,3 @@
 module TwitterImages
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_images
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexey Zabelin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fileutils
@@ -98,6 +98,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -196,8 +216,10 @@ extra_rdoc_files: []
 files:
 - bin/twitter_images
 - lib/twitter_images.rb
+- lib/twitter_images/authorizer.rb
 - lib/twitter_images/cli.rb
 - lib/twitter_images/configuration.rb
+- lib/twitter_images/consumer.rb
 - lib/twitter_images/downloader.rb
 - lib/twitter_images/parser.rb
 - lib/twitter_images/requester.rb