robot_sweatshop 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c125a8f67b9ce641d746be4fea9d5811924675
-  data.tar.gz: b15915e3189e482a6130437040c6c8625e5dfdc2
+  metadata.gz: dba386e07d0e4cced4e3f798b2e8b0bad86f7fbf
+  data.tar.gz: d45191b2778dd0da0c68a3fa894af7b69adc6155
 SHA512:
-  metadata.gz: 0cc634d9cd96a474729a12c5a8881fa83627ee6233b3d36e2923f43893f49593398ea2d8d98a663eb986b7f94b4b2ea4a483710f412677e040d485430be9cc02
-  data.tar.gz: 69d52e4e53a8cfdc7acc50d9bc6456f0524fabe58b1c33cf392f87f67b54b411997f714cff1572aa6526776c8257185de461185285c627d5e5ddd11ccbb7fb0e
+  metadata.gz: bacf799921528b9999ba5f4bf14f007f471dc25804ac573f7a0024ee0911e5120bb8cdabd7525a74b2fa4fa8740b0461738fb2d9fe83d9c7012a3367f1eb7d99
+  data.tar.gz: 6f1799495398e16f2d50e3be43728513367dece4c5a7cca81354aaeb4893e656b85e88e869cb783e232fcce85c1631c25d3a0a578af10430ea098c439ccec9e2

data/README.md

@@ -6,12 +6,11 @@ Robot Sweatshop is a single-purpose CI server that runs collections of arbitrary
 
 # Usage
 
-```
-gem install robot_sweatshop
-sweatshop start
-```
+First install [ZMQ as described in the EZMQ gem](https://github.com/colstrom/ezmq). Then `gem install robot_sweatshop`.
 
-Robot Sweatshop uses Eye to handle its services and will set up and configure everything for you.
+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.
+
+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.
 
@@ -24,20 +23,19 @@ Currently supported formats:
 
 # Configuration
 
-The server isn't much help without a job to run. Run `sudo -E sweatshop job <name>` to create a new job or edit an existing one.
-
-You can also use `sudo -E sweatshop config` to create and edit a user configuration at `/etc/robot_sweatshop/config.yaml`.
+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
 
-_TODO: Support for running as a custom user via eye uid/gid_
+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.
 
 # Roadmap
 
 - CLI job running
-- Common scrips such as git repo syncing
+- custom/empty payloads
+- Common scrips such as git repo syncing and creating a job run ID
 - Support for multiple workers
 - Better logging for the processes
 - Improved architecture:

data/bin/lib/setup.rb

@@ -0,0 +1,25 @@
+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/sweatshop

@@ -10,7 +10,7 @@ require_relative 'lib/config'
 require_relative '../config'
 
 program :name, 'Robot Sweatshop'
-program :version, '0.1.1'
+program :version, '0.1.2'
 program :description, 'A lightweight, unopinionated CI server'
 program :help, 'Author', 'Justin Scott <jvscott@gmail.com>'
 
@@ -53,6 +53,14 @@ command :stop do |c|
   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.'

data/config.rb

@@ -1,4 +1,3 @@
-require 'fileutils'
 require 'configatron'
 require 'yaml'
 
@@ -15,16 +14,3 @@ configurations.each do |config_path|
     configatron.configure_from_hash hash
   end
 end
-
-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|
-  FileUtils.mkdir_p directory unless Dir.exists? directory
-  # TODO: set chmod to appropriate user
-end

data/config.yaml

@@ -2,6 +2,8 @@ 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:

data/robot_sweatshop.eye

@@ -12,6 +12,8 @@ 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}"
 
   group 'input' do
     process :http do

data/robot_sweatshop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'robot_sweatshop'
-  gem.version     = '0.1.5'
+  gem.version     = '0.1.6'
   gem.licenses    = 'MIT'
   gem.authors     = ['Justin Scott']
   gem.email       = 'jvscott@gmail.com'
@@ -12,6 +12,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- kintama/**/*`.split("\n")
   gem.executables   = `git ls-files -- bin/sweatshop`.split("\n").map { |f| File.basename(f) }
 
+  gem.required_ruby_version = '>= 2.1'
+
   gem.add_runtime_dependency 'sinatra'
   gem.add_runtime_dependency 'ezmq'
   gem.add_runtime_dependency 'faker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robot_sweatshop
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Justin Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -181,6 +181,7 @@ files:
 - bin/lib/config.rb
 - bin/lib/inspect.rb
 - bin/lib/job.rb
+- bin/lib/setup.rb
 - bin/lib/start.rb
 - bin/sweatshop
 - config.rb
@@ -228,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="