rat_deployer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124b0ad74f1fe05802dc538c2113bf6a67b85792
-  data.tar.gz: b50d566c0e05f40f38443fb4c8cba9d750b17766
+  metadata.gz: d123dc54c137abf9114ea06c8526d5e86ad5b21b
+  data.tar.gz: b820160c369e1a8292c71546e1023eeaea0f5331
 SHA512:
-  metadata.gz: 4f8f055a0f13597540aef2efa86959910f7425e15ced8e49083a79b58202903b899fbed27933eb1617b473ac905c88c4f965be408397f90e2da04e3cd59aa0db
-  data.tar.gz: 55fb3171b53a4b72f7f4a3073f428ffc2752c08e081efbf6ee07fdde2a4cd77d5525134164c851bc970b17a422d7d73ee08443a15b455d34bf2b402ad89f6d59
+  metadata.gz: 670e760d635e7e5bf524d66e3836c5d7c66f92f16a12c948ed97539bea474518f86d564e7c6a2f7acb587a7aaa3236244c2fba4b79b58f2367d365640b748ad6
+  data.tar.gz: b9c47a75fcb09ffb82afeea6a8e134130585cf87a16f34265caa2fa7a8ef3d3e87f1501de9abb2da81aaead6afdd6d0a23292e16249a9bd769c8e8a2b6a22175

data/lib/rat_deployer/cli.rb

@@ -12,47 +12,31 @@ module RatDeployer
 
     desc "deploy", "deploys current environment"
     def deploy
-      unset_machine
       run "rat images update"
-
-      within_machine do
-        run "rat compose pull"
-        run "rat compose up -d"
-      end
+      run "rat compose pull"
+      run "rat compose up -d"
     end
 
     desc "compose ARGS...", "runs docker-compose command with default flags"
     def compose(cmd, *cmd_flags)
-      env          = RatDeployer::Config.env
-      project_name = RatDeployer::Config.all.fetch('project_name')
+      env           = RatDeployer::Config.env
+      project_name  = RatDeployer::Config.all.fetch('project_name')
 
       flags = [
         "-f config/default.yml",
         "-f config/#{env}.yml",
         "-p #{project_name}_#{env}"
-      ].join(' ')
-
-      within_machine do
-        run "docker-compose #{flags} #{cmd} #{cmd_flags.join(" ")}"
-      end
-    end
+      ]
 
-    private
+      flags.unshift(remote_machine_flags) if RatDeployer::Config.remote
 
-    def set_machine
-      machine = RatDeployer::Config.for_env.fetch("machine")
-      run "eval $(docker-machine env #{machine})"
+      run "docker-compose #{flags.join(' ')} #{cmd} #{cmd_flags.join(" ")}"
     end
 
-    def unset_machine
-      run "eval $(docker-machine env --unset)"
-    end
+    private
 
-    def within_machine(&block)
-      set_machine
-      yield
-    ensure
-      unset_machine
+    def remote_machine_flags
+      `docker-machine config #{RatDeployer::Config.machine}`.gsub(/\n/, ' ')
     end
 
     #def warn_if_running_on_remote_host

data/lib/rat_deployer/command.rb

@@ -9,7 +9,7 @@ module RatDeployer
         puts msg
       end
 
-      system cmd
+      exit 1 unless system(cmd)
     end
 
     def put_heading(str)
@@ -48,7 +48,7 @@ module RatDeployer
     end
 
     private
-    
+
     def prompt_enabled?
       ENV['RAT_PROMPT'] != "false"
     end

data/lib/rat_deployer/config.rb

@@ -24,5 +24,14 @@ module RatDeployer
       env_conf     = environmental.fetch(e)
       default_conf.deep_merge(env_conf)
     end
+
+    def self.machine
+      for_env.fetch("machine")
+    end
+
+    def self.remote
+      env_var = ENV['RAT_REMOTE']
+      env_var.nil? ? true : env_var == 'true'
+    end
   end
 end

data/lib/rat_deployer/version.rb

@@ -1,3 +1,3 @@
 module RatDeployer
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rat_deployer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nicolas Oga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor