ukku 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 305c7f9a904bcd72a8c94e34412a3df87f8ddd1b
-  data.tar.gz: df9ab5f883072fa59f7bb2f5984f0615275728a9
+  metadata.gz: 3fb9c1ffa5635540ca22a07a596acd32aba2da94
+  data.tar.gz: d72c921c54053e4c6068e5bcc39a8d0ec0ee2526
 SHA512:
-  metadata.gz: 2a1e0f80855a522b8b73d2012d93a757fe653522f8345671c2b2a406bea7cc8b862e55614ea6eb09bf03f38d738949d180dffd2cb51db21414da38859c77f517
-  data.tar.gz: 4fc31d926872b5e33914d67885188d53605b0c1675842cd269b2557b4ca37f1c59e02b39290b856ba26a59fb7e31e4682baecbd1882532e4752d3332ca479787
+  metadata.gz: bb7c6348d92265ad55c05058a201c578c403044172653f2ce575b226d207be2f89b739f52d76eb5f5e26128c7548b3955f0b987cb8874b2b966a0dff62712f42
+  data.tar.gz: 0d604e16e402b753a23768605100e76f2867cb898045a026ba3d26fec927686c7d53a43e010f2c930bf1654bbae2f5a21a6a574167d9c76693fdb2090c091658

data/bin/ukku

@@ -10,11 +10,15 @@ doc = <<DOCOPT
 Ukku.
 
 Usage:
-  ukku configure [-u USER] [-i IDENTITY_FILE] HOST [NAME]
+  ukku configure [-u USER] [-i IDENTITY_FILE] [--no-pg] HOST [NAME]
   ukku [--app=NAME] run COMMAND...
   ukku [--app=NAME] keys:upload PUBLIC_KEY_FILE
   ukku [--app=NAME] vars
   ukku [--app=NAME] vars:set VAR_NAME VAR_VALUE
+  ukku [--app=NAME] ps
+  ukku [--app=NAME] ps:add TYPE
+  ukku [--app=NAME] ps:remove TYPE
+  ukku [--app=NAME] ps:restart [TYPE]
 
 Arguments:
   HOST                  Domain or IP of your server.
@@ -39,9 +43,13 @@ begin
   UploadKeyCommand.new.execute(args) if args['keys:upload']
   VarsCommand.new.execute(args) if args['vars']
   SetVarCommand.new.execute(args) if args['vars:set']
+  PsCommand.new.execute(args) if args['ps']
+  PsAddCommand.new.execute(args) if args['ps:add']
+  PsRemoveCommand.new.execute(args) if args['ps:remove']
 rescue Docopt::Exit => e
   puts doc.strip
 rescue Exception => e
   puts "   !   #{e.message}"
+  puts e.backtrace
   exit 1
 end

data/lib/ukku.rb

@@ -5,3 +5,6 @@ require 'ukku/run_command.rb'
 require 'ukku/vars_command.rb'
 require 'ukku/set_var_command.rb'
 require 'ukku/upload_key_command.rb'
+require 'ukku/ps_command.rb'
+require 'ukku/ps_add_command.rb'
+require 'ukku/ps_remove_command.rb'

data/lib/ukku/configure_command.rb

@@ -1,9 +1,9 @@
 class ConfigureCommand
-
   def execute(args)
     host = args['HOST']
     name = args['NAME'] || "production"
     user = args['--user'] || "root"
+    no_pg = args['--no-pg']
     identity_file = args['-i']
 
     entry = { "host" => host, "user" => user } # the entry to add to UKKU_FILE
@@ -21,7 +21,7 @@ class ConfigureCommand
     if server_ready
       puts "The server is already configured ... skipping"
     else
-      configure_server(conn)
+      configure_server(conn, no_pg)
     end
 
     repo = fetch_repo
@@ -31,7 +31,7 @@ class ConfigureCommand
 
     append_ukku_file_to_gitignore
 
-    print_ssh_config if identity_file
+    print_ssh_config(host, identity_file) if identity_file
 
     puts
     puts "Your server is configured! Deploy your application using 'git push #{name} master'"
@@ -58,10 +58,11 @@ class ConfigureCommand
       end
     end
 
-    def configure_server(conn)
+    def configure_server(conn, no_pg)
       wget1_command = "wget https://raw.githubusercontent.com/germanescobar/ukku/master/server/bootstrap.sh"
       chmod_command = "chmod 755 bootstrap.sh"
-      run_command = "./bootstrap.sh"
+      run_command = "sudo ./bootstrap.sh"
+      run_command += " -p" unless no_pg
       conn.execute "#{wget1_command} && #{chmod_command} && #{run_command}"
     end
 
@@ -101,7 +102,7 @@ class ConfigureCommand
       end
     end
 
-    def print_ssh_config
+    def print_ssh_config(host, identity_file)
       puts "*********************************************************************"
       puts "ATTENTION: Add the following to '~/.ssh/config' before deploying"
       puts "(create the file if necessary; erase any other entry with same host):"

