Merge pull request #28 from ninoseki/improve-custom-list-error-handling

refactor: improve custom-list error handling

lib/rogue_one/detector.rb

@@ -92,7 +92,7 @@ def inspect
     end
 
     def domains
-      @domains ||= custom_domains || top_100_domains
+      @domains ||= custom_list ? custom_domains : top_100_domains
     end
 
     def custom_domains
@@ -105,14 +105,15 @@ def top_100_domains
         read_domains File.expand_path("./data/alexa_100.yml", __dir__)
       when "fortune"
         read_domains File.expand_path("./data/fortune_100.yml", __dir__)
-      else
-        raise ArgumentError, "A list for #{default_list} is not existing"
       end
     end
 
     def read_domains(path)
       list = DomainList.new(path)
-      list.valid? ? list.domains : nil
+      return list.domains if list.valid?
+
+      raise ArgumentError, "Inputted an invalid list. #{path} is not eixst." unless list.exists?
+      raise ArgumentError, "Inputted an invalid list. Please input a list as an YAML file." unless list.valid_format?
     end
 
     def normal_resolver

lib/rogue_one/domain_list.rb

@@ -18,8 +18,6 @@ def domains
       @domains ||= exists? ? YAML.safe_load(File.read(path)) : nil
     end
 
-    private
-
     def exists?
       File.exist?(path)
     end

spec/detector_spec.rb

@@ -40,5 +40,13 @@
         expect(report.dig(:results)).to be_a(Hash)
       end
     end
+
+    context "when given an invalid --custom-list" do
+      subject { described_class.new(target: "1.1.1.1", custom_list: "/tmp/foobar") }
+
+      it do
+        expect { subject.report }.to raise_error(ArgumentError)
+      end
+    end
   end
 end