har 0.0.5 → 0.0.6

data/bin/har

@@ -3,8 +3,7 @@
 require "har"
 
 begin
-  ARGV << "-" if ARGV.empty?
   HAR::Viewer.new(ARGV).show
 rescue HAR::Error => ex
   abort "\n\n#{ex.message}"
-end
+end

data/har.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "har"
 
   s.add_dependency "json"
-  s.add_dependency "json-schema", ">= 0.1.10"
+  s.add_dependency "json-schema", "= 0.1.12"
   s.add_dependency "launchy"
 
   s.add_development_dependency "rspec", "~> 2.0"

data/lib/har/version.rb

@@ -1,3 +1,3 @@
 module HAR
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/har/viewer.rb

@@ -10,17 +10,17 @@ module HAR
       @running = false
       @options = parse(args)
 
-      if @options[:validate]
-        args = validate(args)
-      end
-
-      if args == ["-"]
+      if args == ["-"] || args.empty?
         progress("Reading HAR from stdin...") {
           @har = Archive.from_file $stdin
         }
+
+        validate_if_needed @har
       else
+        hars = validate_if_needed(args)
+
         progress("Merging HARs...") {
-          @har = Archive.by_merging args
+          @har = Archive.by_merging hars
         }
       end
     end
@@ -33,12 +33,16 @@ module HAR
 
     private
 
-    def validate(hars)
+    def validate_if_needed(hars)
+      return hars unless @options[:validate]
+
       progress("Validating archives...") {
-        hars = hars.map { |path| Archive.from_file(path) }
-        hars.each { |h| h.validate! }
+        Array(hars).map { |har|
+          har = har.kind_of?(Archive) ? har : Archive.from_file(har)
+          har.validate!
 
-        hars
+          har
+        }
       }
     end
 

data/spec/har/viewer_spec.rb

@@ -7,8 +7,8 @@ module HAR
       it "has sensible defaults" do
         v = Viewer.new([google_path])
 
-        v.options[:port] == 1234
-        v.options[:validate] == true
+        v.options[:port].should == 9292
+        v.options[:validate].should be_false
       end
 
       it "parses the port option" do
@@ -26,9 +26,15 @@ module HAR
       lambda { Viewer.new(["--validate", *all_hars]) }.should raise_error(ValidationError)
     end
 
+    it "validates HARs read from stdin if asked to" do
+      with_stdin_replaced_by(har_path("bad")) do
+        lambda { Viewer.new(["--validate", "-"]) }.should raise_error(ValidationError)
+      end
+    end
+
     it "has a merged archive" do
       Viewer.new(good_hars).har.should be_kind_of(Archive)
     end
 
   end
-end
+end

data/spec/spec_helper.rb

@@ -34,6 +34,18 @@ module HAR
     def good_hars
       all_hars.reject { |e| e =~ /bad/ }
     end
+
+    def with_stdin_replaced_by(file_path)
+      stdin = $stdin
+      begin
+        File.open(file_path, "r") { |io|
+          $stdin = io
+          yield
+        }
+      ensure
+        $stdin = stdin
+      end
+    end
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: har
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 +01:00
+date: 2011-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,9 +30,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.10
+        version: 0.1.12
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: har
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby library to work with HTTP archives