robot_sweatshop 0.4.9 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0117fcc7d8e0d91f24a08a46a8b7e24f4cd0b65b
-  data.tar.gz: e01c0e51398d698e8dc4d7a56f53c77fb35955e5
+  metadata.gz: b9ae5c44f98320bdde45d1f7cb315f29059a0b92
+  data.tar.gz: ea24dec2cb35c6eef63e03a5f3d251627701fdd1
 SHA512:
-  metadata.gz: 1255a647775979d5da1d5fb2be512e23af38979b6aba58dd37906c45e1da4f25a34d72d0b31e48a13a50f2e08b8661b2da611c1bbb76ce98ffde092e8490599a
-  data.tar.gz: 8dda97b15749001ff014e0500bf37663cffad1201d1f91066f057068b68fc752913b87ff638aa67e0386541c075def54d4c8f8e305ff7433e9382e4eda658698
+  metadata.gz: d1d9969540fee3705c050f823525ac671626a3dbd94746a710a2bdfe755cbd864b7ec702e0072b2e6dc7e5ce3d031735dfeba59f46052a23ca8e304a3f8bf4da
+  data.tar.gz: aad296f9bf18403b6ade6f6064bc706d750d98c338c57852a3b2bb58c6abf917183fd95f080efbeb91e7fb03c6d9bd9a824f1593730429f4244145162529965c

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased][unreleased]
+### Added
+- Multiple worker support
+
+## [0.4.11] - 2015-07-14
+### Fixed
+- Config erroring out if you don't have a home path
+
+## [0.4.10] - 2015-07-13
+### Added
+- Started using a change log
+
+### Removed
+- `sweatshop config system` for convention over configuration
+
+### Changed
+- Input server being transformed into the API server
+
+### Fixed
+- Front-end hitting the the API server instead of always `localhost`
+
+[0.4.9 and previous]: https://github.com/jscott/robot_sweatshop/compare/0.1.0...0.4.9

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    robot_sweatshop (0.4.8)
-      bundler
+    robot_sweatshop (0.4.9)
       commander
       configatron
       contracts

data/bin/sweatshop

@@ -7,7 +7,7 @@ require 'robot_sweatshop/config'
 require 'robot_sweatshop/create-config-directories'
 
 program :name, 'Robot Sweatshop'
-program :version, '0.4.9'
+program :version, '0.4.11'
 program :description, 'A lightweight, nonopinionated CI server'
 program :help, 'Author', 'Justin Scott <jvscott@gmail.com>'
 
@@ -48,11 +48,8 @@ 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|
-    options.default testing: false
-    environment = options.testing ? 'testing' : 'production'
-    CLI::Start.sweatshop for_environment: environment
+    CLI::Start.sweatshop
   end
 end
 
@@ -64,6 +61,8 @@ command :stop do |c|
   end
 end
 
+alias_command :restart, :start
+
 command :gears do |c|
   c.syntax = 'sweatshop gears ...'
   c.description = 'See `sweatshop-gears --help`'

data/bin/{sweatshop-input → sweatshop-api}

@@ -7,7 +7,7 @@ require 'robot_sweatshop/connections'
 using ExtendedEZMQ
 
 configure do
-  set :port, configatron.input_port
+  set :port, configatron.api_port
   set :bind, configatron.http_bind
   set :run, true
   set :conveyor, EZMQ::Client.new(port: configatron.conveyor_port)

data/config.defaults.yaml

@@ -8,9 +8,10 @@ scripts_path: .robot_sweatshop/scripts
 http_bind: 0.0.0.0
 http_cross_origin: true
 overseer_port: 10554
-input_port: 10555
+api_port: 10555
 conveyor_port: 10556
 payload_parser_port: 10557
 job_dictionary_port: 10558
 worker_port: 10559
+api_url: http://localhost:10555
 job_timeout_length: 300 # 5 minutes

data/docs/README.md

@@ -10,7 +10,7 @@
 POST payload /run/:job
 ```
 
-## input
+## api
 
 ```
 PUSH {

data/docs/architecture.dot

@@ -2,26 +2,26 @@ digraph architecture {
   label="Robot Sweatshop process interaction"
   labelloc="top"
 
-  O [label="Overseer",shape=box]
-  I [label="Input"]
-  A [label="Assembler"]
-  W [label="Worker"]
+  overseer [label="Overseer",shape=box]
+  api [label="API"]
+  assembler [label="Assembler"]
+  worker [label="Worker"]
   subgraph cluster_services {
     label="Req/Rep Services"
     labelloc="bottom"
     style="dashed"
-    C [label="Conveyor"]
-    P [label="Payload Parser"]
-    D [label="Job Dictionary"]
+    conveyor [label="Conveyor"]
+    parser [label="Payload Parser"]
+    dictionary [label="Job Dictionary"]
   }
 
-  O->I
-  I->C
-  A->C [dir="both"]
-  A->P [dir="both"]
-  A->D [dir="both"]
-  A->W [headlabel="1..*",labeldistance=2]
-  W->C
+  overseer->api
+  api->conveyor
+  assembler->conveyor [dir="both"]
+  assembler->parser [dir="both"]
+  assembler->dictionary [dir="both"]
+  assembler->worker [headlabel="1..*",labeldistance=2]
+  worker->conveyor
 
-  { rank=same; I W A }
+  { rank=same; api worker assembler }
 }

data/lib/robot_sweatshop/cli/config.rb

@@ -9,10 +9,7 @@ module CLI
     end
 
     def self.path(scope)
-      case scope
-      when 'system'
-        '/etc/robot_sweatshop/config.yaml'
-      when 'user'
+      if scope == 'user'
         '~/.robot_sweatshop/config.yaml'
       else
         '.robot_sweatshop/config.yaml'

data/lib/robot_sweatshop/cli/start.rb

@@ -5,12 +5,12 @@ require 'robot_sweatshop/config'
 module CLI
   # Methods for starting Robot Sweatshop
   module Start
-    def self.sweatshop(for_environment:)
+    def self.sweatshop
       Config.compile_to_file
       eye_config = File.expand_path "#{__dir__}/../../../robot_sweatshop.eye"
       output = `eye load #{eye_config}`
       fail output if $?.exitstatus != 0
-      Announce.success "Robot Sweatshop loaded with a #{for_environment} configuration"
+      Announce.success "Robot Sweatshop loaded"
       Announce.info `eye restart robot_sweatshop`
       Announce.info 'Run \'eye --help\' for more info on debugging'
     end

data/lib/robot_sweatshop/config.rb

@@ -1,5 +1,6 @@
 require 'configatron'
 require 'yaml'
+require 'terminal-announce'
 
 configatron.reset!
 
@@ -16,6 +17,8 @@ configurations.each do |config_path|
     hash = YAML.load_file config_path
     configatron.configure_from_hash hash
   end
+rescue ArgumentError => error
+  Announce.info "Couldn't load '#{config_path}': #{error.message}"
 end
 
 require 'robot_sweatshop/create-config-directories'

data/lib/robot_sweatshop/overseer.rb

@@ -3,20 +3,20 @@ require 'erubis'
 # Helper methods for the Overseer Sinatra server
 module OverseerHelper
   def log_list
-    %w(assembler conveyor input job-dictionary payload-parser worker)
+    log_path = File.expand_path "#{configatron.logfile_path}"
+    Dir.glob("#{log_path}/*.log").map { |path| File.basename path, '.log' }
   end
 
   def job_list
-    log_path = File.expand_path "#{configatron.job_path}"
-    p log_path, Dir.glob("#{log_path}/*.yaml")
-    Dir.glob("#{log_path}/*.yaml").map { |path| File.basename path, '.yaml' }
+    job_path = File.expand_path "#{configatron.job_path}"
+    Dir.glob("#{job_path}/*.yaml").map { |path| File.basename path, '.yaml' }
   end
 
   def frontpage
     context = {
       jobs: job_list,
       logs: log_list,
-      input_port: configatron.input_port
+      api_url: configatron.api_url
     }
     template = File.read "#{__dir__}/templates/index.html.eruby"
     eruby = Erubis::Eruby.new template

data/lib/robot_sweatshop/templates/default_job.yaml

@@ -1,9 +1,9 @@
 ---
 # branch_whitelist:
-# - master
+#   - master
 
 commands:
-- echo "Hello $WORLD!"
+  - echo "Hello $WORLD!"
 
 environment:
   WORLD: Earth

data/lib/robot_sweatshop/templates/index.html.eruby

@@ -8,8 +8,8 @@
     var QueueJob = function() {
       var job = $('select#job').val();
       var data = $('textarea#data').val();
-      console.log("http://localhost:<%= input_port %>/run/"+job);
-      $.post("http://localhost:<%= input_port %>/run/"+job, data);
+      console.log("POST <%= api_url %>/run/"+job);
+      $.post("<%= api_url %>/run/"+job, data);
     }
   </script>
   <style>

data/lib/robot_sweatshop/templates/log.html.eruby

@@ -3,6 +3,9 @@
 <head>
   <meta charset="UTF-8" />
   <title>Robot Sweatshop - <%= process %> log</title>
+  <style>
+    pre { word-wrap: break-word; }
+  </style>
 </head>
 
 <body>

data/robot_sweatshop.eye

@@ -42,10 +42,10 @@ Eye.application :robot_sweatshop do
     start_command "#{__dir__}/bin/sweatshop-overseer"
     daemonize true
   end
-  process :input do
-    pid_file "#{PID_PATH}/input.pid"
-    stdall "#{LOG_PATH}/input.log"
-    start_command "#{__dir__}/bin/sweatshop-input"
+  process :api do
+    pid_file "#{PID_PATH}/api.pid"
+    stdall "#{LOG_PATH}/api.log"
+    start_command "#{__dir__}/bin/sweatshop-api"
     daemonize true
   end
   process :assembler do

data/robot_sweatshop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'robot_sweatshop'
-  gem.version     = '0.4.9'
+  gem.version     = '0.4.11'
   gem.licenses    = 'MIT'
   gem.authors     = ['Justin Scott']
   gem.email       = 'jvscott@gmail.com'
@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.1'
 
-  gem.add_runtime_dependency 'bundler'
   gem.add_runtime_dependency 'faker'
   gem.add_runtime_dependency 'commander'
   gem.add_runtime_dependency 'eye'

data/test/README.md

@@ -1,3 +1,5 @@
+Please run these with `bundle exec`. There's so many self-references that it just makes sense.
+
 You can run individual `_spec.rb` files with Ruby or `all.rb` to go through each. There's no way to run everything together with the way processes are set up but this hasn't been a problem so far.
 
-Because I'm lazy, TestProcess::Stub uses the UNIX `lsof` to check if ports are in use. There's probably a better, more portable way to do this.
+Because I'm lazy, `TestProcess::Stub.running?` uses the UNIX `lsof` to check if ports are in use. There's probably a better, more portable way to do this.

data/test/all.rb

@@ -19,7 +19,7 @@ def non_zero(array)
 end
 
 tests = %w(
-  input
+  api
   conveyor
   payload_parser
   job_dictionary

data/test/{input_spec.rb → api_spec.rb}

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'kintama'
 require 'ezmq'
 require 'oj'
@@ -10,7 +9,7 @@ require_relative 'shared/helpers'
 $stdout.sync = true
 
 Kintama.on_start do
-  @pids = TestProcess.start %w(input)
+  @pids = TestProcess.start %w(api)
   sleep $a_while
 end
 
@@ -26,7 +25,7 @@ given 'the HTTP Input' do
     context "POSTing #{format} data" do
       setup do
         @conveyor = TestProcess.stub :conveyor
-        url = input_url for_job: 'test_job'
+        url = job_running_url for_job: 'test_job'
         Timeout.timeout($a_while) do
           @response = HTTP.post url, body: example_raw_payload(format)
         end

data/test/conveyor_spec.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'kintama'
 require 'ezmq'
 require 'timeout'

data/test/end-to-end_spec.rb

@@ -1,7 +1,7 @@
-require 'bundler/setup'
 require 'kintama'
 require 'ezmq'
 require 'http'
+require 'timeout'
 require_relative 'shared/scaffolding'
 require_relative 'shared/helpers'
 
@@ -11,7 +11,7 @@ describe 'Robot Sweatshop' do
 
   setup do
     Setup.empty_conveyor
-    @pids = TestProcess.start %w(input conveyor payload-parser job-dictionary assembler worker)
+    @pids = TestProcess.start %w(api conveyor payload-parser job-dictionary assembler worker)
     Setup.populate_test_jobs
     sleep $a_while
   end
@@ -20,10 +20,10 @@ describe 'Robot Sweatshop' do
     TestProcess.stop @pids
   end
 
-  context "POSTing data to the HTTP Input" do
+  context "POSTing data to the API" do
     setup do
       clear_worker_output
-      url = input_url for_job: 'test_job'
+      url = job_running_url for_job: 'test_job'
       Timeout.timeout($a_while) { @response = HTTP.post url, body: example_raw_payload('JSON') }
     end
 

data/test/job_dictionary_spec.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'kintama'
 require 'ezmq'
 require 'timeout'

data/test/overseer_spec.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'kintama'
 require 'timeout'
 require 'http'
@@ -24,7 +23,7 @@ given 'the Overseer' do
     should('respond') { assert_equal 200, @response.code }
     should('link to process logs') do
       page = Nokogiri::HTML(@response.to_s)
-      links = page.css('a').select { |link| link.text.include? 'worker' }
+      links = page.css('a').select { |link| link.text.include? 'overseer' }
       assert_not_equal 0, links.count
     end
     should('have a form for running jobs') do
@@ -37,12 +36,12 @@ given 'the Overseer' do
     setup { Timeout.timeout($a_while) { @response = HTTP.get overseer_url('log') } }
     should('redirect') { assert_equal 303, @response.code }
   end
-  context '/log?for=worker' do
-    setup { Timeout.timeout($a_while) { @response = HTTP.get overseer_url('log?for=worker') } }
+  context '/log?for=overseer' do
+    setup { Timeout.timeout($a_while) { @response = HTTP.get overseer_url('log?for=overseer') } }
     should('respond') { assert_equal 200, @response.code }
     should('show logs from file') do
       page = Nokogiri::HTML(@response.to_s)
-      log = File.read "#{configatron.logfile_path}/worker.log"
+      log = File.read "#{configatron.logfile_path}/overseer.log"
       output = page.css('.raw_log').first
       assert_equal log, output.text, 'Expected raw log output'
     end

data/test/payload_parser_spec.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'kintama'
 require 'ezmq'
 require 'timeout'

data/test/shared/helpers/input.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'yaml'
 require 'oj'
 require 'robot_sweatshop/payload'
@@ -10,8 +9,8 @@ module InputHelper
     payload_strings[format.downcase]
   end
 
-  def input_url(for_job: 'test_job')
-    "http://localhost:#{configatron.input_port}/run/#{for_job}"
+  def job_running_url(for_job: 'test_job')
+    "http://localhost:#{configatron.api_port}/run/#{for_job}"
   end
 
   def conveyor_enqueue(type)

data/test/shared/helpers/output.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'fileutils'
 require 'robot_sweatshop/payload'
 require 'robot_sweatshop/config'

data/test/shared/helpers/overseer.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'robot_sweatshop/config'
 
 module OverseerHelper

data/test/shared/scaffolding.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'fileutils'
 require 'oj'
 require 'robot_sweatshop/config'
@@ -28,9 +27,9 @@ module TestProcess
   def self.start(name_list)
     pids = []
     name_list.each do |name|
-      input_script = File.expand_path "#{__dir__}/../../bin/sweatshop-#{name}"
-      input_script += ' testingid' if name == 'worker'
-      pids.push spawn(input_script, out: '/dev/null', err: '/dev/null')
+      command = File.expand_path "#{__dir__}/../../bin/sweatshop-#{name}"
+      command += ' testingid' if name == 'worker'
+      pids.push spawn(command, out: '/dev/null', err: '/dev/null')
     end
     pids
   end

data/test/worker_spec.rb

@@ -1,4 +1,3 @@
-require 'bundler/setup'
 require 'kintama'
 require 'ezmq'
 require 'timeout'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: robot_sweatshop
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.11
 platform: ruby
 authors:
 - Justin Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -280,9 +266,9 @@ description: A lightweight, nonopinionated CI server.
 email: jvscott@gmail.com
 executables:
 - sweatshop
+- sweatshop-api
 - sweatshop-assembler
 - sweatshop-conveyor
-- sweatshop-input
 - sweatshop-job-dictionary
 - sweatshop-overseer
 - sweatshop-payload-parser
@@ -292,15 +278,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/sweatshop
+- bin/sweatshop-api
 - bin/sweatshop-assembler
 - bin/sweatshop-conveyor
-- bin/sweatshop-input
 - bin/sweatshop-job-dictionary
 - bin/sweatshop-overseer
 - bin/sweatshop-payload-parser
@@ -331,6 +318,7 @@ files:
 - robot_sweatshop.gemspec
 - test/README.md
 - test/all.rb
+- test/api_spec.rb
 - test/assembler_spec.rb
 - test/conveyor_spec.rb
 - test/data/custom_script
@@ -342,7 +330,6 @@ files:
 - test/data/test_job.yaml
 - test/data/weird_job.yaml
 - test/end-to-end_spec.rb
-- test/input_spec.rb
 - test/job_dictionary_spec.rb
 - test/overseer_spec.rb
 - test/payload_parser_spec.rb