flickr_airlift 0.4.1 → 0.4.2

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Eastmedia
+Copyright (c) 2013 Stephen Schor
 
 MIT License
 

data/flickr_airlift.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('launchy',  '0.4.0')
-  gem.add_dependency('flickraw', '0.8.4')
-  gem.add_dependency('highline', '1.6.11')
+  gem.add_dependency 'highline',              '1.6.11'
+  gem.add_dependency 'flickr_authentication', '0.0.1'
 
   gem.rubyforge_project = 'nowarning'
 

data/lib/flickr_airlift/version.rb

@@ -1,3 +1,3 @@
 module FlickrAirlift
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/flickr_airlift.rb

@@ -1,9 +1,8 @@
 require "flickr_airlift/version"
 require "flickr_airlift/downloader"
-require 'flickraw'
+require 'flickr_authentication'
 require 'net/http'
 require 'cgi'
-require 'launchy'
 require 'highline/import'
 require 'yaml'
 
@@ -13,6 +12,7 @@ module FlickrAirlift
 
   def self.download
     begin
+
       establish_session
 
       # Prompt
@@ -76,44 +76,8 @@ module FlickrAirlift
   end
 
   def self.establish_session
-    auth_file               = File.join(Dir.home(), ".flick_airliftrc")
-    FlickRaw.api_key        = "3b2360cc04947af8cf59f51c47a6a8e4"
-    FlickRaw.shared_secret  = "405549bcec106815"
-
-    if File.exists?(auth_file)
-
-      data = YAML.load_file(auth_file)
-
-      begin
-        auth = flickr.auth.checkToken :auth_token => data["api_token"]
-      rescue Exception => e
-        puts "These was a problem with the credentials in #{auth_file}"
-        puts "Delete the file and try again."
-        exit
-      end
-
-    else
-      frob     = flickr.auth.getFrob
-      auth_url = FlickRaw.auth_url :frob => frob, :perms => "write"
-
-      puts " "
-      puts "opening your browser..."
-      sleep 1
-      puts "Come back and press Enter when you are finished"
-      sleep 2
-      Launchy.open(auth_url)
-
-      STDIN.getc
-
-      # Authentication
-      auth  = flickr.auth.getToken :frob => frob
-      login = flickr.test.login
-
-      puts "Writing credentials to #{auth_file}"
-      data = {}
-      data["api_token"] = auth.token
-      File.open(auth_file, "w"){|f| YAML.dump(data, f) }
-    end
+    fa = FlickrAuthentication.new(key: '3b2360cc04947af8cf59f51c47a6a8e4', shared_secret: '405549bcec106815', auth_file: File.join(Dir.home, ".flick_airliftrc"))
+    fa.authenticate
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickr_airlift
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,32 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: flickraw
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 1.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +26,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: flickr_authentication
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.11
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.11
+        version: 0.0.1
 description: A Command-Line tool for scraping any user's original photos OR uploading
   all photos from a given directory
 email: