hak 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3706b3e79dbd722ce1f04144949576281440acca
-  data.tar.gz: 409a2d706a48e55aefa5959e7f923b6869040069
+  metadata.gz: 8fa4f3e8c13734a9fd62d935ac3239a5c69b0930
+  data.tar.gz: 45e61a65496a632201fe8ee9e2bd13a1364cdb97
 SHA512:
-  metadata.gz: 65d16b2f51a1dd05f6c64f92127798f2c18512fa12dbeb4865a3226c07617af773a4f7bdf5c216fcaa57a992539489e53e7badc277b79273ce01cfd52d8ebf8e
-  data.tar.gz: dcfd3573127ff50b72f5d96c75ae74c00c64c8762a6df14cad064c36f3448a7b9a913e40053d547af2ec90159e2c47db9789d83b914bbba72aa1d47cd8ba429d
+  metadata.gz: 4d5685322c8338b1351baf0af0be46f3ff38f2e2c7fb3547ae9140fa56d7da43f136bd19d77baf4bbfff4255dab5789aec79b464079646da53a807d2629d454a
+  data.tar.gz: c56b8b8db7895e0e6905f39c44e52e5b279eb814d334129745d8a722018b325ed1e13520664e0679ba97c9391695bfa5ba5876a5a30c65229f4706133fd63cf6

data/bin/hak

@@ -6,7 +6,7 @@ require 'yaml'
 require 'pp'
 
 program :name, 'hakberry'
-program :version, '0.3.6'
+program :version, '0.3.7'
 program :description, 'Hak - start hacking!'
 
 default_command :help
@@ -42,7 +42,7 @@ command :create do |c|
   c.summary = 'creates site'
   c.description = ''
   c.example 'description', 'hak create something.com'
-  c.action do |args, options|    
+  c.action do |args, options|
 
     if args.empty?
       puts "ex: hak create something"
@@ -67,7 +67,7 @@ command :create do |c|
       system "cp -Rfp ~/.hak/#{repo} #{folder}"
 
       # rename virtual host to app name
-      file_path = "#{folder}/docker-compose.yml"      
+      file_path = "#{folder}/docker-compose.yml"
       file = File.open(file_path, "r+")
       content = file.read
       host = "#{folder}.docker"
@@ -94,7 +94,7 @@ command :on do |c|
     # if ~/.hak not exists, initialize it
     if !Dir.exists?(File.expand_path('~/.hak'))
       system "mkdir -p ~/.hak/packages"
-    end    
+    end
 
     # if ~/.dinghy not exists, initialize it
     if !Dir.exists?(File.expand_path('~/.dinghy'))
@@ -109,14 +109,14 @@ command :on do |c|
       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"
-      
-      
+
+
     end
 
     system "eval $(dinghy env)"
 
     # start up
-    system "dinghy up"    
+    system "dinghy up"
   end
 end
 
@@ -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|
-    system "docker-compose up -d && docker-compose logs"
+    h_com "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|
-    system "docker-compose stop"
+    h_com "docker-compose stop"
   end
 end
 
@@ -169,12 +169,12 @@ command :logs do |c|
   c.description = ''
   c.example 'description', 'hak logs'
   c.action do |args, options|
-    system "docker-compose logs"
+    h_com "docker-compose logs"
   end
 end
 
 command :ssh do |c|
-  
+
   c.syntax = 'hak ssh'
   c.summary = 'ssh to your app'
   c.description = ''
@@ -195,9 +195,41 @@ command :ssh do |c|
       #app = apps[0]
     else
       app = args[0]
-      system "docker-compose run #{app} bash"
+      h_com "docker-compose run #{app} bash"
+    end
+
+  end
+
+end
+
+command :ps do |c|
+  c.syntax = 'hak ps'
+  c.summary = 'lists your running websites'
+  c.description = ''
+  c.example 'description', 'hak ps'
+  c.action do |args, options|
+    container_names = h_com('docker ps --format "{{.Names}}"', true)
+    lines = container_names.lines
+    sites = lines.map do | line |
+      line.split('_')[0]
     end
-    
+
+    sites.shift
+
+    puts "Running websites"
+    puts sites.uniq
+  end
+end
+
+
+def h_com(command, hide=false)
+  exec = "eval $(dinghy env) && #{command}"
+
+  if hide
+    res = `#{exec}`
+  else
+    res = system exec
   end
 
+  return res
 end

data/lib/hak/version.rb

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

metadata

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