karo 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cef5122b1fb4265a148cd2f1c700684a044f3e1
-  data.tar.gz: 06353a8e2e1a1d299d94d2a7ef2bc602a8b8a159
+  metadata.gz: 57790c4a5e39d2f7216f9eacef0058efaca23650
+  data.tar.gz: 307d1ec8497c299eb3ca9acd9aa2c364b96079a4
 SHA512:
-  metadata.gz: 33f114b6f81e5e816e49b0b1ee89a058dff3472fa96e1a1a6bdfd28486595dfebd4bd14117094eef6e6ff3f38d5701738f2efaea0c24204110e090bd60ea599b
-  data.tar.gz: 6c5c1a3a18256511e54143b5655ec7acd731c933d5539efee70c98eb7b9a4722623dfd829ae81657bf00b2b58279c2652456105250c941bda2456984ac1ea290
+  metadata.gz: 010a486f89abd57065abf15d64ead832017dfdbe9ff6688e9afc52c619c33a2a72a8f10c02db4e5328c6f0d4a7b01ecb1fb1da0af30e3fbffdb24429a2079673
+  data.tar.gz: 5f4ca62a3594ec4312918014f20ce6d5ef4698ca8b42d95d50cfca0991d7d892dd5a588b593257e85f32185f38f203d8c410830370e31a209737191988bd6fe9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.1.2
+
+### Features
+
+- Refactoring Db "pull" command
+
 ## v2.1.1
 
 ### Features

data/lib/karo/assets.rb

@@ -1,16 +1,11 @@
-require 'karo/config'
+require 'karo/common'
 require 'thor'
 
 module Karo
 
 	class Assets < Thor
 
-    include Thor::Actions
-
-    class_option :config_file, type: :string, default: Config.default_file_name,
-                  aliases: "-c", desc: "name of the file containing server configuration"
-    class_option :environment, aliases: "-e", desc: "server environment", default: "production"
-    class_option :verbose, type: :boolean, lazy_default: true, aliases: "-v", desc: "verbose"
+    include Karo::Common
 
 	  desc "pull", "syncs assets from server shared/system/dragonfly/<environment> directory into local system/dragonfly/development directory"
 	  def pull
@@ -22,11 +17,9 @@ module Karo
       path_server = File.join(configuration["path"], "shared/system/dragonfly/#{options[:environment]}")
 
 	    host = "deploy@#{configuration["host"]}"
-	    cmd  = "rsync -az --progress #{host}:#{path_server}/ #{path_local}/"
-
-      say cmd, :green if options[:verbose]
+	    command  = "rsync -az --progress #{host}:#{path_server}/ #{path_local}/"
 
-      system cmd
+      run_it command, options[:verbose]
 
       say "Assets sync complete", :green
 	  end
@@ -44,17 +37,12 @@ module Karo
 
       path_server = File.join(configuration["path"], "shared/system/dragonfly/#{options[:environment]}")
 
-      cmd_1  = "ssh #{host} 'mkdir -p #{path_server}'"
-      cmd_2  = "rsync -az --progress #{path_local}/ #{host}:#{path_server}/"
-
-      if options[:verbose]
-        say cmd_1, :green
-        say cmd_2, :green
-      end
+      command_1  = "ssh #{host} 'mkdir -p #{path_server}'"
+      command_2  = "rsync -az --progress #{path_local}/ #{host}:#{path_server}/"
 
       if yes?("Are you sure?", :yellow)
-        system "#{cmd_1}"
-        system "#{cmd_2}"
+        run_it command_1, options[:verbose]
+        run_it command_2, options[:verbose]
         say "Assets sync complete", :green
       else
         say "Assets sync cancelled", :yellow

data/lib/karo/cache.rb

@@ -5,10 +5,6 @@ module Karo
 
 	class Cache < Thor
 
-	  class_option :config_file, type: :string, default: Config.default_file_name,
-	  						  aliases: "-c", desc: "name of the file containing server configuration"
-	  class_option :environment, aliases: "-e", desc: "server environment", default: "production"
-
 	  desc "search", "searches for any matching cache files from the shared/cache directory"
 	  def search(name="")
 	    configuration = Config.load_configuration(options)

data/lib/karo/cli.rb

@@ -1,15 +1,20 @@
 require 'karo/version'
