hak 0.2.5 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7c21a42db6d5be332c1736701fe29b53ad48f2
-  data.tar.gz: 0164bdced80f29e31c5fe289a655a8b4c7ff2e64
+  metadata.gz: 024bb8aabbcd431750643b97d116f4417400fc05
+  data.tar.gz: 59f8fe05bc51a58cf36c2ead1fb1830c97d36d36
 SHA512:
-  metadata.gz: b84efd649b16b8cabce09d717277dd172f2c655f75d64be252cd11f8e9aeb00f89b876e2ab6bbb8ccf1a76c81c7826e5793c8c2c7c74d17b6531938458795c53
-  data.tar.gz: 85e00ee1cefb2bd95726154619e8f22138b42f75906e1ec77ee0e547f8529afacde7e6cff0ae75b45142bea2835f26154b88b6b4621b2f9b414256dcbb8278c4
+  metadata.gz: 730f1370a48be9e9b5191dba8be3438cdb6eb287584a5b8f574da07c724e9d9c7f71a27e5d43cade1179655477263830d959a742748b871b0dd8e3e29ae8f5dd
+  data.tar.gz: 73d704874bbe92b3af34e1594cd4b02030d12b08a95af68bad88a000f8dff200ff79b914802a0d375d17dd1ce4d964a91418b6d0a75a60c10c24cd2ee3d2a180

data/bin/hak

@@ -2,9 +2,11 @@
 
 require 'rubygems'
 require 'commander/import'
+require 'yaml'
+require 'pp'
 
 program :name, 'hakberry'
-program :version, '0.2.0'
+program :version, '0.2.7'
 program :description, 'Hakberry - a Ruby hackathon starter'
 
 default_command :help
@@ -17,7 +19,7 @@ command :pull do |c|
   c.action do |args, options|
 
     if !Dir.exists?(File.expand_path("~/.hak"))
-      exec "mkdir ~/.hak"
+      system "mkdir ~/.hak"
     end
 
     if args.empty?
@@ -31,15 +33,15 @@ command :pull do |c|
       package = repo.split("/")[1]
     end
 
-    exec "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"
+    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 = 'downloads framework'
+  c.summary = 'creates site'
   c.description = ''
-  c.example 'description', 'hak get jaequery/honeybadger'
+  c.example 'description', 'hak create something.com'
   c.action do |args, options|    
 
     if args.empty?
@@ -57,23 +59,27 @@ command :create do |c|
       # download package if not exist
       if !Dir.exists?(File.expand_path("~/.hak/" + repo))
         puts "#{repo} not exists, pulling"
-        exec "hak pull #{repo}"
+        system "hak pull #{repo}"
       end
 
+      # copies the package from local ~/.hak/[repo] to local folder
+      puts "copying ~/.hak/#{repo} to ./#{folder}"
+      system "cp -Rfp ~/.hak/#{repo} #{folder}"
+
       # rename virtual host to app name
-      require 'yaml'
-      file_path = 'docker-compose.yml'
+      file_path = "#{folder}/docker-compose.yml"      
       file = File.open(file_path, "r+")
       content = file.read
       new_content = content.gsub(/VIRTUAL_HOST=(.*?)\n/, "VIRTUAL_HOST=#{folder}.docker\n")
       File.write(file_path, new_content)
+      puts "set VIRTUAL_HOST of http://#{file_path}.docker/"
 
-      # copies the package from local ~/.hak/[repo] to local folder
-      puts "copying ~/.hak/#{repo} to ./#{folder}"
       puts "now type:"
       puts "cd #{folder}"
       puts "hak up"
-      exec "cp -Rfp ~/.hak/#{repo} #{folder}"
+      puts "copied"
+
+      
 
     end
 
@@ -91,16 +97,16 @@ command :on do |c|
 
     # if ~/.hak not exists, initialize it
     if !Dir.exists?(File.expand_path('~/.dinghy'))
-      exec "mkdir -p ~/.hak/packages"
+      system "mkdir -p ~/.hak/packages"
     end
 
     # if ~/.dinghy not exists, initialize it
     if !Dir.exists?(File.expand_path('~/.dinghy'))
-      exec "mkdir ~/.hak"
-      exec "brew tap codekitchen/dinghy && brew install dinghy"
-      exec "brew install docker docker-machine"
+      system "mkdir ~/.hak"
+      system "brew tap codekitchen/dinghy && brew install dinghy"
+      system "brew install docker docker-machine wget"
     else
-      exec "dinghy up"
+      system "dinghy up"
     end
   end
 end
@@ -111,7 +117,7 @@ command :off do |c|
   c.description = 'shuts off the hakberry server'
   c.example 'description', 'hak off'
   c.action do |args, options|
-    exec "dinghy halt"
+    system "dinghy halt"
   end
 end
 
@@ -121,7 +127,7 @@ command :up do |c|
   c.description = 'this starts up the website'
   c.example 'description', 'hak up'
   c.action do |args, options|
-    exec "docker-compose up -d && docker-compose logs"
+    system "docker-compose up -d && docker-compose logs"
   end
 end
 
@@ -131,7 +137,7 @@ command :down do |c|
   c.description = 'turns the site down'
   c.example 'description', 'hak down'
   c.action do |args, options|
-    exec "docker-compose stop"
+    system "docker-compose stop"
   end
 end
 
@@ -141,35 +147,33 @@ command :logs do |c|
   c.description = ''
   c.example 'description', 'hak logs'
   c.action do |args, options|
-    exec "docker-compose logs"
+    system "docker-compose logs"
   end
 end
 
 command :ssh do |c|
-
-  require 'yaml'
-  require 'pp'
-  file_name = 'docker-compose.yml'
-  config_options = YAML.load_file(file_name)
-  app = ''
-  apps = []
-  config_options.each do |key, value|
-      apps << key
-  end
-
+  
   c.syntax = 'hak ssh'
   c.summary = 'ssh to your app'
   c.description = ''
   c.example 'description', 'hak ssh [app]'
   c.action do |args, options|
 
+    file_name = 'docker-compose.yml'
+    config_options = YAML.load_file(file_name)
+    app = ''
+    apps = []
+    config_options.each do |key, value|
+        apps << key
+    end
+
     if args.empty?
       puts "choose one:"
-      PP.pp apps
+      puts apps
       #app = apps[0]
     else
       app = args[0]
-      exec "docker-compose run #{app} bash"
+      system "docker-compose run #{app} bash"
     end
     
   end

data/lib/hak/version.rb

@@ -1,3 +1,3 @@
 module Hak
-  VERSION = "0.2.5"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hak
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.8
 platform: ruby
 authors:
 - jaequery