hak 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59036d5baab90eccfda9560822c1344bcd5bcd89
-  data.tar.gz: 18b22fa73884b8713ce8c543a642a0090af4e5d8
+  metadata.gz: de167389e00c46748a4b0c2690c5616382ef66a6
+  data.tar.gz: a70b22a1e315f1e8ab9d4af493656a3d1ebd703f
 SHA512:
-  metadata.gz: 512494f63e62bd716e6228896204663f05a0cef309106a5589d19475016fb0be48f0f353fb78c077f86b75e579af9f98241aeefdd1e06331080853296135d612
-  data.tar.gz: cc6cd146a93e1154e2d07bd1b0e9461db18c2173dad577fbe871d352757cf04a1e04f5061d758599b0ebfa1e61000b11064914cd3633f5a6554287cd8da3afb8
+  metadata.gz: 6e785bcb1a9601495f81a7af0d37b4fb97444b4c3b8d9aaf62970527f37d34899576c4730cf1bf9162002685f3be30ec112d44259f3fa40a5d092296e8022e89
+  data.tar.gz: 85ac0bc43d632b37928260cade340f0c73e8699a5daa20dd766f7940d7fdaebcda07fc051ca850f11064f6a3129a0edfadbb4ddf7271ab3472241b8aed719ba2

data/bin/hak

@@ -7,7 +7,7 @@ require 'colorize'
 require 'highline'
 
 program :name, 'hak'
-program :version, '0.5.2'
+program :version, '0.5.3'
 program :description, 'Hak - A Docker powered website manager for OSX'
 
 default_command :help
@@ -22,19 +22,18 @@ command :install do |c|
     # if ~/.hak not exists, initialize it
     puts "checking to see if ~/.hak exists".blue
     if !Dir.exists?(File.expand_path('~/.hak'))
-      puts "- creating ~/.hak".light_blue
+      puts "- creating ~/.hak".blue
       system "mkdir -p ~/.hak/packages"
 
       # install required dependencies 
-      puts "- installing docker, docker-machine, docker-compose, xhyve, wget".light_blue
+      puts "- setting up docker, docker-machine, docker-compose, xhyve, wget from brew".blue
 
       # re-install docker
-      system "brew upgrade dinghy docker docker-machine docker-compose wget docker-machine-driver-xhyve"
       system "brew tap codekitchen/dinghy"
-      system "brew install dinghy"
-      system "brew install docker docker-machine docker-compose wget"
-      system "brew install docker-machine-driver-xhyve"
-      system "brew link --overwrite docker-machine"
+      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"
@@ -42,31 +41,12 @@ command :install do |c|
     else
       puts "- it exists, skipping".blue
     end
+  
+    # check if docker is running
+    check_docker
 
-    # check if Docker env variables are set and from which SHELL
-    puts "checking your shell:".blue
-    shell = `echo $SHELL`.strip    
-    puts "- #{shell} detected".blue
-
-    puts "checking if docker environmental variables are set:".blue
-    if shell == '/bin/zsh'
-      docker_env_exist = `fgrep "export DOCKER_MACHINE_NAME=dinghy" ~/.zshrc |wc -l`.to_i
-      if docker_env_exist == 0
-        puts '- not set, type:'.yellow
-        puts "echo 'eval $(dinghy env)' >> ~/.zshrc"
-      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 '- not set, type:'.yellow
-        puts "echo 'eval $(dinghy env)' >> ~/.bash_profile"
-      end
-    end    
-
-    puts "to power on hak, type:".yellow
-    puts "  hak on"
+    # check if env is set
+    check_env    
 
   end
 end
@@ -90,8 +70,13 @@ command :on do |c|
   c.description = 'powers on the hak server'
   c.example 'description', 'hak on'
   c.action do |args, options|
-    # start up
-    system "dinghy up"
+    if check_env
+
+      if check_proxy
+        system "dinghy start"
+      end
+            
+    end
   end
 end
 
@@ -101,48 +86,22 @@ command :off do |c|
   c.description = 'shuts off the hak server'
   c.example 'description', 'hak off'
   c.action do |args, options|
-    system "dinghy halt"
+    system "dinghy stop"
   end
 end
 
-command :pull do |c|
-  c.syntax = 'hak pull jaequery/honeybadger'
-  c.summary = 'downloads framework'
+command :clone do |c|
+  c.syntax = 'hak clone jaequery/react-starter'
+  c.summary = 'clones github repo'
   c.description = ''
-  c.example 'description', 'hak pull jaequery/honeybadger'
+  c.example 'description', 'hak clone jaequery/react-starter'
   c.action do |args, options|
 
-    if !Dir.exists?(File.expand_path("~/.hak"))
-      system "mkdir ~/.hak"
-    end
-
     if args.empty?