data/lib/ukku/ps_add_command.rb

@@ -0,0 +1,36 @@
+class PsAddCommand
+  def execute(args)
+    type = args['TYPE']
+
+    if !File.exist?(UKKU_FILE)
+      raise "No application configured. Run 'ukku configure HOST' first."
+    end
+
+    data = YAML.load_file(UKKU_FILE)
+    name, server = data.first
+    if name.nil?
+      raise "No application configured. Run 'ukku configure <host>' first."
+    end
+
+    if data.length > 1
+      if args['--app'].empty?
+        raise "No app specified, use the --app NAME option"
+      else
+        name = args[--app]
+        sever = data[name]
+      end
+    end
+
+    host = server['host']
+    user = server['user']
+    identity_file = server['identity_file']
+
+    puts "Adding process type '#{type}' on #{host} ..."
+    conn = Connection.new(host, user, identity_file)
+    conn.execute("sudo touch /etc/ukku/ps-types/#{type}")
+    begin
+      conn.execute("launchapp")
+    rescue Subprocess::NonZeroExit => e
+    end
+  end
+end

data/lib/ukku/ps_command.rb

@@ -0,0 +1,31 @@
+class PsCommand
+  def execute(args)
+    type = args['TYPE']
+
+    if !File.exist?(UKKU_FILE)
+      raise "No application configured. Run 'ukku configure HOST' first."
+    end
+
+    data = YAML.load_file(UKKU_FILE)
+    name, server = data.first
+    if name.nil?
+      raise "No application configured. Run 'ukku configure <host>' first."
+    end
+
+    if data.length > 1
+      if args['--app'].empty?
+        raise "No app specified, use the --app NAME option"
+      else
+        name = args[--app]
+        sever = data[name]
+      end
+    end
+
+    host = server['host']
+    user = server['user']
+    identity_file = server['identity_file']
+
+    conn = Connection.new(host, user, identity_file)
+    conn.execute("ls /etc/ukku/ps-types")
+  end
+end

data/lib/ukku/ps_remove_command.rb

@@ -0,0 +1,36 @@
+class PsRemoveCommand
+  def execute(args)
+    type = args['TYPE']
+
+    if !File.exist?(UKKU_FILE)
+      raise "No application configured. Run 'ukku configure HOST' first."
+    end
+
+    data = YAML.load_file(UKKU_FILE)
+    name, server = data.first
+    if name.nil?
+      raise "No application configured. Run 'ukku configure <host>' first."
+    end
+
+    if data.length > 1
+      if args['--app'].empty?
+        raise "No app specified, use the --app NAME option"
+      else
+        name = args[--app]
+        sever = data[name]
+      end
+    end
+
+    host = server['host']
+    user = server['user']
+    identity_file = server['identity_file']
+
+    puts "Removing process type '#{type}' on #{host} ..."
+    conn = Connection.new(host, user, identity_file)
+    conn.execute("sudo rm /etc/ukku/ps-types/#{type} && docker kill app-#{type} && docker rm app-#{type}")
+    begin
+      conn.execute("launchapp")
+    rescue Subprocess::NonZeroExit => e
+    end
+  end
+end

data/lib/ukku/set_var_command.rb

@@ -23,6 +23,10 @@ class SetVarCommand
     identity_file = server['identity_file']
 
     conn = Connection.new(host, user, identity_file)
-    conn.execute("mkdir -p /etc/vars && echo '#{var_value}' > /etc/vars/#{var_name} && launchapp")
+    conn.execute("sudo mkdir -p /etc/ukku/vars && echo '#{var_value}' > /etc/ukku/vars/#{var_name}")
+    begin
+      conn.execute("launchapp")
+    rescue Subprocess::NonZeroExit => e
+    end
   end
 end

data/lib/ukku/vars_command.rb

@@ -20,6 +20,6 @@ class VarsCommand
     identity_file = server['identity_file']
 
     conn = Connection.new(host, user, identity_file)
-    conn.execute("mkdir -p /etc/vars && FILES=/etc/vars/*; for f in $FILES; do echo \"${f##*/}=$(<$f)\"; done")
+    conn.execute("sudo mkdir -p /etc/ukku/vars && FILES=/etc/ukku/vars/*; for f in $FILES; do echo \"${f##*/}=$(<$f)\"; done")
   end
 end

data/lib/ukku/version.rb

@@ -1,3 +1,3 @@
 module Ukku
-  VERSION = '0.1.3'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ukku
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Germán Escobar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,6 +125,9 @@ files:
 - lib/ukku.rb
 - lib/ukku/configure_command.rb
 - lib/ukku/connection.rb
+- lib/ukku/ps_add_command.rb
+- lib/ukku/ps_command.rb
+- lib/ukku/ps_remove_command.rb
 - lib/ukku/run_command.rb
 - lib/ukku/set_var_command.rb
 - lib/ukku/upload_key_command.rb