yield 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a641621a62dc49014f39bce2a1e6caba8d3f03
-  data.tar.gz: 07d5e89234624f95f581e3a03b72e15a56e6a8b0
+  metadata.gz: 7d05c742780e6c9166f606a4686b5acee21bc486
+  data.tar.gz: 17055d7b5de8aa074c904985aee520670f1b5929
 SHA512:
-  metadata.gz: 2ff9bcfe989f1ed2f827b14a80f640d35a0e4457f5bf9f70d547c1359cc6785cf340d689b07d572fe5622ce2820fb8839304c1ca3dd2729345783011cb86e8b3
-  data.tar.gz: a171350d8f9ca629f6b4231ff2df32dcf300e3143eb06d428ef062234ad72b26aa81596e0eea91e4b11c03ef50f209dede6f11c8a0646ada41206718dbf57fa4
+  metadata.gz: d2c6589a5328150b9b5df2c291e10869c6e11e52b3625acdf26cc273d20eed2de5fa671b9c8fb7232c7e5dde2713aa80bb57864116df4fd5d1df03aed42c067a
+  data.tar.gz: e246e63eb5be03da6b18236d7df5d8e4707edcd32bd669e5ac5be00332e1a32a8e9366b1e51442d0070dc51af602117c4463388cedae5e4f7adab94fd5a3039a

data/.gitignore

@@ -16,4 +16,7 @@ test/tmp
 test/version_tmp
 tmp
 .DS_Store
-/versions
+/versions
+/spec
+.rspec
+test.md

data/bin/yield

@@ -3,25 +3,26 @@ require 'rbconfig'
 require 'optparse'
 require_relative '../lib/yield'
 
-# Determine if OS is Windows, and disable echo of characters in hat notation (^C) if it is not.
+port = 4000
+
+# Determine OS type and disable echo of hat notation characters (^C) if not Windows.
 is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
 `stty -echoctl` unless is_windows
 
-port = 4000
-
-OptionParser.new do |o|
-  o.banner = "Usage: #{o.program_name} MARKDOWN_FILE.md"
+OptionParser.new do |opt|
+  opt.banner = "=* Usage: #{opt.program_name} MARKDOWN_FILE.md"
 
-  o.on('-h', '--help', 'View the help menu') { puts o; Kernel.exit }
-  o.on('-p PORT', '--port PORT', 'Specify port to run Yield on') { |o| port = o }
-  o.on('-v', '--version', 'Display version number') do
-    puts 'yield version ' + Yield::VERSION
+  opt.on('-h', '--help', 'View the help menu') { puts opt; Kernel.exit }
+  opt.on('-p PORT', '--port PORT', 'Specify port to run Yield on') { |o| port = o }
+  opt.on('-v', '--version', 'Display version number') do
+    puts '=* yield v' + Yield::VERSION
     Kernel.exit
   end
 
   begin
-    o.parse!
+    opt.parse!
   rescue OptionParser::InvalidOption => o
+    # Print invalid option message, but still run yield.
     puts o.message
   end
 end

data/lib/yield.rb

@@ -1,12 +1,12 @@
-require "sinatra"
-require "launchy"
-require "net/https"
-require "uri"
-require "json"
+require 'sinatra'
+require 'launchy'
+require 'net/https'
+require 'uri'
+require 'json'
 
-require_relative "yield/version"
-require_relative "yield/markdown"
-require_relative "yield/server"
+require_relative 'yield/version'
+require_relative 'yield/markdown'
+require_relative 'yield/server'
 
 module Yield
 end

data/lib/yield/markdown.rb

@@ -1,12 +1,10 @@
 module Yield
   class Markdown < Sinatra::Base
 
-    @content = nil
-    @filename = nil
+    @content, @filename = nil
 
     def self.init(filename = 'README.md')
       @filename = filename.to_s
-      $stdout = StringIO.new
       abort "Filename '#{@filename}' doesn't exist." unless File.exist?(@filename)
     end
 
@@ -18,7 +16,7 @@ module Yield
       response.body
     end
 
-    def self.filename 
+    def self.filename
       @filename
     end
 

data/lib/yield/server.rb

@@ -1,4 +1,7 @@
 module Yield
+
+  class BadConnection < StandardError; end
+
   class Server < Sinatra::Base
 
     set :server, 'webrick'
@@ -15,7 +18,9 @@ module Yield
         yield server if block_given?
       end
     rescue Errno::EADDRINUSE
-      $stderr.puts "=* Port #{port} is already in use!"
+      $stderr.puts "=* Port #{port} is already in use."
+    rescue Errno::EACCES
+      $stderr.puts "=* Port #{port} could not be used: Permission denied."
     end
 
     # Override quit! method from Sinatra
@@ -25,24 +30,30 @@ module Yield
     end
 
     get '/' do
-      filename = Markdown.filename
-      content = Markdown.convert_to_html(File.read(filename))
-      erb :index, locals: { content: content, filename: filename }
+      begin
+        filename = Markdown.filename
+        content = Markdown.convert_to_html(File.read(filename))
+        erb :index, locals: { content: content, filename: filename }
+      rescue SocketError => e
+        erb :error
+      end
     end
 
     get '/:filename' do
-      filename = params[:filename]
       begin
+        filename = params[:filename]
         content = Markdown.convert_to_html(File.read(filename))
         erb :index, locals: { content: content, filename: filename }
       rescue Errno::EISDIR
         raise Sinatra::NotFound
       rescue Errno::ENOENT
         raise Sinatra::NotFound
+      rescue SocketError => e
+        erb :error
       end
-    end 
+    end
 
-    not_found do 
+    not_found do
       filename = request.fullpath.split('/')[-1]
       erb :'404', locals: { filename: filename }
     end

data/lib/yield/version.rb

@@ -1,3 +1,3 @@
 module Yield
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/yield/views/error.erb

@@ -0,0 +1,2 @@
+<h2>Connection Error</h2>
+<p>Yield requires an active internet connection.</p>

data/yield.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = 'caseyscarborough@gmail.com'
   spec.description   = 'A utility for previewing markdown files in GitHub Flavored Markdown.'
   spec.summary       = 'Yield is a command line utility written in Ruby that allows a user to render markdown files for previewing in a browser. It renders the markdown files using GitHub flavored markdown at http://localhost:4000/ using Sinatra and Thin.'
-  spec.homepage      = 'https://github.com/caseyscarborough/yield'
+  spec.homepage      = 'http://caseyscarborough.github.io/yield'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version     = '>= 1.9.3'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
 
   spec.add_dependency 'sinatra', '1.4.3'
   spec.add_dependency 'launchy', '2.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yield
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Casey Scarborough
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -84,9 +98,10 @@ files:
 - lib/yield/server.rb
 - lib/yield/version.rb
 - lib/yield/views/404.erb
+- lib/yield/views/error.erb
 - lib/yield/views/index.erb
 - yield.gemspec
-homepage: https://github.com/caseyscarborough/yield
+homepage: http://caseyscarborough.github.io/yield
 licenses:
 - MIT
 metadata: {}