argus-builder 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 493ccb46314486055d4caa0d2168bef4e69313b4
-  data.tar.gz: 98457b166a0c082cb757ba44b28dccb39dbfbbd8
+  metadata.gz: 145c2ab7806fa9d79f972c7c7204fab58c7f991f
+  data.tar.gz: afbc50652c564cfd36b3de596c01d901072290c3
 SHA512:
-  metadata.gz: 4c826fb33c67b41c83ccbe02863b2f5932ecf1c4f10c126d3405e0937164a7086ee9aed052fb7f7c3866ca355578a0374977ff71f58aced0ad9a887d5f4cc5ef
-  data.tar.gz: 504c2d7180ed1f595893486444664c14c4b5be1b1578140398216208b5705e64d90d77e094695dbb7eed71fc0dfa1545f47b5a7b683c6b7b1c41327995d6886b
+  metadata.gz: 45bb8ebdb954fbff07336c80f870b0dd0a102a63256e11c541daf4f777ba9cad1801d54c4a34b1ccc4f4571defd2a76d965418bb2f95f46dbe421a354fb3ae4d
+  data.tar.gz: d9c5c2c0848dfd1be63a487deacd4db6993d7fe30d4c5ae0156498e9f26114cd596bf72d87c4d43f677655417ae0a91ac675666e9e91c149569826ca8a721268

data/README.md

@@ -27,7 +27,13 @@ You will need:
   `GITHUB_TOKEN`
 - a repository created on ECR to push the docker image once built
 
-Create an SQS queue called `argus`, then:
+If you have local docker, you can run a single build with:
+
+```
+argus-build rlister/argus:master
+```
+
+To run the builder daemon, create an SQS queue called `argus`, then:
 
 ```
 gem install argus-builder

data/bin/argus-build

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+## run a single argus build directly
+
+require 'argus'
+
+usage = 'argus-build org/repo:branch [sha]'
+
+if ARGV.empty?
+  puts "Usage: #{usage}"
+  exit
+end
+
+## parse github repo
+org, repo, branch = ARGV[0].split(/[\/:]+/, 3)
+sha = ARGV[1] || nil
+
+## incoming message from sqs
+msg = {
+  org:    org,
+  repo:   repo,
+  branch: branch,
+  sha:    sha
+}
+
+## prevent timeout on docker api operations (e.g. long bundle install during build)
+Excon.defaults[:write_timeout] = ENV.fetch('DOCKER_WRITE_TIMEOUT', 1000)
+Excon.defaults[:read_timeout]  = ENV.fetch('DOCKER_READ_TIMEOUT',  1000)
+
+Argus::Runner.new(msg)

data/bin/argus-send

@@ -3,7 +3,7 @@
 require 'aws-sdk'
 
 ## parse github repo
-org, repo, branch = ARGV[0].split(/[\/:]+/)
+org, repo, branch = ARGV[0].split(/[\/:]+/, 3)
 
 ## format to send to argus
 msg = {

data/lib/argus/docker.rb

@@ -34,9 +34,15 @@ module Argus
 
       @build_time = Benchmark.realtime do
         @image = Docker::Image.build_from_dir('.', dockerfile: 'Dockerfile') do |chunk|
-          stream = JSON.parse(chunk)['stream']
-          unless (stream.nil? || stream.match(/^[\s\.]+$/)) # very verbose about build progress
-            puts stream.chomp
+          chunk.split(/[\r\n]+/).each do |line| # latest docker jams multiple streams into chunk
+            begin
+              stream = JSON.parse(line)['stream']
+              unless (stream.nil? || stream.match(/^[\s\.]+$/)) # very verbose about build progress
+                puts stream.chomp
+              end
+            rescue => e         # be robust to json parse errors
+              puts e.message
+            end
           end
         end
       end

data/lib/argus/git.rb

@@ -2,11 +2,11 @@ module Argus
   class Git
     attr_reader :org, :repo, :branch, :sha
 
-    def initialize(org, repo, branch = 'master')
+    def initialize(org, repo, branch = 'master', sha = nil)
       @org    = org
       @repo   = repo
       @branch = branch
-      @sha    = nil
+      @sha    = sha
     end
 
     def to_s
@@ -34,7 +34,8 @@ module Argus
       else
         clone
       end
-      @sha = rev_parse                 # return SHA
+      reset if sha              # specific sha was requested
+      @sha = rev_parse          # return sha
     end
 
     ## checkout branch of an existing repo
@@ -51,6 +52,12 @@ module Argus
       raise ArgusError, "git clone failed for #{self}" unless $? == 0
     end
 
+    ## get a specific commit
+    def reset
+      puts "specific sha requested, resetting to #{sha}"
+      %x[git fetch && git reset --hard #{sha}]
+    end
+
     ## get current sha
     def rev_parse
       %x[git rev-parse #{branch} ].chomp

data/lib/argus/runner.rb

@@ -52,7 +52,7 @@ module Argus
       FileUtils.mkdir_p(dir)
 
       ## github repo to get
-      git = Git.new(msg[:org], msg[:repo], msg[:branch])
+      git = Git.new(msg[:org], msg[:repo], msg[:branch], msg.fetch(:sha, nil))
 
       ## authenticate to registry
       registry = authenticate_ecr

data/lib/argus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: argus-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Richard Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ description:
 email:
 - rlister+gh@gmail.com
 executables:
+- argus-build
 - argus-send
 - argus-worker
 - console
@@ -100,6 +101,7 @@ files:
 - README.md
 - Rakefile
 - argus.gemspec
+- bin/argus-build
 - bin/argus-send
 - bin/argus-worker
 - bin/console