guard-puma 0.1.0 → 0.2.0

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 0.2.0
+
+* Switched to puma's control server. pid file was too messy.
+
 ## 0.1.0
 
 * Fixed pid file path. Ready for general consumption.

data/README.md

@@ -39,11 +39,9 @@ end
 * `: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 the Puma config file (optional)
-* `:pidfile`` is the path to store the pid 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)
+* `:control_port` is the port to use for the control server(optional)
 * `:threads` is the min:max number of threads to use. Defaults to 0:16 (optional)
 
 ## Contributing

data/guard-puma.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency              "puma"
   gem.add_development_dependency  "rake", "~> 0.9.2.2"
   gem.add_development_dependency  "rspec", "~> 2.9.0"
-  gem.add_development_dependency  "guard-rspec", "~> 0.6.0"
+  gem.add_development_dependency  "guard-rspec", "~> 0.7.0"
   gem.add_development_dependency  "bundler", "~> 1.1.0"
   gem.add_development_dependency  "fakefs"
-  gem.add_development_dependency  "mocha"
 end

data/lib/guard/puma.rb

@@ -21,17 +21,18 @@ module Guard
       @options = DEFAULT_OPTIONS.merge(options)
       @runner = ::Guard::PumaRunner.new(@options)
     end
-def start
+
+    def start
       server = options[:server] ? "#{options[:server]} and " : ""
-      UI.info "Guard::Puma will now restart your app on port #{options[:port]} using #{server}#{options[:environment]} environment."
-      reload if options[:start_on_start]
+      UI.info "Guard::Puma will now start your app on port #{options[:port]} using #{server}#{options[:environment]} environment."
+      runner.start if options[:start_on_start]
     end
 
     def reload
       UI.info "Restarting Puma..."
       Notifier.notify("Puma restarting on port #{options[:port]} in #{options[:environment]} environment...", :title => "Restarting Puma...", :image => :pending)
       if runner.restart
-        UI.info "Puma restarted, pid #{runner.pid}"
+        UI.info "Puma restarted"
         Notifier.notify("Puma restarted on port #{options[:port]}.", :title => "Puma restarted!", :image => :success)
       else
         UI.info "Puma NOT restarted, check your log files."
@@ -41,7 +42,7 @@ def start
 
     def stop
       Notifier.notify("Until next time...", :title => "Puma shutting down.", :image => :pending)
-      runner.stop
+      runner.halt
     end
 
     def run_on_change(paths)

data/lib/guard/puma/runner.rb

@@ -1,58 +1,40 @@
-require 'fileutils'
-require 'tmpdir'
+require 'net/http'
 
 module Guard
   class PumaRunner
 
     MAX_WAIT_COUNT = 20
 
-    attr_reader :options
+    attr_reader :options, :control_url, :control_token
 
     def initialize(options)
+      @control_token = (options.delete(:control_token) || 'pumarules')
+      @control = "0.0.0.0"
+      @control_port = (options.delete(:control_port) || '9293')
+      @control_url = "#{@control}:#{@control_port}"
       @options = options
     end
 
     def start
-      kill_unmanaged_pid! if options[:force_run]
-      run_puma_command!
-      wait_for_pid
-    end
-
-    def stop
-      if File.file?(pid_file)
-        system %{kill -KILL #{File.read(pid_file).strip}}
-        wait_for_no_pid if $?.exitstatus == 0
-        FileUtils.rm pid_file
-      end
-    end
-
-    def restart
-      stop
-      start
-    end
-
-    def build_puma_command
       puma_options = {
         '--port' => options[:port],
-        '--pidfile' => pid_file,
+        '--control-token' => @control_token,
+        '--control' => "tcp://#{@control_url}"
       }
-      [:config, :bind, :state, :control, :threads].each do |opt|
+      [:config, :bind, :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} && puma #{opts.join(' ')} &'}
     end
 
-    def pid_file
-      pidfilepath = File.expand_path(options[:pidfile]) if options[:pidfile]
-      @pf ||= (pidfilepath || \
-               File.expand_path("#{Dir.tmpdir}/guard-puma-#{options[:environment]}.pid"))
+    def halt
+      run_puma_command!("halt")
     end
 
-    def pid
-      File.file?(pid_file) ? File.read(pid_file).to_i : nil
+    def restart
+      run_puma_command!("restart")
     end
 
     def sleep_time
@@ -61,54 +43,14 @@ module Guard
 
     private
     
-    def run_puma_command!
-      system build_puma_command
-    end
-
-    def has_pid?
-      File.file?(pid_file)
-    end
-
-    def wait_for_pid_action
-      sleep sleep_time
-    end
-
-    def kill_unmanaged_pid!
-      if pid = unmanaged_pid
-        system %{kill -KILL #{pid}}
-        FileUtils.rm pid_file
-        wait_for_no_pid
-      end
+    def run_puma_command!(cmd)
+      Net::HTTP.get((build_uri(cmd)))
     end
 
-    def unmanaged_pid
-      %x{lsof -n -i TCP:#{options[:port]}}.each_line { |line|
-        if line["*:#{options[:port]} "]
-          return line.split("\s")[1]
-        end
-      }
-      nil
+    def build_uri(cmd)
+      URI("http://#{control_url}/#{cmd}?token=#{control_token}")
     end
 
-    private
-
-      def wait_for_pid
-        wait_for_pid_loop
-      end
-
-      def wait_for_no_pid
-        wait_for_pid_loop(false)
-      end
-
-      def wait_for_pid_loop(check_for_existence = true)
-        count = 0
-        while !(check_for_existence ? has_pid? : !has_pid?) && count < MAX_WAIT_COUNT
-          wait_for_pid_action
-          count += 1
-        end
-        !(count == MAX_WAIT_COUNT)
-      end
-      
   end
 end
 

data/lib/guard/puma/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module PumaVersion
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

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

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'guard/puma/runner'
-require 'fakefs/spec_helpers'
 
 describe Guard::PumaRunner do
   let(:runner) { Guard::PumaRunner.new(options) }
@@ -9,80 +8,26 @@ describe Guard::PumaRunner do
   
   let(:default_options) { { :environment => environment, :port => port } }
   let(:options) { default_options }
-  
-  describe '#pid' do
-    include FakeFS::SpecHelpers
-
-    context 'pid file exists' do
-      let(:pid) { 12345 }
-
-      before do
-        FileUtils.mkdir_p File.split(runner.pid_file).first
-        File.open(runner.pid_file, 'w') { |fh| fh.print pid }
-      end
 
-      it "reads the pid" do
-        runner.pid.should == pid
-      end
-    end
-
-    context 'pid file does not exist' do
-      it "returns nil" do
-        if defined?(Rubinius)
-          runner.pid.should == nil
-        else
-          runner.pid.should be_nil
-        end
-      end
+  describe "#initialize" do
+    it "sets options" do
+      runner.options.should eq(options)
     end
   end
-
-  describe '#start' do
-    let(:kill_expectation) { runner.expects(:kill_unmanaged_pid!) }
-    let(:pid_stub) { runner.stubs(:has_pid?) }
-
-    before do
-      runner.expects(:run_puma_command!).once
-    end
-
-    context 'do not force run' do
-      before do
-        pid_stub.returns(true)
-        kill_expectation.never
-        runner.expects(:wait_for_pid_action).never
-      end
-
-      it "acts properly" do
-        runner.start.should be_true
-      end
-    end
-
-    context 'force run' do
-      let(:options) { default_options.merge(:force_run => true) }
-
-      before do
-        pid_stub.returns(true)
-        kill_expectation.once
-        runner.expects(:wait_for_pid_action).never
-      end
-
-      it "acts properly" do
-        runner.start.should be_true
-      end
-    end
-
-    context "don't write the pid" do
+  
+  %w(halt restart).each do |cmd|
+    describe cmd do
       before do
-        pid_stub.returns(false)
-        kill_expectation.never
-        runner.expects(:wait_for_pid_action).times(Guard::PumaRunner::MAX_WAIT_COUNT)
+        runner.stub(:build_uri).with(cmd).and_return(uri)
       end
-
-      it "acts properly" do
-        runner.start.should be_false
+      let(:uri) { URI("http://#{runner.control_url}/#{cmd}?token=#{runner.control_token}") }
+      it "#{cmd}s" do
+        Net::HTTP.should_receive(:get).with(uri).once
+        runner.send(cmd.intern)
       end
     end
   end
+  
 
   describe '#sleep_time' do
     let(:timeout) { 30 }
@@ -94,9 +39,8 @@ describe Guard::PumaRunner do
   end
 
   describe "#build_puma_command" do
-    let(:command) {
-      Guard::PumaRunner.new(options).build_puma_command
-    }
+    let(:command) { Guard::PumaRunner.new(options).start }
+
     context "with config" do
       let(:options) {{ :config => path }}
       let(:path) { "/tmp/elephants" }
@@ -113,22 +57,6 @@ describe Guard::PumaRunner do
       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" }

data/spec/lib/guard/puma_spec.rb

@@ -15,12 +15,10 @@ describe Guard::Puma do
   end
 
   describe '#start' do
-    let(:ui_expectation) { Guard::UI.expects(:info).with(regexp_matches(/#{Guard::Puma::DEFAULT_OPTIONS[:port]}/)) }
 
     context 'start on start' do
-      it "shows the right message and run startup" do
-        guard.expects(:reload).once
-        ui_expectation
+      it "runs startup" do
+        guard.should_receive(:start).once
         guard.start
       end
     end
@@ -29,62 +27,42 @@ describe Guard::Puma do
       let(:options) { { :start_on_start => false } }
 
       it "shows the right message and not run startup" do
-        guard.expects(:reload).never
-        ui_expectation
+        guard.runner.should_receive(:start).never
         guard.start
       end
     end
   end
 
   describe '#reload' do
-    let(:pid) { '12345' }
 
     before do
-      Guard::UI.expects(:info).with('Restarting Puma...')
-      Guard::Notifier.expects(:notify).with(regexp_matches(/Puma restarting/), has_entry(:image => :pending))
-      Guard::PumaRunner.any_instance.stubs(:pid).returns(pid)
+      Guard::UI.should_receive(:info).with('Restarting Puma...')
+      Guard::Notifier.should_receive(:notify).with(/Puma restarting/, hash_including(:image => :pending))
+      guard.runner.stub(:restart).and_return(true)
     end
 
-    let(:runner_stub) { Guard::PumaRunner.any_instance.stubs(:restart) }
+    let(:runner_stub) { Guard::PumaRunner.any_instance.stub(:halt) }
 
-    context 'with pid file' do
-      before do
-        runner_stub.returns(true)
-      end
-
-      it "restarts and show the pid file" do
-        Guard::UI.expects(:info).with(regexp_matches(/#{pid}/))
-        Guard::Notifier.expects(:notify).with(regexp_matches(/Puma restarted/), has_entry(:image => :success))
+    it "restarts and show the message" do
+      Guard::UI.should_receive(:info)
+      Guard::Notifier.should_receive(:notify).with(/Puma restarted/, hash_including(:image => :success))
 
-        guard.reload
-      end
+      guard.reload
     end
 
-    context 'no pid file' do
-      before do
-        runner_stub.returns(false)
-      end
-
-      it "restarts and show the pid file" do
-        Guard::UI.expects(:info).with(regexp_matches(/#{pid}/)).never
-        Guard::UI.expects(:info).with(regexp_matches(/Puma NOT restarted/))
-        Guard::Notifier.expects(:notify).with(regexp_matches(/Puma NOT restarted/), has_entry(:image => :failed))
-
-        guard.reload
-      end
-    end
   end
 
   describe '#stop' do
     it "stops correctly" do
-      Guard::Notifier.expects(:notify).with('Until next time...', anything)
+      Guard::Notifier.should_receive(:notify).with('Until next time...', anything)
+      guard.runner.should_receive(:halt).once
       guard.stop
     end
   end
 
   describe '#run_on_change' do
     it "reloads on change" do
-      guard.expects(:reload).once
+      guard.should_receive(:reload).once
       guard.run_on_change([])
     end
   end

data/spec/spec_helper.rb

@@ -6,11 +6,10 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 ENV["GUARD_ENV"] = 'test'
 require 'rspec'
-require 'mocha'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-  config.mock_with :mocha
+  config.mock_with :rspec
 end

metadata

@@ -1,176 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: guard-puma
 version: !ruby/object:Gem::Version
-  version: 0.1.0
   prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Jesse Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &6804 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  name: guard
+  requirement: *6804
 - !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &6860 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rb-inotify
+  requirement: *6860
+- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: &6904 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: libnotify
+  requirement: *6904
+- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: &6948 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  name: puma
+  requirement: *6948
+- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: &6992 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: *6992
+- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: &7036 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+  name: rspec
+  requirement: *7036
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  type: :development
+  version_requirements: &7080 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 0.7.0
     none: false
+  prerelease: false
+  name: guard-rspec
+  requirement: *7080
+- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: &7124 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  name: bundler
+  requirement: *7124
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &7168 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  name: fakefs
+  requirement: *7168
 description: 
 email:
 - jesse@jc00ke.com
@@ -201,20 +140,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Restart puma when files change