consul_bridge 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dccee1f4afc595dcb461408de4fa2db90c02708c
-  data.tar.gz: d297be5908ef994daf49b1135f8d26595ab687a8
+  metadata.gz: de3103de52dcb69d51926ebc07534b5424e24e18
+  data.tar.gz: 0cfcc4ae5f166d3770ef6219b772d92362112ca7
 SHA512:
-  metadata.gz: 8e61b42ca0208270ebfe1844a18b42eb59772dede5f63f6c53784f6c683fbced72447da8c8e53012c065497f0dcad10073771e542fe72194756238974f649aaf
-  data.tar.gz: 6759cb111df0dbd08953337ea8d3072dc650eeb0958718b771a0fa074af837c6947ae1fa3ea45ac2da68fbbfdad29b32b672447d86823bbbd73a35c033d5e218
+  metadata.gz: 0a021ecbad6f0a07642c8e1597020a1d78a0acae2cfa2d50caf5ba974c456135c1f2e99873e831554872bb92fd714542543e7ba4317c1b13667651282afabbf7
+  data.tar.gz: 9016100027daafe73ee55463e6f4225ed868bfa0d145865d2d7bd5c28c250a2686726d63ebef6abc22d68263250d3e945977d583a16843d0facbe56124adac4d

data/.dockerignore

@@ -0,0 +1,3 @@
+pkg/
+Gemfile.lock
+tmp/

data/Dockerfile

@@ -1,19 +1,29 @@
-FROM outstand/ruby-base:2.2.4-alpine
+FROM outstand/ruby-base:2.3.1-alpine
 MAINTAINER Ryan Schlesinger <ryan@outstand.com>
 
-RUN addgroup bridge && \
+RUN addgroup -S bridge && \
+    adduser -S -G bridge bridge && \
     addgroup -g 1101 docker && \
-    adduser -S -G bridge -G docker bridge
+    addgroup bridge docker
 
-RUN apk --no-cache add build-base libxml2-dev libxslt-dev
+RUN apk --no-cache add build-base openssh
+
+ENV USE_BUNDLE_EXEC true
+
+WORKDIR /consul_bridge
+COPY Gemfile consul_bridge.gemspec /consul_bridge/
+COPY lib/consul_bridge/version.rb /consul_bridge/lib/consul_bridge/
+COPY scripts/fetch-bundler-data.sh /consul_bridge/scripts/fetch-bundler-data.sh
+
+ARG bundler_data_host
+RUN /consul_bridge/scripts/fetch-bundler-data.sh ${bundler_data_host} && \
+    bundle install && \
+    git config --global push.default simple
 COPY . /consul_bridge/
-RUN cd /consul_bridge \
-    && bundle config build.nokogiri --use-system-libraries \
-    && bundle install \
-    && bundle exec rake install
+RUN ln -s /consul_bridge/exe/consul_bridge /usr/local/bin/consul_bridge
 
-COPY docker-entrypoint.sh /docker-entrypoint.sh
+COPY scripts/docker-entrypoint.sh /docker-entrypoint.sh
 
 ENV DUMB_INIT_SETSID 0
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["consul_bridge"]
+CMD ["help"]

data/Dockerfile.release

@@ -1,20 +1,19 @@
-FROM outstand/ruby-base:2.2.4-alpine
+FROM outstand/ruby-base:2.3.1-alpine
 MAINTAINER Ryan Schlesinger <ryan@outstand.com>
 
-RUN addgroup bridge && \
+RUN addgroup -S bridge && \
+    adduser -S -G bridge bridge && \
     addgroup -g 1101 docker && \
-    adduser -S -G bridge -G docker bridge
+    addgroup bridge docker
 
-ENV CONSUL_BRIDGE_VERSION=0.1.4
+ENV CONSUL_BRIDGE_VERSION=0.1.5
 
-RUN apk --no-cache add libxml2 libxslt \
-    && apk --no-cache add --virtual build-dependencies build-base libxml2-dev libxslt-dev \
-    && gem install nokogiri -- --use-system-libraries \
+RUN apk --no-cache add --virtual build-dependencies build-base \
     && gem install consul_bridge -v ${CONSUL_BRIDGE_VERSION} \
     && apk del build-dependencies
 
