etcd-env 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6e8e985054b8b3c0fb87b7eafbe064bd2c808d6
-  data.tar.gz: 14cfc948d891bbfec9d43fb842d8d535076220e4
+  metadata.gz: f3626f43d7c856086a4000c27751eecef8d91395
+  data.tar.gz: 99b2879b50911dc6f773000baedabff4e8ab9a04
 SHA512:
-  metadata.gz: 82acb643d95f74f7dac4c2f83baa1e20e120c5fe58b9f85fa8c1b74bb865dd8c0298f41d2ba5dad2b076dd4d50479a93feb59cc612269e4e218ff89ae60cb771
-  data.tar.gz: c4e9bc2f6b0559d22bdf2d3d1c047e379fcf11c6e97a9328b09c9c6757cfc80ae6cd5873c4dfa791692c615fdcfe6c5bdbe52a0434113f5f1d857e6cfcf379fe
+  metadata.gz: dcdb7f01675b823be9ad9fbe7cf1095f81ab7b86c81fb8eb3fb3df6ee3eb902143c821ba6420663e3163b779de1c017aafb11026162e2be5354b58467bbed2db
+  data.tar.gz: c485c3cc59ccc5190ea416473b95b03b09217158cfde46cdad2f3a851ba07d5b4270c93a3426268fbbba1fcffebe2d02539f7eb50cbc07be3ec10e86c4d60177

data/circle.yml

@@ -1,12 +1,19 @@
+machine:
+  ruby:
+    version: 2.1.5
+
 dependencies:
   pre:
     - wget https://github.com/coreos/etcd/releases/download/v0.4.6/etcd-v0.4.6-linux-amd64.tar.gz
     - tar xzvf etcd-v0.4.6-linux-amd64.tar.gz
     - sudo cp etcd-v0.4.6-linux-amd64/etcd* /usr/local/bin/
   override:
-    - 'rvm-exec 2.1.5 bundle install'
-
+    - gem update bundler
 
 test:
+  pre:
+    - etcd --data-dir /tmp/etcd --name test:
+        background: true
+    - sleep 2
   override:
-    - etcd --data-dir /tmp/etcd --name test & sleep 2 && rvm-exec 2.1.5 bundle exec rspec
+    - bundle exec rspec

data/etcd-env.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name     = 'etcd-env'
-  spec.version  = '0.0.1'
+  spec.version  = '0.0.2'
   spec.authors  = ['Charles Martinot', 'Omar Khan']
   spec.email    = ['techadmin@playlab.com']
   spec.summary  = 'Run a command with environment variables from etcd'
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.bindir      = 'exe'
   spec.executables = spec.files.grep(/^exe\//) { |f| File.basename(f) }
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
 end

data/exe/etcd-env

@@ -5,18 +5,17 @@ require 'json'
 require 'net/http'
 
 def usage
-  puts "Usage: #{$PROGRAM_NAME} <etcd key> [ <etcd key> ... ] -- <command>"
+  puts "Usage: #{$PROGRAM_NAME} <etcd key> [ <etcd key> ... --] <command>"
 end
 
 def env_vars(keys)
-  var = Array.new
-  keys.each do |key|
+  result = keys.reduce({}) do |memo, key|
     response = fetch "http://#{etcd_host}:#{etcd_port}/v2/keys#{key}"
-    var << (JSON.parse(response)['node']['nodes'] || [])
+    vars = (JSON.parse(response)['node']['nodes'] || [])
       .map { |var| [var['key'].split('/').last, var['value']] }
       .to_h
+    memo.merge(vars)
   end
-  var
 end
 
 def etcd_host
@@ -43,12 +42,17 @@ def fetch(uri_str, limit = 10)
   end
 end
 
-if __FILE__ == $PROGRAM_NAME
-  key_str, *commands = ARGV.join(" ").split(" -- ")
-  keys = key_str.split(" ")
-  if commands.empty?
-    usage
-    exit 1
-  end
-  exec env_vars(keys).reduce({}, :merge), *commands
+sep = ARGV.index '--'
+if sep
+  keys = ARGV[0...sep]
+  commands = ARGV[(sep + 1)..-1]
+else
+  keys = ARGV.take(1)
+  commands = ARGV.drop(1)
+end
+if commands.empty?
+  usage
+  exit 1
 end
+exec env_vars(keys), *commands
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etcd-env
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Charles Martinot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement