devcenter 0.0.2 → 0.0.3

data/lib/devcenter.rb

@@ -1,5 +1,6 @@
 require_relative '../vendor/sinatra/lib/sinatra'
 require_relative 'devcenter/version'
+require_relative 'devcenter/logger'
 require_relative 'devcenter/helpers'
 require_relative 'devcenter/previewer'
 require_relative 'devcenter/coderay_extensions'

data/lib/devcenter/cli.rb

@@ -13,7 +13,10 @@ command :open do |c|
   c.summary = 'Open the article with the given slug in the default browser'
   c.description = c.summary
   c.example 'devcenter open process-model', 'Opens https://devcenter.heroku.com/articles/process-model in the default browser'
+  c.option '--debug', 'Output internal log to help debugging'
   c.action do |args, options|
+    options.default :debug => false
+    Devcenter::Logger.active = options.debug
     Devcenter::Commands::Open.run(args[0])
   end
 end
@@ -24,8 +27,10 @@ command :pull do |c|
   c.description = c.summary
   c.example 'devcenter pull process-model', 'Saves the content of the article with the "process-model" slug to a local process-model.md file in the current directory'
   c.option '--force', 'Skip confirmation and overwrite existing local file'
+  c.option '--debug', 'Output internal log to help debugging'
   c.action do |args, options|
-    options.default :force => false
+    options.default :force => false, :debug => false
+    Devcenter::Logger.active = options.debug
     Devcenter::Commands::Pull.run(args[0], options.force)
   end
 end
@@ -38,8 +43,10 @@ command :preview do |c|
 
   c.option '--host HOST', String, 'Host where the preview will be available'
   c.option '--port PORT_NUMBER', Integer, 'Port where the preview will be available'
+  c.option '--debug', 'Output internal log to help debugging'
   c.action do |args, options|
-    options.default :host => '127.0.0.1', :port => 3000
+    options.default :host => '127.0.0.1', :port => 3000, :debug => false
+    Devcenter::Logger.active = options.debug
     Devcenter::Commands::Preview.run(args[0], options.host, options.port)
   end
 end

data/lib/devcenter/commands/base.rb

@@ -7,6 +7,7 @@ module Devcenter::Commands
 
   class Base
 
+    include Devcenter::Logger
     include Devcenter::Helpers
 
     def self.run(*args)
@@ -43,5 +44,6 @@ module Devcenter::Commands
       say message.join("\n")
       exit
     end
+
   end
 end

data/lib/devcenter/commands/open.rb

@@ -15,14 +15,13 @@ module Devcenter::Commands
 
     def run
       url = article_url(@slug)
+      log "Connecting to #{url}"
       head = Excon.head(url)
       case head.status
       when 200
-        say("Opening #{@slug} docs")
+        log "Page found, opening"
         launchy = Launchy.open(url)
-        if launchy.respond_to?(:join)
-          launchy.join
-        end
+        launchy.join if launchy.respond_to?(:join)
       when 301, 302
         say "Redirected to #{head.headers['Location']}"
       when 404

data/lib/devcenter/logger.rb

@@ -0,0 +1,17 @@
+module Devcenter::Logger
+
+  extend self
+
+  def self.active=(bool)
+    @@active = bool
+  end
+
+  def self.active?
+    !!@@active
+  end
+
+  def log(str)
+    puts "devcenter gem: #{str}" if Devcenter::Logger.active?
+  end
+
+end

data/lib/devcenter/previewer.rb

@@ -11,6 +11,7 @@ module Devcenter::Previewer
   def preview(slug, md_path, host, port)
     server = WebServer.new(host, port, WebApp, true)
     file_listener_callback = Proc.new do |modified, added, removed|
+      modified.each{ |f| Devcenter::Logger.log "File modified: #{f}" }
       WebApp.send_server_event
     end
 

data/lib/devcenter/previewer/web_app.rb

@@ -2,6 +2,8 @@ module Devcenter::Previewer
 
   class WebApp < Sinatra::Base
 
+    include Devcenter::Logger
+
     set :logging, false
     set connections: []
     set :public_folder, File.dirname(__FILE__)
@@ -17,17 +19,34 @@ module Devcenter::Previewer
     get '/stream', provides: 'text/event-stream' do
       stream :keep_open do |conn|
         settings.connections << conn
-        conn.callback { settings.connections.delete(conn) } # connection closed properly
-        conn.errback do # connection closed due to an error
+        log "New incoming connection (#{settings.connections.size} open)"
+
+        # refresh connection before browser times out
+        EventMachine::PeriodicTimer.new(20) do
+          log "Refreshing connection"
+          conn << ":refreshing \n\n"
+        end
+
+        conn.callback do
+          settings.connections.delete(conn)
+          log "Connection closed locally (#{settings.connections.size} open)"
+        end
+
+        conn.errback do
           conn.close
           settings.connections.delete(conn)
+          settings.connections.delete(conn)
+          log "Connection closed externally (#{settings.connections.size} open)"
         end
       end
     end
 
     get '/:slug' do
+      log "Local article requested: #{params[:slug]}"
       src_path = File.join(Dir.pwd, "#{params[:slug]}.md")
+      log "Parsing"
       @article = parse_article(src_path)
+      log "Serving"
       erb :article
     end
 
@@ -45,6 +64,7 @@ module Devcenter::Previewer
     end
 
     def self.send_server_event
+      Devcenter::Logger.log "Serving server side event to #{settings.connections.size} connections"
       settings.connections.each do |conn|
         conn << "data: reload\n\n"
       end

data/lib/devcenter/version.rb

@@ -1,3 +1,3 @@
 module Devcenter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devcenter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -228,6 +228,7 @@ files:
 - lib/devcenter/commands/pull.rb
 - lib/devcenter/helpers.rb
 - lib/devcenter/layout.html
+- lib/devcenter/logger.rb
 - lib/devcenter/md_parser.rb
 - lib/devcenter/previewer.rb
 - lib/devcenter/previewer/assets/images/public/article-icon-large.png