-require 'karo/config'
+require 'karo/common'
 require 'karo/assets'
 require 'karo/cache'
 require 'karo/db'
-require 'thor'
 require 'ap'
 
 module Karo
 
   class CLI < Thor
 
+    include Karo::Common
+
+    # FIXME: Duplicated in Karo::Common
+    # Is needed for the generate method
+    # Otherwise you get this error
+    # undefined method `source_paths_for_search' for Karo::CLI
     include Thor::Actions
 
     class_option :config_file, type: :string, default: Config.default_file_name,
@@ -23,7 +28,7 @@ module Karo
     desc "assets [pull, push]", "syncs dragonfly assets between server shared/system/dragonfly/<environment> directory and local system/dragonfly/development directory"
     subcommand "assets", Assets
 
-    desc "db [pull, push]", "syncs MySQL database between server and localhost"
+    desc "db [pull, push, console]", "syncs MySQL database between server and localhost"
     subcommand "db", Db
 
     desc "config", "displays server configuration stored in a config file"
@@ -144,7 +149,7 @@ module Karo
       ssh << " -t" if options[:tty]
 
       command = make_command configuration, "server", cmd, extras
-      run_it "#{ssh} #{command}", options[:verbose]
+      run_it "#{ssh} '#{command}'", options[:verbose]
     end
     map srv:    :server
     map remote: :server
@@ -204,25 +209,6 @@ 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/common.rb

@@ -0,0 +1,29 @@
+require 'karo/config'
+require 'thor'
+
+module Karo
+
+  module Common Thor
+
+    include Thor::Actions
+
+    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(1).uniq.join(" ").strip
+
+      "#{command} #{extras}"
+    end
+
+    def run_it(cmd, verbose=false)
+      say cmd, :green if verbose
+      system cmd
+    end
+
+  end
+
+end

data/lib/karo/db.rb

@@ -1,26 +1,57 @@
-require 'karo/config'
-require 'thor'
-require 'yaml'
+require 'karo/common'
 require 'erb'
-require 'ap'
 
 module Karo
 
 	class Db < Thor
 
-    include Thor::Actions
-
-    class_option :config_file, type: :string, default: Config.default_file_name,
-                  aliases: "-c", desc: "name of the file containing server configuration"
-    class_option :environment, aliases: "-e", desc: "server environment", default: "production"
-    class_option :verbose, type: :boolean, lazy_default: true, aliases: "-v", desc: "verbose"
+    include Karo::Common
 
     method_option :migrate, aliases: "-m", desc: "run migrations after sync", default: true
 	  desc "pull", "syncs MySQL database from server to localhost"
 	  def pull
-	    configuration = Config.load_configuration(options)
+	    @configuration = Config.load_configuration(options)
+
+      local_db_config  = load_local_db_config
+      server_db_config = load_server_db_config
+
+      drop_and_create_local_database(local_db_config)
 
+      sync_server_to_local_database(server_db_config, local_db_config)
+
+      if options[:migrate]
+        say "Running rake db:migrations", :green
+        run_it "bundle exec rake db:migrate", options[:verbose]
+      end
+
+      say "Database sync complete", :green
+	  end
+
+    desc "push", "syncs MySQL database from localhost to server"
+	  def push
+      say "Pending Implementation...", :yellow
+	  end
+
+    desc "console", "open rails dbconsole for a given server environment"
+    method_option :tty, aliases: "-t", desc: "force pseudo-tty allocation",
+                  type: :boolean, default: true
+    def console
+      configuration = Config.load_configuration(options)
+
+      path = File.join(configuration["path"], "current")
+      ssh  = "ssh #{configuration["user"]}@#{configuration["host"]}"
+      ssh << " -t" if options[:tty]
+
+      command  = "cd #{path} && bundle exec rails dbconsole #{options[:environment]} -p"
+
+      run_it "#{ssh} '#{command}'", options[:verbose]
+    end
+
+    private
+
+    def load_local_db_config
       local_db_config_file  = File.expand_path("config/database.yml")
+
       unless File.exists?(local_db_config_file)
         raise Thor::Error, "Please make sure that this file exists locally? '#{local_db_config_file}'"
       end
@@ -31,14 +62,16 @@ module Karo
         raise Thor::Error, "Please make sure MySQL development configuration exists within this file? '#{local_db_config_file}'"
       end
 
-      local_db_config = local_db_config["development"]
-
       say "Loading local database configuration", :green
 
-      server_db_config_file = File.join(configuration["path"], "shared/config/database.yml")
+      local_db_config["development"]
+    end
 
-	    host = "deploy@#{configuration["host"]}"
-	    cmd  = "ssh #{host} 'cat #{server_db_config_file}'"
+    def load_server_db_config
+      server_db_config_file = File.join(@configuration["path"], "shared/config/database.yml")
+
+      host = "deploy@#{@configuration["host"]}"
+      cmd  = "ssh #{host} 'cat #{server_db_config_file}'"
 
       server_db_config_output = `#{cmd}`
       yaml_without_any_ruby = ERB.new(server_db_config_output).result
@@ -48,56 +81,23 @@ module Karo
         raise Thor::Error, "Please make sure MySQL development configuration exists within this file? '#{server_db_config_file}'"
       end
 
-      server_db_config = server_db_config[options[:environment]]
-
       say "Loading #{options[:environment]} server database configuration", :green
 
-      # Drop local database and re-create
-      to_run = "mysql -v -h #{local_db_config["host"]} -u#{local_db_config["username"]} -p#{local_db_config["password"]} -e 'DROP DATABASE IF EXISTS `#{local_db_config["database"]}`; CREATE DATABASE IF NOT EXISTS `#{local_db_config["database"]}`;'"
-
-      say to_run, :green if options[:verbose]
-
-      system to_run
-
-      ssh  = "ssh #{configuration["user"]}@#{configuration["host"]}"
-
-      to_run = "#{ssh} \"mysqldump --opt -C -u#{server_db_config["username"]} -p#{server_db_config["password"]} #{server_db_config["database"]}\" | mysql -v -h #{local_db_config["host"]} -C -u#{local_db_config["username"]} -p#{local_db_config["password"]} #{local_db_config["database"]}"
-
-      say to_run, :green if options[:verbose]
-
-      system to_run
-
-      if options[:migrate]
-        say "Running rake db:migrations", :green
-        system "bundle exec rake db:migrate"
-      end
-
-      say "Database sync complete", :green
-	  end
-
-    desc "push", "syncs MySQL database from localhost to server"
-	  def push
-      say "Pending Implementation...", :yellow
-	  end
-
-    desc "console", "open rails dbconsole for a given server environment"
-    method_option :tty, aliases: "-t", desc: "force pseudo-tty allocation",
-                  type: :boolean, default: true
-    def console
-      configuration = Config.load_configuration(options)
+      server_db_config[options[:environment]]
+    end
 
-      path = File.join(configuration["path"], "current")
-      ssh  = "ssh #{configuration["user"]}@#{configuration["host"]}"
+    def drop_and_create_local_database(local_db_config)
+      command = "mysql -v -h #{local_db_config["host"]} -u#{local_db_config["username"]} -p#{local_db_config["password"]} -e 'DROP DATABASE IF EXISTS `#{local_db_config["database"]}`; CREATE DATABASE IF NOT EXISTS `#{local_db_config["database"]}`;'"
 
-      # Forces pseudo-tty allocation
-      ssh << " -t" if options[:tty]
+      run_it command, options[:verbose]
+    end
 
-      cmd  = "cd #{path} && bundle exec rails dbconsole #{options[:environment]} -p"
+    def sync_server_to_local_database(server_db_config, local_db_config)
+      ssh = "ssh #{@configuration["user"]}@#{@configuration["host"]}"
 
-      to_run = "#{ssh} '#{cmd}'"
+      command = "#{ssh} \"mysqldump --opt -C -u#{server_db_config["username"]} -p#{server_db_config["password"]} #{server_db_config["database"]}\" | mysql -v -h #{local_db_config["host"]} -C -u#{local_db_config["username"]} -p#{local_db_config["password"]} #{local_db_config["database"]}"
 
-      say to_run, :green if options[:verbose]
-      system to_run
+      run_it command, options[:verbose]
     end
 
 	end

data/lib/karo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karo
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Rahul Trikha
@@ -147,6 +147,7 @@ files:
 - lib/karo/assets.rb
 - lib/karo/cache.rb
 - lib/karo/cli.rb
+- lib/karo/common.rb
 - lib/karo/config.rb
 - lib/karo/db.rb
 - lib/karo/templates/karo.yml