assemblyline-cli 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66b6e66e03248ea3799528109cfc54526e5253e1
-  data.tar.gz: ccf7cb0fdf2d09534cc36e524a0995b33d8534f6
+  metadata.gz: f1f11bc038e169a633ded370d70ac330acb1bfc7
+  data.tar.gz: b247486abf028b32dfbdb93cd99c462efb0477df
 SHA512:
-  metadata.gz: a9148c99801fe095bf783b17c07b91376a7c9b44f5b0bde49054b689d91f82c7f0597858aa69f46a5e44a46bb2513fa1273751aea05ae8c79165e67e3f715b34
-  data.tar.gz: cbda574db4c4ad899779d6528bfd3e8e984c5729481a827c4f15c94e12c7e263e43d9b1cfa91c21b92fb2cb7ba33c0806557d3ec3edb711cf1cb89ad793c9f47
+  metadata.gz: 00960990496d840b33011e09a573feada360e039915d938201d63beb3285f4a6b0f2bd875c33a7e8d8275f209767dfce8197b963b3b6661c787a3ea27ef21dbd
+  data.tar.gz: a9779d394722ed9d09b4a05994ae9d75426f7f8445be0ef2a0519494b4bf2d3230482334bf69ed12710edd70663e8cb52baa355dda0d5245cd410ea09bfc1dcc

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in assemblyline-cli.gemspec
 gemspec

data/Rakefile

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

data/assemblyline-cli.gemspec

@@ -1,24 +1,24 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'assemblyline/cli/version'
+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       = '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(/^bin\//) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'thor', '~> 0.19'
-  spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'reevoocop'
+  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/bin/assemblyline

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'assemblyline/cli'
+require "assemblyline/cli"
 
 Assemblyline::CLI.start

data/lib/assemblyline/cli/version.rb

@@ -1,3 +1,3 @@
 module Assemblyline
-  CLI_VERSION = '0.0.11'
+  CLI_VERSION = "0.0.12"
 end

data/lib/assemblyline/cli.rb

@@ -1,26 +1,26 @@
-require 'assemblyline/cli/version'
-require 'thor'
+require "assemblyline/cli/version"
+require "thor"
 
 module Assemblyline
   class CLI < Thor
-    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'
+    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} #{dev_mount} #{local_mount} #{assemblyline_builder} bin/build #{build_command(url_or_path)}" # rubocop:disable Metrics/LineLength
     end
 
-    desc 'update', 'update assemblyline'
+    desc "update", "update assemblyline"
     def update
       fail unless system "docker pull #{assemblyline_builder}"
-      exec 'gem install assemblyline-cli'
+      exec "gem install assemblyline-cli"
     end
 
-    map '-v' => 'version', '--version' => 'version'
-    desc 'version', 'print the current version'
+    map "-v" => "version", "--version" => "version"
+    desc "version", "print the current version"
     def version
       puts CLI_VERSION
     end
@@ -39,7 +39,7 @@ module Assemblyline
 
     def push
       return unless options[:push]
-      '--push '
+      "--push "
     end
 
     def sha
@@ -57,7 +57,7 @@ module Assemblyline
 
     def debug_flags
       return unless options[:debug] || options[:dev]
-      '-ti'
+      "-ti"
     end
 
     def dev_mount
@@ -66,35 +66,49 @@ module Assemblyline
     end
 
     def env_flags
-      env.map { |var, val| "-e #{var}=#{val}" }.join(' ')
+      env.map { |var, val| "-e #{var}=#{val}" }.join(" ")
     end
 
     def env
       {
-        'SSH_KEY' => ssh_key,
-        'DOCKERCFG' => dockercfg,
-        'JSPM_GITHUB_TOKEN' => ENV['JSPM_GITHUB_TOKEN'],
-      }
+        "SSH_KEY" => ssh_key,
+        "DOCKERCFG" => dockercfg,
+        "JSPM_GITHUB_TOKEN" => ENV["JSPM_GITHUB_TOKEN"],
+        "CI" => ci?,
+        "CI_MASTER" => ci_master?,
+      }.reject { |_, v| v.nil? }
+    end
+
+    def ci?
+      %w(CI CONTINUOUS_INTEGRATION TDDIUM TRAVIS BUILD_ID JENKINS_URL CIRCLECI).each do |var|
+        return true if ENV[var]
+      end
+      nil
+    end
+
+    def ci_master?
+      return true if ENV["GIT_BRANCH"] == "origin/master"
+      return true if ENV["CI_MASTER"]
     end
 
     def bind_mounts
-      '-v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock'
+      "-v /tmp:/tmp -v /var/run/docker.sock:/var/run/docker.sock"
     end
 
     def assemblyline_builder
-      'quay.io/assemblyline/builder:latest'
+      "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 = ENV['DOCKERCFG']
-      cfg ||= File.read(File.join(Dir.home, '.dockercfg'))
-      cfg.gsub("\n", '').gsub("\t", '').dump
+      cfg = ENV["DOCKERCFG"]
+      cfg ||= File.read(File.join(Dir.home, ".dockercfg"))
+      cfg.gsub("\n", "").gsub("\t", "").dump
     end
 
     def key_path
@@ -102,7 +116,7 @@ module Assemblyline
     end
 
     def ssh_key_path(key)
-      File.join(ENV['HOME'], ".ssh/#{key}")
+      File.join(ENV["HOME"], ".ssh/#{key}")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assemblyline-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor