karo 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6208e6d5c789482d34ba5d8deb7d87e739953a
-  data.tar.gz: a4855f848b1ad56b3808695d6bc7be01aeff71c8
+  metadata.gz: 2cef5122b1fb4265a148cd2f1c700684a044f3e1
+  data.tar.gz: 06353a8e2e1a1d299d94d2a7ef2bc602a8b8a159
 SHA512:
-  metadata.gz: 29d57337e8ae7c563fb93241d7d8e44820096eb0039f5dcc6d84e4add649d3599cb84367d16cdada7456d40d603e70b9465c4f90d9c26b74b6dd934b77a7afe1
-  data.tar.gz: 5e9e9424bfe7507321c410265661c5fd80ba2b28a6f4406d58f4dee354c76e652b1900d8bb69167bb921a87f2e9e91ac3a0b4cd9a59411503812d2a3a7d090ad
+  metadata.gz: 33f114b6f81e5e816e49b0b1ee89a058dff3472fa96e1a1a6bdfd28486595dfebd4bd14117094eef6e6ff3f38d5701738f2efaea0c24204110e090bd60ea599b
+  data.tar.gz: 6c5c1a3a18256511e54143b5655ec7acd731c933d5539efee70c98eb7b9a4722623dfd829ae81657bf00b2b58279c2652456105250c941bda2456984ac1ea290

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.1.1
+
+### Features
+
+- Refactoring CLI "server" and "client" commands
+
 ## v2.1.0
 
 ### Features

data/lib/karo/cli.rb

@@ -77,18 +77,10 @@ module Karo
 
     > Beginning deploy...
     LONGDESC
-    def client(cmd, *extra)
+    def client(cmd, *extras)
       configuration = Config.load_configuration(options)
-
-      if configuration["commands"] && configuration["commands"]["client"] && configuration["commands"]["client"][cmd]
-        cmd = configuration["commands"]["client"][cmd]
-      end
-
-      to_run = "#{cmd} #{extra.flatten.uniq.join(" ")}"
-
-      say to_run, :green if options[:verbose]
-
-      system to_run
+      command = make_command configuration, "client", cmd, extras
+      run_it command, options[:verbose]
     end
     map clt:   :client
     map local: :client
@@ -145,29 +137,21 @@ module Karo
 
     > 25224800  active memory
     LONGDESC
-    def server(cmd, *extra)
+    def server(cmd, *extras)
       configuration = Config.load_configuration(options)
 
       ssh  = "ssh #{configuration["user"]}@#{configuration["host"]}"
-
-      # Forces pseudo-tty allocation
       ssh << " -t" if options[:tty]
 
-      if configuration["commands"] && configuration["commands"]["server"] && configuration["commands"]["server"][cmd]
-        cmd = configuration["commands"]["server"][cmd]
-      end
-
-      to_run = "#{ssh} '#{cmd} #{extra.flatten.uniq.join(" ")}'"
-
-      say to_run, :green if options[:verbose]
-      system to_run
+      command = make_command configuration, "server", cmd, extras
+      run_it "#{ssh} #{command}", options[:verbose]
     end
     map srv:    :server
     map remote: :server
 
     desc "top", "run top command on a given server environment"
-    def top(*extra)
-      invoke :server, ["top", extra]
+    def top(*extras)
+      invoke :server, ["top", extras]
     end
 
     desc "ssh", "open ssh console for a given server environment"
@@ -192,18 +176,18 @@ module Karo
     end
 
     desc "rake", "run rake commands for a rails app on a given server environment"
-    def rake(command, *extra)
+    def rake(command, *extras)
       configuration = Config.load_configuration(options)
 
       path = File.join(configuration["path"], "current")
       cmd  = "cd #{path} && export RAILS_ENV=#{options[:environment]} && bundle exec rake #{command}"
 
-      invoke :server, [cmd, extra]
+      invoke :server, [cmd, extras]
     end
 
     desc "log", "displays server log for a given environment"
     class_option :continous, type: :boolean, lazy_default: true, aliases: "-f", desc: "The -f option causes tail to not stop when end of file is reached, but rather to wait for additional data to be appended to the input."
-    def log(*extra)
+    def log(*extras)
       configuration = Config.load_configuration(options)
 
       path = File.join(configuration["path"], "shared/log/#{options["environment"]}.log")
@@ -212,7 +196,7 @@ module Karo
       cmd << " -f" if options[:continous]
       cmd << " #{path}"
 
-      invoke :server, [cmd, extra]
+      invoke :server, [cmd, extras]
     end
 
     desc "version", "displays karo's current version"
@@ -220,6 +204,25 @@ module Karo
       say Karo::VERSION
     end
 
+    private
+
+    def make_command(configuration, namespace, command, extras)
+      commands = configuration["commands"]
+
+      if commands && commands[namespace] && commands[namespace][command]
+        command = commands[namespace][command]
+      end
+
+      extras = extras.flatten.uniq.join(" ")
+
+      "#{command} #{extras}"
+    end
+
+    def run_it(cmd, verbose=false)
+      say cmd, :green if verbose
+      system cmd
+    end
+
   end
 
 end

data/lib/karo/version.rb

@@ -1,3 +1,3 @@
 module Karo
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karo
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Rahul Trikha