guard-zeus 2.0.0 → 2.0.1.pre.alpha.pre.81

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Mjg5ODQ2ZGFmZTY2NWViNTJkZmVhNTIzZTdiMWNlMTNiMTA5NjAwMg==
+  data.tar.gz: !binary |-
+    ODg3ODUwY2Q3YjM2MWRjMjhmNzBhZTRhYjc4OGFjN2M5NDUwZjRlMQ==
+SHA512:
+  metadata.gz: !binary |-
+    M2Y1ZDNmNDY3OTdlNjExMTYxOWY0NTRiZGMwMzk2YzQ0MDdmNzY3YTE4Y2Y2
+    MWNiYjYxYTY0ZWJkODFkZmE3MWZiYzFkZjIzNDkwOTlmZTU0MDMxMjM3N2Nk
+    YjI0ZTAyYWViNDkxNGIyNzZlOGRmN2FjMmI5ZGY0NzQzYzQ0NDM=
+  data.tar.gz: !binary |-
+    NDBmNTQwZTMxNjgyZDYzMjJhYWE3NGMxNjA3ZjA1NDc5ZmU5NDc1ODY4YjI2
+    NjkwOTM3ZjIwMDdiZGI1NGEwMDFmMjYwNTdlNjA3NDk3MmU0ZThlMWIyNWE3
+    NGQ3OGYwZDdiNGU0ZWNkNTA3MzhmZmIzMGNmNGViMzcyNWJhODU=

data/README.md

@@ -3,8 +3,8 @@ Guard::Zeus
 
 Guard::Zeus automatically starts and stops [Zeus](https://github.com/burke/zeus).
 
-[![Build Status](https://travis-ci.org/qnm/guard-zeus.png?branch=master)](https://travis-ci.org/qnm/guard-zeus)
-[![Code Climate](https://codeclimate.com/github/qnm/guard-zeus.png)](https://codeclimate.com/github/qnm/guard-zeus)
+[![Build Status](https://travis-ci.org/guard/guard-zeus.png?branch=master)](https://travis-ci.org/guard/guard-zeus)
+[![Code Climate](https://codeclimate.com/github/guard/guard-zeus.png)](https://codeclimate.com/github/guard/guard-zeus)
 
 Install
 -------
@@ -50,8 +50,8 @@ Available options:
 Development
 -----------
 
-* Source hosted at [GitHub](https://github.com/qnm/guard-zeus)
-* Report issues/Questions/Feature requests on [GitHub Issues](https://github.com/qnm/guard-zeus/issues)
+* Source hosted at [GitHub](https://github.com/guard/guard-zeus)
+* Report issues/Questions/Feature requests on [GitHub Issues](https://github.com/guard/guard-zeus/issues)
 
 Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
 you make.

data/lib/guard/zeus/runner.rb

@@ -3,25 +3,43 @@ require 'socket'
 require 'tempfile'
 require 'digest/md5'
 
+require 'guard/compat/plugin'
+
 module Guard
-  class Zeus
+  class Zeus < Plugin
     class Runner
       attr_reader :options
 
       def initialize(options = {})
-        @options = {:run_all => true}.merge(options)
-        UI.info "Guard::Zeus Initialized"
-      end
-
-      def launch_zeus(action)
-        UI.info "#{action}ing Zeus", :reset => true
-        spawn_zeus zeus_serve_command, zeus_serve_options
+        @zeus_pid = nil
+        @options = { run_all: true }.merge(options)
+        Compat::UI.info 'Guard::Zeus Initialized'
       end
 
       def kill_zeus
         stop_zeus
       end
 
+      def launch_zeus(action)
+        Compat::UI.info "#{action}ing Zeus", reset: true
+
+        # check for a current .zeus.sock
+        if File.exist? sockfile
+          Compat::UI.info 'Guard::Zeus found an existing .zeus.sock'
+
+          # if it's active, use it
+          if can_connect_to_socket?
+            Compat::UI.info 'Guard::Zeus is re-using an existing .zeus.sock'
+            return
+          end
+
+          # just delete it
+          delete_sockfile
+        end
+
+        spawn_zeus zeus_serve_command, zeus_serve_options
+      end
+
       def run(paths)
         run_command zeus_push_command(paths), zeus_push_options
       end
@@ -29,22 +47,43 @@ module Guard
       def run_all
         return unless options[:run_all]
         if rspec?
-          run(['rspec'])
+          run(['spec'])
         elsif test_unit?
-          run(Dir['test/**/*_test.rb']+Dir['test/**/test_*.rb'])
+          run(Dir['test/**/*_test.rb'] + Dir['test/**/test_*.rb'])
         end
       end
 
       private
 
-      def sockfile
-          File.join(Dir.pwd, ".zeus.sock")
+      def bundler?
+        @bundler ||= options[:bundler] != false && File.exist?("#{Dir.pwd}/Gemfile")
+      end
+
+      # Return a truthy socket, or catch the thrown exception
+      # and return false
+      def can_connect_to_socket?
+        UNIXSocket.open(sockfile)
+      rescue Errno::ECONNREFUSED
+        false
+      end
+
+      def delete_sockfile
+        Compat::UI.info 'Guard::Zeus is deleting an unusable .zeus.sock'
+        File.delete(sockfile)
+      end
+
+      def rspec?
+        @rspec ||= options[:rspec] != false && File.exist?("#{Dir.pwd}/spec")
       end
 
       def run_command(cmd, options = '')
         system "#{cmd} #{options}"
       end
 
+      def sockfile
+        File.join(Dir.pwd, '.zeus.sock')
+      end
+
       def spawn_zeus(cmd, options = '')
         @zeus_pid = fork do
           exec "#{cmd} #{options}"
@@ -62,14 +101,20 @@ module Guard
           end
         rescue Errno::ECHILD
         end
-        File.delete(sockfile) if File.exist? sockfile
-        UI.info "Zeus Stopped", :reset => true
+
+        delete_sockfile if File.exist? sockfile
+
+        Compat::UI.info 'Zeus Stopped', reset: true
+      end
+
+      def test_unit?
+        @test_unit ||= options[:test_unit] != false && File.exist?("#{Dir.pwd}/test/test_helper.rb")
       end
 
       def zeus_push_command(paths)
         cmd_parts = []
-        cmd_parts << "bundle exec" if bundler?
-        cmd_parts << "zeus test"
+        cmd_parts << 'bundle exec' if bundler?
+        cmd_parts << 'zeus test'
         cmd_parts << paths.join(' ')
         cmd_parts.join(' ')
       end
@@ -80,8 +125,8 @@ module Guard
 
       def zeus_serve_command
         cmd_parts = []
-        cmd_parts << "bundle exec" if bundler?
-        cmd_parts << "zeus start"
+        cmd_parts << 'bundle exec' if bundler?
+        cmd_parts << 'zeus start'
         cmd_parts.join(' ')
       end
 
@@ -90,18 +135,6 @@ module Guard
         opt_parts << options[:cli] unless options[:cli].nil?
         opt_parts.join(' ')
       end
-
-      def bundler?
-        @bundler ||= options[:bundler] != false && File.exist?("#{Dir.pwd}/Gemfile")
-      end
-
-      def test_unit?
-        @test_unit ||= options[:test_unit] != false && File.exist?("#{Dir.pwd}/test/test_helper.rb")
-      end
-
-      def rspec?
-        @rspec ||= options[:rspec] != false && File.exist?("#{Dir.pwd}/spec")
-      end
     end
   end
 end

data/lib/guard/zeus/templates/Guardfile

@@ -1,12 +1,38 @@
 guard 'zeus' do
-  # uses the .rspec file
-  # --colour --fail-fast --format documentation --tag ~slow
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.+)\.haml$})                         { |m| "spec/#{m[1]}.haml_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
-  
+  require 'ostruct'
+
+  rspec = OpenStruct.new
+  rspec.spec_dir = 'spec'
+  rspec.spec = ->(m) { "#{rspec.spec_dir}/#{m}_spec.rb" }
+  rspec.spec_helper = "#{rspec.spec_dir}/spec_helper.rb"
+
+  # matchers
+  rspec.spec_files = /^#{rspec.spec_dir}\/.+_spec\.rb$/
+
+  # Ruby apps
+  ruby = OpenStruct.new
+  ruby.lib_files = /^(lib\/.+)\.rb$/
+
+  watch(rspec.spec_files)
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(ruby.lib_files) { |m| rspec.spec.call(m[1]) }
+
+  # Rails example
+  rails = OpenStruct.new
+  rails.app_files = /^app\/(.+)\.rb$/
+  rails.views_n_layouts = /^app\/(.+(?:\.erb|\.haml|\.slim))$/
+  rails.controllers = %r{^app/controllers/(.+)_controller\.rb$}
+
+  watch(rails.app_files) { |m| rspec.spec.call(m[1]) }
+  watch(rails.views_n_layouts) { |m| rspec.spec.call(m[1]) }
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      rspec.spec.call("acceptance/#{m[1]}")
+    ]
+  end
+
   # TestUnit
   # watch(%r|^test/(.*)_test\.rb$|)
   # watch(%r|^lib/(.*)([^/]+)\.rb$|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }

data/lib/guard/zeus/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module ZeusVersion
-    VERSION = "2.0.0"
+    VERSION = '2.0.1'
   end
 end

data/lib/guard/zeus.rb

@@ -1,25 +1,23 @@
-require 'guard'
-require 'guard/plugin'
+require 'guard/compat/plugin'
 
 module Guard
   class Zeus < Plugin
-
     autoload :Runner, 'guard/zeus/runner'
     attr_accessor :runner
 
-    def initialize(options={})
+    def initialize(options = {})
       super
       @runner = Runner.new(options)
     end
 
     def start
       runner.kill_zeus
-      runner.launch_zeus("Start")
+      runner.launch_zeus('Start')
     end
 
     def reload
       runner.kill_zeus
-      runner.launch_zeus("Reload")
+      runner.launch_zeus('Reload')
     end
 
     def run_all
@@ -33,6 +31,5 @@ module Guard
     def stop
       runner.kill_zeus
     end
-
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-zeus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.0.1.pre.alpha.pre.81
 platform: ruby
 authors:
 - jonathangreenberg
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,59 +22,52 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: zeus
+  name: guard-compat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: zeus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.0'
 description: Guard::Zeus automatically manage zeus
 email:
 - greenberg@entryway.net
@@ -86,34 +77,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - lib/guard/zeus.rb
-- lib/guard/zeus/templates/Guardfile
 - lib/guard/zeus/runner.rb
+- lib/guard/zeus/templates/Guardfile
 - lib/guard/zeus/version.rb
-- LICENSE
-- README.md
-homepage: http://github.com/qnm/guard-zeus
+homepage: https://github.com/guard/guard-zeus
 licenses: []
+metadata: {}
 post_install_message: 
 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
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pushes watched files to Zeus
 test_files: []