hak 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fa4f3e8c13734a9fd62d935ac3239a5c69b0930
-  data.tar.gz: 45e61a65496a632201fe8ee9e2bd13a1364cdb97
+  metadata.gz: e2863e5f7035d67c47b0e09e77a98d5dcd7688c0
+  data.tar.gz: 2061c19b0a34d99e1d74f11e9853358438500547
 SHA512:
-  metadata.gz: 4d5685322c8338b1351baf0af0be46f3ff38f2e2c7fb3547ae9140fa56d7da43f136bd19d77baf4bbfff4255dab5789aec79b464079646da53a807d2629d454a
-  data.tar.gz: c56b8b8db7895e0e6905f39c44e52e5b279eb814d334129745d8a722018b325ed1e13520664e0679ba97c9391695bfa5ba5876a5a30c65229f4706133fd63cf6
+  metadata.gz: c3ee66d9c868a04d14e05bfb346a200d5c3edb92b7be83355be870744dfd4a41cd10aaf42453e6b9d61a6e1b7b8a5e8d5f44e00b14b8eba168df4894fcd292d8
+  data.tar.gz: 6833dd0911021c742e8820dbb2e82d4f5310a53da549c69178dd3fc3a72636e953bf1729f7fd2480146dc0255481e4639789b80056b5b66b26771dd0199f3800

data/bin/hak

@@ -5,8 +5,8 @@ require 'commander/import'
 require 'yaml'
 require 'pp'
 
-program :name, 'hakberry'
-program :version, '0.3.7'
+program :name, 'hak'
+program :version, '0.3.8'
 program :description, 'Hak - start hacking!'
 
 default_command :help
@@ -149,7 +149,7 @@ command :up do |c|
   c.description = 'this starts up the website'
   c.example 'description', 'hak up'
   c.action do |args, options|
-    h_com "docker-compose up -d && docker-compose logs"
+    run "docker-compose up -d && docker-compose logs"
   end
 end
 
@@ -159,7 +159,7 @@ command :down do |c|
   c.description = 'turns the site down'
   c.example 'description', 'hak down'
   c.action do |args, options|
-    h_com "docker-compose stop"
+    run "docker-compose stop"
   end
 end
 
@@ -169,7 +169,7 @@ command :logs do |c|
   c.description = ''
   c.example 'description', 'hak logs'
   c.action do |args, options|
-    h_com "docker-compose logs"
+    run "docker-compose logs"
   end
 end
 
@@ -195,7 +195,7 @@ command :ssh do |c|
       #app = apps[0]
     else
       app = args[0]
-      h_com "docker-compose run #{app} bash"
+      run "docker-compose run #{app} bash"
     end
 
   end
@@ -208,21 +208,41 @@ command :ps do |c|
   c.description = ''
   c.example 'description', 'hak ps'
   c.action do |args, options|
-    container_names = h_com('docker ps --format "{{.Names}}"', true)
+    container_names = run('docker ps --format "{{.Names}}"', true)
     lines = container_names.lines
-    sites = lines.map do | line |
-      line.split('_')[0]
+    dinghy_running = false
+    sites = lines.map do |line|
+      name = line.split('_')[0]
+      if name == 'dinghy'
+        dinghy_running = true
+        "proxy"
+      else
+        name
+      end
     end
 
-    sites.shift
+    if dinghy_running == true
+      puts sites.uniq
+    else
+      puts "hak is off, turn it on first by typing:"
+      puts "hak on"
+    end
 
-    puts "Running websites"
-    puts sites.uniq
+  end
+end
+
+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|
+    run "dinghy upgrade"
   end
 end
 
 
-def h_com(command, hide=false)
+def run(command, hide=false)
   exec = "eval $(dinghy env) && #{command}"
 
   if hide

data/lib/hak/version.rb

@@ -1,3 +1,3 @@
 module Hak
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hak
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - jaequery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander