content_server 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a63eee2309b1dd4c6ef0be4cff6bfda6595f0b0
-  data.tar.gz: 5071dac6c7413718c60db1ea71c0f3cefe70f6c4
+  metadata.gz: 0a288112dbf913248ae14dab2ab1fa643974dda1
+  data.tar.gz: d8316b22760a0462a0f6250c5e17f78a924af61e
 SHA512:
-  metadata.gz: 36fff7c2a300f6928dc6eec4af451e477ef78e2d703729c895c7329ef56fa8992444150abbbef1cc731d3ea176961b1c415e1a7f0966873f8317d1b93c08d653
-  data.tar.gz: bd23efe8a7e65e0411718dd873915918a0e31b9141707f544dde6e2eb6ce45d3bb13f81f3ca3d18fc9bb293d01cb56669b4f638d24c95ef96ca1e55a031e371e
+  metadata.gz: 8fa5f8092cd8593d6cc6601ffa3316f2beb8857f2a747ba08e330703126643b739c27796ec08185443c1ae57a2698cb961bdc39473c93241d32d902b9fa75948
+  data.tar.gz: ee91201c9e3d320ab9e561f203fbc54bccb42f36db36180fdd4cfb720321ee4ccc6514f859d6d0dec84d577834a815849ed74b695d8bd690732f0a287f259bf7

data/bin/fix_content_data

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'content_data/content_data'
+require 'params'
+
+usage = <<END
+Get two file names, one is source content data, other is destination,
+and a delimiter that separates fields in the source content data file
+(optional, default is ',').
+Converts source content data old format to new format and writes it
+to the destination file.
+Usage:
+#{$PROGRAM_NAME} old.cd fixed.cd
+is equivalent to
+#{$PROGRAM_NAME} old.cd fixed.cd ','
+END
+
+unless ARGV.length >= 2
+  puts usage
+  exit
+end
+
+Params.init
+
+cd = ContentData::ContentData.new
+if ARGV.length > 2
+  cd.from_file_old(ARGV[0], ARGV[2])
+else
+  cd.from_file_old(ARGV[0])
+end
+cd.to_file(ARGV[1])

data/lib/content_data/content_data.rb

@@ -361,7 +361,7 @@ module ContentData
           elsif number_of_instances > 0
             if (6 != row.length)
               raise("Parse error of content data file:#{filename}  line ##{$.}\n" +
-                        "Expected to read 6 fields ('<' separated) but got #{row.length}.\nLine:#{instance_line}")
+                        "Expected to read 6 fields ('<' separated) but got #{row.length}.")
             end
             add_instance(row[0],        #checksum
                          row[1].to_i,   # size

data/lib/content_server/version.rb

@@ -1,3 +1,3 @@
   module ContentServer
-    VERSION = "1.7.1"
+    VERSION = "1.7.2"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: content_server
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - BBFS Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algorithms
@@ -84,22 +84,23 @@ dependencies:
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
 description: Monitor and Index a directory and back it up to backup server.
 email: bbfsdev@gmail.com
 executables:
 - content_server
 - backup_server
 - file_utils
+- fix_content_data
 - testing_server
 - testing_memory
 extensions:
@@ -109,6 +110,7 @@ files:
 - bin/backup_server
 - bin/content_server
 - bin/file_utils
+- bin/fix_content_data
 - bin/testing_memory
 - bin/testing_server
 - ext/run_in_background/mkrf_conf.rb