gorgon 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c7715c6f11333845258e304eec73544db11135d
-  data.tar.gz: f4f2c0ca24b61ebd1e238673dbba746bb30a787f
+SHA256:
+  metadata.gz: 9724573d2e23c58b465f2420cff3d59af675e9599555daf228c55556d247ff9d
+  data.tar.gz: 3b92ad056401808c0b01e4cbc9631d77cf1114d96a507bd70df6eddd0e4b5838
 SHA512:
-  metadata.gz: 16092b5b748104343f172c539d2dd0a8e625ce2c06bb628d717e4140729c2e77536e91c68914774241eb0ba242fd9c523434915d8908239c79e1ddf2061f16e8
-  data.tar.gz: 2a08a60a432b19c46ab7170cb2c4e0061fa9a8c1cc2b42b635a54d2d342457ba92929dbc936a460c97bf8aef20b24148e9108548ef9fa7c49222575ddae148b6
+  metadata.gz: 759e075c18e5b1e9cdfb04a366156a16626835ff6edbcec56ee859a49aacbbdb5e8ccb08c04faedd226585be79c2b330ee7bec2061b5fb6af4b4b174c05553a0
+  data.tar.gz: a0b6e638d57012577d914e074e0ac7952dde717bf9ab4cff57f900c048bb97b0dbc6f7e69ca71056e4ac7e1cda3c317313530ed8f8ffcbd30dcc1346fc4bf7d0

data/.gitignore

@@ -10,7 +10,5 @@ pkg
 .idea
 .rbenv-version
 *.log
-*.json
-.rspec
 .rake_tasks
 *.gem

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,10 @@
+language: bash
+sudo: required
+services:
+  - docker
+before_script:
+  - ./run_dev_environment.sh -d
+  - sleep 15
+  - ./run_listener.sh &
+  - ./run_gorgon.sh || true # ignore error status from gorgon run
+script: ./run_test.sh

data/Dockerfile

@@ -0,0 +1,25 @@
+FROM ruby:2.1.6-slim
+
+RUN apt-get update -y && apt-get install -y \
+  build-essential \
+  git \
+  net-tools # we need ifconfig
+
+RUN mkdir -p ~/.ssh
+
+ADD spec/dummy/test_gorgon.pem .
+RUN mv test_gorgon.pem ~/.ssh/id_rsa && chmod 400 ~/.ssh/id_rsa
+
+WORKDIR '/opt/gorgon'
+
+RUN gem install bundler
+ADD ["Gemfile", "Gemfile.lock", "gorgon.gemspec", "./"]
+ADD ["lib/gorgon/version.rb", "lib/gorgon/"]
+RUN bundle install
+
+ADD . .
+
+RUN gem build gorgon.gemspec && gem install gorgon
+RUN cd spec/dummy
+
+ENTRYPOINT ["/bin/bash", "-c", "sleep infinity"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gorgon (0.11.0)
+    gorgon (0.11.1)
       amq-protocol (~> 1.9.2)
       amqp (~> 1.1.0)
       awesome_print
@@ -10,7 +10,7 @@ PATH
       open4 (~> 1.3.0)
       ruby-progressbar (~> 1.7.5)
       uuidtools (= 2.1.3)
-      yajl-ruby (= 1.1.0)
+      yajl-ruby (= 1.3.1)
 
 GEM
   remote: http://rubygems.org/
@@ -19,24 +19,29 @@ GEM
     amqp (1.1.8)
       amq-protocol (>= 1.9.2)
       eventmachine
-    awesome_print (1.7.0)
+    awesome_print (1.8.0)
     colorize (0.5.8)
-    diff-lcs (1.1.3)
+    diff-lcs (1.3)
     eventmachine (1.0.9.1)
     open4 (1.3.4)
     rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     ruby-progressbar (1.7.5)
     test-unit (2.5.2)
     uuidtools (2.1.3)
-    yajl-ruby (1.1.0)
+    yajl-ruby (1.3.1)
 
 PLATFORMS
   ruby
@@ -44,8 +49,8 @@ PLATFORMS
 DEPENDENCIES
   gorgon!
   rake
-  rspec (~> 2.11.0)
+  rspec (~> 3.5.0)
   test-unit
 
 BUNDLED WITH
-   1.13.1
+   1.16.1

data/README.md

@@ -1,8 +1,4 @@
-Gorgon
-=====================
-
-[![Gem Version](https://badge.fury.io/rb/gorgon.png)](https://rubygems.org/gems/gorgon)
-[![Code Climate](https://codeclimate.com/github/Fitzsimmons/Gorgon.png)](https://codeclimate.com/github/Fitzsimmons/Gorgon)
+# Gorgon [![Build Status](https://travis-ci.org/nulogy/Gorgon.svg?branch=master)](https://travis-ci.org/nulogy/Gorgon) [![Gem Version](https://badge.fury.io/rb/gorgon.svg)](https://rubygems.org/gems/gorgon) [![Code Climate](https://codeclimate.com/github/nulogy/Gorgon/badges/gpa.svg)](https://codeclimate.com/github/nulogy/Gorgon)
 
 About
 ---------------------
@@ -26,6 +22,7 @@ Gotchas
 
 Also note that the steps in the tutorial are **not** meant to work on every project, they will only give you initial settings. You will probably have to modify the following files:
 * gorgon.json
+* gorgon_secret.json
 * {test, spec}/gorgon_callbacks/gorgon_callbacks.rb
 * gorgon_listener.json (located in your project root or in ~/.gorgon/)
 
@@ -47,6 +44,11 @@ This file contains project-specific settings for gorgon, such as:
 
 See [gorgon.json example](/gorgon.json.sample) for an example file.
 
+### gorgon_secret.json (optional)
+This optional file contains sensitive information such as passwords that cannot be put in gorgon.json.
+
+See [gorgon_secret.json example](/gorgon_secret.json.sample) for an example file.
+
 ### gorgon_listener.json
 This file contains the listener-specific settings, such as:
 
@@ -60,6 +62,31 @@ Contributing
 ---------------------
 Read overview [architecture](/architecture.md)
 
+### Requirements:
+
+* You only need [Docker](https://docs.docker.com/docker-for-mac/install/)
+
+### Prepare your environment
+
+* Execute `./run_dev_environment.sh`
+* In a new terminal tab, execute `./run_listener.sh`
+
+**NOTE:** If you make changes changes to `listener` code, you must restart `./run_listener.sh` for those changes to take effect
+
+### Running all tests
+
+* `./run_test.sh`
+
+### Running gorgon using the `spec/dummy` project
+
+* `./run_gorgon.sh`
+
+Releasing to RubyGems
+---------------------
+
+1. Update `version.rb`
+1. Run `rake release`
+
 Credits
 ---------------------
 Gorgon is maintained by:
@@ -67,4 +94,4 @@ Gorgon is maintained by:
 * Arturo Pie
 
 Gorgon is funded by [Nulogy Corp](http://www.nulogy.com/).
-Thank you to all the [contributors](https://github.com/Fitzsimmons/Gorgon/contributors).
+Thank you to all the [contributors](https://github.com/nulogy/Gorgon/contributors).

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:spec]

data/architecture.md

@@ -1,7 +1,7 @@
 Architecture
 ---------------------
 
-[Gorgon](https://github.com/Fitzsimmons/Gorgon/) distributes a test suite across multiple machines. So you can use all the computer power in your office to run your tests in parallel.
+[Gorgon](https://github.com/nulogy/Gorgon/) distributes a test suite across multiple machines. So you can use all the computer power in your office to run your tests in parallel.
 
 These are the main components of Gorgon's architecture:
 
@@ -33,7 +33,7 @@ When a *listener* receives a *job definition*, it:
 After WorkerManager starts, it:
 
 * Runs before_creating_workers callback
-* Forks n workers, where n is the number of available worker slots specified in [gorgon configuration](https://github.com/Fitzsimmons/Gorgon/blob/master/gorgon_listener.json.sample).
+* Forks n workers, where n is the number of available worker slots specified in [gorgon configuration](https://github.com/nulogy/Gorgon/blob/master/gorgon_listener.json.sample).
 * Subscribes to a queue where originator can send a cancel_job message
 
 Each Worker:

data/bin/gorgon

@@ -1,116 +1,4 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
-require 'gorgon'
-require 'gorgon/originator'
-require 'gorgon/listener'
-require 'gorgon/rsync_daemon'
-require 'gorgon/worker_manager'
-require 'gorgon/ping_service'
-require 'gorgon/gem_service'
-require 'gorgon/version'
-require 'gorgon/listener_installer'
-require 'gorgon/settings/initial_files_creator'
-
-WELCOME_MSG = "Welcome to Gorgon #{Gorgon::VERSION}"
-
-def start
-  o = Originator.new
-  exit o.originate
-end
-
-def listen
-  l = Listener.new
-  l.listen
-end
-
-def start_rsync_daemon
-  puts "Starting rsync daemon..."
-  exit 1 unless RsyncDaemon.start ARGV[1]
-  puts "Rsync Daemon is running. Use 'gorgon stop_rsync' to kill it."
-end
-
-def stop_rsync_daemon
-  puts "Stopping rsync daemon..."
-  exit 1 unless RsyncDaemon.stop
-  puts "Done"
-end
-
-def manage_workers
-  config_path = ENV["GORGON_CONFIG_PATH"]
-
-  manager = WorkerManager.build config_path
-  manager.manage
-
-  # For some reason I have to 'exit' here, otherwise WorkerManager process crashes
-  exit
-end
-
-def ping_listeners
-  PingService.new.ping_listeners
-end
-
-def run_gem command
-  GemService.new.run command
-end
-
-def init framework
-  Settings::InitialFilesCreator.run framework
-end
-
-def install_listener
-  ListenerInstaller.install
-end
-
-def usage
-  #print instructions on how to use gorgon
-  puts "\tstart - remotely runs all tests specified in gorgon.json"
-  puts "\tlisten - starts a listener process using the settings in gorgon_listener.json"
-  puts "\tping - pings listeners and shows hosts and gorgon's version they are running"
-  puts "\tinit [rails] - create initial files for current project"
-  puts "\tinstall_listener - runs gorgon listener as a daemon process"
-  puts "\tstart_rsync <directory> - start rsync daemon. Run this command in File Server"
-  puts "\tstop_rsync - stop rsync daemon."
-  puts "\tgem command [options...] - execute the gem command on every listener and shutdown listener. e.g. 'gorgon gem install --version 1.0.0'"
-end
-
-case ARGV[0] # special case for 'version', because we don't need the welcome message telling us the version when we're explicitly asking for it
-when "version", "--version"
-  puts Gorgon::VERSION
-  exit
-end
-
-puts WELCOME_MSG
-
-case ARGV[0]
-when nil
-  start
-when "help", "--help"
-  usage
-  exit
-when "start"
-  start
-when "listen"
-  listen
-when "start_rsync"
-  start_rsync_daemon
-when "stop_rsync"
-  stop_rsync_daemon
-when "manage_workers"
-  manage_workers
-when "ping"
-  ping_listeners
-when "gem"
-  ARGV.shift
-  run_gem ARGV.join(' ')
-when "help"
-  usage
-when "init"
-  init ARGV[1]
-when "install_listener"
-  install_listener
-else
-  puts "Unknown command!"
-  usage
-  exit 1
-end
+require 'gorgon/command'
+Gorgon::Command.run(ARGV)

data/daemon_with_upstart_and_rvm.md

@@ -5,7 +5,7 @@ These steps will guarantee that the listener is always running and it will start
 1. `mkdir ~/.gorgon && cd ~/.gorgon`
 1. `rvm use ruby-1.9.3` or whatever version of ruby you use.
 1. `gem install gorgon foreman`
-1. Place your _gorgon\_listener.json_ in this directory. See [here](https://github.com/Fitzsimmons/Gorgon/blob/master/gorgon_listener.json.sample) for a _gorgon\_listener.json_ example.
+1. Place your _gorgon\_listener.json_ in this directory. See [here](https://github.com/nulogy/Gorgon/blob/master/gorgon_listener.json.sample) for a _gorgon\_listener.json_ example.
 1. `echo 'listener: [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" && `
    `rvm ruby-1.9.3 do gorgon listen > listener.out 2> listener.err' > Procfile`
 1. ``rvmsudo foreman export upstart /etc/init -a gorgon -u `whoami` -c listener=1``

data/docker-compose.yml

@@ -0,0 +1,28 @@
+version: '3'
+services:
+  rabbitmq:
+    image: "rabbitmq:alpine"
+    ports:
+      - "5672:5672"
+  file_server:
+    build: "file_server"
+    volumes:
+      - .:/opt/gorgon
+  listener:
+    container_name: "gorgon_listener"
+    build: .
+    entrypoint: "sleep infinity"
+    hostname: listener
+    volumes:
+      - .:/opt/gorgon
+    depends_on:
+      - rabbitmq
+  originator:
+    container_name: "gorgon_originator"
+    build: .
+    entrypoint: "sleep infinity"
+    volumes:
+      - .:/opt/gorgon
+    depends_on:
+      - rabbitmq
+

data/file_server/Dockerfile

@@ -0,0 +1,8 @@
+FROM rastasheep/ubuntu-sshd:16.04
+
+RUN apt-get update && apt-get install -y rsync
+
+ADD test_gorgon.pem.pub .
+
+RUN mkdir -p ~/.ssh \
+  && cat test_gorgon.pem.pub >> ~/.ssh/authorized_keys

data/file_server/test_gorgon.pem.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1d8JdZfeqU4sSuHBf05UQUradgWds1W6UFkTm89ZsPAFTJNLO40A603tyYX/kYWdYmbZQev4ExznIpZDChdqTojjjP1qnFESv9NcBUERHo3I79mp2PanQfFnL0VkcJw9XbDAZITc7lTyZymGZZL3FiGNWGiik3m+OhuBebqJ7shhUm9i+1k4LEIEqYPERMOX0dimHJLCw2Fzh+89piYM/yOTZIY3tneDaQPwU6Z7ytRR1g1B+eLaXsCrihE1SeXjy/powYqpbz1EB34uD+aM9Vwiyb/rtcfkTQWA69UA9Niqd7TpsGllyQeu7jbFQ82WQe2GIv09ukG5hVg0pD2Bb arturopie@arturop-mac-2.local

data/gorgon.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_development_dependency "test-unit"
-  s.add_development_dependency "rspec", '~>2.11.0'
+  s.add_development_dependency "rspec", '~>3.5.0'
 
   s.add_runtime_dependency "amqp", '~> 1.1.0'
   s.add_runtime_dependency "amq-protocol", '~> 1.9.2'
@@ -32,6 +32,6 @@ Gem::Specification.new do |s|
 
   # this dependencies are clashing with one of our apps
   # This problem should be fixed
-  s.add_runtime_dependency "yajl-ruby", '=1.1.0'
+  s.add_runtime_dependency "yajl-ruby", '=1.3.1'
   s.add_runtime_dependency "uuidtools", '=2.1.3'
 end

data/gorgon_secret.json.sample

@@ -0,0 +1,5 @@
+{
+  "connection": {
+    "password": "password"
+  }
+}

data/lib/gorgon/amqp_service.rb

@@ -1,39 +1,41 @@
 require 'gorgon_bunny/lib/gorgon_bunny'
 require 'yajl'
 
-class AmqpQueueDecorator
-  def initialize queue
-    @queue = queue
-  end
+module Gorgon
+  class AmqpQueueDecorator
+    def initialize queue
+      @queue = queue
+    end
 
-  def pop
-    m = @queue.pop
-    payload = m[2]
-    return payload
+    def pop
+      m = @queue.pop
+      payload = m[2]
+      return payload
+    end
   end
-end
 
-class AmqpExchangeDecorator
-  def initialize exchange
-    @exchange = exchange
-  end
+  class AmqpExchangeDecorator
+    def initialize exchange
+      @exchange = exchange
+    end
 
-  def publish msg
-    serialized_msg = Yajl::Encoder.encode(msg)
-    @exchange.publish serialized_msg
+    def publish msg
+      serialized_msg = Yajl::Encoder.encode(msg)
+      @exchange.publish serialized_msg
+    end
   end
-end
 
-class AmqpService
-  def initialize connection_config
-    @connection_config = connection_config.merge(:spec => "09")
-  end
+  class AmqpService
+    def initialize connection_config
+      @connection_config = connection_config.merge(:spec => "09")
+    end
 
-  def start_worker file_queue_name, reply_exchange_name
-    GorgonBunny.run @connection_config do |b|
-      queue = b.queue(file_queue_name, :auto_delete => true)
-      exchange = b.exchange(reply_exchange_name, :auto_delete => true)
-      yield AmqpQueueDecorator.new(queue), AmqpExchangeDecorator.new(exchange)
+    def start_worker file_queue_name, reply_exchange_name
+      GorgonBunny.run @connection_config do |b|
+        queue = b.queue(file_queue_name, :auto_delete => true)
+        exchange = b.exchange(reply_exchange_name, :auto_delete => true)
+        yield AmqpQueueDecorator.new(queue), AmqpExchangeDecorator.new(exchange)
+      end
     end
   end
 end