gitdis 0.0.1.1 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc3764ebe71bcc03b916fb6a29b1b02daaf34dd
-  data.tar.gz: 3dbd971bf31a576d535e176e573023fe362d383b
+  metadata.gz: beade5f09d9ae75291929512a0167b15ed6d5ea3
+  data.tar.gz: 78f1b0232a334dc7f39d080ec33876950f31e83e
 SHA512:
-  metadata.gz: 6da95b9acf0be41a12e4c588169d19ab10e72d48f381f4337fe229e166263b79d414be8cb2144cef37d6a9668de6771355bdf1ca1e28be4268372db013a26421
-  data.tar.gz: 64f87929af5d569b59bf08d2d927855ee657508fed9bd149ab37a577852062dfc4c8d94dfb972914a40fd032243298b6f21600088effeec78273d0f478700861
+  metadata.gz: 2d481b7509a15999e8a0ccf734b30c24941f775d2c7670b8ae4bcf384f6ce578165ff585cce365eb3b579859d9636e6fa443f55811e19222b158ebc78a9c673e
+  data.tar.gz: b875da553b25546d218218a09fa8385e64d0321ecf2e1cd11effe15a317aff7896abe295c4fd200f17477bc62063018589f71021ce3f374fa6d05f317f894c80

data/README.md

@@ -18,40 +18,38 @@
 
 ### YAML Config
 
-5 options, 1 keymap, plus environment overrides:
+Toplevel keys are environments.  `default` is required. Other environment
+settings override defaults.  5 options, 1 keymap.
 
 ```
-redis-host: localhost
-redis-port: 6379
-redis-db: 0
-git-repo: ~/foo/bar/baz
-git-branch: quux
-keymap:
-  "redis:key:1": "path/to/file1"
-  "redis:key:2": "path/to/file2"
-
-environments:
-  yours:
-    redis-host: localhost
-    git-branch: mine
-  mine:
-    redis-host: localhost
-    git-branch: yours
-  qa:
-    redis-host: qa.big.com
-    git-branch: develop
-  prod:
-    redis-host: secret.big.net
-    git-branch: master
+default:
+  redis-host: localhost
+  redis-port: 6379
+  redis-db: 0
+  git-repo: ~/foo/bar/baz
+  git-branch: quux
+  keymap:
+    "redis:key:1": "path/to/file1"
+    "redis:key:2": "path/to/file2"
+
+qa:
+  redis-host: qa.big.com
+  git-branch: develop
+
+prod:
+  redis-host: secret.big.net
+  git-branch: master
 ```
 
+See also https://github.com/rickhull/gitdis/tree/master/examples
+
 ### Command Line Options
 
 Select your environment (optional).  Add final overrides (optional).
 
 ```
   Environment selection
-    -e, --environment  select within YAML[environments]
+    -e, --environment  toplevel YAML key
   Redis overrides
     -H, --redis-host   string
     -p, --redis-port   number

data/VERSION

@@ -1 +1 @@
-0.0.1.1
+0.0.2.1

data/bin/gitdis

@@ -7,7 +7,7 @@ require 'gitdis'
 opts = Slop.parse { |o|
   o.banner = "USAGE: gitdis path/to/config.yaml [options]"
   o.separator '  Environment selection'
-  o.string '-e', '--environment', 'select within YAML[environments]'
+  o.string '-e', '--environment', 'toplevel YAML key'
   o.separator '  Redis overrides'
   o.string  '-H', '--redis-host', 'string'
   o.integer '-p', '--redis-port', 'number'
@@ -66,12 +66,13 @@ redis_options = {}
 }
 puts "Redis options: #{redis_options}"
 
-# do things'n'stuff
+# process keymap
 if opts.dump?
   GitDis.dump(keymap.keys, redis_options)
 else
   gd = GitDis.new config.fetch('git-repo')
   gd.git_pull config.fetch('git-branch')
+
   keymap.each { |key, fileglob|
     result = gd.update(key, fileglob)
     case result

data/lib/gitdis.rb

@@ -42,11 +42,10 @@ class GitDis
         val = redis.get(rkey)
         if val and val.include?("\n")
           val = "\n" << val.split("\n").map { |line| "\t#{line}" }.join("\n")
+          puts ["[#{rkey}]", val].join(' ')
         end
-        puts ["[#{rkey}]", val].join(' ')
       }
     }
-    redis.disconnect
   end
 
   attr_accessor :repo_dir, :redis

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitdis
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Rick Hull