vx-worker 0.2.1 → 0.3.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96e09a570bfc0d594a12355a2b0638de9e647583
-  data.tar.gz: f6353a5aa2583d06c2c1982f9849c62418929f66
+  metadata.gz: 4a191dee94cb01a6620420e3739eab93dae138e1
+  data.tar.gz: 32849707818830f282a6af4c0f9e83d7cc9d7f91
 SHA512:
-  metadata.gz: 66c295d5ca7fe1c17f11e4f4dc80780bc5a8ba1c86f46e44a4da0b93f72e26e7e6b788948c3aca61f05725e0e9ac140a7f0b2bdc1f7eaec4e8fe87923efe62c8
-  data.tar.gz: ea635b5522aed2fd5b70d8342dedf7c2dd2b0c08f486f0b64499d58d96a95fdf9032bd1e5fc14c3005a57a6b946f3e74c8ac0713bc370ecb9d0c58a1af6e09f6
+  metadata.gz: 3a66ad52567249f726d3f685906e81b0bbc67bda4adeeab76fe0780f5ed05cf6a739f6c5854e46cbaa1f204d85d104e39d6ee777cb1677e35996f0c18632fcab
+  data.tar.gz: acd583b29ea3b59afd002c42ce87fc3e37f56f8fdfb6528d42e5bb1745aefa69488d2f78d85006512c98ddca51b11edcf627d3941290c01d9a705e95bab6ff9a

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 fixtures/
+.tmp/
+.vagrant/

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in vx-worker.gemspec
 gemspec
+
+group :test do
+  gem 'rspec'
+  gem 'rr'
+end

data/Vagrantfile

@@ -0,0 +1,80 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+class CloudUbuntuVagrant < VagrantVbguest::Installers::Ubuntu
+  def install(opts=nil, &block)
+    communicate.sudo('sed -i "/^# deb.*multiverse/ s/^# //" /etc/apt/sources.list ', opts, &block)
+    communicate.sudo('apt-get update', opts, &block)
+    communicate.sudo('apt-get -y -q purge virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11', opts, &block)
+    @vb_uninstalled = true
+    super
+  end
+
+  def running?(opts=nil, &block)
+    return false if @vb_uninstalled
+    super
+  end
+end
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = 'precise64'
+  config.vm.box_url = 'http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box'
+
+  script =<<SCRIPT
+set -e
+
+cat > /etc/apt/sources.list << EOF
+deb mirror://mirrors.ubuntu.com/mirrors.txt precise main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt precise-backports main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt precise-security main restricted universe multiverse
+EOF
+
+mkdir -p /etc/apt/sources.list.d
+
+if [ ! -f /etc/apt/sources.list.d/vexor.list ] ; then
+  echo 'deb http://download.opensuse.org/repositories/home:/dmexe:/vexor:/testing/xUbuntu_12.04/  ./' > /etc/apt/sources.list.d/vexor.list
+  curl -s http://download.opensuse.org/repositories/home:/dmexe:/vexor:/testing/xUbuntu_12.04/Release.key | apt-key add -
+fi
+
+if [ ! -f /etc/apt/sources.list.d/osc.list ] ; then
+  echo 'deb http://download.opensuse.org/repositories/openSUSE:/Tools/xUbuntu_12.04/ ./' > /etc/apt/sources.list.d/osc.list
+  curl -s http://download.opensuse.org/repositories/openSUSE:/Tools/xUbuntu_12.04/Release.key | apt-key add -
+fi
+
+apt-get -qqy update > /dev/null
+apt-get -qy install osc build vx-embeded-ruby vx-embeded-bundler git-core devscripts debhelper > /dev/null
+apt-get -qy autoremove > /dev/null
+
+function sd () {
+  sudo su -c "$1" vagrant
+}
+
+if [ ! -d home:dmexe:vexor:testing ] ; then
+  pushd /home/vagrant
+  sd "osc co home:dmexe:vexor:testing"
+  popd
+fi
+
+pushd /vagrant/.tmp/
+  sudo su -c "sh build.sh" vagrant
+popd
+
+pushd /home/vagrant/home:dmexe:vexor:testing/vx-worker
+  sd "rm -rf vx-worker_*"
+  sd "cp /vagrant/.tmp/vx-worker_* ."
+  status=$(sudo su -c "osc st" vagrant)
+  if [ ! -z "${status}" ] ; then
+    echo "changes detected: ${status}"
+    sd "osc addremove"
+    sd "osc ci -m 'bump'"
+  fi
+popd
+
+SCRIPT
+
+  config.vm.provision :shell, :inline => script
+end

