hak 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114e6e292a118e36ac4e5ce5d9578fd29edbc1af
-  data.tar.gz: abbbe51ccfa33ae933837129d68666ace6db02df
+  metadata.gz: ccab0e8c148fe31b82b4616417d674670ceda79c
+  data.tar.gz: 5b27503207226611ea12ea2114917b077c21fd6d
 SHA512:
-  metadata.gz: 7aa94fd76bf15de54e34c4aaa4b12591b830c23966ede2079abbced65c6ad9603b119de4d3275490441aa1f8aa0fda249aa25cf6e707ea8e4510bc2aefda257b
-  data.tar.gz: 82b942f04bfcce86bd8d4adfa693bcd9ed9d32a9481cbae11fe3bec14c0d48cf7c2414a5734558deb834cda86cdf59a57db64c2ba6f90451462e75199e428fe5
+  metadata.gz: e9311ce88bfff02ce1717a22619c4d99a995d010b9f95029dc85bab24eaeed63311674523599551a88c2391c6e1638b11d637e5633d99d51f1baa6c5fa3e4447
+  data.tar.gz: 353b36d61ab2f990264d4e9e4640c0c52983b695d0ecee68fced6bd623203d6643f764dca6d598f28a03f90b047d02137a945eb1dc98e8d2e53d1dd4da99346a

data/bin/hak

@@ -5,9 +5,10 @@ require 'commander/import'
 require 'yaml'
 require 'colorize'
 require 'highline'
+require 'rbconfig'
 
 program :name, 'hak'
-program :version, '0.5.9'
+program :version, '0.6.0'
 program :description, 'Hak - A Docker-driven development platform'
 
 default_command :help
@@ -17,25 +18,27 @@ command :install do |c|
   c.summary = 'installs hak'
   c.description = 'installs hak'
   c.example 'description', 'hak install'
-  c.action do |args, options|
+  c.action do |args, options|  
 
-    user = `whoami`.strip
+    installed = false    
 
-    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
+    case os
+    when :macosx
+      installed = `echo "nameserver 127.0.0.1\nport 19322" | sudo tee -a /etc/resolver/docker`
+    when :linux
+      installed = `gem install dory`
     else
+      puts "other os are not supported at this time".red
+      abort
+    end
 
-      res = `cat > /etc/resolver/docker <<EOL
-nameserver 127.0.0.1
-port 19322`
-
+    if installed
       puts "hak installed".green
       puts "now turn hak on by typing:"
       puts "hak on".yellow
-
+    else
+      puts "dns resolver was not setup correctly".red
+      abort
     end
     
   end
@@ -47,11 +50,17 @@ command :on do |c|
   c.description = 'powers on the hak server'
   c.example 'description', 'hak on'
   c.action do |args, options|
-    check_docker
-    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 > /dev/null 2>&1`
+
+    case os
+    when :macosx
+      check_docker
+      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 > /dev/null 2>&1`
+    when :linux
+      `dory up`
+    end
     puts "hak-proxy started".green
   end
 end
@@ -62,8 +71,13 @@ command :off do |c|
   c.description = 'shuts off the hak server'
   c.example 'description', 'hak off'
   c.action do |args, options|
-    `docker stop hak-proxy > /dev/null 2>&1`
-    `docker rm hak-proxy > /dev/null 2>&1`
+    case os
+    when :macosx
+      `docker stop hak-proxy > /dev/null 2>&1`
+      `docker rm hak-proxy > /dev/null 2>&1`
+    when :linux
+      `dory down`
+    end
     puts "hak-proxy stopped".green
   end
 end
@@ -76,7 +90,7 @@ command :clone do |c|
   c.action do |args, options|
 
     if args.empty?
-      puts "for more hak ready packages, check out https://hak.sh/"
+      puts "for more packages, check out https://www.composeup.com/"
       puts "type one of the following to get started: "
       puts "hak clone jaequery/react-starter".yellow
       puts "hak clone jaequery/honeybadger".yellow
@@ -122,10 +136,8 @@ command :start do |c|
   c.action do |args, options|
     check_all
     check_compose
-
     run "docker-compose up -d && docker-compose logs -f"
     puts "app started".green    
-    
   end
 end
 
@@ -172,7 +184,7 @@ command :logs do |c|
   c.description = ''
   c.example 'description', 'hak logs'
   c.action do |args, options|
-    check_docker
+    check_all
     run "docker-compose logs -f"
   end
 end
@@ -215,17 +227,23 @@ command :ps do |c|
   c.action do |args, options|
     check_all
 
+    case os
+    when :macosx
+      proxy_name = "hak-proxy"
+    when :linux
+      proxy_name = "dory_dinghy_http_proxy"
+    end
+
     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 == 'hak-proxy'
-        dinghy_running = true
-        "proxy"
-      else
-        name
-      end
+      # if name == proxy_name
+      #   dinghy_running = true
+      # else
+      #   name
+      # end
     end
 
     puts sites.uniq
@@ -331,9 +349,14 @@ def run(command, hide=false)
 end
 
 def check_all
-  check_docker
-  check_dns
-  check_proxy
+  case os
+  when :macosx
+    check_docker
+    check_dns
+    check_proxy
+  when :linux
+    check_dory
+  end
 end
 
 def check_docker
@@ -352,11 +375,25 @@ def check_docker
 end
 
 def check_dns
-  if !File.exist?('/etc/resolver/docker')
-    puts "hak not installed properly, please type:"
-    puts "sudo hak install".yellow
-    abort
+
+
+  case os
+  when :macosx
+
+    if !File.exist?('/etc/resolver/docker')
+      puts "hak not installed properly, please type:"
+      puts "hak install".yellow
+      abort
+    end
+
+  when :linux
+    if !File.exist?('/etc/resolver/docker')
+      puts "hak not installed properly, please type:"
+      puts "hak install".yellow
+      abort
+    end
   end
+
   return true
 end
 
@@ -377,3 +414,29 @@ def check_compose
   end
 end
 
+def check_dory
+  res = system "dory status"
+  if res.include? "not running"
+    puts 'Dory was not running, starting it up'.green
+    system "dory on"
+  end
+end
+
+def os
+  @os ||= (
+    host_os = RbConfig::CONFIG['host_os']
+    case host_os
+    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      :windows
+    when /darwin|mac os/
+      :macosx
+    when /linux/
+      :linux
+    when /solaris|bsd/
+      :unix
+    else
+      raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+    end
+  )
+end
+

data/lib/hak/version.rb

@@ -1,3 +1,3 @@
 module Hak
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hak
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - jaequery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hak is like NPM for websites. You can download, start, and deploy websites
   directly from the CLI.
 email: