rticker 1.1.2 → 1.2.0

data/bin/rticker

@@ -2,5 +2,7 @@
 
 require 'rticker/application'
 
+Thread.abort_on_exception = true
+
 application = RTicker::Application.new(ARGV)
-application.run
+application.run

data/lib/rticker/application.rb

@@ -57,8 +57,11 @@ module RTicker
       end
 
       # Set proxy settings
+      system_proxy = RTicker::Net.detect_system_proxy
       if @options.proxy
         RTicker::Net.proxy = @options.proxy
+      elsif not system_proxy.nil? and not @options.no_proxy
+        RTicker::Net.proxy = "#{system_proxy[:host]}:#{system_proxy[:port]}"
       end
       
       # Update entries via web calls until user quits via Ctrl-C

data/lib/rticker/currency.rb

@@ -30,7 +30,7 @@ module RTicker
         fields = result.split(",")
         price = fields[1]
         last_date = fields[2]
-        return if Date.strptime(last_date, '"%m/%d/%Y"') != Date.today
+        return if last_date.nil? or Date.strptime(last_date, '"%m/%d/%Y"') != Date.today
         if price.to_f != entry.curr_value and not entry.curr_value.nil?
           # The price has changed
           entry.last_changed = Time.now() 

data/lib/rticker/equity.rb

@@ -57,14 +57,16 @@ module RTicker
       symbols = entries.map { |e| e.symbol }
       uri = "http://download.finance.yahoo.com/d/quotes.csv?s=%s&f=l1c1d1va2xj1b4j4dyekjm3m4rr5p5p6s7" % CGI::escape(symbols.join(","))
       response = RTicker::Net.get_response(uri) rescue return
+      return if response.nil?
       results = response.split("\n")
       entries.zip(results) do |entry, result|
         # Yahoo uses A CSV format.
+        return if result.nil?
         fields = result.split(",")
         price  = fields[0]
         change = fields[1]
         last_date = fields[2]
-        return if Date.strptime(last_date, '"%m/%d/%Y"') != Date.today
+        return if last_date.nil? or Date.strptime(last_date, '"%m/%d/%Y"') != Date.today
         if price.to_f != entry.curr_value and not entry.curr_value.nil?
           # The price has changed
           entry.last_changed = Time.now() 

data/lib/rticker/future.rb

@@ -71,7 +71,7 @@ module RTicker
         price  = fields[0]
         change = fields[1]
         last_date = fields[2]
-        return if Date.strptime(last_date, '"%m/%d/%Y"') != Date.today
+        return if last_date.nil? or Date.strptime(last_date, '"%m/%d/%Y"') != Date.today
         if price.to_f != _entry.curr_value and not _entry.curr_value.nil?
           # The price has changed
           _entry.last_changed = Time.now() 

data/lib/rticker/net.rb

@@ -26,5 +26,27 @@ module RTicker
         return ""
       end
     end
+
+    def self.detect_system_proxy ()
+      require 'rbconfig'
+      os = Config::CONFIG['host_os']
+      # Only support mac os x right now
+      return detect_system_proxy_macosx() if os.start_with? "darwin"
+      return nil
+    end
+
+    def self.detect_system_proxy_macosx ()
+      ethernet_enabled = (not %x[networksetup -getinfo ethernet].match(/IP address:/).nil?)
+      airport_enabled = (not %x[networksetup -getinfo airport].match(/IP address:/).nil?)
+      return nil if not (ethernet_enabled or airport_enabled)
+      networkservice = ethernet_enabled ? "ethernet" : "airport"
+      webproxy_info = %x[networksetup -getwebproxy #{networkservice}]
+      return nil if webproxy_info.match(/Enabled: Yes/).nil?
+      host, port, authentication_required = "", "", false
+      host = webproxy_info.match(/Server: ([^\n]*)/)[1]
+      port = webproxy_info.match(/Port: ([^\n]*)/)[1]
+      authentication_required = webproxy_info.match(/Authenticated Proxy Enabled: (0|1)/)[1] == "1"
+      return {:host => host, :port => port, :authentication_required => authentication_required}
+    end
   end
 end

data/lib/rticker/options.rb

@@ -5,7 +5,7 @@ module RTicker
   class Options
 
     attr_reader :once, :no_color, :input_files
-    attr_reader :sleep, :rest, :proxy
+    attr_reader :sleep, :rest, :proxy, :no_proxy
     
     def initialize (args)
       # Defaults
@@ -13,6 +13,7 @@ module RTicker
       @no_color = false # Don't use color when showing results to user
       @input_files = [] # Input files provided by user
       @proxy = nil      # "host:port" proxy
+      @no_proxy = false # Don't default to system proxy if one is detected
       @sleep = 2        # how long to delay between web requests
       @rest = []        # The rest of the command line arguments
       parse!(args)
@@ -44,10 +45,14 @@ module RTicker
           @sleep = secs.to_f
         end
         
-        opts.on("-p", "--proxy HOST:PORT", "Host and port of HTTP proxy to use.") do |proxy|
+        opts.on("-p", "--proxy HOST:PORT", "Host and port of HTTP proxy to use.  This overrides any system proxy that is detected.") do |proxy|
           @proxy = proxy
         end
         
+        opts.on("-x", "--no-proxy", "Don't default to system proxy if one is detected.") do
+          @no_proxy = true
+        end
+        
         opts.on("-h", "--help", "Display this screen") do 
           puts opts
           exit

data/rticker.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.name = "rticker"
   s.summary = "Command line-based stock ticker application"
   s.description = File.read(File.join(File.dirname(__FILE__), 'README'))
-  s.version = "1.1.2"
+  s.version = "1.2.0"
   s.author = "Alfred J. Fazio"
   s.email = "alfred.fazio@gmail.com"
   s.platform = Gem::Platform::RUBY

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rticker
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Alfred J. Fazio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -05:00
+date: 2012-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: []