ukku 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzViOTY0ZjU4MzFhNjkyNDM3ZWViNDg0Mzk3NjcxN2FkZWJhMmUyZg==
-  data.tar.gz: !binary |-
-    MDUxNTBjZDBlNmY4OTYwYWJiMmUzOTIyZGNkZjM4MDM1YTVkN2FkMg==
+SHA1:
+  metadata.gz: 305c7f9a904bcd72a8c94e34412a3df87f8ddd1b
+  data.tar.gz: df9ab5f883072fa59f7bb2f5984f0615275728a9
 SHA512:
-  metadata.gz: !binary |-
-    ZjVlMTlkN2QxNDY1YTZhNzlmNzNlYmMyYWI4NGMyN2E0ZjQ1YjFhMGQwNzIz
-    NzBmN2EyNzMxNWFkZWU3YWIzZGU1YTc4NmMwMjc0NjM3NmE5NGQ0ZDQ1YTkx
-    Njk4NTMyYWQ5MzQ4NDQ4ZjI3NDNiYWY2OWY2N2RjYzcxZjhiZjc=
-  data.tar.gz: !binary |-
-    MzI1YWY0N2NmNTMwNzFjODI1M2EwOTk5ODU3OWVhMjYzYzgwZWZhNWM1ZjZm
-    YjY5ZTU1M2JhMzRlOGY3NDYxZDE0NjkxM2E1NzAyMzI5ZDJjOWU3NjkxZWZi
-    MzAzZmEyYjdmNzRlMTgwMmU5MTY5YTQ5OGJkOWYwMmY4YTljYmM=
+  metadata.gz: 2a1e0f80855a522b8b73d2012d93a757fe653522f8345671c2b2a406bea7cc8b862e55614ea6eb09bf03f38d738949d180dffd2cb51db21414da38859c77f517
+  data.tar.gz: 4fc31d926872b5e33914d67885188d53605b0c1675842cd269b2557b4ca37f1c59e02b39290b856ba26a59fb7e31e4682baecbd1882532e4752d3332ca479787

data/bin/ukku

@@ -12,6 +12,9 @@ Ukku.
 Usage:
   ukku configure [-u USER] [-i IDENTITY_FILE] 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
 
 Arguments:
   HOST                  Domain or IP of your server.
@@ -33,6 +36,11 @@ begin
   # execute commands
   ConfigureCommand.new.execute(args) if args['configure']
   RunCommand.new.execute(args) if args['run']
+  UploadKeyCommand.new.execute(args) if args['keys:upload']
+  VarsCommand.new.execute(args) if args['vars']
+  SetVarCommand.new.execute(args) if args['vars:set']
+rescue Docopt::Exit => e
+  puts doc.strip
 rescue Exception => e
   puts "   !   #{e.message}"
   exit 1

data/lib/ukku.rb

@@ -2,3 +2,6 @@ require 'ukku/version.rb'
 require 'ukku/connection.rb'
 require 'ukku/configure_command.rb'
 require 'ukku/run_command.rb'
+require 'ukku/vars_command.rb'
+require 'ukku/set_var_command.rb'
+require 'ukku/upload_key_command.rb'

data/lib/ukku/configure_command.rb

@@ -31,6 +31,8 @@ class ConfigureCommand
 
     append_ukku_file_to_gitignore
 
+    print_ssh_config if identity_file
+
     puts
     puts "Your server is configured! Deploy your application using 'git push #{name} master'"
   end
@@ -58,10 +60,9 @@ class ConfigureCommand
 
     def configure_server(conn)
       wget1_command = "wget https://raw.githubusercontent.com/germanescobar/ukku/master/server/bootstrap.sh"
-      wget2_command = "wget https://raw.githubusercontent.com/germanescobar/ukku/master/server/run.sh"
-      chmod_command = "chmod 755 bootstrap.sh run.sh"
+      chmod_command = "chmod 755 bootstrap.sh"
       run_command = "./bootstrap.sh"
-      conn.execute "#{wget1_command} && #{wget2_command} && #{chmod_command} && #{run_command}"
+      conn.execute "#{wget1_command} && #{chmod_command} && #{run_command}"
     end
 
     def fetch_repo
@@ -100,4 +101,15 @@ class ConfigureCommand
       end
     end
 
+    def print_ssh_config
+      puts "*********************************************************************"
+      puts "ATTENTION: Add the following to '~/.ssh/config' before deploying"
+      puts "(create the file if necessary; erase any other entry with same host):"
+      puts
+      puts "Host #{host}"
+      puts "    User git"
+      puts "    IdentityFile #{identity_file}"
+      puts "*********************************************************************"
+    end
+
 end

data/lib/ukku/connection.rb

@@ -5,12 +5,17 @@ class Connection
     @identity_file = identity_file
   end
 
-  def execute(command)
-    args = ["ssh", "-t"]
+  def execute(command, &blk)
+    args = ["ssh"]
+    args << "-t" if blk.nil?
     if @identity_file
       args += ["-i", @identity_file ]
     end
     args += ["#{@user}@#{@host}", "#{command}"]
-    Subprocess.check_call(args)
+    if blk
+      Subprocess.check_call(args, stdin: Subprocess::PIPE, &blk)
+    else
+      Subprocess.check_call(args)
+    end
   end
 end

data/lib/ukku/run_command.rb

@@ -27,6 +27,6 @@ class RunCommand
 
     puts "Running command '#{command}' on #{host} ..."
     conn = Connection.new(host, user, identity_file)
-    conn.execute("./run.sh #{command}")
+    conn.execute("runcommand #{command}")
   end
 end

data/lib/ukku/set_var_command.rb

@@ -0,0 +1,28 @@
+class SetVarCommand
+  def execute(args)
+    var_name = args['VAR_NAME']
+    var_value = args['VAR_VALUE']
+
+    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("mkdir -p /etc/vars && echo '#{var_value}' > /etc/vars/#{var_name} && launchapp")
+  end
+end

data/lib/ukku/upload_key_command.rb

@@ -0,0 +1,42 @@
+class UploadKeyCommand
+  def execute(args)
+    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']
+
+    key_file = args['PUBLIC_KEY_FILE']
+
+    conn = Connection.new(host, user, identity_file)
+
+    puts "Uploading key '#{key_file}' ... "
+    conn.execute("gitreceive upload-key ukku") do |p|
+      p.communicate IO.read(File.expand_path(key_file))
+    end
+    puts "Done!"
+
+    puts
+    puts "*********************************************************************"
+    puts "ATTENTION: Add the following to '~/.ssh/config' before deploying"
+    puts "(create the file if necessary; erase any other entry with same host):"
+    puts
+    puts "Host #{host}"
+    puts "    User git"
+    puts "    IdentityFile #{key_file}"
+    puts "*********************************************************************"
+  end
+end

data/lib/ukku/vars_command.rb

@@ -0,0 +1,25 @@
+class VarsCommand
+  def execute(args)
+    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("mkdir -p /etc/vars && FILES=/etc/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.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ukku
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Germán Escobar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,6 +126,9 @@ files:
 - lib/ukku/configure_command.rb
 - lib/ukku/connection.rb
 - lib/ukku/run_command.rb
+- lib/ukku/set_var_command.rb
+- lib/ukku/upload_key_command.rb
+- lib/ukku/vars_command.rb
 - lib/ukku/version.rb
 - test/default_test.rb
 - test/test_helper.rb
@@ -141,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Easily deploy your application to your own server using "git push"