robot_sweatshop 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eec24a1025b81640f28412b5601d5999e56040f
-  data.tar.gz: 9e3efeb22f6e15c8ec7dcf8c60760901eaf8be34
+  metadata.gz: a5592f2b311bf3192547642a2bee4f295b8a2234
+  data.tar.gz: 1089c1b361eaeec881ce56d59cf605dded0e92ae
 SHA512:
-  metadata.gz: 72eb1ee064569d102f7ac6f1e0a2b772dea5bd790b52f963793ca161bca22fb5a5a5edbad0082e9ffc7fe9d0a9378269ad55b943632b02d5018a889326fd9ef9
-  data.tar.gz: 6d0680dd1d160940db79f436240451489e843f8c0af4a127e00d38ec4413db15e2f57ba3e81e89f3fc8fc4cf2be75ef254a6412ed7065267e58253d4c1986849
+  metadata.gz: f00071cbbfebef8bb00057d4c3cbf805a50b02bbfc3926bc8b8eed275c0f748fda6806d069a6c8e88934a82c1daa7651d74baa9ad18eb44ebb509b5363c0e78b
+  data.tar.gz: 455da1ed22b381fdac31c6c3a8e6130248446e40e4dfccfdb92ba9d196351cd2d7f5d0e29ea5847981b1ee2a4017ff91d8d73dfe8b7c249300a178fa0105e32e

data/README.md

@@ -19,7 +19,8 @@ You can see what jobs are available with `sweatshop job --list`.
 
 Currently supported formats:
 
-- bitbucket
+- Github (application/json format only)
+- Bitbucket
 
 # Configuration
 
@@ -35,7 +36,6 @@ _TODO: Support for running as a custom user via eye uid/gid_
 
 # Roadmap
 
-- Enable Github support
 - CLI job running
 - Common scrips such as git repo syncing
 - Support for multiple workers

data/Rakefile

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

data/config.rb

@@ -2,6 +2,8 @@ require 'fileutils'
 require 'configatron'
 require 'yaml'
 
