aide 0.1.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 913b87b1b83f1ddbfc8d738b14e80fa2f8c20cf4
-  data.tar.gz: 2601657bfb9457f09d2fedfbfb3adb82956bad21
+SHA256:
+  metadata.gz: 16ee63237abd5377a1cd568f5b2b02fa86a6a8b1e83a3afebc5cf785146b8071
+  data.tar.gz: 56f88a4269a3e36646bcf89a65c219403a506189924e39a3640eb784b445ebe3
 SHA512:
-  metadata.gz: fd22e13b823f658d3dc8e795a2535e5e8f5b579736507ace32a1db6668d262a87eac6c23a30cd0aa3720019c37264c029aa01748a7a9ef1a22eecc7b014705d1
-  data.tar.gz: f0dc8b980e0b17a68b8914975cec967bc8a0ed6d3ad12c6e20e525f752fc136407a1dc01e82425ce41e5bed74f2e383b86d27366d6043de0ccfad6482e9eca70
+  metadata.gz: b2f53cdf68945d364acbff07f40a75220698bbf2cfdab469b21911588fc3ada2ec894fc9fc828ee1ca583bc7d8bf7a3245f0a0ea6b1eb251016e16e159ec9ba8
+  data.tar.gz: c5841984bd8895c7a6a255008744315ba2eda0d48e0a508014559b0426f33c4ab32b3e0fd7a3700a057f866db609ab16768327eeab211df1afd708abae576ea9

data/Deskfile

@@ -0,0 +1,15 @@
+rspec() {
+  dev run --rm aide rspec "$@"
+}
+
+rake() {
+  dev run --rm aide rake "$@"
+}
+
+bundle() {
+  dev run --rm aide bundle "$@"
+}
+
+release_gem() {
+  dev run --rm release_gem
+}

data/Dockerfile

@@ -0,0 +1,21 @@
+FROM 786715713882.dkr.ecr.us-east-1.amazonaws.com/fixuid as fixuid
+
+FROM 786715713882.dkr.ecr.us-east-1.amazonaws.com/ruby-test:3.1.2
+LABEL maintainer="Ryan Schlesinger <ryan@outstand.com>"
+
+COPY --from=fixuid /usr/local/bin/fixuid /usr/local/bin/fixuid
+COPY --from=fixuid /etc/fixuid/config.yml /etc/fixuid/config.yml
+RUN chmod 4755 /usr/local/bin/fixuid
+
+RUN groupadd -g 1000 deploy && \
+      useradd -u 1000 -g deploy -ms /bin/bash deploy
+
+COPY --chown=deploy:deploy docker/irbrc /home/deploy/.irbrc
+
+COPY docker/tools-entrypoint.sh /tools-entrypoint.sh
+COPY docker/entrypoint.sh /docker-entrypoint.sh
+
+EXPOSE 3000
+EXPOSE 7787
+ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"]
+CMD ["rails", "server", "-b", "0.0.0.0"]

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in aide.gemspec
 gemspec
+
+gem "standard", group: [:development, :test]

data/README.md

@@ -1,8 +1,6 @@
 # Aide
 
