stockery 0.4.1 → 0.4.2

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/pierot/stockery.png)](http://travis-ci.org/pierot/stockery)
+
 stockery
 ======
 Get stock quotes.
@@ -14,6 +16,7 @@ CLI Usage
     Command options:
       -s, --source HOST                Stock source (default: GOOGLE)
       -q, --quotes 'comma separated'   Required, no default
+      -o, --output 'print|json'        Either 'json' (default) or 'print'
       
       -h, --help 
       -v, --version

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/stockery/runner.rb

@@ -69,8 +69,8 @@ module Stockery
 
           opts.separator ""
 
-          opts.on_tail("-h", "--help", "Show this message")                                 { puts opts; exit }
-          opts.on_tail("-v", "--version", "Print version")                                  { puts Stockery::VERSION; exit }
+          opts.on_tail("-h", "--help", "Show this message")                                 { puts opts; exit 0 }
+          opts.on_tail("-v", "--version", "Print version")                                  { puts Stockery::VERSION; exit 0 }
         end
       end
   end

data/stockery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "stockery"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pieter Michels"]
-  s.date = "2011-09-25"
+  s.date = "2011-09-26"
   s.description = "Fetch stock quotes. Build as a gem and command line tool."
   s.email = "pieter@noort.be"
   s.executables = ["stockery"]

data/test/helper.rb

@@ -17,12 +17,36 @@ require 'stockery'
 class Test::Unit::TestCase
 end
 
-def silence_stream(stream)                                                                                                                                   
-  old_stream = stream.dup
-  stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
-  stream.sync = true                                                                                                                                         
-
-  yield                                                                                                                                                    
-ensure                                                                                                                                                       
-  stream.reopen(old_stream)                                                                                                                                  
+require 'stringio'
+
+def capture_output(&block)
+  original_stdout = $stdout
+
+  $stdout = fake = StringIO.new
+  $stdout.flush
+
+  begin
+    yield
+  ensure
+    $stdout = original_stdout
+    $stdout.flush
+  end
+
+  fake.string
+end
+
+def capture_error(&block)
+  original_stdout = $stderr
+
+  $stderr = fake = StringIO.new
+  $stderr.flush
+
+  begin
+    yield
+  ensure
+    $stderr = original_stdout
+    $stderr.flush
+  end
+
+  fake.string
 end

data/test/test_runner.rb

@@ -15,33 +15,68 @@ class TestStockeryRunner < Test::Unit::TestCase
       assert_equal runner.options[:output], "print"
     end
 
-    # should "print the result as a json string by default" do
-    #   out = silence_stream(STDOUT) do
-    #     runner = Stockery::Runner.new(%w(-q AAPL))
-    #     runner.run!
-    #   end
-
-    #   puts out.to_s
-    #   json = JSON.parse(out.to_s)
-    #   # assert_match out.to_s, "/Quotes at/"
-    # end
-
-    # should "print the result when passing print output argument" do
-    #   out = silence_stream(STDOUT) do
-    #     runner = Stockery::Runner.new(%w(-q AAPL -o print))
-    #     runner.run!
-    #   end
-
-    #   assert_match out.to_s, "/Quotes at/"
-    # end
-
-    # should "print its version" do
-    #   out = silence_stream(STDOUT) do
-    #     runner = Stockery::Runner.new(%w(-v))
-    #     runner.run!
-    #   end
-
-    #   assert_equal out.to_s, Stockery::VERSION
-    # end
+    should "exit when passing invalid option" do
+      out = capture_error do
+        begin
+          Stockery::Runner.new(%w(--bad-option))
+        rescue SystemExit => e
+        end
+      end
+      
+      assert_equal "Invalid option.\n", out.to_s
+    end
+
+    should "exit when passing no symbols" do
+      out = capture_error do
+        begin
+          runner = Stockery::Runner.new(%w(-o print))
+          runner.run!
+        rescue SystemExit => e
+        end
+      end
+      
+      assert_equal "Stock symbols missing. Usage `stockery -q \"GOOG, MSFT\"\n", out.to_s
+    end
+
+    should "print the result as a json string by default" do
+      out = capture_output do
+        runner = Stockery::Runner.new(%w(-q AAPL))
+        runner.run!
+      end
+
+      possible_json_data = out.to_s
+
+      begin
+        JSON.parse(possible_json_data)
+
+        valid = true
+      rescue JSON::ParserError => e
+        valid = false 
+      end
+
+      assert valid
+    end
+
+    should "print the result when passing print output argument" do
+      out = capture_output do
+        runner = Stockery::Runner.new(%w(-q AAPL -o print))
+        runner.run!
+      end
+
+      assert_match "Quotes at", out.to_s
+    end
+
+    should "print its version" do
+      out = capture_output do
+        begin
+          runner = Stockery::Runner.new(%w(-v))
+          runner.run!
+        rescue SystemExit => e
+
+        end
+      end
+
+      assert_equal Stockery::VERSION + "\n", out.to_s # \n because of exit status
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stockery
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000Z
+date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2162930560 !ruby/object:Gem::Requirement
+  requirement: &2156699420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162930560
+  version_requirements: *2156699420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2162929560 !ruby/object:Gem::Requirement
+  requirement: &2156698560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162929560
+  version_requirements: *2156698560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2162928800 !ruby/object:Gem::Requirement
+  requirement: &2156697600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2162928800
+  version_requirements: *2156697600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2162927900 !ruby/object:Gem::Requirement
+  requirement: &2156696880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2162927900
+  version_requirements: *2156696880
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2162926940 !ruby/object:Gem::Requirement
+  requirement: &2156696120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162926940
+  version_requirements: *2156696120
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &2162925960 !ruby/object:Gem::Requirement
+  requirement: &2156695040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162925960
+  version_requirements: *2156695040
 description: Fetch stock quotes. Build as a gem and command line tool.
 email: pieter@noort.be
 executables:
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3780466078473534277
+      hash: 3668783843777895541
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: