gitdis 0.1.1.1 → 0.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 122d1a3f1436e31c123e42fdfb6e9f146f196004
-  data.tar.gz: 453ba3ef4a508206ef3b71e228eca18e7c534e66
+  metadata.gz: dff5d4e19798bf4fa0087e9a97affdc2b60cb5ff
+  data.tar.gz: 9d3133897f4a68c1de7298615e6d9a50ac7ed39b
 SHA512:
-  metadata.gz: f0729411c0f2fe5519fffe64f965c2f449e9b4afc60fc3970c33215b3561f490abd1c2c992629c09b8947471c59ad90974e6eaa4e98d35cff5003d5f86285df8
-  data.tar.gz: e077368e323bb720bd3040506853e3994a81f96b66971b76bfd0f6ef02e1aba199bddc035aada22667aef7b4e8aa8b4dffd54a42e74c316d7869909d494283cc
+  metadata.gz: fc9c1c81e4b3ccd76df7259f01bbd8970ed18770a0f53d8d1631a236c0d460a3adcba521a42660c19db323232581b4a89432ab4b68d1a460062f79ab8eeb6078
+  data.tar.gz: f48060d031e6b1865ce3f7f771e64889f8bf924a7748801a1dd50022ff6526336715a5617a86fe09ebff18b9a1932f30e77104913ab6858a176d4da7ffa588a8

data/VERSION

@@ -1 +1 @@
-0.1.1.1
+0.1.2.1

data/bin/gitdis

@@ -16,6 +16,7 @@ opts = Slop.parse { |o|
   o.string '-r', '--git-repo',   'path/to/repo_dir'
   o.string '-b', '--git-branch', 'e.g. master'
   o.separator '  Other options'
+  o.bool    '--dry-run', 'Perform comparisons but do not write to Redis'
   o.bool '-D', '--dump', 'Just dump Redis contents per YAML keymap'
   o.on   '-h', '--help' do
     puts o
@@ -71,6 +72,7 @@ if opts.dump?
   GitDis.dump(keymap.keys, redis_options)
 else
   gd = GitDis.new(config.fetch('git-repo'), redis_options)
+  gd.dry_run = true if opts[:'dry-run']
   gd.git_pull config.fetch('git-branch')
 
   keymap.each { |key, fileglob|
@@ -80,12 +82,14 @@ else
       puts "#{fileglob} not found"
     when false
       puts "#{fileglob} unchanged"
+    when true
+      puts "#{fileglob} changed but not updated (DRY RUN)"
+    when Array
+      ver, md5 = *result
+      puts "#{fileglob} updated:"
+      puts "\tVersion: #{ver} (#{md5})"
     else
-      unless opts.dry_run?
-        ver, md5 = *result
-        puts "#{fileglob} updated:"
-        puts "\tVersion: #{ver} (#{md5})"
-      end
+      raise "unknown update result: #{result.inspect}"
     end
   }
 end

data/lib/gitdis.rb

@@ -48,9 +48,45 @@ class GitDis
     }
   end
 
-  attr_accessor :repo_dir, :redis
+  # concatenate file contents into a single string
+  # separate by newlines, including CRs if any CRs are detected anywhere
+  # include a filetype-specific separator if recognized
+  # filenames is an array, and all lengths 0-N are handled
+  def self.concatenate(filenames)
+    filetypes = filenames.map { |fname| File.extname(fname) }.uniq
+    case filetypes.length
+    when 0
+      return "" if filenames.length == 0
+      raise "filetype detection failure: #{filenames}"
+    when 1
+      sep = self.separator(filetypes.first)
+    else
+      raise "refusing to concatenate disparate filetypes: #{filetypes}"
+    end
+
+    payload = filenames.map { |fname|
+      contents = File.read(fname) || raise("could not read #{fname}")
+      sep << "\r" if !sep.include?("\r") and contents.include?("\r")
+      contents if !contents.empty?
+    }.compact.join("#{sep}\n")
+  end
+
+  # return a specific separator for known filetypes
+  # e.g. yaml document separator: ---
+  def self.separator(filetype)
+    filetype = filetype[1..-1] if filetype[0] == '.'
+    case filetype.downcase
+    when 'yaml', 'yml'
+      '---'
+    else
+      ''
+    end
+  end
+
+  attr_accessor :repo_dir, :redis, :dry_run
 
   def initialize(repo_dir, redis_options = {})
+    @dry_run = false
     @repo_dir = File.expand_path(repo_dir)
     raise "#{@repo_dir} does not exist!" unless Dir.exist? @repo_dir
     @redis = Redis.new(redis_options)
@@ -68,6 +104,7 @@ class GitDis
   end
 
   # quick false if calculated md5 == redis md5
+  # return true if dry run and update needed
   # otherwise update contents and md5; increment version
   def update_redis(base_key, file_contents)
     md5 = Digest::MD5.hexdigest(file_contents)
@@ -75,7 +112,6 @@ class GitDis
     return false if @redis.get(mkey) == md5
 
     if @dry_run
-      puts "DRY RUN: would have updated #{base_key} with md5 #{md5}"
       true
     else
       @redis.set(fkey, file_contents)
@@ -88,6 +124,7 @@ class GitDis
   # e.g. update('foo:bar:baz', 'foo/bar/*.baz')
   # return nil        # path does not exist
   #        false      # no update needed
+  #        true       # update was needed, but just a dry run
   #        [ver, md5] # updated
   def update(base_key, relpath)
     # handle e.g. "foo/bar/*.yaml"
@@ -95,27 +132,7 @@ class GitDis
     case files.length
     when 0 then nil
     when 1 then self.update_redis(base_key, File.read(files.first))
-    else
-      puts "concatenating #{files.length} files"
-      sep = "\n"
-
-      payload = files.map { |fname|
-        contents = File.read(fname)
-        if contents and !contents.empty?
-          # scan for carriage returns (Microsoft text format)
-          sep = "\r\n" if sep == "\n" and contents.include?("\r")
-          contents
-        # debugging
-        elsif contents
-          puts "#{fname} is empty"
-          nil
-        else
-          puts "File.read(#{fname}) returned false/nil"
-          nil
-        end
-      }.compact.join("---#{sep}")
-
-      self.update_redis(base_key, payload)
+    else        self.update_redis(base_key, self.class.concatenate(files))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitdis
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
+  version: 0.1.2.1
 platform: ruby
 authors:
 - Rick Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop