assemblyline-cli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e4d9c5da410f82b87d264d272100f55a0cc8e71
-  data.tar.gz: 66eb2a8ccee7faa4f1b71fc128e025f5f1ed19eb
+  metadata.gz: edd099b797138ae441122b355e03c4b1f1469d1c
+  data.tar.gz: 0090fba2a2f7a4d5ba762b8eae3a1e3168caff77
 SHA512:
-  metadata.gz: de32c7559d592245e4e00dca60cae50262de03d8e88bc78faa3bd50f985c82f4e179e5644ddd153c810e3ddac9705e58887c3fa98b3c1c3cc647b645b7ba8245
-  data.tar.gz: 4b4c49b66c8add2fd3a041242d5b600c32416b8f9f50d83b1802e81121fe0ca8b160e5482f416020892fbbae461643defb33b6bcc76daf40f37587a112687ee7
+  metadata.gz: c1c778e8371bb90bf7a1799c724ce1370325e7251ffd92f531e0ba7d1e9decc55a1943b925820849982ec57785cd534168b704e86147e0d1bfb80a78b7a2fa6e
+  data.tar.gz: d7e30c6d05ac6ba2d00cfc7171e060fb76b2ccc2fa52faabe5e31007431b9dd47ca1173d929ae0fbf3b546a05d9e5070367fe665c0c77b54bbff662b41aa50fd

data/lib/assemblyline/cli.rb

@@ -10,7 +10,7 @@ module Assemblyline
     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
+      exec "docker run --rm #{bind_mounts} #{env_flags} #{debug_flags} #{dev_mount} #{local_mount} #{assemblyline_builder} bin/build #{build_command(url_or_path)}" # rubocop:disable Metrics/LineLength
     end
 
     desc 'update', 'update assemblyline'
@@ -48,18 +48,23 @@ module Assemblyline
 
     def init_local_mount(path)
       return unless dir?(path)
-      @local_mount = "-v #{File.expand_path(Dir.pwd, path)}:/usr/assemblyline/local"
+      @local_mount = "-v #{File.expand_path(path, Dir.pwd)}:/usr/assemblyline/local"
     end
 
     def dir?(path)
-      File.directory?(File.expand_path(Dir.pwd, path))
+      File.directory?(File.expand_path(path, Dir.pwd))
     end
 
     def debug_flags
-      return unless options[:debug]
+      return unless options[:debug] || options[:dev]
       '-ti'
     end
 
+    def dev_mount
+      return unless options[:dev]
+      "-v #{File.expand_path(options[:dev], Dir.pwd)}:/usr/src"
+    end
+
     def env_flags
       env.map { |var, val| "-e #{var}=#{val}" }.join(' ')
     end

data/lib/assemblyline/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assemblyline-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ed Robinson