guard-rack 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f3f1d76fdf26523714559cae171ecc150b07934
-  data.tar.gz: aee5f7a2b2bc99858dd5c3af575c9fc0273aeee1
+  metadata.gz: b49da0e890d6242a516c5c1205aaf14bbd44d45d
+  data.tar.gz: 9be5c0c5f25a654819c6b508ba0eebe29ffc9ec6
 SHA512:
-  metadata.gz: e63feae80068915a758a197805175537081922c869d3fc32871de6cb34c9874ced743e53f4c5febba1940296f95cdab8160f9922b57c4d4c91222b24d986b16f
-  data.tar.gz: f6485324937d2abd86589ef9d0092b98af7415b19fbab5253a05399e793f6d417decedfdad65f9d029674737d7b9acdb928d4824249597b147687b7478b5f6d8
+  metadata.gz: 7bbde5d25b4b00a0cead05ce62deea1ab1b2409f239d94a09463f56f1a08bc81149ffbab1c22c456806f285bd36c1c24da9b0941b72486f0f631856f2d67b3b2
+  data.tar.gz: f40a9827262d2280cf9804433e2dae808de16ef060b0c010b532f2057362fc27243bd9885abd9532386bb1e7ac40ce1e47e3cdff11850ae3f073cda76ae2d151

data/.rubocop.yml

