robot_sweatshop 0.4.13 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08cbf83ffc230f92b481c9bd3e050e30c8b2a771
-  data.tar.gz: 3945c41f5f694828ad9651c18e6e8d33e761f0b8
+  metadata.gz: 8e497e652596a13ab375886a0c9adfdbd6e5c33f
+  data.tar.gz: f6b1e12c4b42f20cdb391ee838600b537404244c
 SHA512:
-  metadata.gz: b0c61a1c671dd53bf48c3aa723cc78b41266817492bc49312d2bdc1cb216491c2f2b597e83659e1ee9479519af92de3d3c207a60f536cd5f8dcebdaf04899195
-  data.tar.gz: 10fa29c67fc744705d541c7846bda2882529c7cf79279838e6c3028ba6795f6cecba7633d5d390efda31483a7db5dcaa5b16515bb18319a331575f871027b27b
+  metadata.gz: c3e21f54d698b659bf86d0f07a699d2213d9b65450b101b5c4e1827483c4319e4f5b572f420ccd76897fe6d0e165a3549816143e9b262462153ed75248f335f0
+  data.tar.gz: 21556cc53d23695339f8d67d7dc7188a0ee2ce5848f9e4c9237d1e3161202c5b4089d1234bdb899744a2934408f19a3e2dea80a6270f6f58533ad5af0e8644da

data/CHANGELOG.md

@@ -1,11 +1,22 @@
 # Change Log
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
+All notable changes to this project will be documented in this file as specified by [http://keepachangelog.com/](http://keepachangelog.com/). This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased][unreleased]
+## [Unreleased] - unreleased
+
+## [1.0.0] - 2015-08-10
 ### Added
 - Multiple worker support
 
+### Changed
+- `sweatshop configure` takes a `--user` flag instead of looking for string arguments
+- `sweatshop config` renamed `sweatshop configure`
+- `sweatshop job` renamed `sweatshop plan`
+
+## [0.4.13] - 2015-07-31
+### Added
+- Logging over ZMQ
+- The Logger process to write files and reflect messages
+
 ## [0.4.12] - 2015-07-14
 ### Fixed
 - Config erroring out if you don't have a home path

data/FUTURE.md

@@ -0,0 +1,6 @@
+- Mascot/logo
+- Use something appropriate than TCP for ZMQ connections
+- Jenkins-to-Sweatshop job converting script
+- Take a look at beefcake for data versioning/serialization
+- CLI configuration via chomp and/or flags
+- Use [eye-http](https://github.com/kostya/eye-http) somewhere?

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    robot_sweatshop (0.4.12)
+    robot_sweatshop (0.4.13)
       commander
       configatron
       contracts

data/README.md

@@ -11,7 +11,7 @@ Robot Sweatshop is a single-purpose CI server that runs collections of arbitrary
 - install [ZMQ as described in the EZMQ gem](https://github.com/colstrom/ezmq#operating-system-notes)
 - `gem install robot_sweatshop`
 - `sweatshop start`
-- `sweatshop job example --auto`
+- `sweatshop plan example --auto`
 - `curl -d '' localhost:10555/run/example`
 - `cat .robot_sweatshop/log/worker.log`
 
@@ -43,24 +43,3 @@ By default, Robot Sweatshop looks in your current working path to configure and
 ## Security
 
 You probably don't want to run Robot Sweatshop as a sudo user. Create a testing user and group and run `sweatshop start` as them.
-
-## Roadmap
-
-1.0
-
-- Mascot/logo
-
-1.1
-
-- Use something appropriate than TCP for ZMQ connections
-- Easier way to run multiple workers
-- Push/pull out node that worker streams output to
-- Add worker tags to output so it can all go to one file
-
-Beyond
-
-- Jenkins-to-Sweatshop job converting script
-- Take a look at beefcake for data versioning/serialization
-- Better logging for the processes
-- CLI configuration via chomp and/or flags
-- Use [eye-http](https://github.com/kostya/eye-http) for the '/' route?

data/bin/sweatshop

@@ -7,12 +7,12 @@ require 'robot_sweatshop/config'
 require 'robot_sweatshop/create-config-directories'
 
 program :name, 'Robot Sweatshop'
-program :version, '0.4.13'
+program :version, '1.0.0'
 program :description, 'A lightweight, nonopinionated CI server'
 program :help, 'Author', 'Justin Scott <jvscott@gmail.com>'
 
-command :job do |c|
-  c.syntax = 'sweatshop job <name>'
+command :plan do |c|
+  c.syntax = 'sweatshop plan <name>'
   c.description = 'Creates and edits jobs.'
   c.option '--auto', 'Create the file without opening the editor.'
   c.action do |args, options|
@@ -24,22 +24,15 @@ command :job do |c|
   end
 end
 
-command :'job-list' do |c|
-  c.syntax = 'sweatshop job-list'
-  c.description = 'Lists available job configurations.'
-  c.action do
-    CLI::Job.list
-  end
-end
-
-command :config do |c|
-  c.syntax = 'sweatshop config [options]'
-  c.description = 'Creates and edits the user configuration file.'
+command :configure do |c|
+  c.syntax = 'sweatshop configure [options]'
+  c.description = 'Creates and edits the configuration file.'
   c.option '--auto', 'Create the file without opening the editor.'
+  c.option '--user', 'Create the file in the user\'s home directory instead of in the local path.'
   c.action do |args, options|
     options.default auto: false
-    for_scope = args.first || 'local'
-    config_file = CLI::Config.path for_scope
+    options.default user: false
+    config_file = CLI::Config.path for_user: options.user
     CLI.create config_file, with_contents: CLI::Config.default
     CLI.edit config_file unless options.auto
   end

data/config.defaults.yaml

@@ -17,3 +17,4 @@ logger_port: 10560
 reflector_port: 10561
 api_url: http://localhost:10555
 job_timeout_length: 300 # 5 minutes
+worker_count: 1

data/docs/README.md

@@ -72,6 +72,19 @@ PUSH {
 }
 ```
 
+## logger
+
+```
+PUB {
+  text String
+  process String
+  user String
+  host String
+}
+```
+
 # Notes
 
 Context is passed around with string keys because it's user provided. Everything else is passed with symbol keys
+
+Anything published to the logger will be republished to the reflector port

data/docs/architecture.dot

@@ -1,5 +1,5 @@
 digraph architecture {
-  label="Robot Sweatshop process interaction"
+  label="Robot Sweatshop process interaction\n(Logger not shown)\n "
   labelloc="top"
 
   overseer [label="Overseer",shape=box]

data/lib/robot_sweatshop/cli/config.rb

@@ -8,8 +8,8 @@ module CLI
       File.read "#{__dir__}/../../../config.defaults.yaml"
     end
 
-    def self.path(scope)
-      if scope == 'user'
+    def self.path(for_user: false)
+      if for_user
         '~/.robot_sweatshop/config.yaml'
       else
         '.robot_sweatshop/config.yaml'

data/{robot_sweatshop.eye → lib/robot_sweatshop/cli/robot_sweatshop.eye.erb}

@@ -1,6 +1,5 @@
 require 'yaml'
 
-# TODO: per-user temp file
 CONFIG_PATH = File.expand_path '~/.robot_sweatshop/compiled_config.yaml'
 CONFIG = YAML.load_file CONFIG_PATH
 PID_PATH = CONFIG[:pidfile_path]
@@ -17,44 +16,49 @@ Eye.application :robot_sweatshop do
   group 'services' do
     process :job_dictionary do
       pid_file "#{PID_PATH}/job-dictionary.pid"
-      start_command "#{__dir__}/bin/sweatshop-job-dictionary"
+      start_command "sweatshop-job-dictionary"
       daemonize true
     end
     process :payload_parser do
       pid_file "#{PID_PATH}/payload-parser.pid"
-      start_command "#{__dir__}/bin/sweatshop-payload-parser"
+      start_command "sweatshop-payload-parser"
       daemonize true
     end
     process :conveyor do
       pid_file "#{PID_PATH}/conveyor.pid"
-      start_command "#{__dir__}/bin/sweatshop-conveyor"
+      start_command "sweatshop-conveyor"
       daemonize true
     end
   end
 
+  group 'workers' do
+  <% worker_count.times do |index| %>
+    process :worker_<%= index+1 %> do
+      pid_file "#{PID_PATH}/worker_<%= index+1 %>.pid"
+      start_command "sweatshop-worker <%= index+1 %>"
+      daemonize true
+    end
+  <% end %>
+  end
+
   process :overseer do
     pid_file "#{PID_PATH}/overseer.pid"
-    start_command "#{__dir__}/bin/sweatshop-overseer"
+    start_command "sweatshop-overseer"
     daemonize true
   end
   process :api do
     pid_file "#{PID_PATH}/api.pid"
-    start_command "#{__dir__}/bin/sweatshop-api"
+    start_command "sweatshop-api"
     daemonize true
   end
   process :assembler do
     pid_file "#{PID_PATH}/assembler.pid"
-    start_command "#{__dir__}/bin/sweatshop-assembler"
-    daemonize true
-  end
-  process :worker do
-    pid_file "#{PID_PATH}/worker.pid"
-    start_command "#{__dir__}/bin/sweatshop-worker"
+    start_command "sweatshop-assembler"
     daemonize true
   end
   process :logger do
     pid_file "#{PID_PATH}/logger.pid"
-    start_command "#{__dir__}/bin/sweatshop-logger"
+    start_command "sweatshop-logger"
     daemonize true
   end
 end

data/lib/robot_sweatshop/cli/start.rb

@@ -1,18 +1,34 @@
 require 'yaml'
 require 'terminal-announce'
 require 'robot_sweatshop/config'
+require 'erubis'
 
 module CLI
   # Methods for starting Robot Sweatshop
   module Start
     def self.sweatshop
+      Announce.info `eye stop robot_sweatshop:workers`
+      load_eye_config
+      Announce.info `eye restart robot_sweatshop`
+    end
+
+    def self.load_eye_config
       Config.compile_to_file
-      eye_config = File.expand_path "#{__dir__}/../../../robot_sweatshop.eye"
-      output = `eye load #{eye_config}`
+      output = `eye load #{generate_eye_config}`
       fail output if $?.exitstatus != 0
       Announce.success "Robot Sweatshop loaded"
-      Announce.info `eye restart robot_sweatshop`
       Announce.info 'Run \'eye --help\' for more info on debugging'
     end
+
+    def self.generate_eye_config
+      template = File.read "#{__dir__}/robot_sweatshop.eye.erb"
+      eruby = Erubis::Eruby.new template
+      compiled_config = eruby.result worker_count: configatron.worker_count
+      compiled_config_file = File.expand_path '~/.robot_sweatshop/robot_sweatshop.eye'
+      File.open compiled_config_file, 'w' do |file|
+        file.write compiled_config
+        file.path
+      end
+    end
   end
 end

data/robot_sweatshop.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |gem|
   gem.name        = 'robot_sweatshop'
-  gem.version     = '0.4.13'
+  gem.version     = '1.0.0'
   gem.licenses    = 'MIT'
   gem.authors     = ['Justin Scott']
   gem.email       = 'jvscott@gmail.com'
-  gem.homepage    = 'http://www.github.com/jscott/robot_sweatshop/'
+  gem.homepage    = 'http://robotsweat.com'
   gem.summary     = 'Robot Sweatshop'
   gem.description = 'A lightweight, nonopinionated CI server.'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robot_sweatshop
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 1.0.0
 platform: ruby
 authors:
 - Justin Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-01 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
@@ -280,6 +280,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
+- FUTURE.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -303,6 +304,7 @@ files:
 - lib/robot_sweatshop/cli/common.rb
 - lib/robot_sweatshop/cli/config.rb
 - lib/robot_sweatshop/cli/job.rb
+- lib/robot_sweatshop/cli/robot_sweatshop.eye.erb
 - lib/robot_sweatshop/cli/start.rb
 - lib/robot_sweatshop/config.rb
 - lib/robot_sweatshop/connections.rb
@@ -316,7 +318,6 @@ files:
 - lib/robot_sweatshop/templates/default_job.yaml
 - lib/robot_sweatshop/templates/index.html.eruby
 - lib/robot_sweatshop/templates/log.html.eruby
-- robot_sweatshop.eye
 - robot_sweatshop.gemspec
 - test/README.md
 - test/all.rb
@@ -343,7 +344,7 @@ files:
 - test/shared/scaffolding.rb
 - test/shared/stub.rb
 - test/worker_spec.rb
-homepage: http://www.github.com/jscott/robot_sweatshop/
+homepage: http://robotsweat.com
 licenses:
 - MIT
 metadata: {}