argus-builder 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 145c2ab7806fa9d79f972c7c7204fab58c7f991f
-  data.tar.gz: afbc50652c564cfd36b3de596c01d901072290c3
+  metadata.gz: 88b9eb34ea2855eef14e84724d8a49746255fb3b
+  data.tar.gz: e0d866df02658db26a327ba49a27c783fbe71721
 SHA512:
-  metadata.gz: 45bb8ebdb954fbff07336c80f870b0dd0a102a63256e11c541daf4f777ba9cad1801d54c4a34b1ccc4f4571defd2a76d965418bb2f95f46dbe421a354fb3ae4d
-  data.tar.gz: d9c5c2c0848dfd1be63a487deacd4db6993d7fe30d4c5ae0156498e9f26114cd596bf72d87c4d43f677655417ae0a91ac675666e9e91c149569826ca8a721268
+  metadata.gz: 12b77e5e546de73c42ac94cc4b107009899764a3872505494318171c534928fe6117726a228a7d1d1ec3bd143b1c702f62f51244d9d145c9d3c7e9e180c6b307
+  data.tar.gz: afaa3cfa70c350ce7d88635a5f9d5a9a1dcb1880776a4d299293ee9b9df9f19a39fe697e176c947e599316b5b4aca0c0b182ac74d6c8d8afe31a7bc0adbbc2bc

data/README.md

@@ -116,8 +116,8 @@ require 'aws-sdk'
 msg = {
   org:    org,
   repo:   repo,
-  branch: branch,
-  tag:    repo:branch # optional
+  branch: branch,     # optional, defaults to master
+  tag:    repo:branch # optional. defaults to repo:branch
 }
 
 sqs = Aws::SQS::Client.new

data/bin/argus-build

@@ -2,28 +2,39 @@
 ## run a single argus build directly
 
 require 'argus'
+require 'optparse'
 
-usage = 'argus-build org/repo:branch [sha]'
+USAGE = 'argus-build org/repo:branch'
 
-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 to send to argus runner
 msg = {
-  org:    org,
-  repo:   repo,
-  branch: branch,
-  sha:    sha
+  build_options: {}
 }
 
+OptionParser.new do |opts|
+  opts.banner = USAGE
+
+  opts.on('-s', '--sha SHA', 'Git SHA to build') do |s|
+    msg[:sha] = s
+  end
+
+  opts.on('-d', '--dockerfile FILENAME', 'Name of Dockerfile') do |d|
+    msg[:build_options][:dockerfile] = d
+  end
+
+  opts.on('-n', '--no-cache', 'Invalidate docker build cache') do |n|
+    msg[:build_options][:nocache] = true
+  end
+end.parse!
+
+abort("Usage: #{USAGE}") if ARGV.empty?
+
+## parse github repo
+msg[:org], msg[:repo], msg[:branch] = ARGV[0].split(/[\/:]+/, 3)
+msg.reject! { |_,v| v.nil? }
+
 ## 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)
+Excon.defaults[:write_timeout] = ENV.fetch('DOCKER_WRITE_TIMEOUT', 10000)
+Excon.defaults[:read_timeout]  = ENV.fetch('DOCKER_READ_TIMEOUT',  10000)
 
 Argus::Runner.new(msg)

data/lib/argus/docker.rb

@@ -28,12 +28,12 @@ module Argus
       end
     end
 
-    ## build docker image
-    def build!
+    ## build docker image, with optional API /build params
+    def build!(options = {})
       puts "building #{self}"
 
       @build_time = Benchmark.realtime do
-        @image = Docker::Image.build_from_dir('.', dockerfile: 'Dockerfile') do |chunk|
+        @image = Docker::Image.build_from_dir('.', options) do |chunk|
           chunk.split(/[\r\n]+/).each do |line| # latest docker jams multiple streams into chunk
             begin
               stream = JSON.parse(line)['stream']

data/lib/argus/runner.rb

@@ -46,6 +46,10 @@ module Argus
 
     def initialize(msg)
       msg = symbolize_keys(msg)
+      puts "Received message: #{msg}"
+
+      ## set default
+      msg[:branch] ||= 'master'
 
       ## make working directory
       dir = File.join(ENV.fetch('ARGUS_HOME', '/tmp'), msg[:org], msg[:repo])
@@ -65,15 +69,18 @@ module Argus
         git.pull              # get the git repo
         raise ArgusError, "git sha not found: #{git}" unless git.sha
 
-        img.build!              # build docker image
+        options = msg.fetch(:build_options, {})
+        img.build!(options) # build docker image
         raise ArgusError, 'docker build failed' unless img.is_ok?
 
-        notify("build complete for #{img} (#{img.build_time.round}s)", :good)
+        short_sha = git.sha.slice(0,7) # human-readable sha for messages
+
+        notify("build complete for #{img} #{short_sha} (#{img.build_time.round}s)", :good)
 
         img.tag!(git.sha)       # tag the image
         img.push(git.sha)       # push to registry
 
-        notify("push complete for #{img} (#{img.push_time.round}s)", :good)
+        notify("push complete for #{img} #{short_sha} (#{img.push_time.round}s)", :good)
       end
     rescue ArgusError => e
       notify(e.message, :danger)

data/lib/argus/version.rb

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

metadata

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