guard-puma 0.2.0 → 0.2.1

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 0.2.1
+
+* Fix restarting & halting inside the runner.
+
 ## 0.2.0
 
 * Switched to puma's control server. pid file was too messy.

data/guard-puma.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency              "rb-inotify"
   gem.add_dependency              "libnotify"
   gem.add_dependency              "puma"
+  gem.add_dependency              "rest-client"
   gem.add_development_dependency  "rake", "~> 0.9.2.2"
   gem.add_development_dependency  "rspec", "~> 2.9.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  "pry"
 end

data/lib/guard/puma/runner.rb

@@ -5,7 +5,7 @@ module Guard
 
     MAX_WAIT_COUNT = 20
 
-    attr_reader :options, :control_url, :control_token
+    attr_reader :options, :control_url, :control_token, :cmd_opts
 
     def initialize(options)
       @control_token = (options.delete(:control_token) || 'pumarules')
@@ -13,9 +13,7 @@ module Guard
       @control_port = (options.delete(:control_port) || '9293')
       @control_url = "#{@control}:#{@control_port}"
       @options = options
-    end
 
-    def start
       puma_options = {
         '--port' => options[:port],
         '--control-token' => @control_token,
@@ -24,9 +22,11 @@ module Guard
       [:config, :bind, :threads].each do |opt|
         puma_options["--#{opt}"] = options[opt] if options[opt]
       end
-      opts = puma_options.to_a.flatten << '-q'
+      @cmd_opts = (puma_options.to_a.flatten << '-q').join(' ')
+    end
 
-      %{sh -c 'cd #{Dir.pwd} && puma #{opts.join(' ')} &'}
+    def start
+      system %{sh -c 'cd #{Dir.pwd} && puma #{cmd_opts} &'}
     end
 
     def halt
@@ -44,11 +44,15 @@ module Guard
     private
     
     def run_puma_command!(cmd)
-      Net::HTTP.get((build_uri(cmd)))
+      Net::HTTP.get build_uri(cmd)
+      return true
+    rescue Errno::ECONNREFUSED => e
+      # server may not have been started correctly.
+      false
     end
 
     def build_uri(cmd)
-      URI("http://#{control_url}/#{cmd}?token=#{control_token}")
+      URI "http://#{control_url}/#{cmd}?token=#{control_token}"
     end
 
   end

data/lib/guard/puma/version.rb

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

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

@@ -39,13 +39,14 @@ describe Guard::PumaRunner do
   end
 
   describe "#build_puma_command" do
-    let(:command) { Guard::PumaRunner.new(options).start }
+    let(:runner) { Guard::PumaRunner.new(options) }
+    let(:command) { runner.start }
 
     context "with config" do
       let(:options) {{ :config => path }}
       let(:path) { "/tmp/elephants" }
       it "adds path to command" do
-        command.should match("--config #{path}")
+        runner.cmd_opts.should match("--config #{path}")
       end
     end
 
@@ -53,15 +54,15 @@ describe Guard::PumaRunner do
       let(:options) {{ :bind => uri }}
       let(:uri) { "tcp://foo" }
       it "adds uri option to command" do
-        command.should match("--bind #{uri}")
+        runner.cmd_opts.should match("--bind #{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}")
+      let(:token) { "imma-token" }
+      it "adds token to command" do
+        runner.cmd_opts.should match(/--control-token #{token}/)
       end
     end
 
@@ -69,7 +70,7 @@ describe Guard::PumaRunner do
       let(:options) {{ :threads => threads }}
       let(:threads) { "13:42" }
       it "adds path to command" do
-        command.should match("--threads #{threads}")
+        runner.cmd_opts.should match("--threads #{threads}")
       end
     end
   end

metadata

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