flickr_airlift 0.1.1 → 0.2.0

data/lib/flickr_airlift.rb

@@ -48,7 +48,7 @@ module FlickrAirlift
   end
 
   def self.upload(relative_url = ".")
-    establish_session("write")
+    establish_session
 
     image_file_names = Dir.entries(relative_url).find_all{ |file_name|  UPLOADABLE_FORMATS.any?{ |extension| file_name.downcase.include?(extension)} }
     uploaded_ids = []
@@ -67,25 +67,39 @@ module FlickrAirlift
     Launchy.open(edit_url)
   end
 
-  def self.establish_session(permission = "read")
+  def self.establish_session
+    auth_file               = File.expand_path("~/.flick_airliftrc")
     FlickRaw.api_key        = "d4d152785af1b0ea68a5a2d173c75707"
     FlickRaw.shared_secret  = "b9da0b4f99507dd0"
-    frob                    = flickr.auth.getFrob
-    auth_url                = FlickRaw.auth_url :frob => frob, :perms => permission
 
-    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 "You are now authenticated as #{login.username} with token #{auth.token}"
+    if File.exists?(auth_file)
+      puts "authenticating thought #{auth_file}"
+      data = YAML.load_file(auth_file)
+      auth = flickr.auth.checkToken :auth_token => data["api_token"]
+    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 auth.token
+
+      require 'yaml'
+      data = {}
+      data["api_token"] = auth.token
+      File.open(auth_file, "w"){|f| YAML.dump(data, f) }
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickr_airlift
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Stephen Schor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -04:00
+date: 2011-07-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
         version: 0.8.4
   type: :runtime
   version_requirements: *id002
-description: A Command-Line tool for scraping any user's original photos
+description: A Command-Line tool for scraping any user's original photos OR uploading all photos from a given directory
 email: 
 - beholdthepanda@gmail.com
 executables: 
@@ -97,6 +97,6 @@ rubyforge_project: nowarning
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A Command-Line tool for scraping any user's original photos
+summary: A Command-Line tool for scraping any user's original photos OR uploading all photos from a given directory
 test_files: []