consul_do 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d4957226da4752a9ea6c7dbad95d11d26a83a6a
-  data.tar.gz: 8b162f20735d87d73316e0ed377480b5f3274047
+  metadata.gz: eaf53b3f134bde3ccd76c2cbc01b7a96438eff91
+  data.tar.gz: 72ed7795cecde8271e9660bb8b5c39f347c25198
 SHA512:
-  metadata.gz: cef041656eb904456cbbdfd0556c841f20225ec392ea9c689cc2bc6154d067f9d574b483356005b3c012886b2ada9377e5fc18fdb21ead6fd2b38770e629d528
-  data.tar.gz: 85f5dbfb0eae86231554843791453e8400dd915b733a66e2a7ddae18edd3e9738a85d8233a9667146a8fec3efe0d3960734bb9f0c359c13f22a0437a7813934a
+  metadata.gz: 86abc466576f29bb9948cd515984df0e8b40ba5480829e2ff76e11c88b115331c4003bf5f6095270f28717acccf9e3a5e5a1e74937b8c31dc741870424a360cc
+  data.tar.gz: 1d993a16794349c9705e1288a28c94f403c8def2ec17fe52c857ab241335aa05a6497198fafe43ff7dfadf23e30d7eec8ab1a0489314b505985e4ed9bd31a88c

data/README.md

@@ -27,17 +27,24 @@ Or install it yourself as:
 
     $ consul-do --help
     Usage: consul-do OPTIONS
-        -k, --key KEY                    Coordination key
-        -h, --consul-host HOST           Consul hostname
-        -p, --consul-port PORT           Consul port
+        -k, --key KEY=consul_do          Coordination key
+        -h, --consul-host HOST=localhost Consul hostname
+        -p, --consul-port PORT=8500      Consul port
+        -t, --token TOKEN                ACL Token
             --http_proxy http://HOST:PORT
                                          Use supplied proxy instead of ENV
+        -v, --verbose                    Verbose logging
 
     $ consul-do -k my_key && echo "do stuff"
     do stuff
 
     $ consul-do -k not_my_key && echo "don't do stuff"
 
+## Requirements
+
+* http access to a host running Consul Agent
+* Write access to the `service/` key [via ACL, token](https://www.consul.io/docs/internals/acl.html), or consul default wide-open permissions.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -46,7 +53,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/consul_do.
+Bug reports and pull requests are welcome on GitHub at https://github.com/goldstar/consul_do.
 
 
 ## License

data/bin/setup

@@ -2,6 +2,10 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+git_root=`git rev-parse --show-cdup`
+
 bundle install
 
+cp $git_root/hooks/* $git_root/.git/hooks/
+
 # Do any other automated setup that you need to do here

data/circle.yml

@@ -1,5 +1,3 @@
 machine:
   ruby:
     version: 2.1.6
-  timezone:
-    Etc/GMT

data/consul_do.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/goldstar/consul_do"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|hooks)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

data/lib/consul_do/config.rb

@@ -37,9 +37,13 @@ module ConsulDo
       "consul-do_#{key}_session"
     end
 
+    def net_http_proxy
+      Net::HTTP.Proxy(proxy.host, proxy.port, proxy.user, proxy.password)
+    end
+
     def http_client
-      if ConsulDo.config.proxy.host && ConsulDo.config.proxy.port
-        ConsulDo.log "http_client", Net::HTTP.Proxy(ConsulDo.config.proxy.host, ConsulDo.config.proxy.port, ConsulDo.config.proxy.user, ConsulDo.config.proxy.password)
+      if proxy.host && proxy.port
+        ConsulDo.log "http_client", net_http_proxy
       else
         ConsulDo.log "http_client", Net::HTTP
       end

data/lib/consul_do/version.rb

@@ -1,3 +1,3 @@
 module ConsulDo
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_do
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jason Scholl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler