assemblyline-cli 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTM4M2E4ZmIyYWZlYTQ4YWNhMDBiNjkzMTgxYTE2MzI2NWQ0MDk2Nw==
+    YzQ2ZGIzOGJmOGNlYmM1YzY2OThlZGZjNTNmNTk2OGUwMGFmMjM3YQ==
   data.tar.gz: !binary |-
-    NmNmMWYyMTMyMThmMjJjMGZjMWI0YzJiMjk1ZjgzZGFlMTI3YjRhZA==
+    YzgxYTlmNWVmY2U3NWRmODEzMmZmZGU2OGU5ODlhZjNkNGI0OGJmYw==
 SHA512:
   metadata.gz: !binary |-
-    Y2FmNDhhM2MxYWVhZDBjMmJjNjUyODU0OGU0YTMwODg3YjE1MDBjNzQ3OTE1
-    NGVlNTQwOWU1ZTcxYWQwMjkyNWRkMzNjYWVlNjU4MDI0ZjlmMDZjODQzNDc1
-    MmYwNWQ3ZjAyNTM4NjkyZDVhMjY2NTU5NmI2NDYzYTMwYTk1YjU=
+    OTkyNDdlMjkwNDg0ZDAxMWFlZjkyN2UxZTIxZTViYzcxY2ExZWUwNGRlMTVi
+    MzIyNjM4MTdlNTU1NDk2NGExOWI0MDkxMjU2NTg0NDEzYmU3MjM4OWNhNzZk
+    NGE3ZmFlMTYyZDk5NWY1OTlkNTEzZmVkM2NkMDdmYWMyYWQ3OTk=
   data.tar.gz: !binary |-
-    MjdkNzA2MGMzYjBjODk1ZGEyMGQ2NjcyMjU4OTQ0NTk4MWQ1OWQ5ZmFiNzRk
-    YWE0YTE0MjExOTk5MWQ5MTZmYmJlODA2Y2I2ZjEyYTJkYTYxMTU4MDllZWVm
-    ODg5YjAwOTNiYTQ2NGJlNzYzYjRiZTJmODY2NjEwMDA0NjVjM2M=
+    MzQzODllMGIzMTA4YjA1ODIyNGEwZWJkMjdlOTkwYzc0ZjJlNzYwMGZjMGJj
+    MDU1ZmQyYjUwN2Y5ZjMxNjc0Mjc1Y2MxMjkzYmM5Y2I3OWVmYjNiMDNiNWQ0
+    YTRmMTZkMjQ3YmRhNDg3YWEzNTZmNDA5MDg5NDRmNWU0NzQ0Y2M=

data/Rakefile

@@ -1 +1,5 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'reevoocop/rake_task'
+ReevooCop::RakeTask.new(:reevoocop)
+
+task build: :reevoocop

data/assemblyline-cli.gemspec

@@ -4,20 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'assemblyline/cli/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "assemblyline-cli"
+  spec.name          = 'assemblyline-cli'
   spec.version       = Assemblyline::CLI_VERSION
-  spec.authors       = ["Ed Robinson"]
-  spec.email         = ["ed@reevoo.com"]
-  spec.summary       = %q{A super-lightweight wrapper to start assemblyline tasks}
-  spec.homepage      = "http://github.com/assemblyline"
-  spec.license       = "MIT"
+  spec.authors       = ['Ed Robinson']
+  spec.email         = ['ed@reevoo.com']
+  spec.summary       = 'A super-lightweight wrapper to start assemblyline tasks'
+  spec.homepage      = 'http://github.com/assemblyline'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "thor", "~> 0.19"
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'reevoocop'
 end

data/lib/assemblyline/cli/version.rb

@@ -1,3 +1,3 @@
 module Assemblyline
-  CLI_VERSION = "0.0.4"
+  CLI_VERSION = '0.0.5'
 end

data/lib/assemblyline/cli.rb

@@ -1,23 +1,54 @@
-require "assemblyline/cli/version"
+require 'assemblyline/cli/version'
 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"
-    def build(url, ref=nil)
-      exec "docker run --rm -v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock -e SSH_KEY=#{ssh_key} -e DOCKERCFG=#{dockercfg} quay.io/assemblyline/builder:latest bin/build #{url} #{ref}"
+    desc 'build URL (REF)', 'Build an assemblyline project from a git url and optionaly merge REF into master'
+    def build(url, ref = nil)
+      exec "docker run --rm #{bind_mounts} #{env_flags} #{assemblyline_builder} bin/build #{url} #{ref}"
+    end
+
+    desc 'update', 'update assemblyline'
+    def update
+      fail unless system "docker pull #{assemblyline_builder}"
+      exec 'gem install assemblyline-cli'
+    end
+
+    map '-v' => 'version', '--version' => 'version'
+    desc 'version', 'print the current version'
+    def version
+      puts CLI_VERSION
     end
 
     private
 
+    def env_flags
+      env.map { |var, val| "-e #{var}=#{val}" }.join(' ')
+    end
+
+    def env
+      {
+        'SSH_KEY' => ssh_key,
+        'DOCKERCFG' => dockercfg,
+      }
+    end
+
+    def bind_mounts
+      '-v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock'
+    end
+
+    def assemblyline_builder
+      'quay.io/assemblyline/builder:latest'
+    end
+
     def ssh_key
       key = File.read(key_path)
-      fail "SSH private key not found" unless key
+      fail 'SSH private key not found' unless key
       key.dump
     end
 
     def dockercfg
-      cfg = File.read(File.join(ENV['HOME'], '.dockercfg')).gsub("\n",'')
+      cfg = File.read(File.join(ENV['HOME'], '.dockercfg')).gsub("\n", '')
       cfg.dump
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assemblyline-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ed Robinson
@@ -52,6 +52,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: reevoocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - ed@reevoo.com