robot_sweatshop 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dba386e07d0e4cced4e3f798b2e8b0bad86f7fbf
-  data.tar.gz: d45191b2778dd0da0c68a3fa894af7b69adc6155
+  metadata.gz: edaa6abb2f131c571be0f100430763222e988055
+  data.tar.gz: dd254380c37b2e7cc946d077e01f5114bf15f609
 SHA512:
-  metadata.gz: bacf799921528b9999ba5f4bf14f007f471dc25804ac573f7a0024ee0911e5120bb8cdabd7525a74b2fa4fa8740b0461738fb2d9fe83d9c7012a3367f1eb7d99
-  data.tar.gz: 6f1799495398e16f2d50e3be43728513367dece4c5a7cca81354aaeb4893e656b85e88e869cb783e232fcce85c1631c25d3a0a578af10430ea098c439ccec9e2
+  metadata.gz: 67a7804817f3f55a23e147a5cb2f15043b34cc906c6783a4bd55dce02ce846ee7d9b442b1c51d96477c27b173dfc9ab9ea59a476b549b096bb9bce508956c6fb
+  data.tar.gz: d14b8909e070f2ac63346e233758f353e0345f61afe2e5f5fccf6f4afd6570024f9d8ef92ed3e1da1817f6c93e759b3a7ea4b62358d2b534f45d315c6528b298

data/.gitignore

@@ -1,6 +1,7 @@
-config.user.yaml
 *.gem
 jobs/*.yaml
-workspaces/**/*
-!workspaces/.keep
+.robot_sweatshop
+
 Gemfile.lock
+.bundle
+vendor

data/README.md

@@ -4,29 +4,30 @@
 
 Robot Sweatshop is a single-purpose CI server that runs collections of arbitrary scripts when it needs to, usually when new code is pushed. There's no assumptions about what you want to report, what front-end you need, or even what repositories you want to clone because you can do that better than I can. It's just you, your code, and the scripts that test and deploy it.
 
