hak 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39247b79afce12fa6fc4bbf5b84f11c0b1e2ea12
-  data.tar.gz: 9995bb233f2c21b25ee57f3feadf530e9d2d7e66
+  metadata.gz: 59036d5baab90eccfda9560822c1344bcd5bcd89
+  data.tar.gz: 18b22fa73884b8713ce8c543a642a0090af4e5d8
 SHA512:
-  metadata.gz: 029ce0915368196f97dbb7e2755bc23bc9f6cf8bf16322fb767586a71b3ac1a90e10dce831376431ac4f9d7d274fe779be0296dd10f00a73ea99842eb54885c0
-  data.tar.gz: ef78596b410707f26106c5c8519aba14ea8b4e77b065883b7a60844d2792211ddd658c268d0de6740199a74a58565b5ea8e9da6c1ade84bbdd3fb2d05ad5a5d7
+  metadata.gz: 512494f63e62bd716e6228896204663f05a0cef309106a5589d19475016fb0be48f0f353fb78c077f86b75e579af9f98241aeefdd1e06331080853296135d612
+  data.tar.gz: cc6cd146a93e1154e2d07bd1b0e9461db18c2173dad577fbe871d352757cf04a1e04f5061d758599b0ebfa1e61000b11064914cd3633f5a6554287cd8da3afb8

data/bin/hak

@@ -7,7 +7,7 @@ require 'colorize'
 require 'highline'
 
 program :name, 'hak'
-program :version, '0.5.0'
+program :version, '0.5.2'
 program :description, 'Hak - A Docker powered website manager for OSX'
 
 default_command :help
@@ -139,12 +139,12 @@ command :get do |c|
   c.action do |args, options|
 
     if args.empty?
-      puts "type one of the following to get started: "
+      puts "for more hak-ready packages, check out https://hak.sh/".yellow
+      puts "type one of the following to get started: ".yellow
       puts "hak get jaequery/react-starter"
       puts "hak get jaequery/honeybadger"
       puts " "
-      puts "for more hak-ready packages, check out https://hak.sh/"
-
+      
     else
       repo = args[0]      
       folder = args[1]
@@ -187,6 +187,7 @@ command :start do |c|
   c.description = 'this starts up the website'
   c.example 'description', 'hak start'
   c.action do |args, options|
+    check_docker
     run "docker-compose up -d && docker-compose logs -f"
   end
 end
@@ -197,6 +198,7 @@ command :stop do |c|
   c.description = 'stops the site'
   c.example 'description', 'hak stop'
   c.action do |args, options|
+    check_docker
     run "docker-compose stop"
   end
 end
@@ -207,6 +209,7 @@ command :restart do |c|
   c.description = 'restarts the site'
   c.example 'description', 'hak restart'
   c.action do |args, options|
+    check_docker
     run "docker-compose stop"
     run "docker-compose up -d && docker-compose logs -f"
   end
@@ -218,7 +221,8 @@ command :rm do |c|
   c.description = 'deletes docker containers for the project'
   c.example 'description', 'hak rm'
   c.action do |args, options|
-    run "docker-compose rm -f --all"
+    check_docker
+    run "docker-compose stop && docker-compose rm -f --all"
   end
 end
 
@@ -228,6 +232,7 @@ command :logs do |c|
   c.description = ''
   c.example 'description', 'hak logs'
   c.action do |args, options|
+    check_docker
     run "docker-compose logs -f"
   end
 end
@@ -239,6 +244,7 @@ command :ssh do |c|
   c.description = ''
   c.example 'description', 'hak ssh [app]'
   c.action do |args, options|
+    check_docker
 
     file_name = 'docker-compose.yml'
     config_options = YAML.load_file(file_name)
@@ -267,6 +273,8 @@ command :ps do |c|
   c.description = ''
   c.example 'description', 'hak ps'
   c.action do |args, options|
+    check_docker
+
     container_names = run('docker ps --format "{{.Names}}"', true)
     lines = container_names.lines
     dinghy_running = false
@@ -397,3 +405,19 @@ def run(command, hide=false)
 
   return res
 end
+
+def check_docker
+
+  res = `dinghy status`
+  if res.include? "VM: stopped"
+    running = false
+    puts "docker not running or stopped".yellow
+    puts "type this to power it on:".yellow
+    puts "hak on"
+    abort
+  else
+    running = true
+  end
+
+  return running
+end

data/lib/hak/version.rb

@@ -1,3 +1,3 @@
 module Hak
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

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