lib/stowaway/options.rb in stowaway-0.1.9 vs lib/stowaway/options.rb in stowaway-0.1.10

@@ -6,36 +6,43 @@
     
     attr_reader :path, :file_types
     
     def initialize(argv)
       @file_types = DEFAULT_FILE_TYPES
-      parse(argv)
-      @path = argv[0]
+      @argv = argv
+      parse
     end
     
     private
+    def parse
+      OptionParser.new do |opts|
+        opts.banner = "Usage: stowaway [ options ] path/to/site"
 
-    def parse(argv) 
-      OptionParser.new do |opts| 
-        opts.banner = "Usage: stowaway [ options ] path/to/site" 
-        
-        opts.on("-t", "--types <TYPES>", String, "File types to search for (ex: .jpg .gif)") do |ext| 
-          @file_types = ext.split(' ')
-        end
+        parse_types(opts)
+        parse_help(opts)
 
-        opts.on("-h", "--help", "Show this message") do
-          puts opts 
-          exit 
-        end 
-        
         begin 
-          argv = ["-h"] if argv.empty? 
-          opts.parse!(argv) 
+          @argv = ["-h"] if @argv.empty?
+          opts.parse!(@argv) 
         rescue OptionParser::ParseError => e 
           STDERR.puts e.message, "\n", opts 
           exit(-1) 
         end 
-        
+
+        @path = @argv[0]
       end 
     end 
-  end 
+
+    def parse_types opts
+      opts.on("-t", "--types <TYPES>", String, "File types to search for (ex: .jpg .gif)") do |ext| 
+        @file_types = ext.split(' ')
+      end
+    end
+
+    def parse_help opts
+      opts.on("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+    end
+  end
 end