guard-rails 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: badcb2d7fa378fb0f9fc7bc4a4922642f6d1b24b
-  data.tar.gz: 80d9c099b2b8b7824cf3bfa186f4dd1960f9e9d1
+  metadata.gz: 445a62a6bd29148ad6ce3200a020dc60d85a8f1b
+  data.tar.gz: 284459605b644a947328ce43fb09431adad8c91e
 SHA512:
-  metadata.gz: 364a7e4234fa9efae4af2dcb8319dc2ea712db73d46e0b1492e4486c0b536f04979bb92cc8f2e0a8583bae0640f2a7ce67e64fc69ef36574037c04519a17bc34
-  data.tar.gz: 84c3dde82a373dd602a5aeead8a8f4f45debbcaf0ae5cbd404e0ea7b3aa13b5632642246856bed09d7ab9ca19a3ac5b178b517ef0bf1d86e57de8b191b2b1436
+  metadata.gz: e1766481621fb35a0d698115799188fddfa4430b4fa7757593ee99b62695e349b22ffffce0343947de00c4edadbf4c2fc372b094a30562469249398cca32ddf7
+  data.tar.gz: e95d187c66a652c95b231b597afa870f1b196d57958e8a3b90705a9a1e60d1d2df053d115e1abf2949a0310dd3f396c2cd84cba93b6453ae01c7d4890ca78d9e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    guard-rails (0.6.1)
+    guard-rails (0.7.0)
       guard (~> 2.0)
 
 GEM
@@ -18,7 +18,7 @@ GEM
     ffi (1.9.6)
     ffi (1.9.6-java)
     formatador (0.2.5)
-    guard (2.7.0)
+    guard (2.8.2)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -75,7 +75,7 @@ GEM
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    terminal-notifier-guard (1.6.1)
+    terminal-notifier-guard (1.6.4)
     thor (0.19.1)
     timers (4.0.1)
       hitimes

data/README.md

@@ -37,6 +37,7 @@ Now I can automatically restart your Rails development server as your files chan
 * `:environment` is the server environment (**default `development`**)
 * `:force_run` kills any process that's holding the listen port before attempting to (re)start Rails (**default `false`**)
 * `:pid_file` specify your pid\_file (**default `tmp/pids/[RAILS_ENV].pid`**)
+* `:host` is where the server is hosted (**default `localhost`**)
 * `:port` is the server port number (**default `3000`**)
 * `:root` lets you specify the Rails root, i.e. for using guard-rails to run a dummy app within an engine (try `:root => '/spec/dummy'`).
 * `:server` the webserver engine to use (**try `:server => :thin`**)

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/guard/rails.rb

@@ -12,18 +12,19 @@ module Guard
     attr_reader :options, :runner
 
     DEFAULT_OPTIONS = {
-      :CLI => nil,
-      :daemon => false,
-      :debugger => false,
-      :environment => 'development',
-      :force_run => false,
-      :pid_file => nil, # construct the filename based on options[:environment] on runtime
-      :port => 3000,
-      :server => nil, # specified by rails
-      :start_on_start => true,
-      :timeout => 30,
-      :zeus_plan => 'server',
-      :zeus => false,
+      CLI: nil,
+      daemon: false,
+      debugger: false,
+      environment: 'development',
+      force_run: false,
+      pid_file: nil, # construct the filename based on options[:environment] on runtime
+      host: "localhost",
+      port: 3000,
+      server: nil, # specified by rails
+      start_on_start: true,
+      timeout: 30,
+      zeus_plan: 'server',
+      zeus: false,
     }
 
     def initialize(options = {})
@@ -41,18 +42,18 @@ module Guard
     def reload(action = "restart")
       title = "#{action.capitalize}ing Rails..."
       UI.info title
-      Notifier.notify("Rails #{action}ing on port #{options[:port]} in #{options[:environment]}...", :title => title, :image => :pending)
+      Notifier.notify("Rails #{action}ing on port #{options[:port]} in #{options[:environment]}...", title: title, image: :pending)
       if runner.restart
         UI.info "Rails #{action}ed, pid #{runner.pid}"
-        Notifier.notify("Rails #{action}ed on port #{options[:port]}.", :title => "Rails #{action}ed!", :image => :success)
+        Notifier.notify("Rails #{action}ed on port #{options[:port]}.", title: "Rails #{action}ed!", image: :success)
       else
         UI.info "Rails NOT #{action}ed, check your log files."
-        Notifier.notify("Rails NOT #{action}ed, check your log files.", :title => "Rails NOT #{action}ed!", :image => :failed)
+        Notifier.notify("Rails NOT #{action}ed, check your log files.", title: "Rails NOT #{action}ed!", image: :failed)
       end
     end
 
     def stop
-      Notifier.notify("Until next time...", :title => "Rails shutting down.", :image => :pending)
+      Notifier.notify("Until next time...", title: "Rails shutting down.", image: :pending)
       runner.stop
     end
 

data/lib/guard/rails/runner.rb

@@ -74,6 +74,7 @@ module Guard
           options[:debugger] ? '-u' : nil,
           '-e', options[:environment],
           '--pid', "\"#{pid_file}\"",
+          '-b', options[:host],
           '-p', options[:port],
           options[:server],
         ]
@@ -149,7 +150,7 @@ module Guard
 
       def remove_pid_file_and_wait_for_no_pid
         wait_for_pid_loop do
-          FileUtils.rm pid_file, :force => true
+          FileUtils.rm pid_file, force: true
           !has_pid?
         end
       end

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

@@ -3,12 +3,14 @@ require 'fakefs/spec_helpers'
 
 describe Guard::Rails::Runner do
   let(:runner) { Guard::Rails::Runner.new(options) }
-  let(:environment) { 'development' }
-  let(:port) { 3000 }
 
-  let(:default_options) { { :environment => environment, :port => port } }
+  let(:default_options) { Guard::Rails::DEFAULT_OPTIONS }
   let(:options) { default_options }
 
+  let(:default_environment) { default_options[:environment] }
+  let(:default_host) { default_options[:host] }
+  let(:default_port) { default_options[:port] }
+
   describe '#pid' do
     include FakeFS::SpecHelpers
 
@@ -32,7 +34,7 @@ describe Guard::Rails::Runner do
     end
 
     context 'when custom rails root given' do
-      let(:options) { default_options.merge(:root => 'spec/dummy') }
+      let(:options) { default_options.merge(root: 'spec/dummy') }
       let(:pid) { 12345 }
 
       before do
@@ -41,7 +43,7 @@ describe Guard::Rails::Runner do
       end
 
       it "points to the right pid file" do
-        expect(runner.pid_file).to match %r{spec/dummy/tmp/pids/development.pid}
+        expect(runner.pid_file).to match %r{spec/dummy/tmp/pids/#{default_environment}.pid}
       end
     end
 
@@ -50,13 +52,13 @@ describe Guard::Rails::Runner do
   describe '#build_command' do
     context "with options[:CLI]" do
       let(:custom_cli) { 'custom_CLI_command' }
-      let(:options) { default_options.merge(:CLI => custom_cli) }
+      let(:options) { default_options.merge(CLI: custom_cli) }
       it "has customized CLI" do
         expect(runner.build_command).to match(%r{#{custom_cli} --pid })
       end
 
       let(:custom_pid_file) { "tmp/pids/rails_dev.pid" }
-      let(:options) { default_options.merge(:CLI => custom_cli, :pid_file => custom_pid_file) }
+      let(:options) { default_options.merge(CLI: custom_cli, pid_file: custom_pid_file) }
       it "uses customized pid_file" do
         pid_file_path = File.expand_path custom_pid_file
         expect(runner.build_command).to match(%r{#{custom_cli} --pid \"#{pid_file_path}\"})
@@ -70,27 +72,27 @@ describe Guard::Rails::Runner do
     end
 
     context "with options[:daemon]" do
-      let(:options) { default_options.merge(:daemon => true) }
+      let(:options) { default_options.merge(daemon: true) }
       it "has a daemon switch" do
         expect(runner.build_command).to match(%r{ -d})
       end
     end
 
     context "without options[:env]" do
-      it "has environment switch to development" do
-        expect(runner.build_command).to match(%r{ -e development})
+      it "has environment switch to default" do
+        expect(runner.build_command).to match(%r{ -e #{default_environment}})
       end
     end
 
     context "with options[:environment] as test" do
-      let(:options) { default_options.merge(:environment => 'test') }
+      let(:options) { default_options.merge(environment: 'test') }
       it "has environment switch to test" do
         expect(runner.build_command).to match(%r{ -e test})
       end
     end
 
     context 'with options[:debugger]' do
-      let(:options) { default_options.merge(:debugger => true) }
+      let(:options) { default_options.merge(debugger: true) }
 
       it "has a debugger switch" do
         expect(runner.build_command).to match(%r{ -u})
@@ -98,7 +100,7 @@ describe Guard::Rails::Runner do
     end
 
     context 'with options[:server] as thin' do
-      let(:options) { default_options.merge(:server => 'thin') }
+      let(:options) { default_options.merge(server: 'thin') }
 
       it "has the server name thin" do
         expect(runner.build_command).to match(%r{thin})
@@ -107,14 +109,14 @@ describe Guard::Rails::Runner do
 
     context "without options[:pid_file]" do
       it "uses default pid_file" do
-        pid_file_path = File.expand_path "tmp/pids/development.pid"
+        pid_file_path = File.expand_path "tmp/pids/#{default_environment}.pid"
         expect(runner.build_command).to match(%r{ --pid \"#{pid_file_path}\"})
       end
     end
 
     context "with options[:pid_file]" do
       let(:custom_pid_file) { "tmp/pids/rails_dev.pid" }
-      let(:options) { default_options.merge(:pid_file => custom_pid_file) }
+      let(:options) { default_options.merge(pid_file: custom_pid_file) }
 
       it "uses customized pid_file" do
         pid_file_path = File.expand_path custom_pid_file
@@ -122,20 +124,50 @@ describe Guard::Rails::Runner do
       end
     end
 
+    context 'with options[:host]' do
+      let(:host) { "1.2.3.4" }
+      let(:options) { default_options.merge(host: host) }
+
+      it 'use customized host' do
+        expect(runner.build_command).to match(/ -b #{host}/)
+      end
+    end
+
+    context 'without options[:host]' do
+      it 'use deafult host' do
+        expect(runner.build_command).to match(/ -b #{default_host}/)
+      end
+    end
+
+    context 'with options[:port]' do
+      let(:port) { 3456 }
+      let(:options) { default_options.merge(port: port) }
+
+      it 'use customized port' do
+        expect(runner.build_command).to match(/ -p #{port}/)
+      end
+    end
+
+    context 'without options[:port]' do
+      it 'use default port' do
+        expect(runner.build_command).to match(/ -p #{default_port}/)
+      end
+    end
+
     context "with options[:zeus]" do
-      let(:options) { default_options.merge(:zeus => true) }
+      let(:options) { default_options.merge(zeus: true) }
       it "has zeus" do
         expect(runner.build_command).to match(%r{zeus server })
       end
 
       context "with options[:zeus_plan]" do
-        let(:options) { default_options.merge(:zeus => true, :zeus_plan => 'test_server') }
+        let(:options) { default_options.merge(zeus: true, zeus_plan: 'test_server') }
         it "uses customized zeus plan" do
           expect(runner.build_command).to match(%r{zeus test_server})
         end
 
         context "with options[:server]" do
-          let(:options) { default_options.merge(:zeus => true, :zeus_plan => 'test_server', :server => 'thin') }
+          let(:options) { default_options.merge(zeus: true, zeus_plan: 'test_server', server: 'thin') }
           it "uses customized server" do
             expect(runner.build_command).to match(%r{zeus test_server .* thin})
           end
@@ -148,14 +180,14 @@ describe Guard::Rails::Runner do
         expect(runner.build_command).to_not match(%r{zeus server })
       end
 
-      let(:options) { default_options.merge(:zeus_plan => 'test_server') }
+      let(:options) { default_options.merge(zeus_plan: 'test_server') }
       it "doesnt' have test_server" do
         expect(runner.build_command).to_not match(%r{test_server})
       end
     end
 
     context 'with options[:root]' do
-      let(:options) { default_options.merge(:root => 'spec/dummy') }
+      let(:options) { default_options.merge(root: 'spec/dummy') }
 
       it "has `cd` command with customized rails root" do
         expect(runner.build_command).to match(%r{cd .*/spec/dummy\" &&})
@@ -164,19 +196,19 @@ describe Guard::Rails::Runner do
   end
 
   describe '#environment' do
-    it "sets RAILS_ENV to development" do
-      expect(runner.environment["RAILS_ENV"]).to eq "development"
+    it "sets RAILS_ENV to default" do
+      expect(runner.environment["RAILS_ENV"]).to eq default_environment
     end
 
     context "with options[:environment] as test" do
-      let(:options) { default_options.merge(:environment => 'test') }
+      let(:options) { default_options.merge(environment: 'test') }
 
       it "sets RAILS_ENV to test" do
         expect(runner.environment["RAILS_ENV"]).to eq "test"
       end
 
       context "with options[:zeus]" do
-        let(:options) { default_options.merge(:zeus => true) }
+        let(:options) { default_options.merge(zeus: true) }
 
         it "sets RAILS_ENV to nil" do
           expect(runner.environment["RAILS_ENV"]).to be nil
@@ -216,13 +248,13 @@ describe Guard::Rails::Runner do
       end
 
       context 'with zeus' do
-        let(:options) { default_options.merge(:zeus => true) }
+        let(:options) { default_options.merge(zeus: true) }
         it_behaves_like "outside of bundler"
       end
 
       context 'with CLI' do
         let(:custom_cli) { 'custom_CLI_command' }
-        let(:options) { default_options.merge(:CLI => custom_cli) }
+        let(:options) { default_options.merge(CLI: custom_cli) }
         it_behaves_like "outside of bundler"
       end
     end
@@ -243,13 +275,13 @@ describe Guard::Rails::Runner do
       end
 
       context 'with zeus' do
-        let(:options) { default_options.merge(:zeus => true) }
+        let(:options) { default_options.merge(zeus: true) }
         it_behaves_like "outside of bundler"
       end
 
       context 'with CLI' do
         let(:custom_cli) { 'custom_CLI_command' }
-        let(:options) { default_options.merge(:CLI => custom_cli) }
+        let(:options) { default_options.merge(CLI: custom_cli) }
         it_behaves_like "outside of bundler"
       end
     end
@@ -276,7 +308,7 @@ describe Guard::Rails::Runner do
     end
 
     context 'with options[:force_run]' do
-      let(:options) { default_options.merge(:force_run => true) }
+      let(:options) { default_options.merge(force_run: true) }
 
       before do
         pid_stub.returns(true)
@@ -324,6 +356,7 @@ describe Guard::Rails::Runner do
 
       it 'kills the process with INT' do
         mock(runner).kill_process.with("INT", pid).returns { true }
+        stub(runner).sleep
         mock(runner).kill_process.with("KILL", pid).once
         runner.stop
       end
@@ -390,7 +423,7 @@ describe Guard::Rails::Runner do
 
     it 'returns pid if any' do
       mock(runner, :'`').with(anything).returns {
-        "ruby #{pid} ranmocy 12u IPv4 0x9c30720e04d31a0f 0t0 TCP *:#{port} (LISTEN)"
+        "ruby #{pid} ranmocy 12u IPv4 0x9c30720e04d31a0f 0t0 TCP *:#{default_port} (LISTEN)"
       }
       expect(runner.send(:unmanaged_pid)).to eq pid
     end
@@ -424,7 +457,7 @@ describe Guard::Rails::Runner do
 
   describe '#sleep_time' do
     let(:timeout) { 30 }
-    let(:options) { default_options.merge(:timeout => timeout) }
+    let(:options) { default_options.merge(timeout: timeout) }
 
     it "adjusts the sleep time as necessary" do
       expect(runner.sleep_time).to eq (timeout.to_f / Guard::Rails::Runner::MAX_WAIT_COUNT.to_f)

data/spec/lib/guard/rails_spec.rb

@@ -5,9 +5,10 @@ describe Guard::Rails do
   let(:options) { {} }
 
   describe "#initialize" do
-    it "initializes with options" do
+    it "initializes with default options" do
       guard
 
+      expect(guard.runner.options[:host]).to eq "localhost"
       expect(guard.runner.options[:port]).to eq 3000
     end
   end
@@ -24,7 +25,7 @@ describe Guard::Rails do
     end
 
     context "doesn't start when Guard starts" do
-      let(:options) { { :start_on_start => false } }
+      let(:options) { { start_on_start: false } }
 
       it "shows the right message and doesn't run startup" do
         mock(guard).reload.never
@@ -44,13 +45,13 @@ describe Guard::Rails do
     context 'at start' do
       before do
         mock(Guard::UI).info.with('Starting Rails...')
-        mock(Guard::Notifier).notify.with(/Rails starting/, hash_including(:image => :pending))
+        mock(Guard::Notifier).notify.with(/Rails starting/, hash_including(image: :pending))
         any_instance_of(Guard::Rails::Runner, restart: true)
       end
 
       it "starts and shows the pid file" do
         mock(Guard::UI).info.with(/#{pid}/)
-        mock(Guard::Notifier).notify.with(/Rails started/, hash_including(:image => :success))
+        mock(Guard::Notifier).notify.with(/Rails started/, hash_including(image: :success))
 
         guard.reload("start")
       end
@@ -60,7 +61,7 @@ describe Guard::Rails do
       before do
         any_instance_of(Guard::Rails::Runner, pid: pid)
         mock(Guard::UI).info.with('Restarting Rails...')
-        mock(Guard::Notifier).notify.with(/Rails restarting/, hash_including(:image => :pending))
+        mock(Guard::Notifier).notify.with(/Rails restarting/, hash_including(image: :pending))
       end
 
       context "with pid file" do
@@ -70,7 +71,7 @@ describe Guard::Rails do
 
         it "restarts and shows the pid file" do
           mock(Guard::UI).info.with(/#{pid}/)
-          mock(Guard::Notifier).notify.with(/Rails restarted/, hash_including(:image => :success))
+          mock(Guard::Notifier).notify.with(/Rails restarted/, hash_including(image: :success))
 
           guard.reload
         end
@@ -84,7 +85,7 @@ describe Guard::Rails do
         it "restarts and shows the pid file" do
           mock(Guard::UI).info.with(/#{pid}/).never
           mock(Guard::UI).info.with(/Rails NOT restarted/)
-          mock(Guard::Notifier).notify.with(/Rails NOT restarted/, hash_including(:image => :failed))
+          mock(Guard::Notifier).notify.with(/Rails NOT restarted/, hash_including(image: :failed))
 
           guard.reload
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - John Bintz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard