karo 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd6cd3053afd3a77746aae662bdfc278244f9f6
-  data.tar.gz: 07267c303a943a821d030b0448e04f2db365c8a1
+  metadata.gz: e6bb2f2f052f4233b76e74240444ff57dad0198b
+  data.tar.gz: 472ec29a410344e0794d8403b0bc578f1d330420
 SHA512:
-  metadata.gz: beb1c0ff512feaa49a5d40309cdac879960567feb67a62eccfa0e6160dead270bef3d6d5d3b8dd268d5ce8d6695f3c8c84a57f672aeedb087c513cedada2addc
-  data.tar.gz: 5b7a45d10b86a3d4c76ad6c4b6dcc16b60d3681f2dc8ae821743dc2c4e3a378c83ad8154a5d0da361b2d132e1deee03a78ae47f0237f71af6f0de59d49987624
+  metadata.gz: 8b4e80082714410de9882d1b924273131cf4324fabd98dc2f6d9e309e4b7461972ce3ebb5ed506f9a477b225a624923685b4d0bcd8b6bc17ea426dce7d5bbe87
+  data.tar.gz: ff3db3a5ee10f35d6dd2110ded09ae6b5bc09b458cf5c690362fa3e65ec15a1ad600e08b70c83684738b63eb360c465502f7992bab9fc4124cec875082926470

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.3.5
+
+### Bug Fixes
+
+- Removed hard coded `localhost` host dependency from db server config
+
 ## v2.3.4
 
 ### Features

data/lib/karo/cli.rb

@@ -36,7 +36,7 @@ module Karo
     def config
       configuration = Config.load_configuration(options)
 
-      ap configuration if configuration
+      ap(configuration, indent: 2) if configuration
     end
 
     def self.source_root

data/lib/karo/config.rb

@@ -1,43 +1,52 @@
+require_relative 'extensions/hash'
 require 'yaml'
 require 'thor'
 
 module Karo
 
-	class NoConfigFileFoundError < StandardError; end
-
-	class Config
-
-		def self.default_file_name
-			".karo.yml"
-		end
-
-	  def self.load_configuration(options)
-	  	begin
-        config_file = File.expand_path(options[:config_file])
-	  		configuration = read_configuration(config_file)[options[:environment]]
-
-		  	if configuration.nil? || configuration.empty?
-		  		raise Thor::Error, "Please pass a valid configuration for an environment '#{options[:environment]}' within this file '#{config_file}'"
-		  	else
-		  		configuration
-		  	end
-		  rescue Karo::NoConfigFileFoundError
-		  	puts "You can use 'karo generate' to generate a skeleton .karo.yml file"
-		  	puts "Please make sure that this configuration file exists? '#{config_file}'"
-		  	raise Thor::Error, "and run the command again"
-		  end
-	  end
-
-	  private
-
-	  def self.read_configuration(file_name)
-	    if File.exist?(file_name)
-	      YAML.load_file(file_name)
-	    else
-	      raise NoConfigFileFoundError
-	    end
-	  end
-
-	end
+  class Config
+
+    def self.default_file_name
+      ".karo.yml"
+    end
+
+    def self.load_configuration(options)
+      configuration = lookup_configuration(Dir.getwd, options[:config_file])
+      configuration = configuration[options[:environment]]
+
+      if configuration.nil? || configuration.empty?
+        puts "Please pass a valid configuration for an environment '#{options[:environment]}' within this file '#{File.expand_path(options[:config_file])}'"
+        raise Thor::Error, "You can use 'karo generate' to generate a skeleton .karo.yml file"
+      else
+        configuration
+      end
+    end
+
+    private
+
+    def self.lookup_configuration(dir, config_file, configuration={})
+      return configuration if dir.empty?
+
+      config_file_path = File.join(dir, config_file)
+      config = read_configuration(config_file_path)
+
+      lookup_configuration(pop_dir(dir), config_file, config.deep_merge(configuration))
+    end
+
+    def self.pop_dir(dir)
+      dirs = dir.split("/")
+      dirs.pop
+      dirs.join("/")
+    end
+
+    def self.read_configuration(file_name)
+      if File.exist?(file_name)
+        YAML.load_file(file_name)
+      else
+        {}
+      end
+    end
+
+  end
 
 end

data/lib/karo/db.rb

@@ -95,7 +95,7 @@ module Karo
     def sync_server_to_local_database(server_db_config, local_db_config)
       ssh = "ssh #{@configuration["user"]}@#{@configuration["host"]}"
 
-      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"]}"
+      command = "#{ssh} \"mysqldump --opt -C -u#{server_db_config["username"]} -p#{server_db_config["password"]} -h#{server_db_config["host"]} #{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"]}"
 
       run_it command, options[:verbose]
     end

data/lib/karo/extensions/hash.rb

@@ -0,0 +1,11 @@
+class Hash
+
+  def deep_merge(other_hash)
+    self.merge(other_hash) do |key, oldval, newval|
+      oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
+      newval = newval.to_hash if newval.respond_to?(:to_hash)
+      oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? oldval.deep_merge(newval) : newval
+    end
+  end
+
+end

data/lib/karo/version.rb

@@ -1,3 +1,3 @@
 module Karo
-  VERSION = "2.3.4"
+  VERSION = "2.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: karo
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Rahul Trikha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -150,6 +150,7 @@ files:
 - lib/karo/common.rb
 - lib/karo/config.rb
 - lib/karo/db.rb
+- lib/karo/extensions/hash.rb
 - lib/karo/templates/karo.yml
 - lib/karo/version.rb
 - lib/karo/workflow.rb
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.1
 signing_key: 
 specification_version: 4
 summary: SSH toolbox to make running logs, sync, cache commands easier for a given