smugsync 0.2 → 0.3

data/.gitignore

@@ -1,3 +1,4 @@
 .kdev4
 *~
 pkg
+*.gem

data/README.md

@@ -10,6 +10,7 @@ SmugSync provides a command-line interface that is somewhat similar to git or sv
 To start, initialize a root directory for your SmugMug account:
 
     smug init
+    smug fetch
 
 Albums are stored as subdirs inside the root directory. To upload an album, create a directory for it, copy your images and videos there and run
 
@@ -33,3 +34,9 @@ To see the difference between your directory and SmugMug run
 
 ## Restrictions
 - Categories and subcategories are not supported.
+
+
+## Changelog
+- 0.3: Ruby 1.9 is supported
+- 0.2: First useful version, all commands work
+- 0.1: Initial release

data/lib/smugsync/console.rb

@@ -1,4 +1,6 @@
-$KCODE = 'u'
+if RUBY_VERSION < "1.9.0"
+    $KCODE = 'u'
+end
 
 commands = [
     ["init", "Initialize current folder as SmugMug folder and authorize with SmugMug"],

data/lib/smugsync/upload.rb

@@ -1,5 +1,7 @@
-require 'system_timer'
-require 'md5'
+if RUBY_VERSION < "1.9.0"
+    require 'system_timer'
+end
+require 'digest/md5'
 require 'set'
 
 module Smug
@@ -68,14 +70,14 @@ Options:
                 modified_albums << album
 
                 begin
-                    SystemTimer.timeout_after(opts[:timeout]) do
+                    with_timeout(opts[:timeout]) do
                         puts "Uploading #{filename} (#{Time.now.to_s}) (#{i}/#{num_files})"
 
                         data = File.open(filename, "rb") { |f| f.read }
 
                         req = {}
                         req['Content-Length'] = File.size(filename).to_s
-                        req['Content-MD5'] = MD5.hexdigest(data)
+                        req['Content-MD5'] = Digest::MD5.hexdigest(data)
                         req['X-Smug-AlbumID'] = album["id"].to_s
                         req['X-Smug-Version'] = '1.3.0'
                         req['X-Smug-FileName'] = filename
@@ -106,6 +108,20 @@ Options:
 
 private
 
+    def with_timeout(upload_timeout, &block)
+        if RUBY_VERSION < "1.9.0"
+            # older ruby need to use SystemTimer because ruby green thread timeout
+            # won't terminate threads that execute system calls
+            SystemTimer.timeout_after(upload_timeout) do
+                yield
+            end
+        else
+            timeout(upload_timeout) do
+                yield
+            end
+        end
+    end
+
     def albums
         # TODO: upload doesn't work without cache
         @albums ||= JSON::parse Config::config_file("cache", "r").read

data/smugsync.gemspec

@@ -1,27 +1,29 @@
 require 'rubygems'
 
 SPEC = Gem::Specification.new do |s|
-    s.name      = "smugsync"
-    s.version   = "0.2"
-    s.author    = "Alexander Dymo"
-    s.email     = "adymo@kdevelop.org"
-    s.homepage  = "http://github.com/adymo/smugsync"
-    s.platform  = Gem::Platform::RUBY
-    s.summary   = "."
+    s.name        = "smugsync"
+    s.version     = "0.3"
+    s.author      = "Alexander Dymo"
+    s.email       = "adymo@kdevelop.org"
+    s.homepage    = "http://github.com/adymo/smugsync"
+    s.platform    = Gem::Platform::RUBY
+    s.summary     = "SmugMug photo and video synchronization tool"
+    s.description = "The hacker-friendly command-line tool to synchronize your photos and videos two-way between your computer and SmugMug."
 
-    s.add_development_dependency('bundler',     '>= 1.0.0')
-    s.add_development_dependency('assert_same', '>= 0.1.0')
+    s.add_development_dependency('assert_same', '>= 0.3.0')
 
     s.add_dependency('trollop',         '>= 1.16.0')
     s.add_dependency('json',            '>= 1.6.0')
     s.add_dependency('oauth',           '>= 0.4.0')
-    s.add_dependency('system_timer',    '>= 1.2.0')
+
+    if RUBY_VERSION < "1.9.0"
+        s.add_dependency('system_timer',    '>= 1.2.0')
+    end
 
     s.files         = `git ls-files`.split("\n")
     s.test_files    = `git ls-files -- test/*`.split("\n")
     s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
     s.require_path      = "lib"
-    s.autorequire       = "smugsync"
     s.has_rdoc          = false
 end

metadata

@@ -1,126 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: smugsync
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: '0.3'
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  version: "0.2"
 platform: ruby
-authors: 
+authors:
 - Alexander Dymo
-autorequire: smugsync
+autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: assert_same
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: assert_same
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
   name: trollop
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 87
-        segments: 
-        - 1
-        - 16
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.16.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: system_timer
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :runtime
-  version_requirements: *id006
-description: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+description: The hacker-friendly command-line tool to synchronize your photos and
+  videos two-way between your computer and SmugMug.
 email: adymo@kdevelop.org
-executables: 
+executables:
 - smug
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - AUTHORS
 - COPYING
@@ -149,38 +111,29 @@ files:
 - test/status_command_test.rb
 homepage: http://github.com/adymo/smugsync
 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: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: .
-test_files: 
+summary: SmugMug photo and video synchronization tool
+test_files:
 - test/local/.gitignore
 - test/mock/command.rb
 - test/mock/oauth/tokens/request_token.rb