har 0.0.1.dev → 0.0.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Jari Bakken
+Copyright (c) 2011 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,6 +19,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-harviewer by Jan Odvarko is covered by the New BSD License
+harviewer is Copyright (c) Jan Odvarko and is covered by the New BSD License
 http://www.opensource.org/licenses/bsd-license.php
 http://code.google.com/p/harviewer/
+

data/README.mdown

@@ -2,7 +2,7 @@ HAR
 ===
 
 Ruby library to work with and view HTTP archives.
-This includes [harviewer](http://code.google.com/p/harviewer/), which can be launched through the "har" command.
+This includes [harviewer][viewer], which can be launched through the "har" command.
 
 Usage
 =============
@@ -10,15 +10,10 @@ Usage
     HAR::Archive.from_string(json) #=> #<Har::Archive:0x5e7cac>
     HAR::Archive.from_file(path)   #=> #<Har::Archive:0x5e7cac>
 
-Or from command the command line:
+Or launch a local [harviewer][viewer] the command line:
 
     har /path/to/some.har
 
-Links
-=====
-
-* [harviewer](http://code.google.com/p/harviewer/)
-
 Note on Patches/Pull Requests
 =============================
 
@@ -33,4 +28,6 @@ Note on Patches/Pull Requests
 Copyright
 =========
 
-Copyright (c) 2010 Jari Bakken. See LICENSE for details.
+Copyright (c) 2011 Jari Bakken. See LICENSE for details.
+
+[viewer]: http://code.google.com/p/harviewer/

data/lib/har/version.rb

@@ -1,3 +1,3 @@
 module HAR
-  VERSION = "0.0.1.dev"
+  VERSION = "0.0.1"
 end

data/lib/har/viewer.rb

@@ -1,5 +1,6 @@
 require "webrick"
 require "launchy"
+require "optparse"
 
 module HAR
   class Viewer
@@ -9,8 +10,7 @@ module HAR
       @running = false
       @options = parse(args)
 
-      hars = create_archives args
-      @har = merge hars
+      @har = merge archives_from(args)
     end
 
     def show
@@ -21,40 +21,65 @@ module HAR
 
     private
 
-    def create_archives(hars)
+    def archives_from(hars)
       hars = hars.map { |path| Archive.from_file(path) }
-      hars.each { |h| h.validate! }
+
+      if @options[:validate]
+        progress("Validating archives...") do
+          hars.each { |h| h.validate! }
+        end
+      end
+
+      hars
     end
 
     def create_root
-      viewer = File.expand_path("../viewer", __FILE__)
-      tmp_dir = Dir.mktmpdir("harviewer")
+      progress("Creating viewer...") {
+        viewer = File.expand_path("../viewer", __FILE__)
+        tmp_dir = Dir.mktmpdir("harviewer")
 
-      at_exit { FileUtils.rm_rf tmp_dir }
-      FileUtils.cp_r viewer, tmp_dir
+        at_exit { FileUtils.rm_rf tmp_dir }
+        FileUtils.cp_r viewer, tmp_dir
 
-      har.save_to File.join(tmp_dir, 'viewer', url_friendly(@har.uri))
+        har.save_to File.join(tmp_dir, 'viewer', url_friendly(@har.uri))
 
-      tmp_dir
+        tmp_dir
+      }
     end
 
     def merge(hars)
-      har = hars.shift or raise Error, "no HARs given"
+      progress("Merging hars...") {
+        har = hars.shift or raise Error, "no HARs given"
 
-      unless hars.empty?
-        hars.each { |h| har.merge! h }
-      end
+        unless hars.empty?
+          hars.each { |h| har.merge! h }
+        end
 
-      har
+        har
+      }
     end
 
     DEFAULT_OPTIONS = {
-      :port => 9292
+      :port     => 9292,
+      :validate => false
     }
 
     def parse(args)
-      # TODO: parse command line
-      DEFAULT_OPTIONS.dup
+      options = DEFAULT_OPTIONS.dup
+
+      OptionParser.new do |opts|
+        opts.banner = "Usage: har [options] [files]"
+
+        opts.on "-p", "--port PORT", Integer do |int|
+          options[:port] = int
+        end
+
+        opts.on "-v", "--validate" do
+          options[:validate] = true
+        end
+      end.parse!(args)
+
+      options
     end
 
     def url
@@ -75,7 +100,7 @@ module HAR
 
     def server(root)
       Thread.new do
-        puts "Starting HAR Viewer Server..."
+        puts "Starting server..."
         puts "Type ^C to exit\n\n"
 
         server = WEBrick::HTTPServer.new(:Port          => port,
@@ -95,5 +120,13 @@ module HAR
       Launchy.open url
     end
 
+    def progress(msg, &blk)
+      print msg
+      res = yield
+      puts "done."
+
+      res
+    end
+
   end # Viewer
 end # HAR

data/spec/har/viewer_spec.rb

@@ -4,13 +4,18 @@ module HAR
   describe Viewer do
 
     context "creating" do
-      it "validates the given HARs" do
-        lambda { Viewer.new(all_hars) }.should raise_error(ValidationError)
+      it "validates the given HARs if asked to" do
+        lambda { Viewer.new(["--validate", *all_hars]) }.should raise_error(ValidationError)
       end
 
       it "has a merged archive" do
         Viewer.new(good_hars).har.should be_kind_of(Archive)
       end
+
+      it "parses options" do
+        v = Viewer.new(["-p", "1234", *good_hars])
+        v.options[:port].should == 1234
+      end
     end
 
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: har
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 0
   - 1
-  - dev
-  version: 0.0.1.dev
+  version: 0.0.1
 platform: ruby
 authors: 
 - Jari Bakken
@@ -255,13 +254,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: har