-# Usage
+# Quick start
+
+- install [ZMQ as described in the EZMQ gem](https://github.com/colstrom/ezmq)
+- `gem install robot_sweatshop`
+- `sweatshop start` ([you may need sudo on OSX](https://github.com/JScott/robot_sweatshop/wiki))
+- `sweatshop job example --auto`
+- POST a Github payload to `localhost:8080/github/payload-for/example`
+- `cat .robot_sweatshop/log/job-worker.log`
 
-First install [ZMQ as described in the EZMQ gem](https://github.com/colstrom/ezmq). Then `gem install robot_sweatshop`.
+# Usage
 
-You can now use `sweatshop config` to configure the processes, `sweatshop setup` to ensure the directories in your config exist, and `sweatshop start` to run everything.
+Drop the `--auto` flag to create the job interactively. You can specify which branches will trigger the job, which commands will be run, and any environment variables you might need.
 
 Robot Sweatshop uses [Eye](https://github.com/kostya/eye) to handle its processes so you can use its commandline tool to monitor their status.
 
-After configuring a job, POST a payload to `localhost:8080/:format/payload-for/:job`. For example, triggering a Bitbucket Git POST hook on `localhost:8080/bitbucket/payload-for/example` will parse the payload and run the 'example' job with the payload data in the environment.
+# Configuration
 
-You can see what jobs are available with `sweatshop job --list`.
+By default, Robot Sweatshop looks in your current working directory to configure and run. You can supply a custom configuration with `sweatshop config [local|user|system]`. Read [the wiki](https://github.com/JScott/robot_sweatshop/wiki) for more information.
 
-Currently supported formats:
+# Supported payload formats
 
 - Github (application/json format only)
 - Bitbucket
 
-# Configuration
-
-The server isn't much help without a job to run. Run `sweatshop job <name>` to create a new job or edit an existing one.
-
-Not sure if your job is valid? Run `sweatshop job --inspection <name>` to see if there's something you overlooked.
-
 # Security
 
 You probably don't want to run Robot Sweatshop as a sudo user. Create a testing user and group and point to them in the configuration file to run Robot Sweatshop processes with those permissions.
@@ -38,6 +39,7 @@ You probably don't want to run Robot Sweatshop as a sudo user. Create a testing
 - Common scrips such as git repo syncing and creating a job run ID
 - Support for multiple workers
 - Better logging for the processes
+- Use [eye-http](https://github.com/kostya/eye-http) for the '/' route?
 - Improved architecture:
 
 ![Improved architecture diagram](http://40.media.tumblr.com/8a5b6ca59c0d93c4ce6fc6b733932a5f/tumblr_nko478zp9N1qh941oo1_1280.jpg)

data/Rakefile

@@ -1,7 +1,3 @@
 task :test do
   require_relative 'kintama/run_all'
 end
-
-task :create_dirs do
-  require_relative 'config'
-end

data/bin/sweatshop

@@ -2,43 +2,52 @@
 require 'yaml'
 require 'commander/import'
 require 'colorize'
-require_relative 'lib/common'
-require_relative 'lib/job'
-require_relative 'lib/inspect'
-require_relative 'lib/start'
-require_relative 'lib/config'
-require_relative '../config'
+require_relative '../lib/sweatshop/cli/common'
+require_relative '../lib/sweatshop/cli/job'
+require_relative '../lib/sweatshop/cli/start'
+require_relative '../lib/sweatshop/cli/config'
+require_relative '../lib/sweatshop/config'
+require_relative '../lib/sweatshop/create-config-directories'
 
 program :name, 'Robot Sweatshop'
-program :version, '0.1.2'
+program :version, '0.2.0'
 program :description, 'A lightweight, unopinionated CI server'
 program :help, 'Author', 'Justin Scott <jvscott@gmail.com>'
 
 command :job do |c|
   c.syntax = 'sweatshop job <name>'
   c.description = 'Creates and edits jobs.'
-  c.option '--list', 'List all available jobs.'
-  c.option '--inspection', 'Inspect the given job.'
+  c.option '--auto', 'Create the file without opening the editor.'
   c.action do |args, options|
-    options.default :list => false
-    options.default :inspect => false
-    
-    job_file = get_job_file for_job: args.first
-    if options.list
-      list_jobs
-    elsif options.inspection
-      validate job_file unless job_file.nil?
+    options.default :auto => false
+    if args.count < 1
+      notify :failure, "Specify a job name as the command argument."
+      exit 1
     else
-      create_and_edit_job job_file unless job_file.nil?
+      job_file = get_job_path for_job: args.first
+      create job_file, with_contents: default_job
+      edit job_file unless options.auto
     end
   end
 end
 
+command :config do |c|
+  c.syntax = 'sweatshop config [options]'
+  c.description = 'Creates and edits the user configuration file.'
+  c.option '--auto', 'Create the file without opening the editor.'
+  c.action do |args, options|
+    options.default :auto => false
+    config_file = get_config_path for_scope: args.first
+    create config_file, with_contents: default_config
+    edit config_file unless options.auto
+  end
+end
+
 command :start do |c|
   c.syntax = 'sweatshop start [options]'
   c.description = 'Start the Sweatshop.'
   c.option '--testing', 'Load the testing Eye configuration.'
-  c.action do |args, options|
+  c.action do |_args, options|
     options.default :testing => false
     environment = options.testing ? 'testing' : 'production'
     start_sweatshop for_environment: environment
@@ -52,30 +61,3 @@ command :stop do |c|
     notify :info, `eye stop robot_sweatshop`
   end
 end
-
-command :setup do |c|
-  c.syntax = 'sweatshop setup'
-  c.description = 'Create the directories and set permissions as specified in the config.'
-  c.action do
-    require_relative 'lib/setup'
-  end
-end
-
-command :directory do |c|
-  c.syntax = 'sweatshop directory'
-  c.description = 'Return the path that Robot Sweatshop runs from.'
-  c.action do
-    puts File.expand_path("#{__dir__}/..")
-  end
-end
-
-command :config do |c|
-  c.syntax = 'sweatshop config [options]'
-  c.description = 'Creates and edits the user configuration file.'
-  c.option '--reset', 'Reset to factory defaults before editing.'
-  c.action do |args, options|
-    options.default :reset => false
-    remove_user_config if options.reset
-    create_and_edit_user_config
-  end
-end

data/{lib/input/http.rb → bin/sweatshop-input-http}

@@ -2,12 +2,13 @@
 require 'sinatra'
 require 'ezmq'
 require 'json'
-require_relative '../../config'
+require_relative '../lib/sweatshop/config'
 
 configure do
-  set :port, configatron.input.http.port
-  set :bind, configatron.input.http.bind
+  set :port, configatron.http_port
+  set :bind, configatron.http_bind
   set :output_queue, 'raw-payload'
+  set :run, true
 end
 
 get '/' do

data/{lib/job/assembler.rb → bin/sweatshop-job-assembler}

@@ -1,28 +1,18 @@
 #!/usr/bin/env ruby
 require 'yaml'
-require_relative '../queue-helper'
-require_relative '../../config'
+require_relative '../lib/sweatshop/queue-helper'
+require_relative '../lib/sweatshop/config'
 
-def find_job_config_file(job_name)
-  configurations = [
-    "#{__dir__}/../../jobs",
-    configatron.assembler.job_directory
-  ]
-  configurations.each do |config_path|
-    file_path = "#{config_path}/#{job_name}.yaml"
-    puts file_path
-    return file_path if File.file? file_path
-  end
-  nil
-end
-
-def load_config(for_job_name:)
-  job_config_path = find_job_config_file for_job_name
-  if job_config_path.nil?
-    puts "No config found for job '#{for_job_name}'"
-    return nil
+def load_config(for_job:)
+  job_directory = File.expand_path configatron.job_directory
+  file_path = "#{job_directory}/#{for_job}.yaml"
+  puts file_path
+  if File.file?(file_path)
+    YAML.load_file file_path
+  else
+    puts "No config found for job '#{for_job}'"
+    nil
   end
-  YAML.load_file job_config_path
 end
 
 def serialize(value)
@@ -30,8 +20,8 @@ def serialize(value)
 end
 
 def assemble_job(data)
-  job_config = load_config for_job_name: data['job_name']
-  return nil unless job_config
+  job_config = load_config for_job: data['job_name']
+  return nil if job_config.nil?
   if job_config['branch_whitelist'].include? data['payload']['branch']
     context = job_config['environment'].merge(data['payload'])
     context.each { |key, value| context[key] = serialize value }
@@ -50,4 +40,6 @@ QueueHelper.wait_for('parsed-payload') do |data|
   puts "Assembling: #{data}"
   assembled_job = assemble_job data
   QueueHelper.enqueue assembled_job, to: 'jobs' if assembled_job
+  $stdout.flush
+  $stderr.flush
 end

data/{lib/job/worker.rb → bin/sweatshop-job-worker}

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
 require 'faker'
 require 'fileutils'
-require_relative '../queue-helper'
-require_relative '../../config'
+require_relative '../lib/sweatshop/queue-helper'
+require_relative '../lib/sweatshop/config'
+
+$stdout.sync = true
+$stderr.sync = true
 
 # TODO: check existing worker ids. it'd be disastrous to have two sharing a workspace
 @worker_id = ARGV[0] || "#{Faker::Name.first_name}"
@@ -10,7 +13,7 @@ require_relative '../../config'
 def from_workspace(named: 'no_job_name')
   workspace = "#{named}-#{@worker_id}"
   puts "Workspace: #{workspace}"
-  path = "#{configatron.worker.workspace_directory}/#{workspace}"
+  path = File.expand_path "#{configatron.workspace_directory}/#{workspace}"
   FileUtils.mkpath path
   Dir.chdir(path) { yield if block_given? }
 end

data/{lib/payload/parser.rb → bin/sweatshop-payload-parser}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-require_relative '../queue-helper'
+require_relative '../lib/sweatshop/queue-helper'
 
 def parse(payload = '', of_format:)
   of_format = of_format.downcase
-  lib_file = "#{__dir__}/lib/#{of_format}.rb"
+  lib_file = "#{__dir__}/../lib/sweatshop/payload/#{of_format}.rb"
   if of_format != 'payload' && File.file?(lib_file)
     require_relative lib_file
     Object.const_get("#{of_format.capitalize}Payload").new payload

data/{lib/queue/broadcaster.rb → bin/sweatshop-queue-broadcaster}

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require_relative 'lib/moneta-queue'
+require_relative '../lib/sweatshop/moneta-queue'
 require 'ezmq'
 
 publisher = EZMQ::Publisher.new port: 5557
@@ -12,6 +12,7 @@ end
 
 loop do
   queues.each do |queue_name, queue|
+    p queue_name if queue.size > 0
     publisher.send queue_name, topic: 'busy-queues' if queue.size > 0
   end
   sleep @wait_time unless @wait_time == 0

data/{lib/queue/handler.rb → bin/sweatshop-queue-handler}

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require_relative 'lib/moneta-queue'
+require_relative '../lib/sweatshop/moneta-queue'
 require 'ezmq'
 
 def enqueue(name, item)

data/config.defaults.yaml

@@ -0,0 +1,10 @@
+---
+pidfile_directory: .robot_sweatshop/run
+logfile_directory: .robot_sweatshop/log
+job_directory: .robot_sweatshop/jobs
+workspace_directory: .robot_sweatshop/workspaces
+moneta_directory: .robot_sweatshop/db
+# user: ci-bot
+# group: nogroup
+http_port: 8080
+http_bind: 0.0.0.0

data/kintama/end-to-end_spec.rb

@@ -11,7 +11,7 @@ describe 'Robot Sweatshop' do
 
   setup do
     @client = EZMQ::Client.new port: 5556
-    @job_name = 'example'
+    @job_name = 'test_job'
     @test_file = reset_test_file
     clear_all_queues
   end

data/kintama/input_http_spec.rb

@@ -13,7 +13,7 @@ given 'the HTTP Input' do
   setup do
     @subscriber = EZMQ::Subscriber.new port: 5557, topic: 'busy-queues'
     @client = EZMQ::Client.new port: 5556
-    @job_name = 'example'
+    @job_name = 'test_job'
     @raw_payload_queue = 'raw-payload'
     clear_all_queues
   end

data/kintama/moneta-queue_spec.rb

@@ -1,6 +1,6 @@
 require 'kintama'
 require_relative 'shared/helpers'
-require_relative '../lib/queue/lib/moneta-queue'
+require_relative '../lib/sweatshop/moneta-queue'
 
 given 'the Moneta Queue class' do
   include QueueHelper

data/kintama/shared/helpers.rb

@@ -1,8 +1,8 @@
 require 'yaml'
 require 'json'
-require_relative '../../lib/queue/lib/moneta-queue'
-require_relative '../../lib/payload/lib/payload'
-require_relative '../../config'
+require_relative '../../lib/sweatshop/moneta-queue'
+require_relative '../../lib/sweatshop/payload/payload'
+require_relative '../../lib/sweatshop/config'
 
 module QueueHelper
   def clear_all_queues
@@ -26,15 +26,15 @@ module InHelper
     payload = load_payload with_format
     JSON.generate payload: payload,
                   format: with_format,
-                  job_name: 'example'
+                  job_name: 'test_job'
   end
-  def input_http_url(for_job: 'example', in_format: 'bitbucket')
-    "http://localhost:#{configatron.input.http.port}/#{in_format}/payload-for/#{for_job}"
+  def input_http_url(for_job: 'test_job', in_format: 'bitbucket')
+    "http://localhost:#{configatron.http_port}/#{in_format}/payload-for/#{for_job}"
   end
 end
 
 module PayloadHelper
-  def example_parsed_payload(with_payload: nil, for_branch: 'develop', for_job: 'example')
+  def example_parsed_payload(with_payload: nil, for_branch: 'develop', for_job: 'test_job')
     payload = with_payload || { branch: for_branch }
     JSON.generate payload: payload,
                   job_name: for_job
@@ -45,10 +45,10 @@ module JobHelper
   def example_job(in_context: {}, with_commands: [])
     JSON.generate context: in_context,
                   commands: with_commands,
-                  job_name: 'example'
+                  job_name: 'test_job'
   end
   def reset_test_file
-    test_file = File.expand_path "#{configatron.worker.workspace_directory}/example-testingid/test.txt"
+    test_file = File.expand_path "#{configatron.workspace_directory}/test_job-testingid/test.txt"
     FileUtils.rm_rf test_file
     test_file
   end

data/kintama/shared/process_spawning.rb

@@ -5,9 +5,11 @@ $for_everything = 3
 
 Kintama.on_start do
   puts `#{__dir__}/../../bin/sweatshop start --testing`
+  FileUtils.cp "#{__dir__}/../data/test_job.yaml", File.expand_path(configatron.job_directory)
   sleep $for_everything
 end
 
 Kintama.on_finish do
   puts `#{__dir__}/../../bin/sweatshop stop`
+  # FileUtils.rm "#{configatron.job_directory}/test_job.yaml"
 end

data/{bin/lib → lib/sweatshop/cli}/common.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require_relative '../config'
 
 def notify(type = :success, string)
   color = case type
@@ -16,34 +17,25 @@ def notify(type = :success, string)
   puts "[#{type.to_s.capitalize.colorize(color)}] #{string}"
 end
 
-def get_job_file(for_job:)
-  for_job = "#{__dir__}/../../jobs/#{for_job}.yaml"
-  if for_job.nil?
-    notify :failure, 'Please specify the job to create or edit. See --help for details'
-    nil
-  else
-    File.expand_path for_job
-  end
-end
-
 def edit(file)
   edit = ENV['EDITOR']
   if edit
     notify :info, "Manually editing file '#{file}'"
     system edit, file
   else
-    notify :failure, "No editor specified in $EDITOR environment variable"
+    notify :warning, "No editor specified in $EDITOR environment variable"
     notify :info, "Displaying file contents instead"
     system 'cat', file
   end
 end
 
-def create_and_edit(file, with_default: '')
+def create(file, with_contents: '')
   file = File.expand_path file
-  FileUtils.mkdir_p File.dirname(file)
-  unless File.file?(file)
-    File.write file, with_default
+  if File.file?(file)
+    notify :info, "'#{file}' already exists"
+  else
+    FileUtils.mkdir_p File.dirname(file)
+    File.write file, with_contents
     notify :success, "Created new file '#{file}'"
   end
-  edit file
 end

data/lib/sweatshop/cli/config.rb

@@ -0,0 +1,16 @@
+require_relative '../config'
+
+def default_config
+  File.read "#{__dir__}/../../../config.defaults.yaml"
+end
+
+def get_config_path(for_scope: 'local')
+  case for_scope
+  when 'system'
+    "/etc/robot_sweatshop/config.yaml"
+  when 'user'
+    "~/.robot_sweatshop/config.yaml"
+  else
+    ".robot_sweatshop/config.yaml"
+  end
+end

data/lib/sweatshop/cli/job.rb

@@ -0,0 +1,14 @@
+require_relative '../config'
+
+def default_job
+  "---\nbranch_whitelist:\n- master\n\ncommands:\n- echo 'Hello $WORLD!'\n\nenvironment:\n  WORLD: Earth\n"
+end
+
+def get_job_path(for_job: nil)
+  "#{configatron.job_directory}/#{for_job}.yaml"
+end
+
+def list_jobs
+  job_directory = File.expand_path configatron.job_directory
+  puts Dir.glob("#{job_directory}/*.yaml").map { |file| File.basename(file, '.yaml') }
+end

data/lib/sweatshop/cli/start.rb

@@ -0,0 +1,25 @@
+require 'yaml'
+require_relative '../config'
+
+def store_config_for_eye
+  config = configatron.to_h
+  config = config.each do |key, value|
+    config[key] = File.expand_path value if key.to_s.match /_directory/
+  end
+  config[:working_directory] = Dir.pwd
+  File.write('/tmp/.robot_sweatshop-eye-config.yaml', config.to_yaml)
+end
+
+def start_sweatshop(for_environment:)
+  store_config_for_eye
+  eye_config = File.expand_path "#{__dir__}/../../../robot_sweatshop.#{for_environment}.eye"
+  output = `eye load #{eye_config}`
+  if $?.exitstatus != 0
+    notify :failure, output
+    exit 1
+  else
+    notify :success, "Robot Sweatshop loaded with a #{for_environment} configuration"
+    notify :info, `eye restart robot_sweatshop`
+    notify :info, 'Run \'eye --help\' for more info on debugging'
+  end
+end

data/lib/sweatshop/config.rb

@@ -0,0 +1,19 @@
+require 'configatron'
+require 'yaml'
+
+configatron.reset!
+
+configurations = [
+  "#{__dir__}/../../config.defaults.yaml",
+  "/etc/robot_sweatshop/config.yaml",
+  "~/.robot_sweatshop/config.yaml",
+  ".robot_sweatshop/config.yaml",
+]
+
+configurations.each do |config_path|
+  config_path = File.expand_path config_path
+  if File.file? config_path
+    hash = YAML.load_file config_path
+    configatron.configure_from_hash hash
+  end
+end

data/lib/sweatshop/create-config-directories.rb

@@ -0,0 +1,29 @@
+require 'fileutils'
+require_relative 'config'
+
+def set_dir_permissions(for_path:)
+  user = configatron.user
+  group = configatron.has_key?(:group) ? configatron.group : 'nogroup'
+  begin
+    FileUtils.chown_R user, group, for_path unless user.nil?
+  rescue ArgumentError
+    puts "Could not set permissions for '#{for_path}'"
+  end
+end
+
+def create_path(path)
+  begin
+    FileUtils.mkdir_p path
+  rescue Errno::EACCES
+    puts "Permission denied to create '#{path}'"
+  end
+end
+
+config = configatron.to_h
+config.each do |key, value|
+  if key.to_s.match /_directory/
+    path = File.expand_path value
+    create_path path
+    set_dir_permissions for_path: path if configatron.has_key? :user
+  end
+end

data/lib/{queue/lib → sweatshop}/moneta-queue.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 require 'moneta'
-require_relative '../../../config'
+require_relative 'config'
 
 # A class to handle queueing through Moneta's key-value storage
 class MonetaQueue
   attr_reader :watched_queues
 
-  @@store = Moneta.new :File, dir: configatron.queue.moneta_directory
+  @@store = Moneta.new :File, dir: File.expand_path(configatron.moneta_directory)
 
   def initialize(name)
     @name = name

data/lib/sweatshop.rb

@@ -0,0 +1,16 @@
+require_relative 'sweatshop/moneta-queue'
+require_relative 'sweatshop/queue-helper'
+require_relative 'sweatshop/config'
+
+require_relative 'sweatshop/payload/payload'
+require_relative 'sweatshop/payload/bitbucket'
+require_relative 'sweatshop/payload/github'
+
+require_relative 'sweatshop/cli/common'
+require_relative 'sweatshop/cli/config'
+require_relative 'sweatshop/cli/inspect'
+require_relative 'sweatshop/cli/job'
+require_relative 'sweatshop/cli/setup'
+require_relative 'sweatshop/cli/start'
+
+

data/robot_sweatshop.eye

@@ -1,60 +1,60 @@
-#!/usr/bin/env ruby
-require_relative 'config'
+require 'yaml'
 
-log_path = configatron.common.logfile_directory
-pid_path = configatron.common.pidfile_directory
+CONFIG = YAML.load_file '/tmp/.robot_sweatshop-eye-config.yaml'
+PID_PATH = CONFIG[:pidfile_directory]
+LOG_PATH = CONFIG[:logfile_directory]
 
 Eye.config do
-  logger "#{log_path}/eye.log"
+  logger CONFIG[:log_file]
 end
 
 Eye.application :robot_sweatshop do
   trigger :flapping, times: 10, within: 1.minute, retry_in: 10.minutes
   check :cpu, every: 10.seconds, below: 100, times: 3
-  working_dir "#{__dir__}/lib"
-  uid "#{configatron.common.user}"
-  gid "#{configatron.common.group}"
+  working_dir CONFIG[:working_directory]
+  uid "#{CONFIG[:user]}" if CONFIG[:user]
+  gid "#{CONFIG[:group]}" if CONFIG[:group]
 
   group 'input' do
     process :http do
-      pid_file "#{pid_path}/input-http.pid"
-      stdall "#{log_path}/input-http.log"
-      start_command "ruby input/http.rb"
+      pid_file "#{PID_PATH}/input-http.pid"
+      stdall "#{LOG_PATH}/input-http.log"
+      start_command "#{__dir__}/bin/sweatshop-input-http"
       daemonize true
     end
   end
   group 'queue' do
     process :handler do
-      pid_file "#{pid_path}/queue-handler.pid"
-      stdall "#{log_path}/queue-handler.log"
-      start_command "ruby queue/handler.rb"
+      pid_file "#{PID_PATH}/queue-handler.pid"
+      stdall "#{LOG_PATH}/queue-handler.log"
+      start_command "#{__dir__}/bin/sweatshop-queue-handler"
       daemonize true
     end
     process :broadcaster do
-      pid_file "#{pid_path}/queue-broadcaster.pid"
-      stdall "#{log_path}/queue-broadcaster.log"
-      start_command "ruby queue/broadcaster.rb #{configatron.eye.broadcaster_interval}"
+      pid_file "#{PID_PATH}/queue-broadcaster.pid"
+      stdall "#{LOG_PATH}/queue-broadcaster.log"
+      start_command "#{__dir__}/bin/sweatshop-queue-broadcaster #{configatron.eye.broadcaster_interval}"
       daemonize true
     end
   end
   group 'job' do
     process :assembler do
-      pid_file "#{pid_path}/job-assembler.pid"
-      stdall "#{log_path}/job-assembler.log"
-      start_command "ruby job/assembler.rb"
+      pid_file "#{PID_PATH}/job-assembler.pid"
+      stdall "#{LOG_PATH}/job-assembler.log"
+      start_command "#{__dir__}/bin/sweatshop-job-assembler"
       daemonize true
     end
     process :worker do
-      pid_file "#{pid_path}/job-worker.pid"
-      stdall "#{log_path}/job-worker.log"
-      start_command "ruby job/worker.rb #{configatron.eye.worker_id}"
+      pid_file "#{PID_PATH}/job-worker.pid"
+      stdall "#{LOG_PATH}/job-worker.log"
+      start_command "#{__dir__}/bin/sweatshop-job-worker #{configatron.eye.worker_id}"
       daemonize true
     end
   end
   process :payload_parser do
-    pid_file "#{pid_path}/payload_parser.pid"
-    stdall "#{log_path}/payload_parser.log"
-    start_command "ruby payload/parser.rb"
+    pid_file "#{PID_PATH}/payload_parser.pid"
+    stdall "#{LOG_PATH}/payload_parser.log"
+    start_command "#{__dir__}/bin/sweatshop-payload-parser"
     daemonize true
   end
 end

data/robot_sweatshop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'robot_sweatshop'
-  gem.version     = '0.1.6'
+  gem.version     = '0.2.0'
   gem.licenses    = 'MIT'
   gem.authors     = ['Justin Scott']
   gem.email       = 'jvscott@gmail.com'
@@ -10,7 +10,8 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- kintama/**/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/sweatshop`.split("\n").map { |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  gem.require_paths = ['lib']
 
   gem.required_ruby_version = '>= 2.1'
 
@@ -26,4 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'kintama'
   gem.add_development_dependency 'http'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'pry-byebug'
 end

data/robot_sweatshop.production.eye

@@ -1,8 +1,7 @@
-#!/usr/bin/env ruby
-Eye.load('./config.rb')
+require 'configatron'
 
 configatron.temp do
   configatron.eye.broadcaster_interval = ''
   configatron.eye.worker_id = ''
-  Eye.load('./robot_sweatshop.eye')
+  Eye.load('robot_sweatshop.eye')
 end

data/robot_sweatshop.testing.eye

@@ -1,8 +1,7 @@
-#!/usr/bin/env ruby
-Eye.load('./config.rb')
+require 'configatron'
 
 configatron.temp do
   configatron.eye.broadcaster_interval = 0.0
   configatron.eye.worker_id = 'testingid'
-  Eye.load('./robot_sweatshop.eye')
+  Eye.load('robot_sweatshop.eye')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robot_sweatshop
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -164,10 +164,45 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A lightweight, unopinionated CI server.
 email: jvscott@gmail.com
 executables:
 - sweatshop
+- sweatshop-input-http
+- sweatshop-job-assembler
+- sweatshop-job-worker
+- sweatshop-payload-parser
+- sweatshop-queue-broadcaster
+- sweatshop-queue-handler
+- sweatshop-queue-watcher
 extensions: []
 extra_rdoc_files: []
 files:
@@ -177,18 +212,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/lib/common.rb
-- bin/lib/config.rb
-- bin/lib/inspect.rb
-- bin/lib/job.rb
-- bin/lib/setup.rb
-- bin/lib/start.rb
 - bin/sweatshop
-- config.rb
-- config.yaml
-- jobs/example.yaml
+- bin/sweatshop-input-http
+- bin/sweatshop-job-assembler
+- bin/sweatshop-job-worker
+- bin/sweatshop-payload-parser
+- bin/sweatshop-queue-broadcaster
+- bin/sweatshop-queue-handler
+- bin/sweatshop-queue-watcher
+- config.defaults.yaml
 - kintama/README.md
 - kintama/data/payload_data.yaml
+- kintama/data/test_job.yaml
 - kintama/end-to-end_spec.rb
 - kintama/input_http_spec.rb
 - kintama/job_assembler_spec.rb
@@ -201,18 +236,18 @@ files:
 - kintama/shared/helpers.rb
 - kintama/shared/process_spawning.rb
 - lib/README.md
-- lib/input/http.rb
-- lib/job/assembler.rb
-- lib/job/worker.rb
-- lib/payload/lib/bitbucket.rb
-- lib/payload/lib/github.rb
-- lib/payload/lib/payload.rb
-- lib/payload/parser.rb
-- lib/queue-helper.rb
-- lib/queue/broadcaster.rb
-- lib/queue/handler.rb
-- lib/queue/lib/moneta-queue.rb
-- lib/queue/watcher.rb
+- lib/sweatshop.rb
+- lib/sweatshop/cli/common.rb
+- lib/sweatshop/cli/config.rb
+- lib/sweatshop/cli/job.rb
+- lib/sweatshop/cli/start.rb
+- lib/sweatshop/config.rb
+- lib/sweatshop/create-config-directories.rb
+- lib/sweatshop/moneta-queue.rb
+- lib/sweatshop/payload/bitbucket.rb
+- lib/sweatshop/payload/github.rb
+- lib/sweatshop/payload/payload.rb
+- lib/sweatshop/queue-helper.rb
 - robot_sweatshop.eye
 - robot_sweatshop.gemspec
 - robot_sweatshop.production.eye
@@ -243,5 +278,6 @@ specification_version: 4
 summary: Robot Sweatshop
 test_files:
 - kintama/data/payload_data.yaml
+- kintama/data/test_job.yaml
 - kintama/shared/helpers.rb
 - kintama/shared/process_spawning.rb

data/bin/lib/config.rb

@@ -1,20 +0,0 @@
-require 'yaml'
-require 'fileutils'
-require_relative '../../config'
-
-def default_config
-  File.read "#{__dir__}/../../config.yaml"
-end
-
-def user_config_file
-  '/etc/robot_sweatshop/config.yaml'
-end
-
-def remove_user_config
-  FileUtils.rm_rf user_config_file
-  notify :success, 'Removing current user config file'
-end
-
-def create_and_edit_user_config
-  create_and_edit user_config_file, with_default: default_config
-end

data/bin/lib/inspect.rb

@@ -1,42 +0,0 @@
-def valid_lists?(job)
-  errors = false
-  %w(branch_whitelist commands).each do |list|
-    if job[list].nil? || job[list].empty?
-      notify :failure, "#{list} empty or not found"
-      errors = true
-    end
-  end
-  errors
-end
-
-def valid_environment?(job)
-  errors = false
-  job['environment'].each do |key, value|
-    unless value.is_a? String
-      notify :warning, "Non-string value for '#{key}'"
-      errors = true
-    end
-  end
-  errors
-end
-
-def valid_yaml?(job)
-  if job
-    true
-  else
-    notify :failure, "Invalid YAML"
-    false
-  end
-end
-
-def validate(job_file)
-  unless File.file?(job_file)
-    notify :failure, 'Job not found. Create it with \'workshop job\''
-  else
-    job = YAML.load_file job_file
-    return unless valid_yaml?(job)
-    errors = valid_lists?(job) |
-             valid_environment?(job)
-    notify :success, 'Valid job configuration' unless errors
-  end
-end

data/bin/lib/job.rb

@@ -1,13 +0,0 @@
-require_relative 'common'
-
-def empty_job
-  "---\nbranch_whitelist:\n- master\n\ncommands:\n- echo 'Hello $WORLD!'\n\nenvironment:\n  WORLD: Earth\n"
-end
-
-def create_and_edit_job(job_path)
-  create_and_edit job_path, with_default: empty_job
-end
-
-def list_jobs
-  puts Dir.glob("#{__dir__}/../../jobs/*").map { |file| File.basename(file, '.yaml') }
-end

data/bin/lib/setup.rb

@@ -1,25 +0,0 @@
-require 'fileutils'
-require 'configatron'
-require_relative 'common'
-require_relative '../../config'
-
-config_directories = [
-  configatron.common.logfile_directory,
-  configatron.common.pidfile_directory,
-  configatron.common.user_config_directory,
-  configatron.queue.moneta_directory,
-  configatron.assembler.job_directory,
-  configatron.worker.workspace_directory
-]
-config_directories.each do |directory|
-  user = configatron.common.user
-  group = configatron.common.group
-  if Dir.exists? directory
-    notify :info, "'#{directory}' already exists"
-  else
-    FileUtils.mkdir_p directory
-    notify :success, "Created '#{directory}' and set owner as #{user}:#{group}"
-  end
-  FileUtils.chown_R user, group, directory
-  notify :success, "Recursively set owner of '#{directory}' as #{user}:#{group}\n\n"
-end

data/bin/lib/start.rb

@@ -1,11 +0,0 @@
-def start_sweatshop(for_environment:)
-  eye_config = "#{__dir__}/../../robot_sweatshop.#{for_environment}.eye"
-  output = `eye load #{eye_config}`
-  if $?.exitstatus != 0
-    notify :failure, output
-  else
-    notify :success, "Robot Sweatshop loaded with a #{for_environment} configuration"
-    notify :info, `eye restart robot_sweatshop`
-    puts 'Check \'eye --help\' for more info on debugging'
-  end
-end

data/config.rb

@@ -1,16 +0,0 @@
-require 'configatron'
-require 'yaml'
-
-# TODO: namespace to avoid collisions?
-
-configurations = [
-  "#{__dir__}/config.yaml",
-  "#{__dir__}/config.user.yaml",
-  "/etc/robot_sweatshop/config.yaml"
-]
-configurations.each do |config_path|
-  if File.file? config_path
-    hash = YAML.load_file config_path
-    configatron.configure_from_hash hash
-  end
-end

data/config.yaml

@@ -1,20 +0,0 @@
-common:
-  pidfile_directory: /var/run/robot_sweatshop
-  logfile_directory: /var/log/robot_sweatshop
-  user_config_directory: /etc/robot_sweatshop
-  user: jscott
-  group: nogroup
-
-input:
-  http:
-    port: 8080
-    bind: 0.0.0.0
-
-queue:
-  moneta_directory: /var/db/robot_sweatshop
-
-assembler:
-  job_directory: /etc/robot_sweatshop/jobs
-
-worker:
-  workspace_directory: /etc/robot_sweatshop/workspaces