-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/aide`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Glue between consul and your rails app.
 
 ## Installation
 
@@ -20,17 +18,14 @@ Or install it yourself as:
 
     $ gem install aide
 
-## Usage
-
-TODO: Write usage instructions here
-
 ## 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.
-
-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).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/aide.
+- `desk go`
+- `dev build --pull aide`
+- `rspec specs` to run specs
+- Set the application path in the volumes section in `compose.yml`.
 
+To release a new version:
+- Update the version number in `version.rb` and commit the result.
+- `dev build --pull aide`
+- `release_gem`

data/aide.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.3"
+  spec.add_development_dependency "rake", "~> 13"
 
   spec.add_runtime_dependency 'diplomat'
 end

data/compose.yml

@@ -0,0 +1,35 @@
+services:
+  aide:
+    build:
+      context: .
+    image: outstand/aide:dev
+    working_dir: ${WORKSPACE_DIR}
+    volumes:
+      - bundler-data:/usr/local/bundle
+      - .:${WORKSPACE_DIR}
+    ports:
+      - "3000"
+    environment:
+      FIXUID:
+      FIXGID:
+      WORKSPACE_DIR:
+
+  release_gem:
+    image: outstand/aide:dev
+    command: rake release
+    working_dir: ${WORKSPACE_DIR}
+    environment:
+      FIXUID:
+      FIXGID:
+      WORKSPACE_DIR:
+    volumes:
+      - bundler-data:/usr/local/bundle
+      - .:${WORKSPACE_DIR}
+      - ~/.dotfiles/config/git/gitconfig:/home/deploy/.gitconfig
+      - ~/.dotfiles/config/git/gitconfig.user:/home/deploy/.gitconfig.user
+      - ~/.config/gh/hosts.yml:/home/deploy/.config/gh/hosts.yml
+      - ~/.local/share/gem/credentials:/home/deploy/.local/share/gem/credentials
+      - ~/.local/share/gem/credentials:/home/deploy/.gem/credentials
+
+volumes:
+  bundler-data:

data/docker/chown-dirs.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+chown_dir() {
+  dir=$1
+  if [[ -d "${dir}" ]] && [[ "$(stat -c %u:%g "${dir}")" != "${FIXUID}:${FIXGID}" ]]; then
+    echo chown "$dir"
+    chown deploy:deploy "$dir"
+  fi
+}
+
+chown_r_dir() {
+  dir=$1
+  if [[ -d "${dir}" ]] && [[ "$(stat -c %u:%g "${dir}")" != "${FIXUID}:${FIXGID}" ]]; then
+    echo chown -R "$dir"
+    chown -R deploy:deploy "$dir"
+  fi
+}
+
+ensure_dir() {
+  dir=$1
+  mkdir -p "$dir"
+
+  chown_dir "$dir"
+}
+
+chown_r_dir "${WORKSPACE_DIR}"
+
+chown_dir /usr/local/bundle
+ensure_dir /home/deploy/.config/irb

data/docker/entrypoint.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -euo pipefail
+
+su-exec "${FIXUID:?Missing FIXUID var}:${FIXGID:?Missing FIXGID var}" fixuid
+
+"${WORKSPACE_DIR}/docker/chown-dirs.sh"
+set +e
+su-exec deploy touch /home/deploy/.config/irb/irb_history
+su-exec deploy ln -s /home/deploy/.config/irb/irb_history /home/deploy/.irb_history
+set -e
+
+install_tls_certs() {
+  if [ -n "$(ls -A /usr/local/share/ca-certificates)" ]; then
+    echo "Updating ca-certificates"
+    update-ca-certificates
+  fi
+}
+install_tls_certs
+
+if [[ "$1" = 'bundle' ]] || [[ "$1" = 'yarn' ]]; then
+  set -- su-exec deploy "$@"
+  exec "$@"
+elif [ "$1" = 'rake' ] && [ "$2" = 'release' ]; then
+  set -- su-exec deploy "$@"
+  exec "$@"
+fi
+
+set -- su-exec deploy bundle exec "$@"
+
+rm -f "${WORKSPACE_DIR}/tmp/pids/server.pid"
+
+exec "$@"

data/docker/irbrc

@@ -0,0 +1,9 @@
+IRB.conf[:SAVE_HISTORY] = 1000
+IRB.conf[:USE_AUTOCOMPLETE] = false
+
+if Reline
+  Reline.dialog_default_bg_color = :black
+  Reline.dialog_default_fg_color = :red
+  Reline.dialog_highlight_bg_color = :blue
+  Reline.dialog_highlight_fg_color = :white
+end

data/docker/tools-entrypoint.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -euo pipefail
+
+su-exec "${FIXUID:?Missing FIXUID var}:${FIXGID:?Missing FIXGID var}" fixuid > /dev/null 2>&1
+
+"${WORKSPACE_DIR}/docker/chown-dirs.sh" > /dev/null
+
+chown_r_dir() {
+  dir="$1"
+  if [[ -d "${dir}" ]] && [[ "$(stat -c %u:%g "${dir}")" != "${FIXUID}:${FIXGID}" ]]; then
+    echo chown -R "$dir"
+    chown -R deploy:deploy "$dir"
+  fi
+}
+
+ensure_dir() {
+  dir=$1
+  mkdir -p "$dir"
+
+  chown_r_dir "$dir"
+}
+
+ensure_dir /home/deploy/.solargraph/cache > /dev/null
+
+if [ "${1:-}" = "bash" ]; then
+  exec "$@"
+elif [ "${1:-}" = "exit" ]; then
+  exit 0
+fi
+
+set -- su-exec deploy "$@"
+exec "$@"

data/lib/aide/config.rb

@@ -25,10 +25,23 @@ module Aide
       self.service_address_method = SERVICE_ADDRESS_METHOD
     end
 
-    def add_service(name:, url:nil, auth:nil, user_key:nil, password_key:nil, protocol_key:nil, multi_url:nil, node:nil, database_key:nil, allow_missing:false)
+    def add_service(
+      name:,
+      url: nil,
+      url_env_key: nil,
+      auth: nil,
+      user_key: nil,
+      password_key: nil,
+      protocol_key: nil,
+      multi_url: nil,
+      node: nil,
+      database_key: nil,
+      allow_missing: false
+    )
       services[name] = {
         name: name,
         url: url,
+        url_env_key: url_env_key,
         multi_url: multi_url,
         auth: auth,
         user_key: user_key,

data/lib/aide/service.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Aide
   class Service
     attr_accessor :name
@@ -15,7 +17,13 @@ module Aide
     alias port ServicePort
 
     def url(filtered: false)
-      template = config[:url]
+      template =
+        if !config[:url_env_key].nil?
+          ENV[config[:url_env_key]]
+        else
+          config[:url]
+        end
+
       return if template.nil?
 
       return if empty? && !config[:allow_missing]
@@ -55,7 +63,7 @@ module Aide
     end
 
     def multi_url!
-      self.multi_url.tap do |orig_url|
+      multi_url.tap do |orig_url|
         raise MissingService.new(name) if orig_url.nil?
       end
     end
@@ -68,6 +76,12 @@ module Aide
       end
     end
 
+    def host
+      return address if url.nil?
+
+      URI.parse(url).host
+    end
+
     def auth(filtered: false)
       template = config[:auth]
 
@@ -113,7 +127,7 @@ module Aide
     end
 
     def node!
-      self.node.tap do |orig_node|
+      node.tap do |orig_node|
         raise MissingService.new(name) if orig_node.nil?
       end
     end
@@ -124,12 +138,14 @@ module Aide
 
     def user
       return if user_key.nil?
+      return @user if defined?(@user)
 
-      @user ||= begin
-                      user = Diplomat::Kv.get(user_key, {}, :return)
-                      user = nil if user == ""
-                      user
-                    end
+      @user =
+        begin
+          user = Diplomat::Kv.get(user_key, {}, :return)
+          user = nil if user == ""
+          user
+        end
     end
 
     def password_key
@@ -138,12 +154,14 @@ module Aide
 
     def password
       return if password_key.nil?
+      return @password if defined?(@password)
 
-      @password ||= begin
-                      password = Diplomat::Kv.get(password_key, {}, :return)
-                      password = nil if password == ""
-                      password
-                    end
+      @password =
+        begin
+          password = Diplomat::Kv.get(password_key, {}, :return)
+          password = nil if password == ""
+          password
+        end
     end
 
     def protocol_key
@@ -152,12 +170,14 @@ module Aide
 
     def protocol
       return if protocol_key.nil?
+      return @protocol if defined?(@protocol)
 
-      @protocol ||= begin
-                      protocol = Diplomat::Kv.get(protocol_key, {}, :return)
-                      protocol = nil if protocol == ""
-                      protocol
-                    end
+      @protocol =
+        begin
+          protocol = Diplomat::Kv.get(protocol_key, {}, :return)
+          protocol = nil if protocol == ""
+          protocol
+        end
     end
 
     def database_key
@@ -166,12 +186,14 @@ module Aide
 
     def database
       return if database_key.nil?
+      return @database if defined?(@database)
 
-      @database ||= begin
-                      database = Diplomat::Kv.get(database_key, {}, :return)
-                      database = nil if database == ""
-                      database
-                    end
+      @database =
+        begin
+          database = Diplomat::Kv.get(database_key, {}, :return)
+          database = nil if database == ""
+          database
+        end
     end
 
     def empty?
@@ -179,16 +201,23 @@ module Aide
     end
 
     private
+
     def service
-      @service ||= Diplomat::Service.get(name)
+      return @service if defined?(@service)
+
+      @service = Diplomat::Service.get(name)
     end
 
     def services
-      @services || Diplomat::Service.get(name, :all)
+      return @services if defined?(@services)
+
+      @services = Diplomat::Service.get(name, :all)
     end
 
     def config
-      @config ||= Aide.config.get_service(name: name)
+      return @config if defined?(@config)
+
+      @config = Aide.config.get_service(name: name)
     end
   end
 end

data/lib/aide/version.rb

@@ -1,3 +1,3 @@
 module Aide
-  VERSION = '0.1.6'
+  VERSION = '1.0.0'
 end

data/lib/aide.rb

@@ -11,7 +11,7 @@ module Aide
     attr_writer :services
 
     def service(name)
-      self.services[name] ||= Aide::Service.new(name: name)
+      services[name] ||= Aide::Service.new(name: name)
     end
 
     def config
@@ -19,23 +19,32 @@ module Aide
     end
 
     def configure(&block)
-      self.config.instance_eval(&block)
+      config.instance_eval(&block)
+      load_services
     end
 
     def display_services
-      load_services
-
       puts "Aide Services (Using #{config.service_address_key}):"
-      self.services.each do |name, service|
-        puts "==> #{name}: #{service.address}#{service.port.nil? ? '' : ":#{service.port}"} #{service.display_url(filtered: true)}".strip
+
+      services.each do |name, service|
+        puts "==> #{name}: #{formatted_service(service: service)}"
       end
     end
 
     private
+
     def load_services
-      self.config.services.keys.each do |name|
+      config.services.each_key do |name|
         service(name)
       end
     end
+
+    def service_port(service:)
+      service.port.nil? ? '' : ":#{service.port}"
+    end
+
+    def formatted_service(service:)
+      "#{service.address}#{service_port(service: service)} #{service.display_url(filtered: true)}".strip
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aide
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -60,12 +60,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Deskfile
+- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
 - aide.gemspec
 - bin/console
 - bin/setup
+- compose.yml
+- docker/chown-dirs.sh
+- docker/entrypoint.sh
+- docker/irbrc
+- docker/tools-entrypoint.sh
 - lib/aide.rb
 - lib/aide/config.rb
 - lib/aide/error.rb
@@ -89,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A configuration helper for Diplomat