devcenter 0.0.3 → 0.0.4

data/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+# Contributing to this repo
+
+We welcome contributions!
+
+## Urgent Security Updates
+* Page us from the "Dev Center" campfire room with `Sentinel: page DevCenter: your emergency message`. While you wait for us, push your fix to a topic branch on GitHub.
+
+## Any Other Contribution
+
+* Create a topic branch from where you want to base your work (this is usually the `master` branch).
+* Make commits of logical units.
+* Check for unnecessary whitespace with `git --diff` before commiting.
+* Push your changes to a topic branch in the main repository.
+* Submit a pull request to the base branch.# Contributing to this repo

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in devcenter.gemspec
 gemspec
-
-# Temporary
-# gem 'sinatra', :git => 'https://github.com/sinatra/sinatra.git', :ref => '9984d0d2b3f1ea12273c6c25f8e102b2329f33e9'
-

data/devcenter.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.executables   = %w{ devcenter }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = %w{ lib vendor }
+  gem.require_paths = %w{ lib }
   gem.add_runtime_dependency('listen', '~> 0.7.2')
   gem.add_runtime_dependency('commander', '~> 4.1.3')
   gem.add_runtime_dependency('json', '~>1.7.6')
@@ -27,5 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('thin', '~>1.5.0')
   gem.add_runtime_dependency('rack', '~>1.4.4')
   gem.add_runtime_dependency('rack-protection', '~>1.3.2')
+  gem.add_runtime_dependency('sinatra', '~>1.3.4')
   gem.add_runtime_dependency('tilt', '~>1.3.3')
 end

data/lib/devcenter.rb

@@ -1,4 +1,3 @@
-require_relative '../vendor/sinatra/lib/sinatra'
 require_relative 'devcenter/version'
 require_relative 'devcenter/logger'
 require_relative 'devcenter/helpers'

data/lib/devcenter/previewer/web_app.rb

@@ -1,3 +1,5 @@
+require 'sinatra'
+
 module Devcenter::Previewer
 
   class WebApp < Sinatra::Base
@@ -5,7 +7,7 @@ module Devcenter::Previewer
     include Devcenter::Logger
 
     set :logging, false
-    set connections: []
+    set :connections, []
     set :public_folder, File.dirname(__FILE__)
     set :views, File.join(File.dirname(__FILE__), 'views')
 
@@ -35,7 +37,6 @@ module Devcenter::Previewer
         conn.errback do
           conn.close
           settings.connections.delete(conn)
-          settings.connections.delete(conn)
           log "Connection closed externally (#{settings.connections.size} open)"
         end
       end

data/lib/devcenter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devcenter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -187,6 +187,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +228,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -282,134 +299,12 @@ files:
 - lib/devcenter/previewer/web_app.rb
 - lib/devcenter/previewer/web_server.rb
 - lib/devcenter/version.rb
