assemblyline-cli 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0503156dc1216f0eeabf88439428799b9428780
-  data.tar.gz: dfc8dbe138236ee7d31cae9f76a905dde0726635
+  metadata.gz: 0e4d9c5da410f82b87d264d272100f55a0cc8e71
+  data.tar.gz: 66eb2a8ccee7faa4f1b71fc128e025f5f1ed19eb
 SHA512:
-  metadata.gz: affe342046f7fbb8640e24897577f75e0ec69c45d63e0d8e704b8b6146d3720634fb29a341c17baddf6e2d0a592a6c2902fc6b4d11bf8d3837d65397b3068431
-  data.tar.gz: f428b2520c256f69e4c9d4c45bd9cabc891e0cd0d4e853d9d9ec4b2dafed8b249ee5b628e72891cdac7a5e059cd5cab7fc02ac67940bee7b0ef06f959bda5465
+  metadata.gz: de32c7559d592245e4e00dca60cae50262de03d8e88bc78faa3bd50f985c82f4e179e5644ddd153c810e3ddac9705e58887c3fa98b3c1c3cc647b645b7ba8245
+  data.tar.gz: 4b4c49b66c8add2fd3a041242d5b600c32416b8f9f50d83b1802e81121fe0ca8b160e5482f416020892fbbae461643defb33b6bcc76daf40f37587a112687ee7

data/lib/assemblyline/cli.rb

@@ -3,10 +3,14 @@ require 'thor'
 
 module Assemblyline
   class CLI < Thor
-    desc 'build URL (REF)', 'Build an assemblyline project from a git url and optionaly merge REF into master'
-    option :debug, type: :boolean
-    def build(url, ref = nil)
-      exec "docker run --rm #{bind_mounts} #{env_flags} #{debug_flags} #{assemblyline_builder} bin/build #{url} #{ref}"
+    desc 'build GIT_URL or PATH', 'Build an assemblyline project from a git url or path'
+    option :debug, type: :boolean, default: false, desc: 'start assemblyline-builder with a tty'
+    option :push, type: :boolean, default: false, desc: 'push the built image to docker repo'
+    option :ref, type: :string, desc: 'merge this ref into master before building'
+    option :dev, type: :string, desc: 'use a local dev checkout of assemblyline-builder', banner: 'PATH'
+    def build(url_or_path)
+      init_local_mount url_or_path
+      exec "docker run --rm #{bind_mounts} #{env_flags} #{debug_flags} #{local_mount} #{assemblyline_builder} bin/build #{build_command(url_or_path)}" # rubocop:disable Metrics/LineLength
     end
 
     desc 'update', 'update assemblyline'
@@ -23,9 +27,37 @@ module Assemblyline
 
     private
 
+    attr_reader :local_mount
+
+    def build_command(url_or_path)
+      if local_mount
+        "local_build #{push}#{sha}"
+      else
+        "build #{push}#{url_or_path} #{options[:ref]}"
+      end
+    end
+
+    def push
+      return unless options[:push]
+      '--push '
+    end
+
+    def sha
+      `git rev-parse --short HEAD`.chomp
+    end
+
+    def init_local_mount(path)
+      return unless dir?(path)
+      @local_mount = "-v #{File.expand_path(Dir.pwd, path)}:/usr/assemblyline/local"
+    end
+
+    def dir?(path)
+      File.directory?(File.expand_path(Dir.pwd, path))
+    end
+
     def debug_flags
       return unless options[:debug]
-      "-v #{Dir.pwd}:/usr/src -ti"
+      '-ti'
     end
 
     def env_flags

data/lib/assemblyline/cli/version.rb

@@ -1,3 +1,3 @@
 module Assemblyline
-  CLI_VERSION = '0.0.6'
+  CLI_VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assemblyline-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A super-lightweight wrapper to start assemblyline tasks