guard-puma 0.0.2 → 0.0.3

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .rbx/
+.rvmrc

data/.travis.yml

@@ -3,3 +3,5 @@ rvm:
   - 1.9.3
   - rbx-19mode
   - rbx-18mode
+  - jruby-19mode
+  - jruby-18mode

data/README.md

@@ -25,7 +25,7 @@ Or install it yourself as:
 ```ruby
 guard 'puma', :port => 4000 do
   watch('Gemfile.lock')
-  watch(%r{^config|lib|app/.*})
+  watch(%r{^config|lib/.*})
 end
 ```
 
@@ -38,11 +38,18 @@ end
 * `: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.
 * `:timeout` waits this number of seconds when restarting the Puma server before reporting there's a problem (default `20`).
+* `:config` is the path to Puma config file (optional)
+* `:bind` is URI to bind to (tcp:// and unix:// only) (optional)
+* `:state` is the path to store the state details (optional)
+* `:control` is the bind URL to use for the control server. Use 'auto' to use temp unix server (optional)
+* `:control_token` is the token to use as authentication for the control server(optional)
+* `:threads` is the min:max number of threads to use. Defaults to 0:16 (optional)
 
 ## Contributing
 
 1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+1. Create your feature branch (`git checkout -b my-new-feature`)
+1. Leave the version alone!
+1. Commit your changes (`git commit -am 'Added some feature'`)
+1. Push to the branch (`git push origin my-new-feature`)
+1. Create new Pull Request

data/lib/guard/puma/runner.rb

@@ -13,7 +13,7 @@ module Guard
 
     def start
       kill_unmanaged_pid! if options[:force_run]
-      run_rack_command!
+      run_puma_command!
       wait_for_pid
     end
 
@@ -30,14 +30,18 @@ module Guard
       start
     end
 
-    def build_rack_command
-      rack_options = [
-        '--port', options[:port],
-        '--pid', pid_file,
-        '-s', 'puma'
-      ]
+    def build_puma_command
+      puma_options = {
+        '--port' => options[:port],
+        '--pidfile' => pid_file,
+      }
+      [:config, :bind, :state, :control, :threads].each do |opt|
+        puma_options["--#{opt}"] = options[opt] if options[opt]
+      end
+      puma_options["--control-token"] = options[:control_token] if options[:control_token]
+      opts = puma_options.to_a.flatten << '-q'
 
-      %{sh -c 'cd #{Dir.pwd} && rackup #{rack_options.join(' ')} &'}
+      %{sh -c 'cd #{Dir.pwd} && puma #{opts.join(' ')} &'}
     end
 
     def pid_file
@@ -54,8 +58,8 @@ module Guard
 
     private
     
-    def run_rack_command!
-      system build_rack_command
+    def run_puma_command!
+      system build_puma_command
     end
 
     def has_pid?

data/lib/guard/puma/templates/Guardfile

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

data/lib/guard/puma/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PumaVersion
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

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

@@ -5,7 +5,7 @@ require 'fakefs/spec_helpers'
 describe Guard::PumaRunner do
   let(:runner) { Guard::PumaRunner.new(options) }
   let(:environment) { 'development' }
-  let(:port) { 3000 }
+  let(:port) { 4000 }
   
   let(:default_options) { { :environment => environment, :port => port } }
   let(:options) { default_options }
@@ -42,7 +42,7 @@ describe Guard::PumaRunner do
     let(:pid_stub) { runner.stubs(:has_pid?) }
 
     before do
-      runner.expects(:run_rack_command!).once
+      runner.expects(:run_puma_command!).once
     end
 
     context 'do not force run' do
@@ -92,4 +92,57 @@ describe Guard::PumaRunner do
       runner.sleep_time.should == (timeout.to_f / Guard::PumaRunner::MAX_WAIT_COUNT.to_f)
     end
   end
+
+  describe "#build_puma_command" do
+    let(:command) {
+      Guard::PumaRunner.new(options).build_puma_command
+    }
+    context "with config" do
+      let(:options) {{ :config => path }}
+      let(:path) { "/tmp/elephants" }
+      it "adds path to command" do
+        command.should match("--config #{path}")
+      end
+    end
+
+    context "with bind" do
+      let(:options) {{ :bind => uri }}
+      let(:uri) { "tcp://foo" }
+      it "adds uri option to command" do
+        command.should match("--bind #{uri}")
+      end
+    end
+
+    context "with state" do
+      let(:options) {{ :state => path }}
+      let(:path) { "/tmp/zebras" }
+      it "adds path to command" do
+        command.should match("--state #{path}")
+      end
+    end
+
+    context "with control" do
+      let(:options) {{ :control => uri }}
+      let(:uri) { "http://foo" }
+      it "adds path to command" do
+        command.should match("--control #{uri}")
+      end
+    end
+
+    context "with control_token" do
+      let(:options) {{ :control_token => token }}
+      let(:token) { "IMMA_TOKEN" }
+      it "adds path to command" do
+        command.should match("--control-token #{token}")
+      end
+    end
+
+    context "with threads" do
+      let(:options) {{ :threads => threads }}
+      let(:threads) { "13:42" }
+      it "adds path to command" do
+        command.should match("--threads #{threads}")
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-puma
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,116 +9,116 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
-  requirement: &5800 !ruby/object:Gem::Requirement
+  requirement: &6060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
-  version_requirements: *5800
+  version_requirements: *6060
   name: guard
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :runtime
-  requirement: &5856 !ruby/object:Gem::Requirement
+  requirement: &6116 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: *5856
+  version_requirements: *6116
   name: rb-inotify
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :runtime
-  requirement: &5900 !ruby/object:Gem::Requirement
+  requirement: &6160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: *5900
+  version_requirements: *6160
   name: libnotify
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :runtime
-  requirement: &5944 !ruby/object:Gem::Requirement
+  requirement: &6204 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: *5944
+  version_requirements: *6204
   name: puma
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :development
-  requirement: &5988 !ruby/object:Gem::Requirement
+  requirement: &6248 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2.2
-  version_requirements: *5988
+  version_requirements: *6248
   name: rake
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :development
-  requirement: &6032 !ruby/object:Gem::Requirement
+  requirement: &6292 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.9.0
-  version_requirements: *6032
+  version_requirements: *6292
   name: rspec
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :development
-  requirement: &6076 !ruby/object:Gem::Requirement
+  requirement: &6336 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
-  version_requirements: *6076
+  version_requirements: *6336
   name: guard-rspec
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :development
-  requirement: &6120 !ruby/object:Gem::Requirement
+  requirement: &6380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-  version_requirements: *6120
+  version_requirements: *6380
   name: bundler
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :development
-  requirement: &6164 !ruby/object:Gem::Requirement
+  requirement: &6424 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: *6164
+  version_requirements: *6424
   name: fakefs
   prerelease: false
 - !ruby/object:Gem::Dependency
   type: :development
-  requirement: &6208 !ruby/object:Gem::Requirement
+  requirement: &6468 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: *6208
+  version_requirements: *6468
   name: mocha
   prerelease: false
 description: