picasa-downloader 0.0.3 → 0.0.4

data/Rakefile

@@ -4,4 +4,5 @@ task :default => 'test'
 desc "Run tests"
 task :test do
     sh "bundle exec rspec"
+    sh "bundle exec cucumber"
 end

data/TODO.md

@@ -1,4 +1,7 @@
 # TODO
 
-* Persist albums into year directiories
+* Possibility to determine the target root directory via CLI
+* Cucumber tests for happy paths
+* Use median year to determine the target directory
 * Video download
+* Allow synchronising with online albums

data/bin/picasa-downloader

@@ -6,28 +6,58 @@ require 'gli'
 
 include GLI
 
-default_download_dir=ENV['HOME'] + '/Picasa-albums'
+@default_download_dir=ENV['HOME'] + '/Picasa-albums'
 
 program_desc 'Picasa downloader'
 
 desc 'Download all albums'
-long_desc "Download all Picasa albums into #{default_download_dir}"
+long_desc "Download all Picasa albums into #{@default_download_dir}"
 command [:all] do |c|
   c.action do |global_options,options,args|
+    client = authenticate
+    albums = list_albums(client)
+    puts "Downloading #{albums.length} albums into #{@default_download_dir}..."
+    albums.each { |album|
+      download(album, client)
+    }
+  end
+end
+
+desc 'Download one album'
+command [:album] do |c|
+  c.action do |global_options,options,args|
+    if args.length == 0
+      raise PicasaDownloader::AlbumNameNotSpecified
+    end
+    album_regex = args[0]
+    client = authenticate
+    albums = list_albums(client)
+    albums_to_download = albums.select { |album|
+      album.title.match(album_regex)
+    }
+    albums_to_download.each { |album|
+      download(album, client)
+    }
+  end
+end
+
+def download(album, client)
+  puts "  downloading #{album.title}..."
+  PicasaDownloader::AlbumPersister.
+    new(client, album, @default_download_dir).download
+end
+
+def authenticate
     credentials = PicasaDownloader::EnvCredentials.new
     raise PicasaDownloader::EnvironmentalCredentialsNotSet unless
       credentials.is_configured?
     puts "Authenticating..."
     client = PicasaDownloader::Client.new(credentials)
+end
+
+def list_albums(client)
     puts "Fetching the album list..."
     albums = client.list_albums
-    puts "Downloading #{albums.length} albums into #{default_download_dir}..."
-    albums.each { |album|
-      puts "  downloading #{album.title}..."
-      PicasaDownloader::AlbumPersister.
-        new(client, album, default_download_dir).download
-    }
-  end
 end
 
 exit GLI.run(ARGV)

data/features/picasa-downloader.feature

@@ -0,0 +1,21 @@
+Feature: Picasa downloader
+
+  In order to conveniently download my photos from Google Picasa
+  As a geek
+  I want to run picasa-downloader and see photo albums appearing on my local disk
+
+  Scenario: Run picasa-downloader without arguments
+    When I run `picasa-downloader`
+    Then the output should contain:
+    """
+    Picasa downloader
+
+    usage: picasa-downloader [global options] command [command options]
+    """
+
+  Scenario: Try downloading single album with insufficient CLI arguments
+    When I run `picasa-downloader album`
+    Then the output should contain:
+    """
+    error: Album name is not specified.
+    """

data/features/support/env.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require
+
+require 'aruba/cucumber'
+require 'cucumber/rspec/doubles'
+
+# Following from 'aruba/cucumber'
+Before do
+  @__aruba_original_paths = (ENV['PATH'] || '').split(File::PATH_SEPARATOR)
+  ENV['PATH'] = ([File.expand_path('bin')] + @__aruba_original_paths).join(File::PATH_SEPARATOR)
+end
+
+After do
+  ENV['PATH'] = @__aruba_original_paths.join(File::PATH_SEPARATOR)
+end
+# End of following from 'aruba/cucumber'
+
+Then /^the file "([^"]*)" should contain:$/ do |file, exact_content|
+  check_file_content(file, exact_content, true)
+end

data/lib/picasa-downloader/client.rb

@@ -19,30 +19,50 @@ module PicasaDownloader
       doc = to_xml(
         "https://picasaweb.google.com/data/feed/api/user/default/albumid/#{album_id}?imgmax=d")
       doc.css("entry").map { |e|
+        timestamp = e.css("tags time")
+        timestamp = e.css("timestamp") unless timestamp
         Photo.new(
           e.xpath("group/content/@url").to_s,
           # Google includes the milliseconds in the timestamp:
-          e.css("timestamp").inner_text.to_i / 1000,
+          timestamp.inner_text.to_i / 1000,
           e.css("size").inner_text.to_i,
           e.css("title").first.inner_text)
       }
     end
 
     def download_photo(photo)
-      unless photo.url.include?"googlevideo"
-        uri = URI.parse(photo.url)
-        http = Net::HTTP.new(uri.host, uri.port)
-        request = Net::HTTP::Get.new(uri.request_uri)
-        http.use_ssl = true
-        response = http.request(request)
-        raise "Response not ok, was #{response.code}" unless
-        response.code.to_i.between? 200, 299
-        response.body
+      if photo.has_video?
+        # Downloading videos is not supported yet
+      else
+        with_retry {
+          uri = URI.parse(photo.url)
+          http = Net::HTTP.new(uri.host, uri.port)
+          request = Net::HTTP::Get.new(uri.request_uri)
+          http.use_ssl = true
+          response = http.request(request)
+          raise "Response not ok, was #{response.code}" unless
+            response.code.to_i.between? 200, 299
+          response.body
+        }
       end
     end
 
     private
 
+    def with_retry
+      retries = [3, 5]
+      begin
+        yield
+      rescue Exception
+        if delay = retries.shift
+          sleep delay
+          retry
+        else
+          raise
+        end
+      end
+    end
+
     def to_xml(gdata_url)
       response = @gd.get(gdata_url)
       xml = response.to_xml.to_s

data/lib/picasa-downloader/errors.rb

@@ -3,7 +3,15 @@ module PicasaDownloader
   end
 
   class EnvironmentalCredentialsNotSet < PicasaDownloaderError
-    def initialize(message = 'Cannot authenticate - environmental settings missing. Please set the environmental values PICASA_USERNAME and PICASA_PASSWORD')
+    def initialize(message =
+                   'Cannot authenticate - environmental settings missing. Please set the environmental values PICASA_USERNAME and PICASA_PASSWORD.')
+      super(message)
+    end
+  end
+
+  class AlbumNameNotSpecified < PicasaDownloaderError
+    def initialize(message =
+                   'Album name is not specified.')
       super(message)
     end
   end

data/lib/picasa-downloader/photo.rb

@@ -8,5 +8,9 @@ module PicasaDownloader
       @size = size
       @name = name
     end
+
+    def has_video?
+      @url.include?'googlevideo'
+    end
   end
 end

data/picasa-downloader.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'picasa-downloader'
-  s.version       = '0.0.3'
+  s.version       = '0.0.4'
   s.license       = 'MIT'
   s.summary       = 'Download your Google Picasa photo albums'
   s.description   =
@@ -26,4 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'webmock'
+  s.add_development_dependency 'cucumber'
+  s.add_development_dependency 'aruba', '>= 0.4.7'
 end

data/spec/client_spec.rb

@@ -36,13 +36,13 @@ module PicasaDownloader
 
     it "downloads photos photos of an album" do
       with_cassettes {
-        @albums = @client.list_albums
-        @photos = @client.list_photos(@albums.first.id)
+        albums = @client.list_albums
+        photos = @client.list_photos(albums.first.id)
         def jpeg?(data)
           # See http://www.astro.keele.ac.uk/oldusers/rno/Computing/File_magic.html
           return data[0, 4] == "\xff\xd8\xff\xe0"
         end
-        bytes = @client.download_photo(@photos.first)
+        bytes = @client.download_photo(photos.first)
         jpeg?(bytes).should be true
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa-downloader
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gdata_19
@@ -139,6 +139,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.7
 description: This Gem makes it convenient to download Picasa albums via command-line
   interface
 email: lauri.lehmijoki@iki.fi
@@ -154,6 +186,8 @@ files:
 - Rakefile
 - TODO.md
 - bin/picasa-downloader
+- features/picasa-downloader.feature
+- features/support/env.rb
 - fixtures/cassettes/google-login.yml
 - fixtures/cassettes/picasa-album.yml
 - fixtures/cassettes/picasa-albums.yml