hak 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f9ecb7498303641f93e19e511c4fb5b9f3f4446
-  data.tar.gz: 093934177e9841cd16981e999250b4cd9710b279
+  metadata.gz: 48cd551542a1400f9ebde1941414be0e6283bb7e
+  data.tar.gz: c709691b827801faed980951a0975bffc0783f85
 SHA512:
-  metadata.gz: 6c72719204fc61e693967a6a46ae2f872c89dcc7981be58320dc3b800b85eaeebe84194799fc62d899b9271000212819708da05bbcd4bcf620db103381e0bc2f
-  data.tar.gz: 67279990432f049116bc2a5f22a0b6a6609da8b69649c4ac3ac5941b14d46e5c4d1ddccb5ebae134193aecbfffa3bcbc98689a33fd45ec16cdecd34bd14e0920
+  metadata.gz: 1e313939fa766cfc6384705637139f81eb89da9b7c5e27a85f99e816092d7761b9e94e455d0a8ed762a5ec51ffe1e683a235fc40409e86af049db8e14bc08f72
+  data.tar.gz: fbe810cc810be2cbce09cd5998bd3b5250bc1686ebeec83bf69611b86647d0f6f95bad6763123d47cd321091b18352b0a1323c3c9d913d1757951668110f25e8

data/bin/hak

@@ -6,7 +6,7 @@ require 'yaml'
 require 'colorize'
 
 program :name, 'hak'
-program :version, '0.4.4'
+program :version, '0.4.5'
 program :description, 'Hak - start hacking!'
 
 default_command :help
@@ -332,24 +332,31 @@ command :deploy do |c|
       end
 
       # check if docker is installed
-      res = `ssh #{dest} which docker`
+      res = `ssh #{dest} which docker`.strip
       if res == ""
         dest_docker_installed = false    
       end
 
       # check if docker-compose is installed
-      res = `ssh #{dest} which docker-compose`
+      res = `ssh #{dest} which docker-compose`.strip
       if res == ""
         dest_docker_installed = false    
       end      
 
+
       # if docker and/or docker-compose is not installed in dest server, install it
       if dest_docker_installed == false
-        res = `ssh #{dest} curl -s https://gist.githubusercontent.com/jaequery/d61ce5371068bc4b386e80b120e8f217/raw/6f14fb1a373335606e86e76627a2debfb8737ab3/install_latest_docker_compose.sh | bash /dev/stdin`
+        res = `ssh #{dest} "curl -s https://gist.githubusercontent.com/jaequery/d61ce5371068bc4b386e80b120e8f217/raw/6f14fb1a373335606e86e76627a2debfb8737ab3/install_latest_docker_compose.sh | bash /dev/stdin"`
+      end
+
+      # add user to docker group if not root
+      user = `ssh #{dest} whoami`.strip
+      if res != "root"
+        system "ssh #{dest} sudo usermod -aG docker #{user}"
       end
 
       # if jwilder/nginx-proxy is not running, run it
-      res = `ssh #{dest} docker ps |grep jwilder/nginx-proxy`
+      res = `ssh #{dest} docker ps |grep jwilder/nginx-proxy`.strip
       if res == ""
         res = `ssh #{dest} "docker run -d --restart=always -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock:ro --name=proxy jwilder/nginx-proxy"`
       end

data/lib/hak/version.rb

@@ -1,3 +1,3 @@
 module Hak
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hak
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - jaequery