git-media 0.1.1 → 0.1.2

data/README.rdoc

@@ -14,7 +14,7 @@ Setup the attributes filter settings.
 Setup the .gitattributes file to map extensions to the filter.
 
 	(in repo - once)
-	$ echo "*.mov filter=media" > .gitattributes  
+	$ echo "*.mov filter=media -crlf" > .gitattributes  
 
 Staging files with those extensions will automatically copy them to the 
 media buffer area (.git/media) until you run 'git media sync' wherein they
@@ -76,6 +76,9 @@ that is. If you want to upload & delete the local cache of media files, run:
   $ sudo gem install git-media-0.1.1.gem
 
 == Notes for Windows
+It is important to switch off git smart newline character support for media files. 
+Use "-crlf" switch in .gitattributes (for example "*.mov filter=media -crlf") or config option "core.autocrlf = false".
+
 If installing on windows, you might run into a problem verifying certificates
 for S3 or something. If that happens, modify
 	C:\Ruby191\lib\ruby\gems\1.9.1\gems\right_http_connection-1.2.4\lib\right_http_connection.rb

data/git-media.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-media}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Chacon"]

data/lib/git-media/filter-clean.rb

@@ -24,7 +24,9 @@ module GitMedia
       tempfile.close
 
       # calculate and print the SHA of the data
-      puts hx = hashfunc.hexdigest 
+      STDOUT.print hx = hashfunc.hexdigest 
+      STDOUT.binmode
+      STDOUT.write("\n")
 
       # move the tempfile to our media buffer area
       media_file = File.join(media_buffer, hx)

data/lib/git-media/filter-smudge.rb

@@ -6,8 +6,8 @@ module GitMedia
       can_download = false # TODO: read this from config and implement
       
       # read checksum size
-      sha = STDIN.read(41)
-      if STDIN.eof? && sha[40, 1] == "\n"
+      sha = STDIN.readline(64).strip # read no more than 64 bytes
+      if STDIN.eof? && sha.length == 40 && sha.match(/^[0-9a-fA-F]+$/) != nil
         # this is a media file
         media_file = File.join(media_buffer, sha.chomp)
         if File.exists?(media_file)
@@ -25,7 +25,8 @@ module GitMedia
           end
         end
       else
-        # if more than 40 chars, just output
+        # if it is not a 40 character long hash, just output
+        STDERR.puts('Unknown git-media file format')
         print sha
         while data = STDIN.read(4096)
           print data

data/lib/git-media/status.rb

@@ -10,7 +10,7 @@ module GitMedia
       r = self.local_cache_status
       self.print_cache_status(r)
     end
-    
+
     # find tree entries that are likely media references
     def self.find_references
       references = {:to_expand => [], :expanded => [], :deleted => []}
@@ -22,7 +22,7 @@ module GitMedia
           if size == tree_size.to_i
             # TODO: read in the data and verify that it's a sha + newline
             sha = File.read(fname).strip
-            if sha.length == 40
+            if sha.length == 40 && sha =~ /^[0-9a-f]+$/
               references[:to_expand] << [fname, sha]
             end
           else
@@ -48,14 +48,14 @@ module GitMedia
         puts "== Expanded Media =="
         refs[:expanded].each do |file|
           size = File.size(file)
-          puts "   " + "(#{self.to_human(size)})".ljust(8) + " #{file}"          
+          puts "   " + "(#{self.to_human(size)})".ljust(8) + " #{file}"
         end
         puts
       end
       if refs[:deleted].size > 0
         puts "== Deleted Media =="
         refs[:deleted].each do |file|
-          puts "           " + " #{file}"          
+          puts "           " + " #{file}"
         end
         puts
       end
@@ -76,7 +76,7 @@ module GitMedia
         refs[:pushed].each do |sha|
           cache_file = GitMedia.media_path(sha)
           size = File.size(cache_file)
-          puts "   " + "(#{self.to_human(size)})".ljust(8) + ' ' + sha[0, 8]          
+          puts "   " + "(#{self.to_human(size)})".ljust(8) + ' ' + sha[0, 8]
         end
         puts
       end
@@ -100,8 +100,8 @@ module GitMedia
         return (size / 1024).to_s + 'k'
       else
         return (size / 1048576).to_s + 'm'
-      end 
+      end
     end
-    
+
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-media
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Scott Chacon
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-10 00:00:00 +02:00
-default_executable: git-media
+date: 2009-06-10 00:00:00 Z
 dependencies: []
 
 description: 
@@ -46,7 +46,6 @@ files:
 - lib/git-media/transport/scp.rb
 - lib/git-media/transport.rb
 - lib/git-media.rb
-has_rdoc: true
 homepage: http://github.com/schacon/git-media
 licenses: []
 
@@ -60,6 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -68,13 +68,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: "\"This is a summary! Stop yer whining\""