rat_deployer 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc1115312147c9e70bfaa521f4022d4bf27fa5b
-  data.tar.gz: 61402f1585e6728af319719b58278261660743cd
+  metadata.gz: c4203c688b0c0a96a80491bb71471ff340b1ecab
+  data.tar.gz: 76e3a012273a7e43dd9c624d0d338c6a5ea6197c
 SHA512:
-  metadata.gz: 96d026a5bbe98dabac1a8f648460a264bb7b3b4ed93efd853b30831b7867eac4d5fafb0e3fea96ad737d112322adbcb8ba791ede8012e983848f9cceb5e1685a
-  data.tar.gz: 5f0c83a6e97cb5e8ef998de2abab712d8ef994732ce6a42d322dbbe89212b13a64918ec50640e7edac7776a11064cb47bf67b5532bbbde8f77a9af2a08a15a77
+  metadata.gz: 8308759584af000b150f42cbcc8f2aad476c575610717591a4ea20d47d88dc8d74687c608ca14ca279c31b13f2fc627be7917982fc088e77a67ac774c7f25bb8
+  data.tar.gz: 564eb2f823afcfb03b3799c028d3c362c7a25ed70af0f7d8ec428a42c3be4e5ed3d29c6ddc4273a440b877cd3d857260f7e016851d6ded913615fd0df3861e7b

data/lib/rat_deployer/cli.rb

@@ -19,7 +19,7 @@ module RatDeployer
 
     desc "compose ARGS...", "runs docker-compose command with default flags"
     def compose(cmd, *cmd_flags)
-      env          = RatDeployer::Config.env
+      etnv          = RatDeployer::Config.env
       project_name = RatDeployer::Config.all.fetch('project_name')
 
       flags = [
@@ -28,7 +28,9 @@ module RatDeployer
         "-p #{project_name}_#{env}"
       ]
 
-      flags.unshift(remote_machine_flags) if RatDeployer::Config.remote
+      if RatDeployer::Config.remote
+        flags.unshift(RatDeployer::Config.remote_machine_flags)
+      end
 
       run "docker-compose #{flags.join(' ')} #{cmd} #{cmd_flags.join(" ")}"
     end
@@ -39,22 +41,12 @@ module RatDeployer
       project_name = RatDeployer::Config.all.fetch('project_name')
 
       flags = []
-      flags.unshift(remote_machine_flags) if RatDeployer::Config.remote
-
-      run "docker #{flags.join(' ')} #{cmd} #{cmd_flags.join(" ")}"
-    end
 
-    private
+      if RatDeployer::Config.remote
+        flags.unshift(RatDeployer::Config.remote_machine_flags)
+      end
 
-    def remote_machine_flags
-      `docker-machine config #{RatDeployer::Config.machine}`.gsub(/\n/, ' ')
+      run "docker #{flags.join(' ')} #{cmd} #{cmd_flags.join(" ")}"
     end
-
-    #def warn_if_running_on_remote_host
-      #if machine = ENV["DOCKER_MACHINE"]
-        #put_warning "Your docker client is pointing to the remote machine #{machine}"
-        #ask_for_confirmation
-      #end
-    #end
   end
 end

data/lib/rat_deployer/config.rb

@@ -25,6 +25,13 @@ module RatDeployer
       default_conf.deep_merge(env_conf)
     end
 
+    def self.prompt_enabled?
+      ENV['RAT_PROMPT'] != "false"
+    end
+
+    # Loads machine config for current env.
+    # Acceps either a docker-machine machine name
+    # or an object with keys ca_cert, cert, key, and host.
     def self.machine
       for_env.fetch("machine")
     end
@@ -34,8 +41,19 @@ module RatDeployer
       env_var.nil? ? true : env_var == 'true'
     end
 
-    def self.prompt_enabled?
-      ENV['RAT_PROMPT'] != "false"
+    def self.remote_machine_flags
+      case machine
+      when Symbol, String
+        `docker-machine config #{machine}`.gsub(/\n/, ' ')
+      when Hash
+        [
+          "--tlsverify",
+          "-H='#{machine.fetch('host')}'",
+          "--tlscacert='#{machine.fetch('ca_cert')}'",
+          "--tlscert='#{machine.fetch('cert')}'",
+          "--tlskey='#{machine.fetch('key')}'",
+        ].join(' ')
+      end
     end
   end
 end

data/lib/rat_deployer/version.rb

@@ -1,3 +1,3 @@
 module RatDeployer
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rat_deployer
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Nicolas Oga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor