pick_and_roll 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7892a2ef90c07b149b2f958ed57d0c4f5bfa04a
-  data.tar.gz: dfd28b34fdd449f3e58f35d62c4f8c264c2faba5
+  metadata.gz: 73616cb908100f380eb2e2818ce72f68e165f0c6
+  data.tar.gz: b45aecd506c90312c122d98c97f7b8bd1776f4e3
 SHA512:
-  metadata.gz: 8b455ae0d0c4e6063be872831dc0d19f2fce4228e13350d2507840aab923d533afbd45574127c25745684b39a81d82874925e2be4da5843aa7bbcef3a0610518
-  data.tar.gz: 6efc0feb7fe303f63890890c3d0855c2f2ef5880ed0c8d97b7d146bd4fe75f00d3a3201400a14b7c7d03142511b6d697d5f4d49de7d6bd4a3d58ce5ded0da13d
+  metadata.gz: f3c480d5346cb15b60532fd7e4bc2293e53b33268c868ccb7666a25399397ba0d2ba381e4c7d2b2dc09eac26a7c988cffe4e04268d259b08d719a7510ce659d6
+  data.tar.gz: 6c7b38bf6e2f708768572202f0191dc4dddb6e91a4f30662f5159caaa4eeea842c656f4f5aaf51a86f14fad005434eddc4f2c1dcc4acd237fe6e790c49c58770

data/lib/pick_and_roll.rb

@@ -1,40 +1,33 @@
 require 'json'
-require 'hash_deep_merge'
+require 'deep'
 #require 'awesome_print'
 
 class PickAndRoll
+  CONFIGS_DIR = '_configs'
   MASTER_CONFIG = 'config.json'
   PARCONFIG_FILE_NAME = '.parconfig'
 
-	def initialize(config_path = '')
+  def initialize(config_path = '')
     @parconfig = read_configuration
+    @configs_dir = @parconfig.has_key?('customDir') ? @parconfig['customDir'] : CONFIGS_DIR
     @config_file = config_path.to_s
   end
 
   def pick
-    master_config_name = @parconfig.has_key?('config') ? @parconfig['config'] : MASTER_CONFIG
-    if File.exist?(master_config_name)
-      @config = JSON.parse(File.read(master_config_name))
-      puts "pick config: #{master_config_name}"
+    master_config_path = File.join(@configs_dir, @parconfig.has_key?('config') ? @parconfig['config'] : MASTER_CONFIG)
+    if File.size?(master_config_path) != nil
+      @config = JSON.parse(File.read(master_config_path))
+      puts "pick config: #{master_config_path}"
     else
       @config = Hash.new
     end
 
-    if @config_file.strip.empty? == false && File.exists?("#{@config_file}.json")
-      @config.deep_merge!(JSON.parse(File.read("#{@config_file}.json")))
-      puts "pick config: #{@config_file}.json"
-    else
-      custom_config = "#{ENV["COMPUTERNAME"]}.json"
-      if @parconfig.has_key?('customDir')
-        custom_config = File.join(@parconfig['customDir'], custom_config)
-      end
-      if File.exist?(custom_config)
-        @config.deep_merge!(JSON.parse(File.read(custom_config)))
-        puts "pick config: #{custom_config}"
-      end
+    custom_config_path = File.join(@configs_dir, "#{@config_file.strip.empty? ? ENV['COMPUTERNAME'] : @config_file}.json")
+    if File.size?(custom_config_path) != nil
+      @config.deep_merge!(JSON.parse(File.read(custom_config_path)))
+      puts "pick config: #{custom_config_path}"
     end
 
-
     if @config.empty?
       printf 'Please set configuration path or create config.json file'
       exit
@@ -46,10 +39,11 @@ class PickAndRoll
 
     file_patterns.each {|file_pattern|
       Dir.glob("**/#{file_pattern}"){ |file_name|
-        File.open(file_name,'r'){ |config_file|
+        File.open(file_name,'r'){ |rolling_file|
           puts "roll file: #{file_name}"
+          content = rolling_file.read()
           File.open(file_name.gsub(/\.generic\./,'.'), 'w'){ |f|
-            f.write config_file.read().gsub(/@@([\w\.]*)@@/) {|s| find_config_value $1}
+            f.write content.gsub(/@@([\w\.]*)@@/) {|s| find_config_value $1}
           }
         }
       }
@@ -70,11 +64,43 @@ class PickAndRoll
   end
 
   def find_config_value(key)
-    key.split('.').inject(@config) { |config, name| config[name] }
+    result = key.split('.').inject(@config) { |config, name| config.nil? ? nil : config[name] }
+    if result.nil?
+      puts "ERROR: cannot find value for parameter #{key}"
+    end
+    result
   end
 
   def go
     pick
     roll
   end
-end
+end
+
+#class Hash
+#
+#  def deep_merge!(specialized_hash)
+#    return internal_deep_merge!(self, specialized_hash)
+#  end
+#
+#  def deep_merge(specialized_hash)
+#    return internal_deep_merge!(Hash.new.replace(self), specialized_hash)
+#  end
+#
+#  protected
+#    def internal_deep_merge!(source_hash, specialized_hash)
+#      specialized_hash.each_pair do |rkey, rval|
+#        if source_hash.has_key?(rkey) then
+#          if rval.is_a?(Hash) and source_hash[rkey].is_a?(Hash) then
+#            internal_deep_merge!(source_hash[rkey], rval)
+#          elsif rval == source_hash[rkey] then
+#          else
+#            source_hash[rkey] = rval
+#          end
+#        else
+#          source_hash[rkey] = rval
+#        end
+#      end
+#      return source_hash
+#    end
+#end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pick_and_roll
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
 platform: ruby
 authors:
 - Dima Salakhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies: []
 description: Creates customizable configuration files
 email: to@dimasalakhov.com
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Configuration helper