pick_and_roll 0.1 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 774abf4612a41866f7142754542c30bc1454c18d
-  data.tar.gz: 44186944b8e6f923fe21af174b8bfea81a41aa3b
+  metadata.gz: f7892a2ef90c07b149b2f958ed57d0c4f5bfa04a
+  data.tar.gz: dfd28b34fdd449f3e58f35d62c4f8c264c2faba5
 SHA512:
-  metadata.gz: 3b68d65792f70fd8a8e852b424bea61740a6d084db4384ecfeae01d93628d597b87e6360a6aa6770ad2664857f34173579e465bfcad37ea7d03230b8ca3cc56b
-  data.tar.gz: 7eba64a649411124541309b456746ec891197853e3c3a9ed336ddf35f18c55f214d3307246fc431c828f4d66b755e30403d70bb30b5ee9dadd734e7217d1cecd
+  metadata.gz: 8b455ae0d0c4e6063be872831dc0d19f2fce4228e13350d2507840aab923d533afbd45574127c25745684b39a81d82874925e2be4da5843aa7bbcef3a0610518
+  data.tar.gz: 6efc0feb7fe303f63890890c3d0855c2f2ef5880ed0c8d97b7d146bd4fe75f00d3a3201400a14b7c7d03142511b6d697d5f4d49de7d6bd4a3d58ce5ded0da13d

data/lib/pick_and_roll.rb

@@ -7,13 +7,15 @@ class PickAndRoll
   PARCONFIG_FILE_NAME = '.parconfig'
 
 	def initialize(config_path = '')
+    @parconfig = read_configuration
     @config_file = config_path.to_s
   end
 
   def pick
-    if File.exist?(MASTER_CONFIG)
-      @config = JSON.parse(File.read(MASTER_CONFIG))
-      puts "pick config: #{MASTER_CONFIG}"
+    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}"
     else
       @config = Hash.new
     end
@@ -21,11 +23,18 @@ class PickAndRoll
     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"
-    elsif File.exist?("#{ENV["COMPUTERNAME"]}.json")
-      @config.deep_merge!(JSON.parse(File.read("#{ENV["COMPUTERNAME"]}.json")))
-      puts "pick config: #{ENV["COMPUTERNAME"]}.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
     end
 
+
     if @config.empty?
       printf 'Please set configuration path or create config.json file'
       exit
@@ -33,7 +42,7 @@ class PickAndRoll
   end
 
   def roll
-    file_patterns = read_file_patterns()
+    file_patterns = get_file_patterns()
 
     file_patterns.each {|file_pattern|
       Dir.glob("**/#{file_pattern}"){ |file_name|
@@ -47,15 +56,17 @@ class PickAndRoll
     }
   end
 
-  def read_file_patterns
-    file_patterns = Array.new
+  def get_file_patterns
+    @parconfig.has_key?('files') ? @parconfig['files'] : Array.new
+  end
+
+  def read_configuration
+    result = Hash.new
     if File.exist?(PARCONFIG_FILE_NAME)
-      File.open(PARCONFIG_FILE_NAME, 'r').each { |line|
-        file_patterns.push(line.strip)
-      }
+      result = JSON.parse(File.read(PARCONFIG_FILE_NAME))
     end
 
-    file_patterns
+    result
   end
 
   def find_config_value(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pick_and_roll
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.9'
 platform: ruby
 authors:
 - Dima Salakhov
@@ -17,7 +17,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/pick_and_roll.rb
-homepage: ''
+homepage: https://rubygems.org/gems/pick_and_roll
 licenses:
 - MIT
 metadata: {}