ukku 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fb9c1ffa5635540ca22a07a596acd32aba2da94
-  data.tar.gz: d72c921c54053e4c6068e5bcc39a8d0ec0ee2526
+  metadata.gz: 8c0a07ab01d66c7f5cd95a53f3aff08bc9d86daa
+  data.tar.gz: 978dd591fc8ce3ceb9c04f3c68418238305d62ec
 SHA512:
-  metadata.gz: bb7c6348d92265ad55c05058a201c578c403044172653f2ce575b226d207be2f89b739f52d76eb5f5e26128c7548b3955f0b987cb8874b2b966a0dff62712f42
-  data.tar.gz: 0d604e16e402b753a23768605100e76f2867cb898045a026ba3d26fec927686c7d53a43e010f2c930bf1654bbae2f5a21a6a574167d9c76693fdb2090c091658
+  metadata.gz: 4674aa0bf3ab0a7d6f8f83be7da985ee257e0f04cb7b34a235a162bb22aef098c7bc6126edd101662b755abcd4d774315759a5c66d238fd3fa59d9606517ea23
+  data.tar.gz: e962080e4d41d9e9046026f14ab2b794d7c3ab7c6d49e67a596e8d51266f8921ea66decdc496320539eea2376e63ac516868a2324aab200b7bc810a095d488c7

data/bin/ukku

@@ -48,6 +48,10 @@ begin
   PsRemoveCommand.new.execute(args) if args['ps:remove']
 rescue Docopt::Exit => e
   puts doc.strip
+rescue NoApplicationError => e
+  puts "   !   No application configured. Run 'ukku configure <host>' first."
+rescue MultipleApplicationsError => e
+  puts "   !   No app specified, use the --app NAME option"
 rescue Exception => e
   puts "   !   #{e.message}"
   puts e.backtrace

data/lib/ukku.rb

@@ -1,5 +1,8 @@
 require 'ukku/version.rb'
+require 'ukku/no_application_error.rb'
+require 'ukku/multiple_applications_error.rb'
 require 'ukku/connection.rb'
+require 'ukku/command.rb'
 require 'ukku/configure_command.rb'
 require 'ukku/run_command.rb'
 require 'ukku/vars_command.rb'

data/lib/ukku/command.rb

@@ -0,0 +1,21 @@
+class Command
+  def load_app_info(args)
+    raise NoApplicationError if !File.exist?(UKKU_FILE)
+
+    data = YAML.load_file(UKKU_FILE)
+    raise NoApplicationError if data.length == 0
+
+    if data.length > 1
+      if args['--app'].nil? || args['--app'] !~ /[^[:space:]]/
+        raise MultipleApplicationsError
+      else
+        name = args['--app']
+        app_info = data[name]
+      end
+    else
+      app_info = data.values.first
+    end
+
+    app_info.each_with_object({}) { |(k,v), h| h[k.to_sym] = v }
+  end
+end

data/lib/ukku/configure_command.rb

@@ -1,4 +1,4 @@
-class ConfigureCommand
+class ConfigureCommand < Command
   def execute(args)
     host = args['HOST']
     name = args['NAME'] || "production"
@@ -15,7 +15,7 @@ class ConfigureCommand
       raise "Name '#{name}' already exists, choose a different one"
     end
 
-    conn = Connection.new(host, user, identity_file)
+    conn = Connection.new(entry)
     server_ready = is_server_ready?(conn)
     
     if server_ready
@@ -88,8 +88,9 @@ class ConfigureCommand
     end
 
     def append_entry_to_ukku_file(name, params)
-      data = { name => params }
-      File.open(UKKU_FILE, 'a') { |f| f.write data.to_yaml }
+      data = File.exist?(UKKU_FILE) ? YAML.load_file(UKKU_FILE) : {}
+      data[name] = params
+      File.open(UKKU_FILE, 'w') { |f| f.write data.to_yaml }
     end
 
     def append_ukku_file_to_gitignore

data/lib/ukku/connection.rb

@@ -1,8 +1,10 @@
 class Connection
-  def initialize(host, user, identity_file)
-    @host = host
-    @user = user
-    @identity_file = identity_file
+  def initialize(opts)
+    options = opts.each_with_object({}) { |(k,v), h| h[k.to_sym] = v }
+
+    @host = options[:host]
+    @user = options[:user]
+    @identity_file = options[:identity_file]
   end
 
   def execute(command, &blk)

data/lib/ukku/multiple_applications_error.rb

@@ -0,0 +1,2 @@
+class MultipleApplicationsError < Exception
+end

data/lib/ukku/no_application_error.rb

@@ -0,0 +1,2 @@
+class NoApplicationError < Exception
+end

data/lib/ukku/ps_add_command.rb

@@ -1,32 +1,11 @@
-class PsAddCommand
+class PsAddCommand < Command
   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']
+    app_info = load_app_info(args)
 
-    puts "Adding process type '#{type}' on #{host} ..."
-    conn = Connection.new(host, user, identity_file)
+    puts "Adding process type '#{type}' on #{app_info[:host]} ..."
+    conn = Connection.new(app_info)
     conn.execute("sudo touch /etc/ukku/ps-types/#{type}")
     begin
       conn.execute("launchapp")

data/lib/ukku/ps_command.rb

@@ -1,31 +1,10 @@
-class PsCommand
+class PsCommand < Command
   def execute(args)
     type = args['TYPE']
 
-    if !File.exist?(UKKU_FILE)
-      raise "No application configured. Run 'ukku configure HOST' first."
-    end
+    app_info = load_app_info(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 = Connection.new(app_info)
     conn.execute("ls /etc/ukku/ps-types")
   end
 end

data/lib/ukku/ps_remove_command.rb

@@ -1,34 +1,13 @@
-class PsRemoveCommand
+class PsRemoveCommand < Command
   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']
+    app_info = load_app_info(args)
 
-    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}")
+    puts "Removing process type '#{type}' on #{app_info[:host]} ..."
+    conn = Connection.new(app_info)
     begin
+      conn.execute("sudo rm /etc/ukku/ps-types/#{type} && docker kill app-#{type} && docker rm app-#{type}")
       conn.execute("launchapp")
     rescue Subprocess::NonZeroExit => e
     end

data/lib/ukku/run_command.rb

@@ -1,32 +1,11 @@
-class RunCommand
+class RunCommand < Command
   def execute(args)
     command = args['COMMAND'].join(' ')
 
-    if !File.exist?(UKKU_FILE)
-      raise "No application configured. Run 'ukku configure HOST' first."
-    end
+    app_info = load_app_info(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']
-
-    puts "Running command '#{command}' on #{host} ..."
-    conn = Connection.new(host, user, identity_file)
+    puts "Running command '#{command}' on #{app_info[:host]} ..."
+    conn = Connection.new(app_info)
     conn.execute("runcommand #{command}")
   end
 end

data/lib/ukku/set_var_command.rb

@@ -1,28 +1,11 @@
-class SetVarCommand
+class SetVarCommand < Command
   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']
+    app_info = load_app_info(args)
 
-    conn = Connection.new(host, user, identity_file)
+    conn = Connection.new(app_info)
     conn.execute("sudo mkdir -p /etc/ukku/vars && echo '#{var_value}' > /etc/ukku/vars/#{var_name}")
     begin
       conn.execute("launchapp")

data/lib/ukku/upload_key_command.rb

@@ -1,28 +1,10 @@
-class UploadKeyCommand
+class UploadKeyCommand < Command
   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']
+    app_info = load_app_info(args)
+    conn = Connection.new(app_info)
 
     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))

data/lib/ukku/vars_command.rb

@@ -1,25 +1,8 @@
-class VarsCommand
+class VarsCommand < Command
   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
+    app_info = load_app_info(args)
 
-    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 = Connection.new(app_info)
     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.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ukku
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Germán Escobar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,8 +123,11 @@ files:
 - features/support/env.rb
 - features/ukku.feature
 - lib/ukku.rb
+- lib/ukku/command.rb
 - lib/ukku/configure_command.rb
 - lib/ukku/connection.rb
+- lib/ukku/multiple_applications_error.rb
+- lib/ukku/no_application_error.rb
 - lib/ukku/ps_add_command.rb
 - lib/ukku/ps_command.rb
 - lib/ukku/ps_remove_command.rb