restart 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca66f6c566aead10c36322c7ec101889aea52ac7
-  data.tar.gz: d822ab6899a4c6054973c4689a7a42e00e8f6aaa
+  metadata.gz: d7e0e224e8faa47590340eba2a9e611876439426
+  data.tar.gz: eb7175aee0bd3e1c5807bbe1ee03f6d71339066b
 SHA512:
-  metadata.gz: 580360f9196c85abb452a2e48c88c85d0331dd13f72b45ff7ee999df81bae77d0eb07337329d2935494862d74920b071ae2c38463d8be03097cc3de6ec7bdf52
-  data.tar.gz: de1cbe504b5daae9d25e39d72cfba1a77dbaf65f38f42828789580ba893390a15114c54494aef88bb32782be16122dac2fef8234c9a223df8173f258c7a7d0f4
+  metadata.gz: 2c0f12e067687fb15e13d0322394f82c8506f7aeb96e3fefccdbeaa75a681d87cc3b096b2b5df588312892eaaf1f9927ba7db5a0886c052b381cae4bd72c3371
+  data.tar.gz: 725e8867f1950d31dae2fef0b67ab7e7bacbf428692b3cd4385514ce29e9bcb65a6a4e7efe12eb80afa4e67d14382f0aaf134bcdbf9961b876bab3a73ad2e9a0

data/README.md

@@ -1,6 +1,6 @@
 # Restart
 
-Runs your shell command, then re-runs it any time filesystem change is detected.
+On MS Windows, restart runs your shell command, then re-runs it any time filesystem change is detected.
 
 EXAMPLE: `restart ruby test.rb`
 