data/dist/build.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+set -e
+
+PACKAGE_NAME="vx-worker"
+
+GIT_LAST_LOG=$(git log -n1 --format=oneline)
+GIT_BUILD_NUMBER=$(git rev-list HEAD | wc -l | sed -e 's/ *//g' | xargs -n1 printf %04d)
+GIT_LAST_TAG=$(git describe --abbrev=0 --tags)
+GIT_VERSION=$(echo $GIT_LAST_TAG | sed -e "s/^v//g")
+GIT_DATE=$(git log -n1 --format="%aD")
+
+RELEASE_VERSION=$(echo $GIT_VERSION | ruby -e "puts Gem::Version.new(STDIN.read).release.to_s")
+RELEASE_SHORT_VERSION=$(echo $GIT_VERSION | ruby -e "puts Gem::Version.new(STDIN.read).release.to_s.split('.')[0..1].join('.')")
+
+VERSION="${RELEASE_VERSION}.rev${GIT_BUILD_NUMBER}"
+PACKAGE_NAME_AND_VERSION="${PACKAGE_NAME}_${VERSION}"
+WORKDIR=".tmp/${PACKAGE_NAME_AND_VERSION}"
+
+function notice() {
+  echo " ---> $1"
+}
+
+function git_export () {
+  rm -rf .tmp
+  mkdir -p $WORKDIR
+  notice "export code to $WORKDIR"
+  git archive master | tar -x -C $WORKDIR
+}
+
+function package_gems () {
+  notice "packaging gems"
+  (cd $WORKDIR && bundle package > /dev/null)
+}
+
+function generate_debian () {
+  notice "generating debian scripts"
+
+  dst=${WORKDIR}/debian
+  src=dist/debian
+
+  pushd .tmp > /dev/null
+    tar -czf "${PACKAGE_NAME_AND_VERSION}.orig.tar.gz" ${PACKAGE_NAME_AND_VERSION}
+  popd > /dev/null
+
+  cp -r $src $dst
+
+  cat $dst/control.mk | sed -e "s/%PACKAGE_NAME%/${PACKAGE_NAME}/g" > $dst/control
+  cat $dst/changelog.mk | sed -e "s/%VERSION%/${VERSION}/g" | sed -e "s/%DATE%/${GIT_DATE}/g" > $dst/changelog
+}
+
+function run_vagrant () {
+  notice "run build in vagrant"
+
+  cat > .tmp/build.sh <<EOF
+set -e
+set -x
+
+(cd ${PACKAGE_NAME_AND_VERSION} && debuild -i -us -uc -S)
+
+mv ${PACKAGE_NAME_AND_VERSION} work
+EOF
+  vagrant up
+  vagrant provision
+}
+
+
+function build () {
+  notice "Building ${PACKAGE_NAME_AND_VERSION}"
+
+  git_export
+  package_gems
+  generate_debian
+  run_vagrant
+}
+
+build

data/dist/debian/changelog.mk

@@ -0,0 +1,6 @@
+vx-worker (%VERSION%) UNRELEASED; urgency=low
+
+  * bump
+
+ -- Dmitry Galinsky <dima.exe@gmail.com>  %DATE%
+

data/dist/debian/ci_env

@@ -0,0 +1,7 @@
+# RABBITMQ_URL=amqp://guest:guest@localhost/%2f
+
+# VX_WORKERS=4
+# VX_DOCKER_IMAGE=dmexe/precise
+
+# AIRBRAKE_API_KEY=<key>
+# AIRBRAKE_HOST=<host>

data/dist/debian/compat

@@ -0,0 +1 @@
+5

data/dist/debian/control.mk

@@ -0,0 +1,12 @@
+Source: vx-worker
+Section: ruby
+Priority: optional
+Maintainer: Dmitry Galinsky <dima.exe@gmail.com>
+Build-Depends: debhelper (>= 9.0), vx-embeded-ruby, vx-embeded-bundler, git-core
+Standards-Version: 3.9.3
+Homepage: http://www.ruby-lang.org/
+
+Package: %PACKAGE_NAME%
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, vx-embeded-ruby, vx-embeded-bundler, adduser
+Description: Vexor worker.

data/dist/debian/postrm

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        if test "x$1" == "xpurge"
+        then
+            userdel -r vx-worker || true
+            rm -rf /var/lib/vexor/worker
+            rm -f /var/log/upstart/vx-worker.log
+        fi
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+esac
+
+#DEBHELPER#
+
+exit 0
+

data/dist/debian/preinst

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+if [ "$1" == "install" ] || [ "$1" == "upgrade" ]; then
+
+  if ! id vx-worker 1> /dev/null 2>&1; then
+    groupadd -f -r vx-worker
+    useradd -d /var/lib/vexor/worker -g vx-worker -G docker -c "Vexor worker daemon" -s /usr/sbin/nologin -r vx-worker
+  fi
+
+  install -m 750 -o vx-worker -g vx-worker -d /var/lib/vexor/worker
+fi
+
+#DEBHELPER#
+
+exit 0
+

data/dist/debian/rules

@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+BUNDLE = /opt/vexor/bin/bundle
+DIST = $(shell pwd)/debian/vx-worker/opt/vexor/worker
+
+%:
+	dh $@
+
+override_dh_auto_install:
+	$(BUNDLE) install --without development --local --standalone
+	mkdir -p $(DIST)
+	cp -r bin $(DIST)
+	cp -r docker $(DIST)
+	cp -r lib $(DIST)
+	cp -r bundle $(DIST)
+	rm -rf $(DIST)/debian
+	mkdir -p debian/vx-worker/etc/vexor
+	install -m 0644 debian/ci_env debian/vx-worker/etc/vexor/ci
+	mkdir -p debian/vx-worker/opt/vexor/bin
+	install -m 0755 debian/script debian/vx-worker/opt/vexor/bin/worker

data/dist/debian/script

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+RUBY=/opt/vexor/ruby/bin/ruby
+REQ=/opt/vexor/worker/bundle/bundler/setup.rb
+
+exec ${RUBY} -r ${REQ} /opt/vexor/worker/bin/vx-worker $*

data/dist/debian/source/format

@@ -0,0 +1 @@
+1.0

data/dist/debian/upstart

@@ -0,0 +1,18 @@
+description "start and stop the vexor worker"
+version "1.0"
+
+start on filesystem or runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+console log
+
+script
+  home=/var/lib/vexor/worker
+  user=vx-worker
+  command=/opt/vexor/bin/worker
+
+  chdir $home
+  su -s /bin/sh -c "exec $command" $user
+end script

data/lib/vx/worker/middlewares/update_job_status.rb

@@ -51,11 +51,11 @@ module Vx
         def create_message(job, status)
           tm = Time.now
           Message::JobStatus.new(
-            build_id: job.message.id,
-            job_id:   job.message.job_id,
-            status:   status,
-            tm:       tm.to_i,
-            matrix:   job.message.matrix_keys
+            project_id: job.message.project_id,
+            build_id:   job.message.id,
+            job_id:     job.message.job_id,
+            status:     status,
+            tm:         tm.to_i,
           )
         end
 

data/lib/vx/worker/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Worker
-    VERSION = "0.2.1"
+    VERSION = "0.3.0.pre0"
   end
 end

data/spec/support/shared_examples/update_job_status_message_spec.rb

@@ -1,6 +1,6 @@
 shared_examples "UpdateJobStatus message" do
-  its(:build_id) { should eq job.message.id }
-  its(:job_id)   { should eq job.message.job_id }
-  its(:matrix)   { should eq job.message.matrix_keys }
-  its(:tm)       { should be }
+  its(:project_id) { should eq job.message.project_id }
+  its(:build_id)   { should eq job.message.id }
+  its(:job_id)     { should eq job.message.job_id }
+  its(:tm)         { should be }
 end

data/vx-worker.gemspec

@@ -19,13 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'vx-common',               "= 0.2.1"
-  spec.add_runtime_dependency 'vx-message',              "= 0.2.1"
-  spec.add_runtime_dependency 'vx-container_connector',  "= 0.2.1"
+  spec.add_runtime_dependency 'vx-message',              "= 0.4.1"
+  spec.add_runtime_dependency 'vx-container_connector',  "= 0.2.3"
   spec.add_runtime_dependency 'vx-common-amqp',          '~> 0.2.6'
   spec.add_runtime_dependency 'hashr',                   '= 0.0.22'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rr"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-worker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0.pre0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: vx-container_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: vx-common-amqp
   requirement: !ruby/object:Gem::Requirement
@@ -108,34 +108,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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: rr
-  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: ' ci worker '
 email:
 - dima.exe@gmail.com
@@ -150,7 +122,19 @@ files:
 - Gemfile
 - LICENSE.txt
 - Rakefile
+- Vagrantfile
 - bin/vx-worker
+- dist/build.sh
+- dist/debian/changelog.mk
+- dist/debian/ci_env
+- dist/debian/compat
+- dist/debian/control.mk
+- dist/debian/postrm
+- dist/debian/preinst
+- dist/debian/rules
+- dist/debian/script
+- dist/debian/source/format
+- dist/debian/upstart
 - docker/.gitignore
 - docker/Dockerfile
 - docker/build.sh
@@ -226,9 +210,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14