har 0.0.4 → 0.0.5

data/bin/har

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

data/lib/har/archive.rb

@@ -6,8 +6,19 @@ module HAR
       new JSON.parse(str), uri
     end
 
-    def self.from_file(path)
-      from_string File.read(path), path
+    def self.from_file(path_or_io)
+      case path_or_io
+      when String
+        from_string File.read(path_or_io), path_or_io
+      when IO
+        from_string path_or_io.read, path_or_io.to_s
+      else
+        unless path_or_io.respond_to?(:to_io)
+          raise TypeError, "expected String, IO or #to_io"
+        end
+
+        from_file path_or_io.to_io
+      end
     end
 
     def self.by_merging(hars)

data/lib/har/version.rb

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

data/lib/har/viewer.rb

@@ -14,9 +14,15 @@ module HAR
         args = validate(args)
       end
 
-      progress("Merging HARs...") {
-        @har = Archive.by_merging(args)
-      }
+      if args == ["-"]
+        progress("Reading HAR from stdin...") {
+          @har = Archive.from_file $stdin
+        }
+      else
+        progress("Merging HARs...") {
+          @har = Archive.by_merging args
+        }
+      end
     end
 
     def show
@@ -59,7 +65,7 @@ module HAR
       options = DEFAULT_OPTIONS.dup
 
       OptionParser.new do |opts|
-        opts.banner = "Usage: har [options] [files]"
+        opts.banner = "Usage: har [options] [files|-]"
 
         opts.on "-p", "--port PORT", Integer do |int|
           options[:port] = int

data/spec/har/archive_spec.rb

@@ -12,6 +12,12 @@ module HAR
         Archive.from_file(har_path("browser-blocking-time")).should be_kind_of(Archive)
       end
 
+      it "can be created from an IO" do
+        File.open(har_path("browser-blocking-time"), "r") do |io|
+          Archive.from_file(io).should be_kind_of(Archive)
+        end
+      end
+
       it "saves the archive URI if created from a file" do
         ar = Archive.from_file(har_path("browser-blocking-time"))
         ar.uri.should_not be_nil

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: har
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jari Bakken
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +01:00
+date: 2011-02-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 10
         version: 0.1.10
   type: :runtime
   version_requirements: *id002
@@ -53,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -66,9 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :development
   version_requirements: *id004
@@ -80,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -264,21 +247,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: har
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby library to work with HTTP archives