hak 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef8f2d427f29a8b74687d2af39d0c74b64325313
-  data.tar.gz: e1a059807866443ee9be6d13ad36b162721feb4f
+  metadata.gz: 16eb47d7ba6667181ac796e52f29a790265e39c5
+  data.tar.gz: 839c5a2dedc2adf3f6edfea79075be28ab550f03
 SHA512:
-  metadata.gz: 2f562cdaaa2ee1a06e2055cf3a43c249b3daa942cd2f6c18abecbf18c2ca7759e64e7954120594b7b8f09c65c458736bd134d6f2b2d380899cacd9afce747e17
-  data.tar.gz: dafed174048dababcc94eec4d12a2d7531bbeadcc2d10dadbbb843512bd1a5f05ae32ff2e130d09608ca5ffcc298a57f715dda71732acb6ebdc59819449a185e
+  metadata.gz: 5a64b4619a7436a253fae3314340085de0bc20c96885c7bf72ab925653a2f127c53bd08257c4551e2537bcb70364c18c47e00c57aa45306613470499497c1d37
+  data.tar.gz: 21f09e6ae8e59b87ea4408a35e8933bb2f6cd48569ee5abb14b2e7cc2ca475aa68355c1a6c6ae7ce2944e5a7ac14e7cd57645f8c7e8053fb6d7252e85b850682

data/bin/hak

@@ -6,7 +6,7 @@ require 'yaml'
 require 'colorize'
 
 program :name, 'hak'
-program :version, '0.4.0'
+program :version, '0.4.1'
 program :description, 'Hak - start hacking!'
 
 default_command :help
@@ -23,25 +23,31 @@ command :setup do |c|
     if !Dir.exists?(File.expand_path('~/.hak'))
       puts "- creating ~/.hak".light_blue
       system "mkdir -p ~/.hak/packages"
-    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'))
+      # install required dependencies 
       puts "- installing docker, docker-machine, docker-compose, xhyve, wget".light_blue
-      # remove existing docker
-      system "brew upgrade docker docker-machine docker-compose"
+
+      # 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 link --overwrite docker-machine"
       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
@@ -61,7 +67,7 @@ command :setup do |c|
     end
 
     if shell == '/bin/bash'
-      docker_env_exist = `fgrep "export DOCKER_MACHINE_NAME=dinghy" ~/.bashrc |wc -l`.to_i
+      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'
@@ -170,11 +176,11 @@ command :create do |c|
       host = "#{folder}.docker"
       new_content = content.gsub(/VIRTUAL_HOST=(.*?)\n/, "VIRTUAL_HOST=#{host}\n")
       File.write(file_path, new_content)
-      puts "set VIRTUAL_HOST of http://#{host}/"
+      puts "this site will be viewable at http://#{host}/"
 
       puts "now type:"
       puts "cd #{folder}"
-      puts "hak up"
+      puts "hak start"
 
     end
 
@@ -288,6 +294,7 @@ command :upgrade do |c|
   c.description = ''
   c.example 'description', 'hak upgrade'
   c.action do |args, options|
+    system "gem update hak"
     run "dinghy upgrade"
   end
 end

data/lib/hak/version.rb

@@ -1,3 +1,3 @@
 module Hak
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hak
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - jaequery
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Hak is like NPM for websites