lib/license_finder/configuration.rb in license_finder-2.0.4 vs lib/license_finder/configuration.rb in license_finder-2.1.0.rc1

@@ -1,37 +1,68 @@
+require_relative 'platform'
+
 module LicenseFinder
   class Configuration
-    def self.with_optional_saved_config(primary_config, project_path)
-      config_file = project_path.join('config', 'license_finder.yml')
+    def self.with_optional_saved_config(primary_config)
+      project_path = Pathname(primary_config.fetch(:project_path, Pathname.pwd)).expand_path
+      config_file =  project_path.join('config', 'license_finder.yml')
       saved_config = config_file.exist? ? YAML.load(config_file.read) : {}
       new(primary_config, saved_config)
     end
 
     def initialize(primary_config, saved_config)
       @primary_config = primary_config
       @saved_config = saved_config
     end
 
+    def valid_project_path?
+      if get(:project_path)
+        return project_path.exist?
+      end
+      true
+    end
+
     def gradle_command
-      get(:gradle_command) || "gradle"
+      get(:gradle_command) || (
+        if Platform.windows?
+          wrapper = 'gradlew.bat'
+          gradle = 'gradle.bat'
+        else
+          wrapper = 'gradlew'
+          gradle = 'gradle'
+        end
+
+        File.exist?(wrapper) ? wrapper : gradle
+      )
     end
 
     def rebar_command
-      get(:rebar_command) || "rebar"
+      get(:rebar_command) || 'rebar'
     end
 
     def rebar_deps_dir
-      get(:rebar_deps_dir) || "deps"
+      path = get(:rebar_deps_dir) || 'deps'
+      project_path.join(path).expand_path
     end
 
-    def decisions_file
-      file_name = get(:decisions_file) || "doc/dependency_decisions.yml"
-      Pathname(file_name)
+    def decisions_file_path
+      path = get(:decisions_file) || 'doc/dependency_decisions.yml'
+      project_path.join(path).expand_path
     end
 
+    def project_path
+      Pathname(path_prefix).expand_path
+    end
+
     private
 
+    attr_reader :saved_config
+
     def get(key)
       @primary_config[key.to_sym] || @saved_config[key.to_s]
+    end
+
+    def path_prefix
+      get(:project_path) || ''
     end
   end
 end