-COPY docker-entrypoint.sh /docker-entrypoint.sh
+COPY scripts/docker-entrypoint.sh /docker-entrypoint.sh
 
 ENV DUMB_INIT_SETSID 0
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["consul_bridge"]
+CMD ["help"]

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,8 +1,4 @@
-# ConsulBridge
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/consul_bridge`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+# Consul Bridge
 
 ## Installation
 
@@ -22,15 +18,26 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Master nodes:
+`docker run -d --net=host outstand/consul_bridge start -b <heartbeat bucket> -n <consul container name> -a`
+
+Client nodes:
+`docker run -d --net=host outstand/consul_bridge start -b <heartbeat bucket> -n <consul container name>`
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+- `docker volume create --name consul_bridge_fog`
+- `./build_dev.sh`
+- `docker run -it --rm --net=host -v $(pwd):/consul_bridge -v consul_bridge_fog:/fog -e FOG_LOCAL=true outstand/consul_bridge:dev start -b bucket -n backup`
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To release a new version:
+- Update the version number in `version.rb` and `Dockerfile.release` and commit the result.
+- `./build_dev.sh`
+- `docker run -it --rm -v ~/.gitconfig:/root/.gitconfig -v ~/.gitconfig.user:/root/.gitconfig.user -v ~/.ssh/id_rsa:/root/.ssh/id_rsa -v ~/.gem:/root/.gem outstand/consul_bridge:dev rake release`
+- `docker build -t outstand/consul_bridge:VERSION -f Dockerfile.release .`
+- `docker push outstand/consul_bridge:VERSION`
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/consul_bridge.
+Bug reports and pull requests are welcome on GitHub at https://github.com/outstand/consul_bridge.
 

data/build_dev.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e -x
+
+build_image=outstand/consul_bridge:dev
+dockerfile=Dockerfile
+bundler_data_dir=tmp
+
+bundler_data_container=''
+tar_container=''
+
+function cleanup {
+  if [ -n "$bundler_data_container" ]; then
+    docker stop bundler-data
+    docker rm -fv bundler-data
+  fi
+
+  if [ -n "$tar_container" ]; then
+    docker rm -fv ${tar_container}
+  fi
+
+  rm -f ${bundler_data_dir}/cidfile
+}
+
+trap cleanup EXIT
+
+build_args=''
+mkdir -p ${bundler_data_dir}
+
+if [ -f $(pwd)/${bundler_data_dir}/bundler-data.tar.gz ]; then
+  docker run --name bundler-data -v $(pwd)/${bundler_data_dir}/bundler-data.tar.gz:/usr/share/nginx/html/bundler-data.tar.gz:ro -d nginx:stable-alpine
+  bundler_data_container=bundler-data
+  build_args="--build-arg bundler_data_host=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' bundler-data)"
+fi
+
+docker build -t ${build_image} -f ${dockerfile} ${build_args} .
+
+docker run -t --cidfile=${bundler_data_dir}/cidfile -w /usr/local/bundle ${build_image} tar -zcf /tmp/bundler-data.tar.gz .
+tar_container=$(cat ${bundler_data_dir}/cidfile)
+docker cp ${tar_container}:/tmp/bundler-data.tar.gz ${bundler_data_dir}/bundler-data.tar.gz

data/consul_bridge.gemspec

@@ -24,7 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'docker-api', '~> 1.28'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_runtime_dependency 'concurrent-ruby-edge', '~> 0.2'
+  spec.add_runtime_dependency 'metaractor', '~> 0.5'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "fog-local", "~> 0.3"
 end

data/lib/consul_bridge/bootstrap_consul.rb

@@ -1,27 +1,33 @@
-require 'consul_bridge/base'
+require 'metaractor'
 require 'consul_bridge/detect_consul'
 require 'consul_bridge/download_masters'
 require 'consul_bridge/join_consul'
 
 module ConsulBridge
-  class BootstrapConsul < Base
-    attr_accessor :bucket, :join_all
+  class BootstrapConsul
+    include Metaractor
 
-    def initialize(bucket:, join_all: false)
-      self.bucket = bucket
-      self.join_all = join_all
-    end
+    required :bucket, :join_all
 
     def call
-      while !DetectConsul.call.running
+      while !DetectConsul.call!.running
         puts 'Local consul agent not detected, sleeping for 5 seconds'
         sleep 5
       end
 
       puts '==> Bootstrapping consul'
-      master_ips = DownloadMasters.call(bucket: self.bucket).master_ips
-      JoinConsul.call(master_ips: master_ips, join_all: self.join_all)
+      master_ips = DownloadMasters.call!(bucket: bucket).master_ips
+      JoinConsul.call!(master_ips: master_ips, join_all: join_all)
       puts '==> Done.'
     end
+
+    private
+    def bucket
+      context.bucket
+    end
+
+    def join_all
+      context.join_all
+    end
   end
 end

data/lib/consul_bridge/bootstrap_consul_actor.rb

@@ -12,11 +12,13 @@ module ConsulBridge
     def on_message(message)
       if message == :bootstrap
         begin
-          BootstrapConsul.call(bucket: @bucket, join_all: @join_all)
+          BootstrapConsul.call!(bucket: @bucket, join_all: @join_all)
         rescue => e
           puts "Warning: #{e.message}; retrying in 5 seconds"
           Concurrent::ScheduledTask.execute(5){ tell :bootstrap }
         end
+
+        nil
       else
         pass
       end

data/lib/consul_bridge/detect_consul.rb

@@ -1,8 +1,10 @@
-require 'consul_bridge/base'
+require 'metaractor'
 require 'excon'
 
 module ConsulBridge
-  class DetectConsul < Base
+  class DetectConsul
+    include Metaractor
+
     URL = 'http://127.0.0.1:8500/v1/agent/self'.freeze
 
     def call
@@ -19,9 +21,8 @@ module ConsulBridge
       rescue Excon::Errors::SocketError, Excon::Errors::HTTPStatusError
         running = false
       end
-      OpenStruct.new(
-        running: running
-      )
+
+      context.running = running
     end
   end
 end

data/lib/consul_bridge/download_masters.rb

@@ -1,30 +1,39 @@
-require 'consul_bridge/base'
+require 'metaractor'
 require 'fog/aws'
+require 'fog/local' if ENV['FOG_LOCAL']
 
 module ConsulBridge
-  class DownloadMasters < Base
-    attr_accessor :bucket
+  class DownloadMasters
+    include Metaractor
 
-    def initialize(bucket:)
-      self.bucket = bucket
-    end
+    required :bucket
 
     def call
-      puts "Downloading master ips from bucket #{self.bucket}"
+      puts "Downloading master ips from bucket #{bucket_name}"
 
       master_ips = []
 
-      storage = Fog::Storage.new provider: 'AWS', use_iam_profile: true
-      bucket = storage.directories.get(self.bucket)
+      bucket = nil
+      if ENV['FOG_LOCAL']
+        puts 'Using fog local storage'
+        storage = Fog::Storage.new provider: 'Local', local_root: '/fog'
+        bucket = storage.directories.create(key: bucket_name)
+      else
+        storage = Fog::Storage.new provider: 'AWS', use_iam_profile: true
+        bucket = storage.directories.get(bucket_name)
+      end
+
       bucket.files.each do |file|
         master_ips << [file.last_modified, file.key]
       end
       master_ips = master_ips.sort.reverse.collect { |file| file[1] }
 
-      OpenStruct.new(
-        master_ips: master_ips
-      )
+      context.master_ips = master_ips
     end
 
+    private
+    def bucket_name
+      context.bucket
+    end
   end
 end

data/lib/consul_bridge/get_private_ip.rb

@@ -1,15 +1,15 @@
-require 'consul_bridge/base'
+require 'metaractor'
 require 'excon'
 
 module ConsulBridge
-  class GetPrivateIP < Base
+  class GetPrivateIP
+    include Metaractor
+
     URL = 'http://169.254.169.254/latest/meta-data/local-ipv4'.freeze
 
     def call
       response = Excon.get(URL, expects: [200], connect_timeout: 10, read_timeout: 10, write_timeout: 10, tcp_nodelay: true)
-      OpenStruct.new(
-        private_ip: response.body
-      )
+      context.private_ip = response.body
     end
   end
 end

data/lib/consul_bridge/join_consul.rb

@@ -1,20 +1,17 @@
-require 'consul_bridge/base'
+require 'metaractor'
 require 'consul_bridge/get_private_ip'
 require 'excon'
 
 module ConsulBridge
-  class JoinConsul < Base
-    attr_accessor :master_ips, :join_all
+  class JoinConsul
+    include Metaractor
 
-    JOIN_URL = 'http://127.0.0.1:8500/v1/agent/join'.freeze
+    required :master_ips, :join_all
 
-    def initialize(master_ips:, join_all: false)
-      self.master_ips = master_ips
-      self.join_all = join_all
-    end
+    JOIN_URL = 'http://127.0.0.1:8500/v1/agent/join'.freeze
 
     def call
-      private_ip = GetPrivateIP.call.private_ip
+      private_ip = GetPrivateIP.call!.private_ip
       puts "Detected private ip: #{private_ip}"
       puts "Starting join with [#{master_ips.join(', ')}]"
 
@@ -33,7 +30,7 @@ module ConsulBridge
           )
           puts "Joined #{ip}"
           joined += 1
-          break unless self.join_all
+          break unless join_all
         rescue Excon::Errors::HTTPStatusError, Excon::Errors::SocketError
           next
         end
@@ -46,5 +43,14 @@ module ConsulBridge
       end
     end
 
+    private
+    def master_ips
+      context.master_ips
+    end
+
+    def join_all
+      context.join_all
+    end
+
   end
 end

data/lib/consul_bridge/monitor_docker_events.rb

@@ -1,20 +1,17 @@
-require 'consul_bridge/base'
+require 'metaractor'
 require 'docker-api'
 
 module ConsulBridge
-  class MonitorDockerEvents < Base
-    attr_accessor :container_name, :handler
+  class MonitorDockerEvents
+    include Metaractor
 
-    def initialize(container_name:, handler:)
-      self.container_name = container_name
-      self.handler = handler
-    end
+    required :container_name, :handler
 
     def call
       begin
-        filters = {type: [:container], event: [:start], container: [self.container_name]}.to_json
+        filters = {type: [:container], event: [:start], container: [container_name]}.to_json
         Docker::Event.stream(filters: filters) do |event|
-          self.handler.call(event)
+          handler.call(event)
         end
       rescue Docker::Error::TimeoutError
         retry
@@ -27,5 +24,14 @@ module ConsulBridge
         end
       end
     end
+
+    private
+    def container_name
+      context.container_name
+    end
+
+    def handler
+      context.handler
+    end
   end
 end

data/lib/consul_bridge/monitor_docker_events_actor.rb

@@ -14,7 +14,7 @@ module ConsulBridge
     def on_message(message)
       if message == :monitor
         begin
-          MonitorDockerEvents.call(
+          MonitorDockerEvents.call!(
             container_name: @container_name,
             handler: ->(event){ @bootstrap_actor << :bootstrap }
           )
@@ -24,6 +24,8 @@ module ConsulBridge
             Concurrent::ScheduledTask.execute(30){ tell :monitor }
           end
         end
+
+        nil
       else
         pass
       end

data/lib/consul_bridge/run_bridge.rb

@@ -1,21 +1,21 @@
-require 'consul_bridge/base'
+require 'metaractor'
 require 'consul_bridge/bootstrap_consul_actor'
 require 'consul_bridge/monitor_docker_events_actor'
 require 'concurrent'
 
 module ConsulBridge
-  class RunBridge < Base
-    attr_accessor :bucket, :container_name, :join_all, :verbose
+  class RunBridge
+    include Metaractor
 
-    def initialize(bucket:, container_name:, join_all: false, verbose: false)
-      self.bucket = bucket
-      self.container_name = container_name
-      self.join_all = join_all
-      self.verbose = verbose
+    required :bucket, :container_name, :join_all, :verbose
+
+    before do
+      context.join_all ||= false
+      context.verbose ||= false
     end
 
     def call
-      Concurrent.use_stdlib_logger(Logger::DEBUG) if self.verbose
+      Concurrent.use_stdlib_logger(Logger::DEBUG) if verbose
 
       self_read, self_write = IO.pipe
       %w(INT TERM).each do |sig|
@@ -31,8 +31,8 @@ module ConsulBridge
       begin
         bootstrap_actor = BootstrapConsulActor.spawn(
           :bootstrap_consul,
-          bucket: self.bucket,
-          join_all: self.join_all
+          bucket: bucket,
+          join_all: join_all
         )
         bootstrap_actor << :bootstrap
 
@@ -54,6 +54,7 @@ module ConsulBridge
       end
     end
 
+    private
     def handle_signal(sig)
       case sig
       when 'INT'
@@ -62,5 +63,21 @@ module ConsulBridge
         raise Interrupt
       end
     end
+
+    def bucket
+      context.bucket
+    end
+
+    def container_name
+      context.container_name
+    end
+
+    def join_all
+      context.join_all
+    end
+
+    def verbose
+      context.verbose
+    end
   end
 end

data/lib/consul_bridge/version.rb

@@ -1,3 +1,3 @@
 module ConsulBridge
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/scripts/docker-entrypoint.sh

@@ -0,0 +1,18 @@
+#!/bin/dumb-init /bin/sh
+set -e
+
+if [ -n "$USE_BUNDLE_EXEC" ]; then
+  BINARY="bundle exec consul_bridge"
+else
+  BINARY=consul_bridge
+fi
+
+if ${BINARY} help "$1" 2>&1 | grep -q "consul_bridge $1"; then
+  set -- ${BINARY} "$@"
+
+  if [ -n "$FOG_LOCAL" ]; then
+    chown -R bridge:bridge /fog
+  fi
+fi
+
+exec "$@"

data/scripts/fetch-bundler-data.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+set -x
+
+if [ -z "$1" ]; then
+  echo 'Missing argument: bundler data host'
+  exit 0
+fi
+
+wget -T 2 -O /tmp/bundler-data.tar.gz http://${1}/bundler-data.tar.gz
+if [ $? -ne 0 ]; then
+  echo 'Unable to fetch bundler data.'
+else
+  cd /usr/local/bundle && \
+    tar -zxf /tmp/bundler-data.tar.gz && \
+    rm /tmp/bundler-data.tar.gz
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_bridge
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: metaractor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: fog-local
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: 
 email:
 - ryan@outstand.com
@@ -144,19 +172,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".gitignore"
 - Dockerfile
 - Dockerfile.release
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- build_dev.sh
 - consul_bridge.gemspec
-- docker-entrypoint.sh
 - exe/consul_bridge
 - lib/consul_bridge.rb
-- lib/consul_bridge/base.rb
 - lib/consul_bridge/bootstrap_consul.rb
 - lib/consul_bridge/bootstrap_consul_actor.rb
 - lib/consul_bridge/cli.rb
@@ -168,6 +197,8 @@ files:
 - lib/consul_bridge/monitor_docker_events_actor.rb
 - lib/consul_bridge/run_bridge.rb
 - lib/consul_bridge/version.rb
+- scripts/docker-entrypoint.sh
+- scripts/fetch-bundler-data.sh
 homepage: https://github.com/outstand/consul_bridge
 licenses: []
 metadata: {}
@@ -187,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Discover consul master nodes and join local agent

data/docker-entrypoint.sh

@@ -1,12 +0,0 @@
-#!/bin/dumb-init /bin/sh
-set -e
-
-if consul_bridge help "$1" 2>&1 | grep -q "consul_bridge $1"; then
-  set -- consul_bridge "$@"
-fi
-
-if [ "$1" = 'consul_bridge' ]; then
-  set -- gosu bridge "$@"
-fi
-
-exec "$@"

data/lib/consul_bridge/base.rb

@@ -1,13 +0,0 @@
-require 'ostruct'
-
-module ConsulBridge
-  class Base
-    def self.call(*args)
-      new(*args).call
-    end
-
-    def call
-      OpenStruct.new()
-    end
-  end
-end