+# TODO: namespace to avoid collisions?
+
 configurations = [
   "#{__dir__}/config.yaml",
   "#{__dir__}/config.user.yaml",
@@ -17,8 +19,12 @@ end
 config_directories = [
   configatron.common.logfile_directory,
   configatron.common.pidfile_directory,
-  configatron.queue.moneta_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

@@ -10,3 +10,9 @@ input:
 
 queue:
   moneta_directory: /var/db/robot_sweatshop
+
+assembler:
+  job_directory: /etc/robot_sweatshop/jobs
+
+worker:
+  workspace_directory: /etc/robot_sweatshop/workspaces

data/kintama/data/payload_data.yaml

@@ -4,3 +4,5 @@ malformed: |
   payload=%7B%22nothing%22%3A%22here%22%7D
 bitbucket: |
   payload=%7B%22repository%22%3A+%7B%22website%22%3A+%22%22%2C+%22fork%22%3A+false%2C+%22name%22%3A+%22Project+X%22%2C+%22scm%22%3A+%22git%22%2C+%22owner%22%3A+%22marcus%22%2C+%22absolute_url%22%3A+%22%2Fmarcus%2Fproject-x%2F%22%2C+%22slug%22%3A+%22project-x%22%2C+%22is_private%22%3A+true%7D%2C+%22truncated%22%3A+false%2C+%22commits%22%3A+%5B%7B%22node%22%3A+%22620ade18607a%22%2C+%22files%22%3A+%5B%7B%22type%22%3A+%22modified%22%2C+%22file%22%3A+%22README%22%7D%5D%2C+%22raw_author%22%3A+%22Marcus+Bertrand+%3Cmarcus%40somedomain.com%3E%22%2C+%22utctimestamp%22%3A+%222014-08-08+00%3A04%3A07%2B00%3A00%22%2C+%22author%22%3A+%22marcus%22%2C+%22timestamp%22%3A+%222014-08-08+02%3A04%3A07%22%2C+%22raw_node%22%3A+%22620ade18607ac42d872b568bb92acaa9a28620e9%22%2C+%22parents%22%3A+%5B%22702c70160afc%22%5D%2C+%22branch%22%3A+%22develop%22%2C+%22message%22%3A+%22Added+some+more+things+to+somefile.py%5Cn%22%2C+%22revision%22%3A+null%2C+%22size%22%3A+-1%7D%5D%2C+%22canon_url%22%3A+%22https%3A%2F%2Fbitbucket.org%22%2C+%22user%22%3A+%22marcus%22%7D
+github: |
+  {"ref":"refs/heads/master","before":"ca8ad5b796be2edebd10563e20d56d6a58477ecc","after":"3aa2a0eff5fac9ea9faab8055229b363e4d44e56","created":false,"deleted":false,"forced":false,"base_ref":null,"compare":"https://github.com/JScott/configs/compare/ca8ad5b796be...3aa2a0eff5fa","commits":[{"id":"3aa2a0eff5fac9ea9faab8055229b363e4d44e56","distinct":true,"message":"test","timestamp":"2015-03-07T10:37:51-08:00","url":"https://github.com/JScott/configs/commit/3aa2a0eff5fac9ea9faab8055229b363e4d44e56","author":{"name":"Justin Scott","email":"jvscott@gmail.com","username":"JScott"},"committer":{"name":"Justin Scott","email":"jvscott@gmail.com","username":"JScott"},"added":["test"],"removed":[],"modified":[]}],"head_commit":{"id":"3aa2a0eff5fac9ea9faab8055229b363e4d44e56","distinct":true,"message":"test","timestamp":"2015-03-07T10:37:51-08:00","url":"https://github.com/JScott/configs/commit/3aa2a0eff5fac9ea9faab8055229b363e4d44e56","author":{"name":"Justin Scott","email":"jvscott@gmail.com","username":"JScott"},"committer":{"name":"Justin Scott","email":"jvscott@gmail.com","username":"JScott"},"added":["test"],"removed":[],"modified":[]},"repository":{"id":15853602,"name":"configs","full_name":"JScott/configs","owner":{"name":"JScott","email":"jvscott@gmail.com"},"private":false,"html_url":"https://github.com/JScott/configs","description":"Any dot files or build scripts that help me day to day. Maybe you can get some use out of them too!","fork":false,"url":"https://github.com/JScott/configs","forks_url":"https://api.github.com/repos/JScott/configs/forks","keys_url":"https://api.github.com/repos/JScott/configs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/JScott/configs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/JScott/configs/teams","hooks_url":"https://api.github.com/repos/JScott/configs/hooks","issue_events_url":"https://api.github.com/repos/JScott/configs/issues/events{/number}","events_url":"https://api.github.com/repos/JScott/configs/events","assignees_url":"https://api.github.com/repos/JScott/configs/assignees{/user}","branches_url":"https://api.github.com/repos/JScott/configs/branches{/branch}","tags_url":"https://api.github.com/repos/JScott/configs/tags","blobs_url":"https://api.github.com/repos/JScott/configs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/JScott/configs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/JScott/configs/git/refs{/sha}","trees_url":"https://api.github.com/repos/JScott/configs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/JScott/configs/statuses/{sha}","languages_url":"https://api.github.com/repos/JScott/configs/languages","stargazers_url":"https://api.github.com/repos/JScott/configs/stargazers","contributors_url":"https://api.github.com/repos/JScott/configs/contributors","subscribers_url":"https://api.github.com/repos/JScott/configs/subscribers","subscription_url":"https://api.github.com/repos/JScott/configs/subscription","commits_url":"https://api.github.com/repos/JScott/configs/commits{/sha}","git_commits_url":"https://api.github.com/repos/JScott/configs/git/commits{/sha}","comments_url":"https://api.github.com/repos/JScott/configs/comments{/number}","issue_comment_url":"https://api.github.com/repos/JScott/configs/issues/comments{/number}","contents_url":"https://api.github.com/repos/JScott/configs/contents/{+path}","compare_url":"https://api.github.com/repos/JScott/configs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/JScott/configs/merges","archive_url":"https://api.github.com/repos/JScott/configs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/JScott/configs/downloads","issues_url":"https://api.github.com/repos/JScott/configs/issues{/number}","pulls_url":"https://api.github.com/repos/JScott/configs/pulls{/number}","milestones_url":"https://api.github.com/repos/JScott/configs/milestones{/number}","notifications_url":"https://api.github.com/repos/JScott/configs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/JScott/configs/labels{/name}","releases_url":"https://api.github.com/repos/JScott/configs/releases{/id}","created_at":1389570979,"updated_at":"2015-03-07T18:34:54Z","pushed_at":1425753471,"git_url":"git://github.com/JScott/configs.git","ssh_url":"git@github.com:JScott/configs.git","clone_url":"https://github.com/JScott/configs.git","svn_url":"https://github.com/JScott/configs","homepage":null,"size":484,"stargazers_count":0,"watchers_count":0,"language":"Shell","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master","stargazers":0,"master_branch":"master"},"pusher":{"name":"JScott","email":"jvscott@gmail.com"},"sender":{"login":"JScott","id":25989,"avatar_url":"https://avatars.githubusercontent.com/u/25989?v=3","gravatar_id":"","url":"https://api.github.com/users/JScott","html_url":"https://github.com/JScott","followers_url":"https://api.github.com/users/JScott/followers","following_url":"https://api.github.com/users/JScott/following{/other_user}","gists_url":"https://api.github.com/users/JScott/gists{/gist_id}","starred_url":"https://api.github.com/users/JScott/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JScott/subscriptions","organizations_url":"https://api.github.com/users/JScott/orgs","repos_url":"https://api.github.com/users/JScott/repos","events_url":"https://api.github.com/users/JScott/events{/privacy}","received_events_url":"https://api.github.com/users/JScott/received_events","type":"User","site_admin":false}}

data/kintama/end-to-end_spec.rb

@@ -19,7 +19,9 @@ describe 'Robot Sweatshop' do
   context "POST git data to the HTTP Input" do
     setup do
       url = input_http_url for_job: @job_name
+puts "posting..."
       HTTP.post url, body: load_payload('bitbucket')
+puts "post successful"
       sleep $for_everything
     end
 

data/kintama/payload_parser_spec.rb

@@ -16,8 +16,7 @@ describe 'the Payload Parser' do
     clear_all_queues
   end
 
-  # TODO: refactor and add github
-  ['Bitbucket'].each do |format|
+  %w(Bitbucket Github).each do |format|
     given "valid #{format} data in 'raw-payload'" do
       setup do
         payload = example_raw_payload(with_format: format)

data/kintama/shared/helpers.rb

@@ -48,7 +48,7 @@ module JobHelper
                   job_name: 'example'
   end
   def reset_test_file
-    test_file = File.expand_path "#{__dir__}/../../workspaces/example-testingid/test.txt"
+    test_file = File.expand_path "#{configatron.worker.workspace_directory}/example-testingid/test.txt"
     FileUtils.rm_rf test_file
     test_file
   end

data/lib/job/assembler.rb

@@ -1,11 +1,24 @@
 #!/usr/bin/env ruby
 require 'yaml'
 require_relative '../queue-helper'
+require_relative '../../config'
 
-def get_config(for_job_name:)
-  job_directory = "#{__dir__}/../../jobs"
-  job_config_path = "#{job_directory}/#{for_job_name}.yaml"
-  unless File.file? job_config_path
+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
   end
@@ -13,7 +26,7 @@ def get_config(for_job_name:)
 end
 
 def assemble_job(data)
-  job_config = get_config for_job_name: data['job_name']
+  job_config = load_config for_job_name: data['job_name']
   return nil unless job_config
   if job_config['branch_whitelist'].include? data['payload']['branch']
     context = job_config['environment'].merge(data['payload'])

data/lib/job/worker.rb

@@ -2,6 +2,7 @@
 require 'faker'
 require 'fileutils'
 require_relative '../queue-helper'
+require_relative '../../config'
 
 # TODO: check existing worker ids. it'd be disastrous to have two sharing a workspace
 @worker_id = ARGV[0] || "#{Faker::Name.first_name}"
@@ -9,7 +10,7 @@ require_relative '../queue-helper'
 def from_workspace(named: 'no_job_name')
   workspace = "#{named}-#{@worker_id}"
   puts "Workspace: #{workspace}"
-  path = File.expand_path "#{__dir__}/../../workspaces/#{workspace}"
+  path = "#{configatron.worker.workspace_directory}/#{workspace}"
   FileUtils.mkpath path
   Dir.chdir(path) { yield if block_given? }
 end

data/lib/payload/lib/github.rb

@@ -40,6 +40,6 @@ class GithubPayload < Payload
   end
 
   def source_url
-    head_commit['url'] || ''
+    commit['url'] || ''
   end
 end

data/robot_sweatshop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'robot_sweatshop'
-  gem.version     = '0.1.2'
+  gem.version     = '0.1.3'
   gem.licenses    = 'MIT'
   gem.authors     = ['Justin Scott']
   gem.email       = 'jvscott@gmail.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: robot_sweatshop
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Justin Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -202,7 +202,6 @@ files:
 - robot_sweatshop.gemspec
 - robot_sweatshop.production.eye
 - robot_sweatshop.testing.eye
-- workspaces/.keep
 homepage: http://www.github.com/jscott/robot_sweatshop/
 licenses:
 - MIT