@@ -10,20 +10,10 @@ This will run `ruby test.rb`, then re-run it after the test.rb file changes (or
 
 `gem install restart`
 
-## Windows Installation
-
-The process of installing this gem involves building native extensions because of its dependency on the [listen](https://rubygems.org/gems/listen) gem. If you have not already installed [DevKit](http://rubyinstaller.org/add-ons/devkit/) from [RubyInstaller.org](http://rubyinstaller.org), you will need to get it installed and working on your system before installing any gems that depend on building native extensions. To get started, [download DevKit](http://rubyinstaller.org/downloads/), and follow [these step-by-step installation instructions](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit).
-
-Once DevKit is installed and working, you are ready to install this gem:
-
-`gem install restart`
-
-It is _highly recommended_ that you also install the [wdm](https://rubygems.org/gems/wdm) gem, which enables [listen](https://rubygems.org/gems/listen) to receive filesystem event notifications from Windows instead of polling the filesystem for changes (you DO NOT want to use polling):
+It is _highly recommended_ that you also install the [wdm](https://rubygems.org/gems/wdm) gem, which enables [listen](https://rubygems.org/gems/listen) to receive filesystem event notifications from Windows instead of polling the filesystem for changes:
 
 `gem install wdm`
 
-That's all - you should now be able to start using the `restart` command.
-
 ## Usage
 
 ```
@@ -47,7 +37,6 @@ OPTIONS:
 
   -i, --ignore REGX[,REGX...]  Ignore file paths matching regular expression.
                                Examples:
-                                 restart -i /foo/bar/
                                  restart -i \.pid$,\.coffee$
                                  restart -i \.pid$ -i \.coffee$
 

data/lib/restart.rb

@@ -1,6 +1,8 @@
-require "restart/version"
+require 'restart/version'
+require 'optparse'
+require 'listen'
 
-Restart::BANNER = <<-BANNER
+Restart::BANNER = <<-BANNER.freeze
 USAGE: restart [options] <your shell command>
 
 Runs your shell command, then re-runs it any time filesystem change is detected.
@@ -11,16 +13,14 @@ This will run "ruby test.rb", then re-run it after test.rb file changes (or any
 other files change in current working directory or any subdirectories under it).
 
 See http://github.com/vais/restart for more info.
-Version: #{ Restart::VERSION }
+Version: #{Restart::VERSION}
 
 OPTIONS:
 BANNER
 
-require 'optparse'
 options = {}
 
 option_parser = OptionParser.new(Restart::BANNER, 28, '  ') do |opts|
-
   options[:dir] = []
   opts.on(
     '-d', '--dir DIR[,DIR...]',
@@ -33,10 +33,11 @@ option_parser = OptionParser.new(Restart::BANNER, 28, '  ') do |opts|
     '  restart -d . -d ../test -d ../lib rake test',
     '  '
   ) do |dirs|
-    dirs.each do |dir|
+    dirs.map do |dir|
       unless File.directory?(dir)
-        fail OptionParser::InvalidArgument, "#{ dir } is not a valid directory"
+        raise OptionParser::InvalidArgument, "#{dir} is not a valid directory"
       end
+      File.expand_path(dir)
     end
     options[:dir] += dirs
   end
@@ -66,7 +67,6 @@ option_parser = OptionParser.new(Restart::BANNER, 28, '  ') do |opts|
     Array,
     'Ignore file paths matching regular expression.',
     'Examples:',
-    '  restart -i /foo/bar/',
     '  restart -i \.pid$,\.coffee$',
     '  restart -i \.pid$ -i \.coffee$',
     '  '
@@ -98,67 +98,43 @@ option_parser = OptionParser.new(Restart::BANNER, 28, '  ') do |opts|
 end
 
 option_parser.order!
-options[:dir] << '.' if options[:dir].empty?
-options[:command] = ARGV.map{|s| s =~ /\s/ ? %Q{"#{ s }"} : s}.join(' ')
+
+options[:dir] = options[:dir].empty? ? [Dir.pwd] : options[:dir].uniq
+options[:command] = ARGV.map { |s| s =~ /\s/ ? %("#{s}") : s }.join(' ')
+
 if options[:explain]
   require 'pp'
   options.delete(:explain)
   pp options
   exit
 end
+
 if options[:command].empty?
   puts option_parser
   exit
 end
 
-require 'listen'
-restarting = false
+listener_options = {}
+listener_options[:only]   = options[:file]   unless options[:file].empty?
+listener_options[:ignore] = options[:ignore] unless options[:ignore].empty?
+
 process = Process.detach(spawn(options[:command]))
 
-begin
-  require 'win32api'
-  ctrl_c = Win32API.new('Kernel32', 'GenerateConsoleCtrlEvent', 'II', 'I')
-  killer = proc do
-    ctrl_c.call(0, 0)
-    sleep 0.1
-    if process.alive?
-      Process.kill(:KILL, process.pid)
-    end
-  end
-  clear = proc do
-    system 'cls'
-  end
-rescue LoadError
-  killer = proc do
-    Process.kill(:INT, -Process.getpgrp)
-    sleep 0.1
-    if process.alive?
-      Process.kill(:KILL, process.pid)
-    end
-  end
-  clear = proc do
-    system 'clear'
-  end
+listener = Listen.to(*options[:dir], listener_options) do
+  system("taskkill /t /f /pid #{process.pid} > nul 2>&1") if process.alive?
+  system('cls') if options[:clear]
+  print "\n\e[7m"
+  print Time.now.strftime('%H:%M:%S')
+  print ' '
+  print options[:command]
+  print "\e[0m\n\n"
+  process = Process.detach(spawn(options[:command]))
 end
 
 trap('INT') do
-  exit unless restarting || process.alive?
-end
-
-listener_options = {}
-unless options[:file].empty?
-  listener_options[:only] = options[:file]
-end
-unless options[:ignore].empty?
-  listener_options[:ignore] = options[:ignore]
-end
-listener = Listen.to(*options[:dir], listener_options) do
-  restarting = true
-  killer.call
-  restarting = false
-  clear.call if options[:clear]
-  print "\n\e[7m#{ Time.now.strftime('%H:%M:%S') } #{ options[:command] }\e[0m\n\n"
-  process = Process.detach(spawn(options[:command]))
+  system("taskkill /t /f /pid #{process.pid} > nul 2>&1") if process.alive?
+  listener.stop
+  exit
 end
 
 listener.start

data/lib/restart/version.rb

@@ -1,3 +1,3 @@
 module Restart
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/restart.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Restart::VERSION
   spec.authors       = ["Vais Salikhov"]
   spec.email         = ["vsalikhov@gmail.com"]
-  spec.summary       = %q{Runs your shell command, then re-runs it any time filesystem change is detected.}
-  spec.description   = %q{Runs your shell command, then re-runs it any time filesystem change is detected. For example, "restart ruby test.rb" will run "ruby test.rb", then re-run it after test.rb file changes (or any other files change in current working directory or any subdirectories under it).}
+  spec.summary       = %q{On MS Windows, restart runs your shell command, then re-runs it any time filesystem change is detected.}
+  spec.description   = %q{On MS Windows, restart runs your shell command, then re-runs it any time filesystem change is detected. For example, "restart ruby test.rb" will run "ruby test.rb", then re-run it after test.rb file changes (or any other files change in current working directory or any subdirectories under it).}
   spec.homepage      = "http://github.com/vais/restart"
   spec.license       = "MIT"
 
@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "listen", "~> 3.0"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

metadata

@@ -1,61 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: restart
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Vais Salikhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: Runs your shell command, then re-runs it any time filesystem change is
-  detected. For example, "restart ruby test.rb" will run "ruby test.rb", then re-run
-  it after test.rb file changes (or any other files change in current working directory
-  or any subdirectories under it).
+        version: '0'
+description: On MS Windows, restart runs your shell command, then re-runs it any time
+  filesystem change is detected. For example, "restart ruby test.rb" will run "ruby
+  test.rb", then re-run it after test.rb file changes (or any other files change in
+  current working directory or any subdirectories under it).
 email:
 - vsalikhov@gmail.com
 executables:
@@ -63,7 +63,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,19 +82,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Runs your shell command, then re-runs it any time filesystem change is detected.
+summary: On MS Windows, restart runs your shell command, then re-runs it any time
+  filesystem change is detected.
 test_files: []
-has_rdoc: