guard-puma 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 036598d285f6aa1103ccf4e48abb0c58e66530c1
-  data.tar.gz: 1ebf5c56e2076d16d9aacb1f7bfe0cf37957ae3c
+  metadata.gz: f82c7f0d0161b84644bcc3cc3ad5c3ae7bdeef03
+  data.tar.gz: 862bc63da4eecb9d3715639c72827f13bde94bf0
 SHA512:
-  metadata.gz: 83f78820ab526fd80559a5db1626934b5f39731353970cd24527edc5a0e23a6e8d11858392311b7e3512064033be3389dcf31395deaa6eb62716d65928cf00b8
-  data.tar.gz: 7e72cb3b760f031f1a8044c5dd916faa8afde30d6454284933ecbf19932b427d0997a4502854dc9a766cdf5ada043fee6d174df1406d264d812b4a854bc0dab3
+  metadata.gz: 312508f7cfaecb959ab5d093298d2da205f6da13c15f474df40ea9f6fb199c2bc86db9202f41470fa2b1bcde306ab6476ea3eb5ee9ad1c74c0a38d78217a2b74
+  data.tar.gz: 87130577132cd45658b41b4e2502ca3a68edf135b2f20c0c36008957545321d2d65c95595e8e3d07b0349303d8d794427edf5bf11c49137aac0110438981f91b

data/.travis.yml

@@ -1,7 +1,7 @@
+sudo: false
 language: ruby
 rvm:
   - 1.9.3
-  - 2.1.2
+  - 2.2.3
   - rbx-2
-  - jruby-19mode
-install: bundle install --retry=3
+  - jruby-9.0.0.0

data/CHANGES.md

@@ -1,5 +1,8 @@
 # Changes
 
+* Update Guardfile to support new options
+* Let --config take precedence over default options
+
 ## 0.3.1
 
 * Update RSpec to 3.1.0+

data/Guardfile

@@ -1,7 +1,13 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', version: 2, cli: '--colour', focus: true, all_on_start: false, all_after_pass: false, keep_failed: false do
+guard 'rspec', {
+      cmd: 'bundle exec rspec',
+      cmd_additional_args: '--colour',
+      focus: true,
+      all_on_start: false,
+      all_after_pass: false,
+      failed_mode: :none } do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/guard-puma.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Guard::PumaVersion::VERSION
   gem.add_dependency              "guard", "~> 2.8"
+  gem.add_dependency              "guard-compat", "~> 1.0"
   gem.add_dependency              "puma"
   gem.add_development_dependency  "rake", "~> 10.2"
   gem.add_development_dependency  "rspec", "~> 3.1.0"

data/lib/guard/puma.rb

@@ -3,6 +3,7 @@ require "guard/plugin"
 require "guard/puma/runner"
 require "rbconfig"
 require "guard/puma/version"
+require "guard/compat/plugin"
 
 module Guard
   class Puma < Plugin

data/lib/guard/puma/runner.rb

@@ -15,13 +15,19 @@ module Guard
       @quiet = options.delete(:quiet) { true }
       @options = options
 
-      puma_options = {
-        '--port' => options[:port],
-        '--control-token' => @control_token,
-        '--control' => "tcp://#{@control_url}",
-        '--environment' => options[:environment]
-      }
-      [:config, :bind, :threads].each do |opt|
+      if options[:config]
+        puma_options = {
+          '--config' => options[:config]
+        }
+      else
+        puma_options = {
+          '--port' => options[:port],
+          '--control-token' => @control_token,
+          '--control' => "tcp://#{@control_url}",
+          '--environment' => options[:environment]
+        }
+      end
+      [:bind, :threads].each do |opt|
         puma_options["--#{opt}"] = options[opt] if options[opt]
       end
       puma_options = puma_options.to_a.flatten
@@ -46,7 +52,7 @@ module Guard
     end
 
     private
-    
+
     def run_puma_command!(cmd)
       Net::HTTP.get build_uri(cmd)
       return true

data/lib/guard/puma/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PumaVersion
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/spec/lib/guard/puma/runner_spec.rb

@@ -5,7 +5,7 @@ describe Guard::PumaRunner do
   let(:runner) { Guard::PumaRunner.new(options) }
   let(:environment) { 'development' }
   let(:port) { 4000 }
-  
+
   let(:default_options) { { :environment => environment, :port => port } }
   let(:options) { default_options }
 
@@ -14,7 +14,7 @@ describe Guard::PumaRunner do
       expect(runner.options).to eq(options)
     end
   end
-  
+
   %w(halt restart).each do |cmd|
     describe cmd do
       before do
@@ -27,7 +27,7 @@ describe Guard::PumaRunner do
       end
     end
   end
-  
+
 
   describe '#sleep_time' do
     let(:timeout) { 30 }
@@ -48,6 +48,13 @@ describe Guard::PumaRunner do
       it "adds path to command" do
         expect(runner.cmd_opts).to match("--config #{path}")
       end
+
+      context "and additional options" do
+        let(:options) {{ :config => path, :port => "4000", quiet: false }}
+        it "assumes options are set in config" do
+          expect(runner.cmd_opts).to eq("--config #{path}")
+        end
+      end
     end
 
     context "with bind" do

data/spec/lib/guard/puma_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'guard/puma'
+require 'guard/compat/test/helper'
 
 describe Guard::Puma do
   let(:guard) { Guard::Puma.new(options) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-puma
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jesse Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: guard-compat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Restart puma when files change