hak 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48cd551542a1400f9ebde1941414be0e6283bb7e
-  data.tar.gz: c709691b827801faed980951a0975bffc0783f85
+  metadata.gz: b5e03b8fac8a7dc7173b76565832a8385f9dfa4a
+  data.tar.gz: 751d57a03fdaf2b9163b8cca376a8c041d444e23
 SHA512:
-  metadata.gz: 1e313939fa766cfc6384705637139f81eb89da9b7c5e27a85f99e816092d7761b9e94e455d0a8ed762a5ec51ffe1e683a235fc40409e86af049db8e14bc08f72
-  data.tar.gz: fbe810cc810be2cbce09cd5998bd3b5250bc1686ebeec83bf69611b86647d0f6f95bad6763123d47cd321091b18352b0a1323c3c9d913d1757951668110f25e8
+  metadata.gz: 53e6b6b57495642c2087f5db226c345903f2893d1e1f2545d42461cc0a296bbbc8d7eb2a200463b197c1a74a94c9fed8a6048e4eee6620fbf48d6cb03290243a
+  data.tar.gz: a5a502b0d1714cc9917a8d76535f3752fb29b08b28fd9387f91931eca58348db998eae8d60394c56589f5d145ab91d163d611cc7e8e6ebc14347a5eb4a49b0cd

data/bin/hak

@@ -6,16 +6,16 @@ require 'yaml'
 require 'colorize'
 
 program :name, 'hak'
-program :version, '0.4.5'
-program :description, 'Hak - start hacking!'
+program :version, '0.4.6'
+program :description, 'Hak - A Docker powered website manager for OSX'
 
 default_command :help
 
-command :setup do |c|
-  c.syntax = 'hak setup'
-  c.summary = 'sets up the hak environment'
+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.example 'description', 'hak setup'
+  c.example 'description', 'hak install'
   c.action do |args, options|
 
     # if ~/.hak not exists, initialize it
@@ -34,20 +34,10 @@ command :setup do |c|
       system "brew install docker docker-machine docker-compose wget"
       system "brew install docker-machine-driver-xhyve"
       system "brew link --overwrite docker-machine"
-      
       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"
 
-    else
-      puts "- it exists, skipping".blue
-    end
-
-    # if ~/.dinghy not exists, initialize it
-    puts "checking to see if ~/.dinghy exists".blue
-    if !Dir.exists?(File.expand_path('~/.dinghy'))
-      
-
     else
       puts "- it exists, skipping".blue
     end
@@ -62,7 +52,7 @@ command :setup do |c|
       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 "$(dinghy env)" >> ~/.zshrc'
+        puts "echo 'eval $(dinghy env)' >> ~/.zshrc"
       end
     end
 
@@ -70,7 +60,7 @@ command :setup do |c|
       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 "$(dinghy env)" >> ~/.bash_profile'
+        puts "echo 'eval $(dinghy env)' >> ~/.bash_profile"
       end
     end    
 
@@ -80,6 +70,19 @@ command :setup do |c|
   end
 end
 
+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
+
 command :on do |c|
   c.syntax = 'hak on'
   c.summary = 'powers on the hak server'
@@ -101,45 +104,6 @@ command :off do |c|
   end
 end
 
-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
-
-command :pull do |c|
-  c.syntax = 'hak pull jaequery/honeybadger'
-  c.summary = 'downloads framework'
-  c.description = ''
-  c.example 'description', 'hak pull jaequery/honeybadger'
-  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 :create do |c|
   c.syntax = 'hak create something.com'
   c.summary = 'creates site'
@@ -364,13 +328,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 files ... ".yellow
+      puts "rsyncing from ../#{app} to #{dest}:~/sites/ ... ".yellow
       res = `rsync -avzr ../#{app} #{dest}:~/sites/`
-      puts "files rsynced".green
+      puts "rsync done".green
 
       puts "running docker-compose -f docker-compose-production.yml up".yellow
       res = `ssh #{dest} "cd ~/sites/#{app} && docker-compose stop && docker-compose -f docker-compose-production.yml up && docker-compose logs"`
-      puts "all up".green
+      puts "all up and running!".green
       
     end
 
@@ -379,7 +343,7 @@ end
 
 
 def run(command, hide=false)
-  exec = "eval $(dinghy env) && #{command}"
+  exec = "#{command}"
 
   if hide
     res = `#{exec}`

data/lib/hak/version.rb

@@ -1,3 +1,3 @@
 module Hak
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

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