-      repo = "jaequery/honeybadger"
-      package_author = "jaequery"
-      package = "honeybadger"
-      puts "Pulling #{repo}"
-    else
-      repo = args[0]
-      package_author = repo.split("/")[0]
-      package = repo.split("/")[1]
-    end
-
-    system "cd ~/.hak && rm -rf #{repo} && mkdir -p #{repo} && cd #{repo} && wget https://github.com/#{repo}/archive/master.zip && unzip master.zip && rm -f master.zip && mv #{package}-master/* . && rm -r #{package}-master"
-  end
-end
-
-command :get do |c|
-  c.syntax = 'hak get jaequery/react-starter'
-  c.summary = 'creates site'
-  c.description = ''
-  c.example 'description', 'hak get jaequery/react-starter'
-  c.action do |args, options|
-
-    if args.empty?
-      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 "for more hak ready packages, check out https://hak.sh/"
+      puts "type one of the following to get started: "
+      puts "hak clone jaequery/react-starter".yellow
+      puts "hak clone jaequery/honeybadger".yellow
       puts " "
       
     else
@@ -159,10 +118,6 @@ command :get do |c|
       # downloads package from github
       system "mkdir -p #{folder} && cd #{folder} && wget https://github.com/#{repo}/archive/master.zip && unzip master.zip && rm -f master.zip && mv #{package}-master/* #{package}-master/.* . && rm -r #{package}-master"
 
-      # copies the package from local ~/.hak/[repo] to local folder
-      #puts "copying ~/.hak/#{repo} to ./#{folder}"
-      #system "cp -Rfp ~/.hak/#{repo} #{folder}"
-
       # rename virtual host to app name
       file_path = "#{folder}/docker-compose.yml"
       file = File.open(file_path, "r+")
@@ -171,9 +126,9 @@ command :get do |c|
       new_content = content.gsub(/VIRTUAL_HOST=(.*?)\n/, "VIRTUAL_HOST=#{host}\n")
       File.write(file_path, new_content)    
 
-      puts "now type:".yellow
-      puts "cd #{folder}"
-      puts "hak start"
+      puts "now type:"
+      puts "cd #{folder}".yellow
+      puts "hak start".yellow
       puts "site should be viewable at http://#{host}/".green
 
     end
@@ -291,8 +246,7 @@ command :ps do |c|
     if dinghy_running == true
       puts sites.uniq
     else
-      puts "hak is off, turn it on first by typing:"
-      puts "hak on"
+      check_docker
     end
 
   end
@@ -320,7 +274,7 @@ command :deploy do |c|
     dest_docker_installed = true
 
     if args.empty?
-      puts "ex: hak deploy jae@someserver.com".yellow
+      puts "ex: hak deploy jae@someserver.com"
     else
 
       # get app name, make sure hak deploy is run from root of your app
@@ -332,8 +286,8 @@ command :deploy do |c|
       res = `ls -l |grep docker-compose-production.yml`
       if res == ""
         puts "docker-compose-production file not exists".red
-        puts "copying docker-compose.yml to docker-compose-production.yml".green
-        domain = ask "what domain do you want to use? ex) myawesomesite.com".light_blue
+        puts "copying docker-compose.yml to docker-compose-production.yml".blue
+        domain = ask "what domain do you want to use? ex) myawesomesite.com".green
         puts "#{domain} set in docker-compose-production.yml"
         system "cp docker-compose.yml docker-compose-production.yml"
 
@@ -380,13 +334,13 @@ command :deploy do |c|
       # deploy to dest
       #res = `rsync -avzr ../#{app} #{dest}:~/sites/` 
       #res = `ssh #{dest} \"cd ~/sites/#{app} && docker-compose stop && docker-compose up && docker-compose logs -f\"`
-      puts "rsyncing from ../#{app} to #{dest}:~/sites/ ... ".yellow
+      puts "rsyncing from ../#{app} to #{dest}:~/sites/ ... ".blue
       res = `rsync -avzr ../#{app} #{dest}:~/sites/`
-      puts "rsync done".green
+      puts "rsync done".blue
 
-      puts "running docker-compose -f docker-compose-production.yml up".yellow
+      puts "running docker-compose -f docker-compose-production.yml up".blue
       res = `ssh #{dest} "cd ~/sites/#{app} && docker-compose stop && docker-compose -f docker-compose-production.yml up && docker-compose logs"`
-      puts "all up and running!".green
+      puts "all up and running!".blue
       
     end
 
@@ -411,13 +365,54 @@ 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"
+    puts "docker not running or stopped"
+    puts "type this to power it on:"
+    puts "hak on".yellow
     abort
   else
     running = true
   end
 
   return running
+end
+
+def check_proxy
+  res = `dinghy status`
+  if res.include? "PROXY: stopped"
+    # restarting seems to sometimes solve this issue
+    system "dinghy restart"
+    return false
+  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
+  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/version.rb

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

metadata

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