content_server 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18f1d28236cf412a9317e5518547d305a18b46d
-  data.tar.gz: 9258505464a15c66a022eed7512128e4ee17b955
+  metadata.gz: 9a63eee2309b1dd4c6ef0be4cff6bfda6595f0b0
+  data.tar.gz: 5071dac6c7413718c60db1ea71c0f3cefe70f6c4
 SHA512:
-  metadata.gz: ad5402c9675b065871bdf91f2167006313a9f564fbe162fea25f3732a941a2ce32fd9b23361ce655bc1fe1b0affbd252b930cefbf2cc6bd59b090e61455f78d8
-  data.tar.gz: 9fb7a23424d60db55ae46cd5ff0e432481a171c1db293d67363e6b9be85ba66af5c6bb0344d841e9d3d551a59dc838c288080f8cc11ac3aab1d02009c8c832e4
+  metadata.gz: 36fff7c2a300f6928dc6eec4af451e477ef78e2d703729c895c7329ef56fa8992444150abbbef1cc731d3ea176961b1c415e1a7f0966873f8317d1b93c08d653
+  data.tar.gz: bd23efe8a7e65e0411718dd873915918a0e31b9141707f544dde6e2eb6ce45d3bb13f81f3ca3d18fc9bb293d01cb56669b4f638d24c95ef96ca1e55a031e371e

data/lib/content_data/content_data.rb

@@ -326,7 +326,7 @@ module ContentData
     def to_file(filename)
       content_data_dir = File.dirname(filename)
       FileUtils.makedirs(content_data_dir) unless File.directory?(content_data_dir)
-      Zlib::GzipWriter.open(filename) do |gz| 
+      Zlib::GzipWriter.open(filename) do |gz|
         gz.write [@instances_info.length].to_csv
         each_instance { |checksum, size, content_mod_time, instance_mod_time, server, path, inst_index_time|
           gz.write [checksum, size, server, path, instance_mod_time, inst_index_time].to_csv
@@ -384,7 +384,7 @@ module ContentData
                     "Expected to read 3 fields ('<' separated) but got #{row.length}.\nLine:#{symlinks_line}")
             end
             @symlinks_info[[row[0], row[1]]] = row[2]
-            number_of_symlinks -= 1 
+            number_of_symlinks -= 1
           end
         end
       }
@@ -463,7 +463,9 @@ module ContentData
     # TODO validation that file indeed contains ContentData missing
     # TODO class level method?
     # Loading db from file using chunks for better memory performance
-    def from_file_old(filename)
+    # @param filename [String] filename of the file containing ContentData in obsolete format
+    # @param delimiter [Character] fields separator character, default is ','
+    def from_file_old(filename, delimiter=',')
       # read first line (number of contents)
       # calculate line number (number of instances)
       # read number of instances.
@@ -514,7 +516,7 @@ module ContentData
             # update last chunk size
             chunk_size = number_of_instances - (chunk_index * CHUNK_SIZE)
           end
-          return unless read_old_instances_chunk(filename, file, chunk_size)
+          return unless read_old_instances_chunk(filename, file, chunk_size, delimiter)
           GC.start
           chunk_index += 1
         end
@@ -531,10 +533,10 @@ module ContentData
             raise("Parse error of content data file:#{filename}  line ##{$.}\n" +
                    "Expected to read symlink line but reached EOF")
           end
-          parameters = symlinks_line.split(',')
+          parameters = symlinks_line.split(delimiter)
           if (3 != parameters.length)
             raise("Parse error of content data file:#{filename}  line ##{$.}\n" +
-                  "Expected to read 3 fields (comma separated) but got #{parameters.length}.\nLine:#{symlinks_line}")
+                  "Expected to read 3 fields but got #{parameters.length}.\nLine:#{symlinks_line}")
           end
 
           @symlinks_info[[parameters[0],parameters[1]]] = parameters[2]
@@ -554,7 +556,7 @@ module ContentData
       true
     end
 
-    def read_old_instances_chunk(filename, file, chunk_size)
+    def read_old_instances_chunk(filename, file, chunk_size, delimiter)
       chunk_index = 0
       while chunk_index < chunk_size
         instance_line = file.gets
@@ -563,7 +565,13 @@ module ContentData
                 "Expected to read Instance line but reached EOF")
         end
 
-        parameters = instance_line.split(',')
+        parameters = instance_line.split(delimiter)
+        if (parameters.length < 6)
+          raise("Parse error of content data file:#{filename}  line ##{$.}\n" +
+                "Expected to read at least 6 fields " +
+                  "but got #{parameters.length}.\nLine:#{instance_line}")
+        end
+
         # bugfix: if file name consist a comma then parsing based on comma separating fails
         if (parameters.size > 6)
           (4..parameters.size-3).each do |i|

data/lib/content_server/version.rb

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

data/lib/params.rb

@@ -251,15 +251,20 @@ module Params
 
   # Initializes the project parameters.
   # Precedence is: Defined params, file and command line is highest.
-  def Params.init(args)
+  # If no args provided then only default values used.
+  def Params.init(args=nil)
     #define default configuration file
     Params['conf_file'] = "~/.bbfs/etc/config_#{File.basename($PROGRAM_NAME)}.yml"
 
     @init_info_messages = []
     @init_warning_messages = []
 
-    #parse command line argument and set configuration file if provided by user
-    results = parse_command_line_arguments(args)
+    results = Hash.new  # Hash to store parsing results.
+
+    # Parse command line argument and set configuration file if provided by user.
+    unless (args.nil?)
+      results = parse_command_line_arguments(args)
+    end
     if results['conf_file']
       Params['conf_file'] = File.expand_path(results['conf_file'])
       if !File.exist?(Params['conf_file']) or File.directory?(Params['conf_file'])
@@ -320,12 +325,13 @@ module Params
 
   #  Parse command line arguments
   def Params.parse_command_line_arguments(args)
-    results = Hash.new  # Hash to store parsing results.
-    options = Hash.new  # Hash of parsing options from Params.
-
     # Define options switch for parsing
     # Define List of options see example on
     # http://ruby.about.com/od/advancedruby/a/optionparser2.htm
+
+    results = Hash.new  # Hash to store parsing results.
+    options = Hash.new  # Hash of parsing options from Params.
+
     opts = OptionParser.new do |opts|
       @params_data_base.values.each do |param|
         tmp_name_long = "--#{param.name} #{param.name.upcase}"  # Define a command with single mandatory parameter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: content_server
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - BBFS Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algorithms
@@ -84,23 +84,22 @@ dependencies:
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 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:
@@ -110,7 +109,6 @@ 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

data/bin/fix_content_data

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-# Get two file names, one is source content data other is destinations.
-# Converts source content data old format to new format and writes it to
-# destination file.
-
-require 'content_data/content_data'
-
-cd = ContentData::ContentData.new
-cd.from_file_old(ARGV[0])
-cd.to_file(ARGV[1])