flickr_cli 0.1.5 → 0.2.0

data/lib/authentication.rb

@@ -1,12 +1,12 @@
 module FlickrCli
   module Authentication
     def self.establish_session
-      auth_file               = File.expand_path("~/.flick_airliftrc")
+      auth_file               =  File.join(Dir.home, ".flickr_clirc")
       FlickRaw.api_key        = "e8505c88feb2c0cc9d2da6bcbe18767c"
       FlickRaw.shared_secret  = "d344de362ea86f0e"
 
       if File.exists?(auth_file)
-        puts "authenticating thought #{auth_file}"
+        puts "authenticating with #{auth_file}"
         data = YAML.load_file(auth_file)
         auth = flickr.auth.checkToken :auth_token => data["api_token"]
       else

data/lib/image_cutter.rb

@@ -1,31 +1,23 @@
+
+
 module FlickrCli
   module ImageCutter
 
-    CHARS = [ 'W', 'M', '$', '@', '#', '%', '^', 'x', '*', 'o', '=', '+',':', '~', '.', ' ' ]
+    CHARS     =  [" ", ".", "~", ":", "+", "=", "o", "*", "x", "^", "%", "#", "@", "$", "M", "W"]
     FONT_ROWS = 8
     FONT_COLS = 4
 
     def self.convert_to_ascii(file)
 
       img = Magick::Image.read(file).first
-
-      # Resize too-large images. The resulting image is going to be
-      # about twice the size of the input, so if the original image is too
-      # large we need to make it smaller so the ASCII version won't be too
-      # big. The `change_geometry' method computes new dimensions for an
-      # image based on the geometry argument. The '320x320>' argument says
-      # "If the image is too big to fit in a 320x320 square, compute the
-      # dimensions of an image that will fit, but retain the original aspect
-      # ratio. If the image is already smaller than 320x320, keep the same
-      # dimensions."
-      img.change_geometry('728x728>') do |cols, rows|
-        img.resize!(cols, rows) if cols != img.columns || rows != img.rows
-      end
+      
+      img.resize_to_fit!('728')
 
       # Compute the image size in ASCII "pixels" and resize the image to have
       # those dimensions. The resulting image does not have the same aspect
       # ratio as the original, but since our "pixels" are twice as tall as
       # they are wide we'll get our proportions back (roughly) when we render.
+    
       pr = img.rows / FONT_ROWS
       pc = img.columns / FONT_COLS
       img.resize!(pc, pr)
@@ -33,21 +25,25 @@ module FlickrCli
       img = img.quantize(16, Magick::GRAYColorspace)
       img = img.normalize
 
+      # Depending on compile-time options for ImageMagick - pixel instensity is stored in different scales
+      # This will calculate the correct denominator to use
+      quantum_calc = Magick::QuantumRange / Magick::QuantumPixel.to_i
+      
       # Draw the image surrounded by a border. The `view' method is slow but
       # it makes it easy to address individual pixels. In grayscale images,
       # all three RGB channels have the same value so the red channel is as
       # good as any for choosing which character to represent the intensity of
       # this particular pixel.
+                  
       border = '+' + ('-' * pc) + '+'
       puts border
 
       img.view(0, 0, pc, pr) do |view|
         pr.times do |i|
         putc '|'
-        pc.times { |j| putc CHARS[view[i][j].red/16] }
+        pc.times { |j| putc CHARS[view[i][j].red/quantum_calc] }
         puts '|'
       end
-
       end
       border
     end

data/lib/menu.rb

@@ -3,7 +3,7 @@ module FlickrCli
 
     def self.main_menu
       choose do |menu|
-        menu.prompt = "What's up?"
+        menu.prompt = "What do you want to explore?"
         menu.choice("Your Photostream")       { menu_for(flickr.test.login.username) }
         menu.choice("Contacts' Photostream")  { contacts }
         menu.choice("Quit")                   { end_program }
@@ -45,14 +45,14 @@ module FlickrCli
       photos       = flickr.photos.getSizes(:photo_id => picked_photo.id)
       download_url = nil
 
-      ["Medium", "Medium 640", "Small"].each do |style|
+      ["Large", "Medium"].each do |style|
         if picture = photos.find{ |photo| photo.label == style }
           download_url  = picture.source
         end
         break if download_url
       end
-
-      my_file = Tempfile.new('tempimage.jpg')
+            
+      my_file = Tempfile.new("tempimage#{File.basename(download_url)}")
       my_file << Net::HTTP.get_response(URI.parse(download_url)).body
       my_file.close
       puts FlickrCli::ImageCutter.convert_to_ascii(my_file.path)

metadata

@@ -1,133 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flickr_cli
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stephen Schor
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-22 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 6
-        - 11
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.6.11
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.11
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: flickraw
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: flickraw
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Command-Line tool for exploring your flickr account
-email: 
+email:
 - beholdthepanda@gmail.com
-executables: 
+executables:
 - flickr_cli
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/flickr_cli
 - lib/authentication.rb
 - lib/flickr_cli.rb
 - lib/image_cutter.rb
 - lib/menu.rb
-has_rdoc: true
 homepage: https://github.com/nodanaonlyzuul/flickr_cli
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nowarning
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Command-Line tool for exploring your flickr account
 test_files: []
-