lib/har/viewer.rb in har-0.0.3 vs lib/har/viewer.rb in har-0.0.4

@@ -12,11 +12,13 @@
 
       if @options[:validate]
         args = validate(args)
       end
 
-      @har = Archive.by_merging(args)
+      progress("Merging HARs...") {
+        @har = Archive.by_merging(args)
+      }
     end
 
     def show
       s = server(create_root)
       launch_browser
@@ -46,22 +48,10 @@
 
         tmp_dir
       }
     end
 
-    def merge(hars)
-      progress("Merging hars...") {
-        har = hars.shift or raise Error, "no HARs given"
-
-        unless hars.empty?
-          hars.each { |h| har.merge! h }
-        end
-
-        har
-      }
-    end
-
     DEFAULT_OPTIONS = {
       :port     => 9292,
       :validate => false
     }
 
@@ -133,6 +123,6 @@
 
       res
     end
 
   end # Viewer
-end # HAR
\ No newline at end of file
+end # HAR