distribot 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db814502a907c2befbabb87810c13137de6b8afd
-  data.tar.gz: 2e6340ecde7e9c48f56da40be373b84fd4f4bfc5
+  metadata.gz: 07ee26e565a08fa420f1de3dc923576e6ec23cad
+  data.tar.gz: 30a0aa682bd3980696528d89831c4e3af4b546a0
 SHA512:
-  metadata.gz: 504d2cc1fc81af0a6e8bc4bd8d90b48495ade2cde749ba1aaebe10488e78278e5587c396ea516b3d7546cfaac2a2e0aaadf565672e9bd4628807f889c7f7a600
-  data.tar.gz: 301e5e4b4c9e648ffc46b2417cd8213df34963e615dce9cd5e98a2a6ae328505c9dfee16ccba8f5982629466138a50f72b5c66771872adecf6c5d10dce60f666
+  metadata.gz: 3dc00eb1f02d685570ca398deb7d432fcefdedeae64996d8d94bdd7e48154fbfc380c57fd9b65e0d252d26e701759489dc6f6c19edf3ebe536369b8ef0649e9a
+  data.tar.gz: 1d681b5e718583624d7e52dfad6226f7f06f2cd7c1a9c52a1a8577f7b476d233c5bb12063c0d48b04efaab955b0a949006d0a5ace27a8b1f4cb3ec6c84c6c96f

data/.docker/Dockerfile.base

@@ -0,0 +1,24 @@
+
+FROM ubuntu:15.10
+
+RUN \
+  apt-get update \
+  && apt-get install -y \
+    sudo \
+    curl \
+    ruby2.2 \
+    ruby2.2-dev \
+    build-essential \
+    git \
+  && gem2.2 install bundler --no-ri --no-rdoc \
+  && gem2.2 install foreman --no-ri --no-rdoc \
+  && useradd -d /home/ubuntu -m -s /bin/bash ubuntu \
+  && echo "ubuntu:changeme" | chpasswd \
+  && echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
+  && sed -i s#/home/ubuntu:/bin/false#/home/ubuntu:/bin/bash# /etc/passwd
+
+COPY Gemfile /tmp/Gemfile
+COPY Gemfile.lock /tmp/Gemfile.lock
+COPY distribot.gemspec /tmp/distribot.gemspec
+USER ubuntu
+RUN cd /tmp/ && bundle

data/distribot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'distribot'
-  spec.version     = '0.1.9'
+  spec.version     = '0.1.10'
   spec.authors     = ['John Drago']
   spec.email       = 'jdrago.999@gmail.com'
   spec.homepage    = 'https://github.com/distribot/distribot'

data/lib/distribot/connector.rb

@@ -20,7 +20,8 @@ module Distribot
       uri.scheme = 'http'
       uri.port = '15672'.to_i
       uri.path = '/api/queues'
-      JSON.parse( Net::HTTP.get_response(URI(uri.to_s)).body ).map{ |x| x['name'] }
+      # XXX: Awful hack because Net::HTTP.get fails with 401.
+      JSON.parse( `curl #{uri.to_s}` ).map{ |x| x['name'] }
     end
 
     def logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distribot
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - John Drago
@@ -232,12 +232,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .docker/Dockerfile.base
+- .docker/Dockerfile.bundle
 - .gitignore
 - .rspec
 - .rubocop.yml
 - .travis.yml
-- Dockerfile
-- Dockerfile.bundle
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -268,8 +268,6 @@ files:
 - lib/distribot/phase_started_handler.rb
 - lib/distribot/task_finished_handler.rb
 - lib/distribot/worker.rb
-- provision/nodes.sh
-- provision/templates/fluentd.conf
 - spec/distribot/bunny_connector_spec.rb
 - spec/distribot/connection_sharer_spec.rb
 - spec/distribot/connector_spec.rb

data/Dockerfile

@@ -1,9 +0,0 @@
-
-FROM ubuntu:14.04
-RUN useradd -d /home/ubuntu -m -s /bin/bash ubuntu
-ADD ./ /var/www/distribot
-RUN echo "ubuntu:changeme" | chpasswd
-RUN echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-RUN sed -i s#/home/ubuntu:/bin/false#/home/ubuntu:/bin/bash# /etc/passwd
-USER ubuntu
-WORKDIR /var/www/distribot

data/provision/nodes.sh

@@ -1,80 +0,0 @@
-#!/bin/bash
-
-set -e
-
-setup_dependencies() {
-  sudo apt-get -y update
-  sudo apt-get -y autoremove
-  sudo apt-get install -y \
-    ruby2.0 \
-    ruby2.0-dev \
-    build-essential \
-    git \
-    wget \
-    vim \
-    librabbitmq-dev \
-    psmisc \
-    curl \
-    libcurl4-gnutls-dev \
-    python
-
-  sudo ln -sf /usr/bin/ruby2.0 /usr/bin/ruby && sudo ln -sf /usr/bin/gem2.0 /usr/bin/gem
-
-  if ! gem list | grep bundler; then
-    sudo gem install bundler --no-ri --no-rdoc
-  fi
-
-  # Don't fail because we haven't added github.com's ssh key to our known_hosts:
-  cat <<EOF | sudo tee -a /etc/ssh/ssh_config > /dev/null
-Host github.com
-    StrictHostKeyChecking no
-EOF
-
-  sudo gem install eye --no-ri --no-rdoc
-}
-
-setup_fluentd() {
-  if [ -f /etc/init.d/td-agent ]; then
-    echo "fluentd is already installed"
-  else
-    curl -L http://toolbelt.treasuredata.com/sh/install-ubuntu-trusty-td-agent2.sh | sudo sh
-  fi
-
-  if td-agent-gem list | grep fluent-plugin-elasticsearch; then
-    echo "fluent-plugin-elasticsearch is already installed"
-  else
-    sudo td-agent-gem install fluent-plugin-elasticsearch -v 0.7.0 --no-ri --no-rdoc
-  fi
-
-  if grep "distribot" /etc/rsyslog.conf; then
-    echo "syslogd already forwarding events to fluentd"
-  else
-    echo '!distribot' | sudo tee -a /etc/rsyslog.conf
-    echo "*.* @127.0.0.1:42185" | sudo tee -a /etc/rsyslog.conf
-  fi
-
-  sudo cp provision/templates/fluentd.conf /etc/td-agent/td-agent.conf
-
-  sudo service rsyslog restart
-
-  # Finally, restart td-agent:
-  sudo service td-agent restart
-}
-
-setup_dependencies
-
-while ! ( echo -e "443\n6379\n5672" | xargs -i nc -w 1 -zv $INFRA_HOST {} ) ; do
-  echo "Waiting for infra to come up..."
-  sleep 5
-done
-
-setup_fluentd
-
-cd /var/www/distribot
-bundle
-
-echo '--------------------------------------------------------------------------'
-echo '--------------------------------------------------------------------------'
-echo '--------------------------------------------------------------------------'
-echo '--------------------------------------------------------------------------'
-echo '--------------------------------------------------------------------------'

data/provision/templates/fluentd.conf

@@ -1,27 +0,0 @@
-
-
-<source>
-  type syslog
-  port 42185
-  bind 127.0.0.1
-  tag syslog
-</source>
-
-<match **>
-  type copy
-  <store>
-    type stdout
-  </store>
-
-  <store>
-    type elasticsearch
-    logstash_format true
-    flush_interval 5s
-    type_name distribot
-
-    # We post data to https://<elasticsearch_hostname>/elastic/<index_name>/
-    hosts https://infra/elastic/
-    index_name distribot
-  </store>
-
-</match>