-- vendor/sinatra/.gitignore
-- vendor/sinatra/.travis.yml
-- vendor/sinatra/.yardopts
-- vendor/sinatra/AUTHORS
-- vendor/sinatra/Gemfile
-- vendor/sinatra/LICENSE
-- vendor/sinatra/README.de.rdoc
-- vendor/sinatra/README.es.rdoc
-- vendor/sinatra/README.fr.rdoc
-- vendor/sinatra/README.hu.rdoc
-- vendor/sinatra/README.jp.rdoc
-- vendor/sinatra/README.ko.rdoc
-- vendor/sinatra/README.pt-br.rdoc
-- vendor/sinatra/README.pt-pt.rdoc
-- vendor/sinatra/README.rdoc
-- vendor/sinatra/README.ru.rdoc
-- vendor/sinatra/README.zh.rdoc
-- vendor/sinatra/Rakefile
-- vendor/sinatra/examples/chat.rb
-- vendor/sinatra/examples/simple.rb
-- vendor/sinatra/examples/stream.ru
-- vendor/sinatra/lib/sinatra.rb
-- vendor/sinatra/lib/sinatra/base.rb
-- vendor/sinatra/lib/sinatra/images/404.png
-- vendor/sinatra/lib/sinatra/images/500.png
-- vendor/sinatra/lib/sinatra/main.rb
-- vendor/sinatra/lib/sinatra/showexceptions.rb
-- vendor/sinatra/lib/sinatra/version.rb
-- vendor/sinatra/sinatra.gemspec
-- vendor/sinatra/test/base_test.rb
-- vendor/sinatra/test/builder_test.rb
-- vendor/sinatra/test/coffee_test.rb
-- vendor/sinatra/test/compile_test.rb
-- vendor/sinatra/test/contest.rb
-- vendor/sinatra/test/creole_test.rb
-- vendor/sinatra/test/delegator_test.rb
-- vendor/sinatra/test/encoding_test.rb
-- vendor/sinatra/test/erb_test.rb
-- vendor/sinatra/test/extensions_test.rb
-- vendor/sinatra/test/filter_test.rb
-- vendor/sinatra/test/haml_test.rb
-- vendor/sinatra/test/helper.rb
-- vendor/sinatra/test/helpers_test.rb
-- vendor/sinatra/test/integration/app.rb
-- vendor/sinatra/test/integration_helper.rb
-- vendor/sinatra/test/integration_test.rb
-- vendor/sinatra/test/less_test.rb
-- vendor/sinatra/test/liquid_test.rb
-- vendor/sinatra/test/mapped_error_test.rb
-- vendor/sinatra/test/markaby_test.rb
-- vendor/sinatra/test/markdown_test.rb
-- vendor/sinatra/test/middleware_test.rb
-- vendor/sinatra/test/nokogiri_test.rb
-- vendor/sinatra/test/public/favicon.ico
-- vendor/sinatra/test/rabl_test.rb
-- vendor/sinatra/test/rack_test.rb
-- vendor/sinatra/test/radius_test.rb
-- vendor/sinatra/test/rdoc_test.rb
-- vendor/sinatra/test/readme_test.rb
-- vendor/sinatra/test/request_test.rb
-- vendor/sinatra/test/response_test.rb
-- vendor/sinatra/test/result_test.rb
-- vendor/sinatra/test/route_added_hook_test.rb
-- vendor/sinatra/test/routing_test.rb
-- vendor/sinatra/test/sass_test.rb
-- vendor/sinatra/test/scss_test.rb
-- vendor/sinatra/test/server_test.rb
-- vendor/sinatra/test/settings_test.rb
-- vendor/sinatra/test/sinatra_test.rb
-- vendor/sinatra/test/slim_test.rb
-- vendor/sinatra/test/static_test.rb
-- vendor/sinatra/test/streaming_test.rb
-- vendor/sinatra/test/templates_test.rb
-- vendor/sinatra/test/textile_test.rb
-- vendor/sinatra/test/views/a/in_a.str
-- vendor/sinatra/test/views/ascii.erb
-- vendor/sinatra/test/views/b/in_b.str
-- vendor/sinatra/test/views/calc.html.erb
-- vendor/sinatra/test/views/error.builder
-- vendor/sinatra/test/views/error.erb
-- vendor/sinatra/test/views/error.haml
-- vendor/sinatra/test/views/error.sass
-- vendor/sinatra/test/views/explicitly_nested.str
-- vendor/sinatra/test/views/foo/hello.test
-- vendor/sinatra/test/views/hello.builder
-- vendor/sinatra/test/views/hello.coffee
-- vendor/sinatra/test/views/hello.creole
-- vendor/sinatra/test/views/hello.erb
-- vendor/sinatra/test/views/hello.haml
-- vendor/sinatra/test/views/hello.less
-- vendor/sinatra/test/views/hello.liquid
-- vendor/sinatra/test/views/hello.mab
-- vendor/sinatra/test/views/hello.md
-- vendor/sinatra/test/views/hello.nokogiri
-- vendor/sinatra/test/views/hello.rabl
-- vendor/sinatra/test/views/hello.radius
-- vendor/sinatra/test/views/hello.rdoc
-- vendor/sinatra/test/views/hello.sass
-- vendor/sinatra/test/views/hello.scss
-- vendor/sinatra/test/views/hello.slim
-- vendor/sinatra/test/views/hello.str
-- vendor/sinatra/test/views/hello.test
-- vendor/sinatra/test/views/hello.textile
-- vendor/sinatra/test/views/hello.wlang
-- vendor/sinatra/test/views/hello.yajl
-- vendor/sinatra/test/views/layout2.builder
-- vendor/sinatra/test/views/layout2.erb
-- vendor/sinatra/test/views/layout2.haml
-- vendor/sinatra/test/views/layout2.liquid
-- vendor/sinatra/test/views/layout2.mab
-- vendor/sinatra/test/views/layout2.nokogiri
-- vendor/sinatra/test/views/layout2.rabl
-- vendor/sinatra/test/views/layout2.radius
-- vendor/sinatra/test/views/layout2.slim
-- vendor/sinatra/test/views/layout2.str
-- vendor/sinatra/test/views/layout2.test
-- vendor/sinatra/test/views/layout2.wlang
-- vendor/sinatra/test/views/nested.str
-- vendor/sinatra/test/views/utf8.erb
-- vendor/sinatra/test/wlang_test.rb
-- vendor/sinatra/test/yajl_test.rb
 homepage: https://devcenter.heroku.com
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
-- vendor
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/vendor/sinatra/.gitignore

@@ -1,6 +0,0 @@
-# please add general patterns to your global ignore list
-# see https://github.com/github/gitignore#readme
-
-/pkg
-/doc/api
-/Gemfile.lock

data/vendor/sinatra/.travis.yml

@@ -1,16 +0,0 @@
----
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - rbx-18mode
-  - rbx-19mode
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - ruby-head
-matrix:
-  include:
-    - { rvm: 1.8.7, env: tilt=master }
-    - { rvm: 1.9.3, env: rack=master }
-    - { rvm: 1.9.3, env: tilt=master }

data/vendor/sinatra/.yardopts

@@ -1,4 +0,0 @@
---readme README.rdoc
---title 'Sinatra API Documentation'
---charset utf-8
-'lib/**/*.rb' - '*.rdoc'

data/vendor/sinatra/AUTHORS

@@ -1,61 +0,0 @@
-Sinatra was designed and developed by Blake Mizerany (bmizerany) in
-California.
-
-Sinatra would not have been possible without strong company backing.
-In the past, financial and emotional support have been provided mainly by
-[Heroku](http://heroku.com), [GitHub](http://github.com) and
-[Engine Yard](http://www.engineyard.com/), and is now taken care of by
-[Travis CI](http://travis-ci.com/).
-
-Special thanks to the following extraordinary individuals, who-out which
-Sinatra would not be possible:
-
-* Ryan Tomayko (rtomayko) for constantly fixing whitespace errors 60d5006   
-* Ezra Zygmuntowicz (ezmobius) for initial help and letting Blake steal
-  some of merbs internal code.
-* Ari Lerner (http://xnot.org/) for his evangelism, spirit, and gumption
-  that got Sinatra recognized from Day 1.
-* Christopher Schneid (cschneid) for The Book, the blog (gittr.com),
-  irclogger.com, and a bunch of useful patches.
-* Markus Prinz (cypher) for patches over the years, caring about
-  the README, and hanging in there when times were rough.
-* Simon Rozet (sr) for a ton of doc patches, HAML options, and all that
-  advocacy stuff he's going to do for 1.0.
-* Erik Kastner (kastner) for fixing `MIME_TYPES` under Rack 0.5.
-* Ben Bleything (bleything) for caring about HTTP status codes and doc fixes.
-* Igal Koshevoy (igal) for root path detection under Thin/Passenger.
-* Jon Crosby (jcrosby) for coffee breaks, doc fixes, and just because, man.
-* Karel Minarik (karmi) for screaming until the website came back up.
-* Jeremy Evans (jeremyevans) for unbreaking optional path params (twice!)
-* The GitHub guys for stealing Blake's table.
-* Nickolas Means (nmeans) for Sass template support.
-* Victor Hugo Borja (vic) for splat'n routes specs and doco.
-* Avdi Grimm (avdi) for basic RSpec support.
-* Jack Danger Canty for a more accurate root directory and for making me
-  watch [this](http://www.youtube.com/watch?v=ueaHLHgskkw) just now.
-* Mathew Walker for making escaped paths work with static files.
-* Millions of Us for having the problem that led to Sinatra's conception.
-* Songbird for the problems that helped Sinatra's future become realized.
-* Rick Olson (technoweenie) for the killer plug at RailsConf '08.
-* Steven Garcia for the amazing custom artwork you see on 404's and 500's
-* Pat Nakajima (nakajima) for fixing non-nested params in nested params Hash's.
-* Konstantin Haase for his hard work and ongoing commitment to improving
-  Sinatra, for 1.1.0, 1.2.0 and beyond..
-* Zachary Scott for adding Konstantin to the AUTHORS file. He also did help
-  writing the book, but mainly for adding Konstantin.
-* Gabriel Andretta for having people wonder whether our documentation is
-  actually in English or in Spanish.
-* Vasily Polovnyov, Nickolay Schwarz, Luciano Sousa, Wu Jiang, Mickael Riga,
-  Bernhard Essl, Janos Hardi, Kouhei Yanagita and "burningTyger" for willingly
-  translating whatever ends up in the README.
-* [Wordy](http://www.wordy.com/) for proofreading our README. 73e137d
-* cactus for digging through code and specs, multiple times.
-* Nicolás Sanguinetti (foca) for strong demand of karma and shaping
-  helpers/register.
-
-and last but not least:
-
-* Frank Sinatra (chairman of the board) for having so much class he
-  deserves a web-framework named after him.
-
-For a complete list of all contributors to Sinatra itself, run `rake authors`.

data/vendor/sinatra/Gemfile

@@ -1,91 +0,0 @@
-# Why use bundler?
-# Well, not all development dependencies install on all rubies. Moreover, `gem
-# install sinatra --development` doesn't work, as it will also try to install
-# development dependencies of our dependencies, and those are not conflict free.
-# So, here we are, `bundle install`.
-#
-# If you have issues with a gem: `bundle install --without-coffee-script`.
-
-RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
-source :rubygems unless ENV['QUICK']
-gemspec
-
-gem 'rake'
-gem 'rack-test', '>= 0.5.6'
-gem 'ci_reporter', :group => :ci
-
-# Allows stuff like `tilt=1.2.2 bundle install` or `tilt=master ...`.
-# Used by the CI.
-github = "git://github.com/%s.git"
-repos  = {'tilt' => github % "rtomayko/tilt", 'rack' => github % "rack/rack"}
-
-%w[tilt rack].each do |lib|
-  dep = case ENV[lib]
-        when 'stable', nil then nil
-        when /(\d+\.)+\d+/ then "~> " + ENV[lib].sub("#{lib}-", '')
-        else {:git => repos[lib], :branch => dep}
-        end
-  gem lib, dep
-end
-
-gem 'haml', '>= 3.0'
-gem 'sass' if RUBY_VERSION < "2.0"
-gem 'builder'
-gem 'erubis'
-gem 'slim', '~> 1.0'
-gem 'temple', '!= 0.3.3'
-gem 'coffee-script', '>= 2.0'
-gem 'rdoc'
-gem 'kramdown'
-gem 'maruku'
-gem 'creole'
-gem 'markaby'
-gem 'radius'
-gem 'rabl' unless RUBY_ENGINE =~ /jruby|maglev/
-
-unless RUBY_ENGINE == 'rbx' and RUBY_VERSION > '1.9'
-  gem 'wlang', '>= 2.0.1' unless RUBY_ENGINE == "maglev"
-  gem 'liquid'
-end
-
-if RUBY_ENGINE == 'jruby'
-  gem 'nokogiri', '!= 1.5.0'
-  gem 'jruby-openssl'
-  gem 'trinidad'
-else
-  gem 'yajl-ruby'
-  gem 'nokogiri'
-  gem 'thin'
-end
-
-if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9'
-  gem 'less', '~> 2.0'
-else
-  gem 'less', '~> 1.0'
-end
-
-if RUBY_ENGINE != 'jruby' or not ENV['TRAVIS']
-  # C extensions
-  gem 'rdiscount'
-  platforms(:ruby_18) do
-    gem 'redcarpet'
-    gem 'mongrel'
-  end
-  gem 'RedCloth' unless RUBY_ENGINE == "macruby"
-  gem 'puma'
-
-  ## bluecloth is broken
-  #gem 'bluecloth'
-end
-
-gem 'net-http-server'
-
-platforms :ruby_18, :jruby do
-  gem 'json' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
-end
-
-platforms :mri_18 do
-  # bundler platforms are broken
-  next if RUBY_ENGINE != 'ruby' or RUBY_VERSION > "1.8"
-  gem 'rcov'
-end

data/vendor/sinatra/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2007, 2008, 2009, 2010, 2011 Blake Mizerany
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE 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.