guard-webrick 0.1.1 → 0.1.2

data/.travis.yml

@@ -1,5 +1,10 @@
+language: ruby
 rvm:
-  - 1.8.7
+  - 1.9.3
   - 1.9.2
+  - jruby-19mode
+  - 1.8.7
   - ree
-  - jruby
+  - jruby-18mode
+  - ruby-head
+  - jruby-head

data/CHANGELOG.md

@@ -1,8 +1,31 @@
-## 0.1.1 (May 17, 2001)
+## 0.1.3.dev (unreleased)
+
+
+## 0.1.2 (May 10, 2012)
+
+### New features
+
+* Pull request [#1](https://github.com/fnichol/guard-webrick/pull/1): SSL support. ([@JustinLove][])
+
+### Improvements
+
+* Fill out Ruby testing on TravisCI. ([@fnichol][])
+
+
+## 0.1.1 (May 17, 2011)
+
+### Bug fixes
+
+* Add missing launch gem dependency ([@fnichol][])
+
+### Improvements
+
+* Add project to travis-ci.org ([@fnichol][])
 
-  * Add project to travis-ci.org
-  * Add missing launch gem dependency
 
 ## 0.1.0 (Mar 19, 2011)
 
 Initial release.
+
+[@fnichol]: https://github.com/fnichol
+[@JustinLove]: https://github.com/JustinLove

data/Gemfile

@@ -2,3 +2,11 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in guard-webrick.gemspec
 gemspec
+
+group :test do
+  gem 'rake', '~> 0.9'
+end
+
+platforms :jruby do
+  gem 'jruby-openssl'
+end

data/README.md

@@ -4,7 +4,7 @@
 
 Guard::WEBrick automatically starts and restarts WEBrick when needed. Useful when you are working on a static site but want to benefit from [Guard::LiveReload](http://github.com/guard/guard-livereload).
 
-* Tested on Ruby 1.8.7, 1.9.2, Ruby Enterprise Edition, and JRuby
+* Tested on Ruby 1.9.3, 1.9.2, 1.8.7, Ruby Enterprise Edition, and JRuby (thanks TravisCI!)
 
 ## Install
 
@@ -46,6 +46,7 @@ Available options:
 
     :host => '127.3.3.1'     # default '0.0.0.0'
     :port => '12345'         # default '3000'
+    :ssl => true             # default false
     :docroot => 'public'     # default current working directory
     :launchy => false        # default true
 

data/guard-webrick.gemspec

@@ -15,14 +15,12 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project = "guard-webrick"
 
-  s.add_dependency 'guard', '~> 0.3'
-  s.add_dependency 'ffi',   '~> 1.0.7'
+  s.add_dependency 'guard', '~> 1.0.2'
   s.add_dependency 'spoon', '~> 0.0.1'
-  s.add_dependency 'launchy', '~> 0.4.0'
+  s.add_dependency 'launchy', '~> 2.1.0'
 
-  s.add_development_dependency 'bundler',       '~> 1.0.10'
   s.add_development_dependency 'rspec',         '~> 2.5.0'
-  s.add_development_dependency 'guard-rspec',   '~> 0.2.0'
+  s.add_development_dependency 'guard-rspec',   '~> 0.7.0'
   s.add_development_dependency 'guard-bundler', '~> 0.1.1'
 
   s.files         = `git ls-files`.split("\n")

data/lib/guard/webrick/server.rb

@@ -1,4 +1,5 @@
 require 'webrick'
+require 'webrick/https'
 
 module Guard
   class WEBrick
@@ -7,11 +8,21 @@ module Guard
       attr_reader :server
 
       def initialize(options = {})
-        @server = ::WEBrick::HTTPServer.new(
-          :BindAddress  => options[:host],
-          :Port         => options[:port],
-          :DocumentRoot => File.expand_path(options[:docroot])
-        )
+        if options[:ssl]
+          @server = ::WEBrick::HTTPServer.new(
+            :BindAddress  => options[:host],
+            :Port         => options[:port],
+            :DocumentRoot => File.expand_path(options[:docroot]),
+            :SSLEnable    => true,
+            :SSLCertName  => [%w[CN localhost]]
+          )
+        else
+          @server = ::WEBrick::HTTPServer.new(
+            :BindAddress  => options[:host],
+            :Port         => options[:port],
+            :DocumentRoot => File.expand_path(options[:docroot])
+          )
+        end
       end
 
       def start
@@ -25,10 +36,11 @@ module Guard
 end
 
 if __FILE__ == $0
-  host, port, docroot = ARGV
+  host, port, ssl, docroot = ARGV
   Guard::WEBrick::Server.new(
     :host     => host,
     :port     => port,
+    :ssl      => ssl == 'true',
     :docroot  => docroot
   ).start
 end

data/lib/guard/webrick/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module WEBrickVersion
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/guard/webrick.rb

@@ -15,6 +15,7 @@ module Guard
       @options = {
         :host       => '0.0.0.0',
         :port       => 3000,
+        :ssl        => false,
         :docroot    => Dir::pwd,
         :launchy    => true
       }.update(options)
@@ -35,11 +36,13 @@ module Guard
           File.expand_path(File.join(File.dirname(__FILE__), %w{webrick server.rb})),
           @options[:host],
           @options[:port].to_s,
+          @options[:ssl].to_s,
           @options[:docroot]
         )
         wait_for_port
         if @options[:launchy]
-          Launchy.open("http://#{@options[:host]}:#{@options[:port]}")
+          scheme = options[:ssl] ? "https" : "http"
+          Launchy.open("#{scheme}://#{@options[:host]}:#{@options[:port]}")
           @options[:launchy] = false  # only run once
         end
         @pid

data/spec/guard/webrick/server_spec.rb

@@ -22,6 +22,17 @@ describe Guard::WEBrick::Server do
       )
       new_server(:docroot => 'public')
     end
+
+    it "should create an ssl server" do
+      ::WEBrick::HTTPServer.should_receive(:new).with(
+        :BindAddress  => '0.0.0.0',
+        :Port         => 3000,
+        :DocumentRoot => Dir::pwd,
+        :SSLEnable    => true,
+        :SSLCertName  => [%w[CN localhost]]
+      )
+      new_server(:ssl => true)
+    end
   end
 
   describe "start" do

data/spec/guard/webrick_spec.rb

@@ -35,6 +35,19 @@ describe Guard::WEBrick do
       end
     end
 
+    describe "ssl" do
+
+      it "should be false by default" do
+        subject = Guard::WEBrick.new([])
+        subject.options[:ssl].should be_false
+      end
+
+      it "should be set to true" do
+        subject = Guard::WEBrick.new([], { :ssl => true })
+        subject.options[:ssl].should be_true
+      end
+    end
+
     describe "docroot" do
 
       it "should be Dir::pwd by default" do
@@ -70,13 +83,16 @@ describe Guard::WEBrick do
     end
 
     it "should spawn the server instance" do
-      subject = Guard::WEBrick.new([], { :host => '127.0.2.5', :port => 8080,
+      subject = Guard::WEBrick.new([], {
+        :host => '127.0.2.5',
+        :port => 8080,
+        :ssl => true,
         :docroot => '/tmp' })
       subject.stub(:wait_for_port)
       Spoon.should_receive(:spawnp).with( 'ruby',
         File.expand_path(File.join(File.dirname(__FILE__),
           %w{.. .. lib guard webrick server.rb})),
-        '127.0.2.5', '8080', '/tmp'
+        '127.0.2.5', '8080', 'true', '/tmp'
       )
       subject.start
     end
@@ -85,7 +101,7 @@ describe Guard::WEBrick do
       Spoon.should_receive(:spawnp).with( 'ruby',
         File.expand_path(File.join(File.dirname(__FILE__),
           %w{.. .. lib guard webrick server.rb})),
-        '0.0.0.0', '3000', Dir::pwd
+        '0.0.0.0', '3000', 'false', Dir::pwd
       )
       subject.start
     end
@@ -107,11 +123,18 @@ describe Guard::WEBrick do
       subject.start
     end
 
-    it "should open a web browser page" do
+    it "should open an HTTP web browser page" do
       Launchy.should_receive(:open).with("http://0.0.0.0:3000")
       subject.start
     end
 
+    it "should open an HTTPS web browser page" do
+      Launchy.should_receive(:open).with("https://0.0.0.0:3000")
+      subject = Guard::WEBrick.new([], { :ssl => true })
+      subject.stub(:wait_for_port)
+      subject.start
+    end
+
     it "should not open a web browser if disabled" do
       subject = Guard::WEBrick.new([], { :launchy => false })
       subject.stub(:wait_for_port)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-webrick
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Fletcher Nichol
@@ -15,44 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -06:00
-default_executable: 
+date: 2012-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: guard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ffi
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 2
+        version: 1.0.2
+  prerelease: false
+  requirement: *id001
   type: :runtime
-  version_requirements: *id002
+  name: guard
 - !ruby/object:Gem::Dependency 
-  name: spoon
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,44 +45,28 @@ dependencies:
         - 0
         - 1
         version: 0.0.1
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
+  requirement: *id002
   type: :runtime
-  version_requirements: *id004
+  name: spoon
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
+        - 2
         - 1
         - 0
-        - 10
-        version: 1.0.10
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
+        version: 2.1.0
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id003
+  type: :runtime
+  name: launchy
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,28 +77,28 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
+  prerelease: false
+  requirement: *id004
   type: :development
-  version_requirements: *id006
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
         - 0
-        - 2
+        - 7
         - 0
-        version: 0.2.0
+        version: 0.7.0
+  prerelease: false
+  requirement: *id005
   type: :development
-  version_requirements: *id007
+  name: guard-rspec
 - !ruby/object:Gem::Dependency 
-  name: guard-bundler
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,8 +109,10 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
+  prerelease: false
+  requirement: *id006
   type: :development
-  version_requirements: *id008
+  name: guard-bundler
 description: Guard::WEBrick automatically starts and restarts WEBrick when needed.
 email: 
 - fnichol@nichol.ca
@@ -171,7 +139,6 @@ files:
 - spec/guard/webrick/server_spec.rb
 - spec/guard/webrick_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/guard-webrick
 licenses: []
 
@@ -203,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard-webrick
-rubygems_version: 1.5.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Guard gem for WEBrick