assemblyline-cli 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dcfbbae517caaf76970b495b5ab797e7ce5babd
-  data.tar.gz: fe34a5ea95213917751f9c8b82bcfd2fb71db8f6
+  metadata.gz: 39d8bced5c840f80dbc46c7cf0ab8ad3f1722ca1
+  data.tar.gz: 1a5bc80a82ba80108afbcc56ceda4b401cadca55
 SHA512:
-  metadata.gz: a78f1bd13c15e254f361c1fcc0916cefe520e24723b22982c0852dd2aed17e951cc80131db342fd404604fc4ec0a382f17394f60411bd04ea34bc3668925aa78
-  data.tar.gz: 3a102fdc46358298e28819cbcbe5ff9541224069a57ae3d68b783e3615807e8fde543e5ac99cc804a9df2c23cb909ddbed6540fdb99c1349a9d69617a87c48b9
+  metadata.gz: 6722385c85447f9ad28ffa4859d34f67c4648e1b547d25350dcdeccf569e2a97b755db044194b5043f769f15840c4bce22e4edd854fb10c20126a7380b15ae30
+  data.tar.gz: 7c335b259f7cf1a005cf7cf358f8d8337f95732a943bc0d8a88f9cd53ba9ee8243138946fa62230c00a3c7681c8f332ac7c23a6e503362872450ea3889f63ce5

data/lib/assemblyline/cli/version.rb

@@ -1,3 +1,3 @@
 module Assemblyline
-  CLI_VERSION = "0.0.13"
+  CLI_VERSION = "0.0.14"
 end

data/lib/assemblyline/cli.rb

@@ -65,32 +65,6 @@ module Assemblyline
       "-v #{File.expand_path(options[:dev], Dir.pwd)}:/usr/src"
     end
 
-    def env_flags
-      env.map { |var, val| "-e #{var}=#{val}" }.join(" ")
-    end
-
-    def env
-      {
-        "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"
     end
@@ -99,24 +73,74 @@ module Assemblyline
       "quay.io/assemblyline/builder:latest"
     end
 
-    def ssh_key
-      key = File.read(key_path)
-      fail "SSH private key not found" unless key
-      key.dump
+    def env_flags
+      Env.new.to_flags
     end
 
-    def dockercfg
-      cfg = ENV["DOCKERCFG"]
-      cfg ||= File.read(File.join(Dir.home, ".dockercfg"))
-      cfg.gsub("\n", "").gsub("\t", "").dump
-    end
+    class Env
+      def to_flags
+        to_hash.map { |var, val| "-e #{var}=#{val}" }.join(" ")
+      end
 
-    def key_path
-      %w(id_rsa id_dsa).map { |private_key| ssh_key_path(private_key) }.detect { |path| File.exist? path }
-    end
+      def to_hash
+        {
+          "SSH_KEY" => ssh_key,
+          "DOCKERCFG" => dockercfg,
+          "JSPM_GITHUB_TOKEN" => ENV["JSPM_GITHUB_TOKEN"],
+          "CI" => ci?,
+          "CI_MASTER" => ci_master?,
+          "BUILD_URL" => build_url,
+          "GIT_URL" => git_url,
+          "GITHUB_ACCESS_TOKEN" => ENV["GITHUB_ACCESS_TOKEN"],
+        }.reject { |_, v| v.nil? }
+      end
+
+      private
 
-    def ssh_key_path(key)
-      File.join(ENV["HOME"], ".ssh/#{key}")
+      def ssh_key
+        key = File.read(key_path)
+        fail "SSH private key not found" unless key
+        key.dump
+      end
+
+      def key_path
+        %w(id_rsa id_dsa).map { |private_key| ssh_key_path(private_key) }.detect { |path| File.exist? path }
+      end
+
+      def ssh_key_path(key)
+        File.join(ENV["HOME"], ".ssh/#{key}")
+      end
+
+      def dockercfg
+        cfg = ENV["DOCKERCFG"]
+        [".dockercfg", ".docker/config.json"].each do |cfg_path|
+          path = File.join(Dir.home, cfg_path)
+          next unless File.exist? path
+          cfg ||= File.read(path)
+        end
+        cfg.gsub("\n", "").gsub("\t", "").dump
+      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 build_url
+        ENV["BUILD_URL"]
+      end
+
+      def git_url
+        u = `git remote get-url origin`.chomp
+        u.empty? ? nil : u
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assemblyline-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-04-13 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.4.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: A super-lightweight wrapper to start assemblyline tasks