guard-zeus 2.0.0.pre.alpha.pre.79 → 2.0.0

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/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)
+[![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)
 
 Install
 -------
@@ -50,8 +50,8 @@ Available options:
 Development
 -----------
 
-* 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)
+* 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)
 
 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.rb

@@ -1,23 +1,25 @@
-require 'guard/compat/plugin'
+require 'guard'
+require 'guard/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
@@ -31,5 +33,6 @@ module Guard
     def stop
       runner.kill_zeus
     end
+
   end
 end

data/lib/guard/zeus/runner.rb

@@ -3,43 +3,25 @@ require 'socket'
 require 'tempfile'
 require 'digest/md5'
 
-require 'guard/compat/plugin'
-
 module Guard
-  class Zeus < Plugin
+  class Zeus
     class Runner
       attr_reader :options
 
       def initialize(options = {})
-        @zeus_pid = nil
-        @options = { run_all: true }.merge(options)
-        Compat::UI.info 'Guard::Zeus Initialized'
-      end
-
-      def kill_zeus
-        stop_zeus
+        @options = {:run_all => true}.merge(options)
+        UI.info "Guard::Zeus Initialized"
       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
-
+        UI.info "#{action}ing Zeus", :reset => true
         spawn_zeus zeus_serve_command, zeus_serve_options
       end
 
+      def kill_zeus
+        stop_zeus
+      end
+
       def run(paths)
         run_command zeus_push_command(paths), zeus_push_options
       end
@@ -47,43 +29,22 @@ module Guard
       def run_all
         return unless options[:run_all]
         if rspec?
-          run(['spec'])
+          run(['rspec'])
         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 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")
+      def sockfile
+          File.join(Dir.pwd, ".zeus.sock")
       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}"
@@ -101,20 +62,14 @@ module Guard
           end
         rescue Errno::ECHILD
         end
-
-        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")
+        File.delete(sockfile) if File.exist? sockfile
+        UI.info "Zeus Stopped", :reset => true
       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
@@ -125,8 +80,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
 
@@ -135,6 +90,18 @@ 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,38 +1,12 @@
 guard 'zeus' do
-  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
-
+  # 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"] }
+  
   # 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.0"
   end
 end

metadata

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

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGZkNWJiNDcyODM0MGE1M2Q1MjQ0MTNmMDU0NzEyYTI0OTU0YzU2YQ==
-  data.tar.gz: !binary |-
-    ZjQ0MjgxZjRhNzNiYzBlYWU4MzQ2ODZhN2UyNGI0ODQ2NWY0MDNhNw==
-SHA512:
-  metadata.gz: !binary |-
-    NTI4OTdmNzY1ZTQ4NjhjZjkyMzRlYjIxMjBhZDI1NjBhMDAyNTNmMmM3YWRl
-    MGUxZmJkM2E3M2Y4YzIyNjY3MDUyZTIyMDc3MGMxNDM0OTNjYTMwMGIxY2I2
-    ODI1MjU2NmU4OGFmMDliYjEzYzZhMWQ3ODA2MWU5YzgwZmMyNDM=
-  data.tar.gz: !binary |-
-    NzI1OWQ1MTUyMDJkYzU4YWEzOGZmMzhmNDY4YzU4ZjVlZmZmOGQ4Y2FiZjdm
-    OGI1NjA4N2M2MGQxMGU1YzBmMjJiYjBlZmJmZWY1OWY3OWE0YzU4YTMxOGYy
-    YjE5ZTVmNTJhMTFkZTcwYTQ4MzIwNzA3ODNjM2I3YjQxNjViZTk=