@@ -3,19 +3,4 @@ AllCops:
     - vendor/**
     - bin/**
 
-LineLength:
-  Enabled: false
-
-MethodLength:
-  Enabled: false
-
-ClassLength:
-  Enabled: false
-
-Documentation:
-  # don't require classes to be documented
-  Enabled: false
-
-Encoding:
-  # no need to always specify encoding
-  Enabled: false
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,33 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-11-14 17:38:24 -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
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Max: 22
+
+# Offense count: 14
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 155
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 17
+
+# Offense count: 3
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: Exclude.
+Style/FileName:
+  Enabled: false
+
+# Offense count: 3
+Style/RegexpLiteral:
+  MaxSlashes: 0

data/.travis.yml

@@ -1,3 +1,15 @@
+language: ruby
+
 rvm:
+  - 2.1.2
   - 1.9.3
   - jruby-19mode
+  - ruby-head
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
+sudo: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+2.0.0 (11/15/2014)
+==================
+
+* Upgraded to Guard 2.x - [@jdurand](https://github.com/jdurand).
+* Upgraded RuboCop to 0.27.1 - [@dblock](https://github.com/dblock).
+* Upgraded RSpec to 3.x - [@dblock](https://github.com/dblock).
+
 1.4.0 (1/28/2014)
 =================
 

data/Gemfile

@@ -1,20 +1,16 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "guard"
-gem "ffi"
-gem "spoon"
+gemspec
+
+gem 'ffi'
+gem 'spoon'
+gem 'guard', '~> 2.3.0'
 
 group :development, :test do
-  gem "rake"
-  gem "bundler"
-  gem "rspec"
-  gem "guard-rspec"
-  gem "fakefs"
-  gem "mocha"
-  gem "rack"
+  gem 'guard-rspec', '~> 4.2.5'
   gem 'growl'
   gem 'rb-inotify', require: false
   gem 'rb-fsevent', require: false
   gem 'rb-fchange', require: false
-  gem 'rubocop'
+  gem 'rubocop', '0.27.1'
 end

data/Guardfile

@@ -1,5 +1,5 @@
-guard 'rspec', :version => 2 do
+guard 'rspec', version: 2 do
   watch(%r{^spec/.+_spec\.rb})
   watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { "spec" }
+  watch('spec/spec_helper.rb') { 'spec' }
 end

data/README.md

@@ -31,5 +31,5 @@ Copyright and License
 
 MIT License, see [LICENSE](http://github.com/dblock/guard-rack/raw/master/LICENSE.md) for details.
 
-(c) 2012 [Daniel Doubrovkine](http://github.com/dblock)
+(c) 2012-2014 [Daniel Doubrovkine](http://github.com/dblock) and [Contributors](https://github.com/dblock/guard-rack/graphs/contributors).
 

data/Rakefile

@@ -7,7 +7,7 @@ begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
@@ -21,7 +21,6 @@ end
 
 require 'rainbow/ext/string' unless String.respond_to?(:color)
 require 'rubocop/rake_task'
-Rubocop::RakeTask.new(:rubocop)
+RuboCop::RakeTask.new(:rubocop)
 
 task default: [:rubocop, :spec]
-

data/guard-rack.gemspec

@@ -2,29 +2,29 @@
 require File.expand_path('../lib/guard/rack/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Daniel Doubrovkine"]
+  gem.authors       = ['Daniel Doubrovkine']
 
-  gem.email         = ["dblock@dblock.org"]
-  gem.description   = "Automatically reloads your Rack based app on file change using Guard."
-  gem.homepage      = "https://github.com/dblock/guard-rack"
+  gem.email         = ['dblock@dblock.org']
+  gem.description   = 'Automatically reloads your Rack based app on file change using Guard.'
+  gem.homepage      = 'https://github.com/dblock/guard-rack'
   gem.summary       = gem.description
   gem.license       = 'MIT'
 
-  gem.name          = "guard-rack"
-  gem.require_paths = ["lib"]
+  gem.name          = 'guard-rack'
+  gem.require_paths = ['lib']
   gem.files         = `git ls-files`.split("\n")
   gem.version       = Guard::RackVersion::VERSION
 
-  gem.add_dependency "guard"
-  gem.add_dependency "ffi"
-  gem.add_dependency "spoon"
-  gem.add_dependency "rb-inotify"
-  gem.add_dependency "libnotify"
+  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"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "fakefs"
-  gem.add_development_dependency "mocha"
-  gem.add_development_dependency "rack"
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'fakefs'
+  gem.add_development_dependency 'mocha', '~> 1.1'
+  gem.add_development_dependency 'rack'
 end

data/lib/guard/rack.rb

@@ -1,23 +1,23 @@
 require 'guard'
-require 'guard/guard'
+require 'guard/plugin'
 require 'guard/rack/runner'
 require 'rbconfig'
 
 module Guard
-  class Rack < ::Guard::Guard
+  class Rack < ::Guard::Plugin
     attr_reader :options, :runner
 
     DEFAULT_OPTIONS = {
-        port: 9292,
-        environment: 'development',
-        start_on_start: true,
-        force_run: false,
-        timeout: 20,
-        debugger: false,
-        config: 'config.ru'
-      }
+      port: 9292,
+      environment: 'development',
+      start_on_start: true,
+      force_run: false,
+      timeout: 20,
+      debugger: false,
+      config: 'config.ru'
+    }
 
-    def initialize(watchers = [], options = {})
+    def initialize(options = {})
       super
       @options = DEFAULT_OPTIONS.merge(options)
       @runner = ::Guard::RackRunner.new(@options)
@@ -46,7 +46,7 @@ module Guard
       runner.stop
     end
 
-    def run_on_changes(paths)
+    def run_on_changes(_paths)
       reload
     end
   end

data/lib/guard/rack/runner.rb

@@ -37,7 +37,7 @@ module Guard
     private
 
     def build_rack_command
-      command = %w{rackup}
+      command = %w(rackup)
       command.push(
         options[:config],
         '--env', options[:environment].to_s,
@@ -90,7 +90,7 @@ module Guard
     end
 
     def unmanaged_pid
-      %x{lsof -n -i TCP:#{options[:port]}}.each_line do |line|
+      `lsof -n -i TCP:#{options[:port]}`.each_line do |line|
         return line.split("\s")[1].to_i if line["*:#{options[:port]} "]
       end
       nil

data/lib/guard/rack/templates/Guardfile

@@ -2,4 +2,3 @@ guard 'rack' do
   watch('Gemfile.lock')
   watch(%r{^(config|lib|app)/.*})
 end
-

data/lib/guard/rack/version.rb

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

data/spec/lib/guard/integration_spec.rb

@@ -8,10 +8,10 @@ describe 'Integration' do
   describe '#start' do
     context 'run' do
       it 'should run' do
-        runner.start.should be_true
+        expect(runner.start).to be_truthy
         pid = runner.pid
-        pid.should_not be_nil
-        Process.getpgid(pid).should be > 0
+        expect(pid).not_to be_nil
+        expect(Process.getpgid(pid)).to be > 0
         runner.stop
         expect do
           Process.getpgid(pid)

data/spec/lib/guard/rack_spec.rb

@@ -2,15 +2,14 @@ require 'spec_helper'
 require 'guard/rack'
 
 describe Guard::Rack do
-  let(:guard) { Guard::Rack.new(watchers, options) }
-  let(:watchers) { [] }
+  let(:guard) { Guard::Rack.new(options) }
   let(:options) { {} }
 
   describe '#initialize' do
     it 'should initialize with options' do
       guard
 
-      guard.runner.options[:port].should == 9292
+      expect(guard.runner.options[:port]).to eq(9292)
     end
   end
 

data/spec/lib/guard/runner_spec.rb

@@ -23,13 +23,13 @@ describe Guard::RackRunner do
       end
 
       it 'should not be nil' do
-        runner.pid.should == pid
+        expect(runner.pid).to eq(pid)
       end
     end
 
     context 'before running' do
       it 'should return nil' do
-        runner.pid.should be_nil
+        expect(runner.pid).to be_nil
       end
     end
   end
@@ -37,7 +37,7 @@ describe Guard::RackRunner do
   describe '#build_rack_command' do
     context 'no daemon' do
       it 'should not have a daemon switch' do
-        runner.send(:build_rack_command).should_not include('--daemonize')
+        expect(runner.send(:build_rack_command)).not_to include('--daemonize')
       end
     end
 
@@ -45,7 +45,7 @@ describe Guard::RackRunner do
       let(:options) { default_options.merge(daemon: true) }
 
       it 'should have a daemon switch' do
-        runner.send(:build_rack_command).should include('--daemonize')
+        expect(runner.send(:build_rack_command)).to include('--daemonize')
       end
     end
 
@@ -53,7 +53,7 @@ describe Guard::RackRunner do
       let(:options) { default_options.merge(debugger: true) }
 
       it 'should have a debugger switch' do
-        runner.send(:build_rack_command).should include('--debug')
+        expect(runner.send(:build_rack_command)).to include('--debug')
       end
     end
 
@@ -63,15 +63,15 @@ describe Guard::RackRunner do
       it 'should honour server switch' do
         command = runner.send(:build_rack_command)
         index = command.index('--server')
-        index.should be >= 0
-        command[index + 1].should == 'thin'
+        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
-          runner.send(:build_rack_command).should include('config.ru')
+          expect(runner.send(:build_rack_command)).to include('config.ru')
         end
       end
 
@@ -79,7 +79,7 @@ describe Guard::RackRunner do
         let(:options) { default_options.merge(config: 'config2.ru') }
         it 'should honour config option' do
           default_options.merge(config: 'config2.ru')
-          runner.send(:build_rack_command).should include('config2.ru')
+          expect(runner.send(:build_rack_command)).to include('config2.ru')
         end
       end
     end
@@ -101,7 +101,7 @@ describe Guard::RackRunner do
       end
 
       it 'should act properly' do
-        runner.start.should be_true
+        expect(runner.start).to be_truthy
       end
     end
 
@@ -114,7 +114,7 @@ describe Guard::RackRunner do
       end
 
       it 'should act properly' do
-        runner.start.should be_true
+        expect(runner.start).to be_truthy
       end
     end
   end
@@ -140,7 +140,7 @@ describe Guard::RackRunner do
         end
 
         it 'should return true' do
-          runner.stop.should be_true
+          expect(runner.stop).to be_truthy
         end
       end
 
@@ -152,7 +152,7 @@ describe Guard::RackRunner do
         end
 
         it 'should return false' do
-          runner.stop.should be_false
+          expect(runner.stop).to be_falsey
         end
 
         it 'should send some kind of message to UI.info' do
@@ -169,7 +169,7 @@ describe Guard::RackRunner do
         end
 
         it 'should return false' do
-          runner.stop.should be_false
+          expect(runner.stop).to be_falsey
         end
 
         it 'should send some kind of message to UI.info' do
@@ -181,7 +181,7 @@ describe Guard::RackRunner do
 
     context 'pid does not exist' do
       it 'should return true' do
-        runner.stop.should be_true
+        expect(runner.stop).to be_truthy
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,8 +2,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'guard-rack'
-require 'mocha_standalone'
+require 'mocha/api'
 
 RSpec.configure do |c|
   c.mock_with :mocha
+  c.raise_errors_for_deprecations!
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: guard-rack
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - .gitignore
 - .rspec
 - .rubocop.yml
+- .rubocop_todo.yml
 - .travis.yml
 - CHANGELOG.md
 - Gemfile