argus-builder 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dcaaed12b45f52b1547d810cd1a87a1f4611b59
-  data.tar.gz: 41dd4d8362911253e86857d565336808cdb4a830
+  metadata.gz: 493ccb46314486055d4caa0d2168bef4e69313b4
+  data.tar.gz: 98457b166a0c082cb757ba44b28dccb39dbfbbd8
 SHA512:
-  metadata.gz: b95253f269aba1667ced23154968a1400c4b91400d6c6f34f398d32f7e22bbb8c94fa5a25d644dcdea5ff0aaef48232d717d1673f044623ab25cc6df9ef7fe4a
-  data.tar.gz: 95b2df158dd4c45b283be922fd6201e379bbfe18aa9f33104a03f1c34dc9470423d32662e1772d2394382c0a966ac57d0da0521adac4432333ee43c40edf7198
+  metadata.gz: 4c826fb33c67b41c83ccbe02863b2f5932ecf1c4f10c126d3405e0937164a7086ee9aed052fb7f7c3866ca355578a0374977ff71f58aced0ad9a887d5f4cc5ef
+  data.tar.gz: 504c2d7180ed1f595893486444664c14c4b5be1b1578140398216208b5705e64d90d77e094695dbb7eed71fc0dfa1545f47b5a7b683c6b7b1c41327995d6886b

data/README.md

@@ -13,6 +13,10 @@ Features:
 The primary goal of this project is simplicity. It should be easy to
 adapt to your exact image-building needs.
 
+Argus is implemented as a shoryuken
+worker. [Shoryuken](https://github.com/phstc/shoryuken) is a super
+efficient AWS SQS thread based message processor.
+
 ## Quick-start
 
 You will need:
@@ -84,7 +88,7 @@ argus-worker
 ## Build procedure
 
 Argus builds images as follows. Examine and modify `lib/argus/git.rb`
-and `lib/argus/docker.git` to change exact behaviour.
+and `lib/argus/docker.rb` to change exact behaviour.
 
 1. `git clone` a new github repo, or `git checkout` an existing one
 1. authenticate to elastic container registry using provided credentials
@@ -106,7 +110,8 @@ require 'aws-sdk'
 msg = {
   org:    org,
   repo:   repo,
-  branch: branch
+  branch: branch,
+  tag:    repo:branch # optional
 }
 
 sqs = Aws::SQS::Client.new
@@ -116,6 +121,22 @@ sqs.send_message(
 )
 ```
 
+If no tag is given it will be constructed as
+`registry/repo:branch`. The git branch will have `/` changed to `-` to
+make a legal docker image name.
+
+For example, git repo:
+
+```
+rlister/argus:feature/foo
+```
+
+will produce docker image:
+
+```
+xxx.dkr.ecr.us-east-1.amazonaws.com/argus:feature-foo
+```
+
 ## Shoryuken options
 
 `argus` is a simple shoryuken worker. You can run it directly from the
@@ -171,7 +192,7 @@ the `.gem` file to [rubygems.org](https://rubygems.org).
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-https://github.com/[USERNAME]/argus. This project is intended to be a
+https://github.com/rlister/argus. This project is intended to be a
 safe, welcoming space for collaboration, and contributors are expected
 to adhere to the
 [Contributor Covenant](http://contributor-covenant.org) code of

data/bin/argus-worker

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 exec <<EOF
+  bundle exec \
   shoryuken \
   --require ./lib/argus/worker.rb \
   --queue ${ARGUS_QUEUE:-argus} \

data/lib/argus/docker.rb

@@ -5,9 +5,8 @@ module Argus
   class Image
     attr_reader :repo, :branch, :build_time, :image, :push_time
 
-    def initialize(repo, branch)
-      @repo   = repo
-      @branch = branch
+    def initialize(name)
+      @repo, @branch = name.split(':')
     end
 
     def to_s

data/lib/argus/runner.rb

@@ -32,6 +32,18 @@ module Argus
       URI.parse(auth.proxy_endpoint).host
     end
 
+    ## return image tag, or make it out of:
+    ## repo:branch with / changed to - in branch;
+    ## prepend registry if none given
+    def image_name(registry, msg)
+      name = msg[:tag] || (msg[:repo] + ':' + msg[:branch].gsub('/', '-'))
+      if name.include?('/')
+        name
+      else
+        "#{registry}/#{name}"
+      end
+    end
+
     def initialize(msg)
       msg = symbolize_keys(msg)
 
@@ -46,7 +58,7 @@ module Argus
       registry = authenticate_ecr
 
       ## docker image to build
-      img = Image.new("#{registry}/#{msg[:repo]}", msg[:branch])
+      img = Image.new(image_name(registry, msg))
 
       Dir.chdir(dir) do
         img.pull              # pull some layers to speed up the build

data/lib/argus/version.rb

@@ -1,3 +1,3 @@
 module Argus
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argus-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Richard Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler