docker-spec 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a736a70e119ee3d55295140138d5f220f382fd4e
-  data.tar.gz: 7945ce843581eb476e90346fc40f63cde87db0a5
+  metadata.gz: 8642a66c400dbd55b436c74c562f50d6f76deeec
+  data.tar.gz: 2a23ed78be5cd72d9b08cf94c3f4840b976aae79
 SHA512:
-  metadata.gz: a3af787003c12260f552e08fdf2a23a80f6377c8c5e243cae6e06abd954643f6918f28cc80262f138510cb20f4c69f5d471c666f531c4f00a7107da83dd82dfe
-  data.tar.gz: 88d4133cfb8a0a4b2e2946e0cb80a8d401a763b473f0c23b9a2eae4b18ff3a435ac99f0d27632ddc0e3f5cb6c95369b79fdc962d319b7116a6211b2abc7d2d2d
+  metadata.gz: d8285c9c5ba7c4a8db0c934f362ab7fa1909a281abc88090a9dcf065702b523c3c530b66d2c91e06dad72a77a133b1bdff86e2a2a1df8aebb00fba0a9c9d158e
+  data.tar.gz: a76e8dc452c72e7c22b68c968707391228af6bde0175da854389613192f73eac1eeff15f2e4d93527a1fdc11b8674cba9494e572a8707e946777e4ad05a7deef

data/lib/docker/spec.rb

@@ -10,6 +10,7 @@ require 'colorize'
 require 'yaml'
 require 'logger'
 require 'moneta'
+require "base64"
 require 'pp'
 
 # Documentation
@@ -17,6 +18,7 @@ module DockerSpec
   CONTAINER_RUN_WAIT_TIMEOUT = 60
   CONFIG_FILE = 'docker_spec.yml'
   ROOT_DIR = 'root'
+  DOCKER_AUTH_FILE = '~/.docker/config.json'
   STDOUT.sync = true
 
   def self.run
@@ -28,19 +30,28 @@ module DockerSpec
 
   def self.push
     @config[:push_container] = DockerSpec.get_config(:push_container, 'DOCKER_SPEC_PUSH_CONTAINER',
-                                                     'Push new tag? ')
+                                                     "\nPush new tag? ")
     if @config[:push_container]
 
       @config[:tag_db] ||
         fail('tag_db is not defined in docker_spec.yml')
-      @config[:dockerhub] ||
-        fail('dockerhub is not defined in docker_spec.yml')
-      @config[:dockerhub][:username] ||
-        fail('dockerhub->username is not defined in docker_spec.yml')
-      @config[:dockerhub][:password] ||
-        fail('dockerhub->password is not defined in docker_spec.yml')
-      @config[:dockerhub][:email] ||
-        fail('dockerhub->email is not defined in docker_spec.yml')
+
+      # Load credentials from config file, or default docker config
+      if @config[:dockerhub]
+        @config[:dockerhub][:username] ||
+          fail('dockerhub->username is not defined in docker_spec.yml')
+        @config[:dockerhub][:password] ||
+          fail('dockerhub->password is not defined in docker_spec.yml')
+        @config[:dockerhub][:email] ||
+          fail('dockerhub->email is not defined in docker_spec.yml')
+      else
+        @config[:dockerhub] = Hash.new
+        docker_auth = JSON.parse(File.read(File.expand_path(DOCKER_AUTH_FILE)))
+        auth_base64 = docker_auth['auths']['https://index.docker.io/v1/']['auth']
+        @config[:dockerhub][:username] = Base64.decode64(auth_base64).split(':').first
+        @config[:dockerhub][:password] = Base64.decode64(auth_base64).split(':').last
+        @config[:dockerhub][:email] = docker_auth['auths']['https://index.docker.io/v1/']['email']
+      end
 
       # Open key value store and get the current tag for this repo
       store = Moneta.new(:YAML, file: @config[:tag_db])

data/lib/docker/spec/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Spec
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-spec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler