hak 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de167389e00c46748a4b0c2690c5616382ef66a6
-  data.tar.gz: a70b22a1e315f1e8ab9d4af493656a3d1ebd703f
+  metadata.gz: bd0f7dee1f2a34c899daeb7ead66035c780bee05
+  data.tar.gz: 598cc60eb0e34c4993abf0350be5eb98fa344734
 SHA512:
-  metadata.gz: 6e785bcb1a9601495f81a7af0d37b4fb97444b4c3b8d9aaf62970527f37d34899576c4730cf1bf9162002685f3be30ec112d44259f3fa40a5d092296e8022e89
-  data.tar.gz: 85ac0bc43d632b37928260cade340f0c73e8699a5daa20dd766f7940d7fdaebcda07fc051ca850f11064f6a3129a0edfadbb4ddf7271ab3472241b8aed719ba2
+  metadata.gz: 28215cc3612f02a526c44e36e84d5f988c4af89d0ce8bbb4fff57648685290dded09bc0cd02c68d984524a8715b99e9fe92512e68e226a0f70ca84a2f7ffe285
+  data.tar.gz: d5ce5958e9f75ec9d8381fdbf188352ddc2c6484552766498246a92cb1fdfa135c90acf38740f9a551f0c244f674c464fdfbc94cc035e8aca9564bac331c16f5

data/bin/hak

@@ -7,60 +7,37 @@ require 'colorize'
 require 'highline'
 
 program :name, 'hak'
-program :version, '0.5.3'
-program :description, 'Hak - A Docker powered website manager for OSX'
+program :version, '0.5.5'
+program :description, 'Hak - A Docker-driven development platform'
 
 default_command :help
 
 command :install do |c|
   c.syntax = 'hak install'
-  c.summary = 'installs the hak environment'
-  c.description = 'installs docker and sets up the entire docker based environment along with proxy'
+  c.summary = 'installs hak'
+  c.description = 'installs hak'
   c.example 'description', 'hak install'
   c.action do |args, options|
 
-    # if ~/.hak not exists, initialize it
-    puts "checking to see if ~/.hak exists".blue
-    if !Dir.exists?(File.expand_path('~/.hak'))
-      puts "- creating ~/.hak".blue
-      system "mkdir -p ~/.hak/packages"
-
-      # install required dependencies 
-      puts "- setting up docker, docker-machine, docker-compose, xhyve, wget from brew".blue
-
-      # re-install docker
-      system "brew tap codekitchen/dinghy"
-      system "brew install dinghy docker docker-machine docker-compose wget docker-machine-driver-xhyve"
-      system "brew upgrade dinghy docker docker-machine docker-compose wget docker-machine-driver-xhyve"
-      system "brew unlink dinghy docker docker-machine docker-compose wget docker-machine-driver-xhyve"
-      system "brew link dinghy docker docker-machine docker-compose wget docker-machine-driver-xhyve"
-      system "sudo chown root:wheel $(brew --prefix)/opt/docker-machine-driver-xhyve/bin/docker-machine-driver-xhyve"
-      system "sudo chmod u+s $(brew --prefix)/opt/docker-machine-driver-xhyve/bin/docker-machine-driver-xhyve"
-      system "dinghy create --provider xhyve"
+    user = `whoami`.strip
 
+    if user != "root"
+      puts "Hak will automatically resolve all domains that ends in .docker to your docker vm for you."
+      puts "To do this, hak requires sudo to place an entry in /etc/resolver/docker, please type:"
+      puts "sudo hak install".yellow
+      abort
     else
-      puts "- it exists, skipping".blue
-    end
-  
-    # check if docker is running
-    check_docker
 
-    # check if env is set
-    check_env    
+      res = `cat > /etc/resolver/docker <<EOL
+nameserver 127.0.0.1
+port 19322`
 
-  end
-end
+      puts "hak installed".green
+      puts "now turn hak on by typing:"
+      puts "hak on".yellow
 
-command :uninstall do |c|
-  c.syntax = 'hak destroy'
-  c.summary = 'destroys hak server'
-  c.description = 'shuts off and destroys the hak server'
-  c.example 'description', 'hak destroy'
-  c.action do |args, options|
-    system "dinghy halt"
-    system "dinghy destroy"
-    system "rm -rf ~/.hak"
-    system "rm -rf ~/.dinghy"
+    end
+    
   end
 end
 
@@ -70,13 +47,11 @@ command :on do |c|
   c.description = 'powers on the hak server'
   c.example 'description', 'hak on'
   c.action do |args, options|
-    if check_env
-
-      if check_proxy
-        system "dinghy start"
-      end
-            
-    end
+    check_dns
+    `docker stop hak-proxy > /dev/null 2>&1`
+    `docker rm hak-proxy > /dev/null 2>&1`
+    `docker run -d -v /var/run/docker.sock:/tmp/docker.sock:ro -p 80:80 -p 443:443 -p 19322:19322/udp -e CONTAINER_NAME=hak-proxy --name hak-proxy codekitchen/dinghy-http-proxy`
+    puts "hak-proxy started"
   end
 end
 
@@ -86,7 +61,9 @@ command :off do |c|
   c.description = 'shuts off the hak server'
   c.example 'description', 'hak off'
   c.action do |args, options|
-    system "dinghy stop"
+    `docker stop hak-proxy > /dev/null 2>&1`
+    `docker rm hak-proxy > /dev/null 2>&1`
+    puts "hak-proxy stopped"
   end
 end
 
@@ -142,7 +119,7 @@ command :start do |c|
   c.description = 'this starts up the website'
   c.example 'description', 'hak start'
   c.action do |args, options|
-    check_docker
+    check_all
     run "docker-compose up -d && docker-compose logs -f"
   end
 end
@@ -153,7 +130,7 @@ command :stop do |c|
   c.description = 'stops the site'
   c.example 'description', 'hak stop'
   c.action do |args, options|
-    check_docker
+    check_all
     run "docker-compose stop"
   end
 end
@@ -164,7 +141,7 @@ command :restart do |c|
   c.description = 'restarts the site'
   c.example 'description', 'hak restart'
   c.action do |args, options|
-    check_docker
+    check_all
     run "docker-compose stop"
     run "docker-compose up -d && docker-compose logs -f"
   end
@@ -176,7 +153,7 @@ command :rm do |c|
   c.description = 'deletes docker containers for the project'
   c.example 'description', 'hak rm'
   c.action do |args, options|
-    check_docker
+    check_all
     run "docker-compose stop && docker-compose rm -f --all"
   end
 end
@@ -199,7 +176,7 @@ command :ssh do |c|
   c.description = ''
   c.example 'description', 'hak ssh [app]'
   c.action do |args, options|
-    check_docker
+    check_all
 
     file_name = 'docker-compose.yml'
     config_options = YAML.load_file(file_name)
@@ -228,14 +205,14 @@ command :ps do |c|
   c.description = ''
   c.example 'description', 'hak ps'
   c.action do |args, options|
-    check_docker
+    check_all
 
     container_names = run('docker ps --format "{{.Names}}"', true)
     lines = container_names.lines
     dinghy_running = false
     sites = lines.map do |line|
       name = line.split('_')[0]
-      if name == 'dinghy'
+      if name == 'hak-proxy'
         dinghy_running = true
         "proxy"
       else
@@ -243,23 +220,8 @@ command :ps do |c|
       end
     end
 
-    if dinghy_running == true
-      puts sites.uniq
-    else
-      check_docker
-    end
-
-  end
-end
+    puts sites.uniq
 
-command :upgrade do |c|
-  c.syntax = 'hak upgrade'
-  c.summary = 'upgrades hak and dinghy'
-  c.description = ''
-  c.example 'description', 'hak upgrade'
-  c.action do |args, options|
-    system "gem update hak"
-    run "dinghy upgrade"
   end
 end
 
@@ -360,59 +322,42 @@ def run(command, hide=false)
   return res
 end
 
+def check_all
+  check_docker
+  check_dns
+  check_proxy
+end
+
 def check_docker
 
-  res = `dinghy status`
-  if res.include? "VM: stopped"
+  res = `docker ps`
+  if res.include? "Cannot connect to the Docker daemon"
     running = false
     puts "docker not running or stopped"
-    puts "type this to power it on:"
-    puts "hak on".yellow
+    puts "Please turn on Docker first. If you don't have Docker installed, please install it from Docker's website."
     abort
-  else
-    running = true
   end
 
-  return running
+  return true
+
 end
 
-def check_proxy
-  res = `dinghy status`
-  if res.include? "PROXY: stopped"
-    # restarting seems to sometimes solve this issue
-    system "dinghy restart"
-    return false
+def check_dns
+  if !File.exist?('/etc/resolver/docker')
+    puts "hak not installed properly, please type:"
+    puts "sudo hak install".yellow
+    abort
   end
   return true
 end
 
-def check_env  
-  docker_machine_name = `echo $DOCKER_MACHINE_NAME`.strip
-  if docker_machine_name == "" || docker_machine_name != "dinghy"
-    puts "To connect the Docker client to the Docker daemon, please set these env variables, type:"
-    puts "$(dinghy env)".yellow
-    puts "To permanently add this to your shell type:  ~/.bashrc"
-    output_env
-    return false
+def check_proxy
+  res = `docker ps`
+  if !res.include? "hak-proxy"
+    puts "proxy not running, please type:"
+    puts "hak on".yellow
+    abort
   end
   return true
 end
 
-def output_env
-
-  shell = `echo $SHELL`.strip
-
-  if shell == '/bin/zsh'
-    docker_env_exist = `fgrep "export DOCKER_MACHINE_NAME=dinghy" ~/.zshrc |wc -l`.to_i
-    if docker_env_exist == 0
-      puts "echo '$(dinghy env)' >> ~/.zshrc".yellow
-    end
-  end
-
-  if shell == '/bin/bash'
-    docker_env_exist = `fgrep "export DOCKER_MACHINE_NAME=dinghy" ~/.bash_profile |wc -l`.to_i
-    if docker_env_exist == 0
-      puts "echo '$(dinghy env)' >> ~/.bash_profile".yellow
-    end
-  end
-end

data/lib/hak.rb

@@ -3,5 +3,5 @@ require 'rubygems'
 require 'commander/import'
 
 module Hak
-    
+
 end

data/lib/hak/version.rb

@@ -1,3 +1,3 @@
 module Hak
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hak
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - jaequery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander