guard-rack 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b49da0e890d6242a516c5c1205aaf14bbd44d45d
-  data.tar.gz: 9be5c0c5f25a654819c6b508ba0eebe29ffc9ec6
+  metadata.gz: be1ee005670e98318b8fc1f54989a8396d3b05ba
+  data.tar.gz: 37507ca4a46c703f04d9548b3189f53e92525447
 SHA512:
-  metadata.gz: 7bbde5d25b4b00a0cead05ce62deea1ab1b2409f239d94a09463f56f1a08bc81149ffbab1c22c456806f285bd36c1c24da9b0941b72486f0f631856f2d67b3b2
-  data.tar.gz: f40a9827262d2280cf9804433e2dae808de16ef060b0c010b532f2057362fc27243bd9885abd9532386bb1e7ac40ce1e47e3cdff11850ae3f073cda76ae2d151
+  metadata.gz: 98780f4397b3f1ccb4ee6644faf3314ce4bac063cea5080a8582612437592f0004ae96bcbd637b1e77533d539c2f549b91812552d76a24727f662672f95e5716
+  data.tar.gz: 2b154ec06be93fae99db4e0ab3224905237351adbf80303a78b659c251fe343267366af07b45cbd9a7fb92106b4fe8c20a57af208ab287e4155ba4b62817d9dc

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-11-14 17:38:24 -0500 using RuboCop version 0.27.1.
+# on 2015-01-01 18:05:17 -0500 using RuboCop version 0.27.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -7,14 +7,14 @@
 
 # Offense count: 2
 Metrics/AbcSize:
-  Max: 22
+  Max: 25
 
 # Offense count: 14
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 155
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 17

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+2.1.0 (03/06/2015)
+============
+
+* [#17](https://github.com/dblock/guard-rack/pull/17): Added ability to specify host - [@jwhitcraft](https://github.com/jwhitcraft).
+* [#18](https://github.com/dblock/guard-rack/pull/18): Removed explicit dependencies on notification libraries, relying instead on Guard's default behavior - [@michaelherold](https://github.com/michaelherold).
+* [#19](https://github.com/dblock/guard-rack/pull/19): Added the ability to specify the command for mounting the Rack application - [@michaelherold](https://github.com/michaelherold).
+
 2.0.0 (11/15/2014)
 ==================
 

data/README.md

@@ -1,6 +1,11 @@
-Guard::Rack [![Build Status](https://secure.travis-ci.org/dblock/guard-rack.png?branch=master)](https://travis-ci.org/dblock/guard-rack)
+Guard::Rack
 ===========
 
+[![Gem Version](http://img.shields.io/gem/v/guard-rack.svg)](http://badge.fury.io/rb/guard-rack)
+[![Build Status](http://img.shields.io/travis/dblock/guard-rack.svg)](https://travis-ci.org/dblock/guard-rack)
+[![Dependency Status](https://gemnasium.com/dblock/guard-rack.svg)](https://gemnasium.com/dblock/guard-rack)
+[![Code Climate](https://codeclimate.com/github/dblock/guard-rack.svg)](https://codeclimate.com/github/dblock/guard-rack)
+
 Want to restart your Rack development with *rackup* whilst you work? Now you can!
 
     guard 'rack', :port => 9292 do
@@ -11,9 +16,11 @@ Want to restart your Rack development with *rackup* whilst you work? Now you can
 Options
 -------
 
-* `:port` is the port number to run on (default `9292`)
-* `:environment` is the environment to use (default `development`)
-* `:start_on_start` will start the server when starting Guard (default `true`)
+* `:cmd` is the command to run to mount the Rack application (default `rackup`).
+* `:host` is the host ip address to run on (default `0.0.0.0`).
+* `:port` is the port number to run on (default `9292`).
+* `:environment` is the environment to use (default `development`).
+* `:start_on_start` will start the server when starting Guard (default `true`).
 * `:force_run` kills any process that's holding open the listen port before attempting to (re)start Rack (default `false`).
 * `:daemon` runs the server as a daemon, without any output to the terminal that ran `guard` (default `false`).
 * `:debugger` runs the server with the debugger enabled (default `false`). Required ruby-debug gem.
@@ -31,5 +38,5 @@ Copyright and License
 
 MIT License, see [LICENSE](http://github.com/dblock/guard-rack/raw/master/LICENSE.md) for details.
 
-(c) 2012-2014 [Daniel Doubrovkine](http://github.com/dblock) and [Contributors](https://github.com/dblock/guard-rack/graphs/contributors).
+(c) 2012-2015 [Daniel Doubrovkine](http://github.com/dblock) and [Contributors](https://github.com/dblock/guard-rack/graphs/contributors).
 

data/RELEASING.md

@@ -0,0 +1,69 @@
+Releasing Guard-Rack
+====================
+
+There're no particular rules about when to release guard-rack. Release bug fixes frequenty, features not so frequently and breaking API changes rarely.
+
+### Release
+
+Run tests, check that all tests succeed locally.
+
+```
+bundle install
+rake
+```
+
+Check that the last build succeeded in [Travis CI](https://travis-ci.org/dblock/guard-rack) for all supported platforms.
+
+Increment the version, modify [lib/guard/rack/version.rb](lib/guard/rack/version.rb).
+
+*  Increment the third number if the release has bug fixes and/or very minor features, only (eg. change `0.5.1` to `0.5.2`).
+*  Increment the second number if the release contains major features or breaking API changes (eg. change `0.5.1` to `0.2.0`).
+
+Change "Next Release" in [CHANGELOG.md](CHANGELOG.md) to the new version.
+
+```
+0.2.0 (2014-01-27)
+==================
+```
+
+Remove the line with "Your contribution here.", since there will be no more contributions to this release.
+
+Commit your changes.
+
+```
+git add CHANGELOG.md lib/guard/rack/version.rb
+git commit -m "Preparing for release, 0.2.0."
+git push origin master
+```
+
+Release.
+
+```
+$ rake release
+
+guard-rack 0.2.0 built to pkg/guard-rack-0.2.0.gem.
+Tagged v0.2.0.
+Pushed git commits and tags.
+Pushed guard-rack 0.2.0 to rubygems.org.
+```
+
+### Prepare for the Next Version
+
+Add the next release to [CHANGELOG.md](CHANGELOG.md).
+
+```
+Next Release
+============
+
+* Your contribution here.
+```
+
+Increment the minor version, modify [lib/guard/rack/version.rb](lib/guard/rack/version.rb).
+
+Comit your changes.
+
+```
+git add CHANGELOG.md lib/guard/rack/version.rb
+git commit -m "Preparing for next release, 0.2.1."
+git push origin master
+```

data/guard-rack.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'guard', '~> 2.3'
   gem.add_dependency 'ffi'
   gem.add_dependency 'spoon'
-  gem.add_dependency 'rb-inotify'
-  gem.add_dependency 'libnotify'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'bundler'

data/lib/guard/rack.rb

@@ -9,12 +9,14 @@ module Guard
 
     DEFAULT_OPTIONS = {
       port: 9292,
+      host: '0.0.0.0',
       environment: 'development',
       start_on_start: true,
       force_run: false,
       timeout: 20,
       debugger: false,
-      config: 'config.ru'
+      config: 'config.ru',
+      cmd: 'rackup'
     }
 
     def initialize(options = {})

data/lib/guard/rack/command.rb

@@ -0,0 +1,64 @@
+require 'guard/rack'
+
+module Guard
+  class Rack < Plugin
+    class Command < String
+      attr_reader :options
+
+      def initialize(options = {})
+        @options = options
+        super(build.join(' '))
+      end
+
+      private
+
+      def build
+        cmd = [options[:cmd]]
+
+        cmd << configuration
+        cmd << environment
+        cmd << host
+        cmd << port
+        cmd << daemon
+        cmd << debug
+        cmd << server
+
+        cmd.flatten.compact
+      end
+
+      def configuration
+        [options[:config]]
+      end
+
+      def daemon
+        return unless options[:daemon]
+
+        ['--daemonize', options[:daemon]]
+      end
+
+      def debug
+        return unless options[:debugger]
+
+        ['--debug', options[:debugger]]
+      end
+
+      def environment
+        ['--env', options[:environment]]
+      end
+
+      def host
+        ['--host', options[:host]]
+      end
+
+      def port
+        ['--port', options[:port]]
+      end
+
+      def server
+        return unless options[:server]
+
+        ['--server', options[:server]]
+      end
+    end
+  end
+end

data/lib/guard/rack/runner.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'timeout'
 require 'spoon'
+require 'guard/rack/command'
 
 module Guard
   class RackRunner
@@ -36,21 +37,6 @@ module Guard
 
     private
 
-    def build_rack_command
-      command = %w(rackup)
-      command.push(
-        options[:config],
-        '--env', options[:environment].to_s,
-        '--port', options[:port].to_s
-      )
-
-      command << '--daemonize' if options[:daemon]
-      command << '--debug' if options[:debugger]
-      command.push('--server', options[:server].to_s) if options[:server]
-
-      command
-    end
-
     def kill(pid, force = false)
       result = -1
 
@@ -75,8 +61,8 @@ module Guard
     end
 
     def run_rack_command!
-      command = build_rack_command
-      UI.debug("Running Rack with command: #{command.inspect}")
+      command = Guard::Rack::Command.new(options)
+      UI.debug("Running Rack with command: #{command}")
       spawn(*command)
     end
 

data/lib/guard/rack/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RackVersion
-    VERSION = '2.0.0'
+    VERSION = '2.1.0'
   end
 end

data/spec/lib/guard/integration_spec.rb

@@ -3,7 +3,7 @@ require 'guard/rack/runner'
 
 describe 'Integration' do
   let(:runner) { Guard::RackRunner.new(options) }
-  let(:options) { { environment: 'development', port: 3000, config: 'spec/lib/guard/integration.ru' } }
+  let(:options) { { cmd: 'rackup', environment: 'development', port: 3000, config: 'spec/lib/guard/integration.ru' } }
 
   describe '#start' do
     context 'run' do

data/spec/lib/guard/rack/command_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe Guard::Rack::Command do
+  let(:default_options) do
+    { cmd: 'rackup', environment: 'development', host: '0.0.0.0',
+      port: 3000, config: 'config.ru' }
+  end
+  let(:options) { default_options }
+  let(:command) { Guard::Rack::Command.new(options) }
+
+  describe '.initialize' do
+    subject { command }
+
+    it { is_expected.to start_with('rackup') }
+    it { is_expected.to include('config.ru') }
+    it { is_expected.to include('--env development') }
+    it { is_expected.to include('--host 0.0.0.0') }
+    it { is_expected.to include('--port 3000') }
+    it { is_expected.not_to include('--daemonize') }
+    it { is_expected.not_to include('--debug') }
+    it { is_expected.not_to include('--server') }
+
+    context 'with a custom command configuration' do
+      let(:options) { default_options.merge(cmd: 'bundle exec rackup') }
+
+      it { is_expected.to start_with('bundle exec rackup') }
+    end
+
+    context 'with a daemon configuration' do
+      let(:options) { default_options.merge(daemon: true) }
+
+      it { is_expected.to include('--daemonize') }
+    end
+
+    context 'with a debugger configuration' do
+      let(:options) { default_options.merge(debugger: true) }
+
+      it { is_expected.to include('--debug') }
+    end
+
+    context 'with an environment configuration' do
+      let(:options) { default_options.merge(environment: 'custom') }
+
+      it { is_expected.to include('--env custom') }
+    end
+
+    context 'with a server configuration' do
+      let(:options) { default_options.merge(server: 'thin') }
+
+      it { is_expected.to include('--server thin') }
+    end
+
+    context 'with a custom config file configuration' do
+      let(:options) { default_options.merge(config: 'config2.ru') }
+
+      it { is_expected.to include('config2.ru') }
+    end
+  end
+end

data/spec/lib/guard/runner_spec.rb

@@ -6,7 +6,7 @@ describe Guard::RackRunner do
   let(:environment) { 'development' }
   let(:port) { 3000 }
 
-  let(:default_options) { { environment: environment, port: port, config: 'config.ru' } }
+  let(:default_options) { { environment: environment, port: port, config: 'config.ru', host: '0.0.0.0' } }
   let(:options) { default_options }
 
   before do
@@ -34,57 +34,6 @@ describe Guard::RackRunner do
     end
   end
 
-  describe '#build_rack_command' do
-    context 'no daemon' do
-      it 'should not have a daemon switch' do
-        expect(runner.send(:build_rack_command)).not_to include('--daemonize')
-      end
-    end
-
-    context 'daemon' do
-      let(:options) { default_options.merge(daemon: true) }
-
-      it 'should have a daemon switch' do
-        expect(runner.send(:build_rack_command)).to include('--daemonize')
-      end
-    end
-
-    context 'debugger' do
-      let(:options) { default_options.merge(debugger: true) }
-
-      it 'should have a debugger switch' do
-        expect(runner.send(:build_rack_command)).to include('--debug')
-      end
-    end
-
-    context 'server' do
-      let(:options) { default_options.merge(server: 'thin') }
-
-      it 'should honour server switch' do
-        command = runner.send(:build_rack_command)
-        index = command.index('--server')
-        expect(index).to be >= 0
-        expect(command[index + 1]).to eq('thin')
-      end
-    end
-
-    context 'config file' do
-      context 'default' do
-        it 'should default to config.ru' do
-          expect(runner.send(:build_rack_command)).to include('config.ru')
-        end
-      end
-
-      context 'custom' do
-        let(:options) { default_options.merge(config: 'config2.ru') }
-        it 'should honour config option' do
-          default_options.merge(config: 'config2.ru')
-          expect(runner.send(:build_rack_command)).to include('config2.ru')
-        end
-      end
-    end
-  end
-
   describe '#start' do
     let(:unmanaged_pid) { 4567 }
     let(:pid) { 1234 }
@@ -120,7 +69,6 @@ describe Guard::RackRunner do
   end
 
   describe '#stop' do
-
     context 'pid exists' do
       let(:pid) { 12_345 }
       let(:status_stub) { stub('process exit status') }

metadata

@@ -1,167 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: guard-rack
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: spoon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: bundler
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   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: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rack
   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'
 description: Automatically reloads your Rack based app on file change using Guard.
@@ -171,25 +143,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.md
 - README.md
+- RELEASING.md
 - Rakefile
 - guard-rack.gemspec
 - lib/guard-rack.rb
 - lib/guard/rack.rb
+- lib/guard/rack/command.rb
 - lib/guard/rack/runner.rb
 - lib/guard/rack/templates/Guardfile
 - lib/guard/rack/version.rb
 - spec/lib/guard/integration.ru
 - spec/lib/guard/integration_spec.rb
+- spec/lib/guard/rack/command_spec.rb
 - spec/lib/guard/rack_spec.rb
 - spec/lib/guard/runner_spec.rb
 - spec/spec_helper.rb
@@ -203,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Automatically reloads your Rack based app on file change using Guard.