be9-rubbr 1.1.5.1 → 1.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0b57872d6ba8780b0229d9879dab0eed67355b78
+  data.tar.gz: 96a580184bf479f509cfb222bb579133d6ca4ba9
+SHA512:
+  metadata.gz: 8433e6b380a2798f2792687135ea730dcdcd27bf209d05bf5b9d88b1ec79219f1fdc9538f748fe15b5150f6035d346a4ce29010cab651e9bcc912ab94c696bff
+  data.tar.gz: 1e628b53adc71e2ca0b17d289b37af3c30eab064a0738abf9caa4446ed58467fdcd917730cab51d8df9a0972f1c5f80ab35b6ac001f6384030ea4f643623d5a4

data/History.txt

@@ -1,3 +1,11 @@
+
+== 1.1.6 / 2013-05-03 (by be9)
+
+* Windows support (cypok)
+* Modern Ruby support (cypok)
+* Support force rebuild in a build loop (cypok)
+* Remove duplication of warnings (cypok)
+
 == 1.1.5 / 2010-08-05 (by be9)
 
 * Consider .sty files as source, .pdf files as graphics source.

data/lib/rubbr/builder.rb

@@ -18,30 +18,57 @@ module Rubbr
       elsif Rubbr.options[:force]
         notice "No changes in #{Rubbr.options[:build_dir]} since last build, building anyway (--force)"
         do_build
-      else 
+      else
         notice "No changes in #{Rubbr.options[:build_dir]} since last build"
         true
       end
     end
 
     def self.build_in_a_loop
+      # single interrupt to rebuild, double to break
+      # inspired by autotest
+      interrupted = false
+      wants_to_break = false
+      force_rebuild = false
+      trap 'INT' do
+        if interrupted
+          wants_to_break = true
+        else
+          interrupted = true
+          notice "Press Ctrl-C a second time to break out."
+          Kernel.sleep 1
+        end
+        raise Interrupt, nil
+      end
+
       delay = Rubbr.options[:loop_delay]
       delay = 0.5 if delay == 0.0
 
-      notice "Entering build loop. Press Ctrl-C to break out."
+      notice "Entering build loop. Press Ctrl-C to force rebuild, double Ctrl-C to break out."
 
       forced_first_time = Rubbr.options[:force]
 
-      while true
-        if Rubbr::Change.d? || forced_first_time
-          notice "Change detected, building"
+      loop do
+        begin
+          if Rubbr::Change.d? || forced_first_time || force_rebuild
+            notice "Building..."
 
-          forced_first_time = false
+            forced_first_time = false
+            force_rebuild = false
 
-          do_build
-        end
+            do_build
+          end
 
-        sleep delay
+          sleep delay
+        rescue Interrupt
+          if wants_to_break
+            break
+          else
+            interrupted = false
+            wants_to_break = false
+            force_rebuild = true
+          end
+        end
       end
     end
 

data/lib/rubbr/cli.rb

@@ -2,6 +2,8 @@ module Rubbr
 
   # Handles command line output and input.
   module Cli
+    include Rubbr::OS
+
     def notice(message)
       puts color?(message, "\e[32m") if Rubbr.options[:verbose]
     end
@@ -20,28 +22,28 @@ module Rubbr
 
     def disable_stdout
       old_stdout = STDOUT.dup
-      STDOUT.reopen('/dev/null')
+      STDOUT.reopen(null_file)
       yield
       STDOUT.reopen(old_stdout)
     end
 
     def disable_stderr
       old_stderr = STDERR.dup
-      STDERR.reopen('/dev/null')
+      STDERR.reopen(null_file)
       yield
       STDERR.reopen(old_stderr)
     end
 
     def disable_stdinn
       old_stdinn = STDIN.dup
-      STDIN.reopen('/dev/null')
+      STDIN.reopen(null_file)
       yield
       STDIN.reopen(old_stdinn)
     end
 
     def executable?(executable)
       disable_stdout do
-        @existing = system("which #{executable}")
+        @existing = system("#{which_cmd} #{executable}")
       end
       @existing
     end
@@ -54,5 +56,25 @@ module Rubbr
         exit
       end
     end
+
+    private
+
+    def null_file
+      case os
+      when :windows
+        'NUL'
+      when :unix
+        '/dev/null'
+      end
+    end
+
+    def which_cmd
+      case os
+      when :windows
+        'where'
+      when :unix
+        'which'
+      end
+    end
   end
 end

data/lib/rubbr/os.rb

@@ -0,0 +1,13 @@
+module Rubbr
+
+  # Detection of OS.
+  module OS
+    def os
+      if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM)
+        :windows
+      else
+        :unix
+      end
+    end
+  end
+end

data/lib/rubbr/runner.rb

@@ -45,7 +45,7 @@ module Rubbr
 
           run = `#@executable #@input_file`
           lines = run.split("\n")
-          @warnings = run.grep(messages).sort
+          @warnings = lines.grep(messages).sort.uniq
 
           if Rubbr.options[:verboser]
 
@@ -83,7 +83,7 @@ module Rubbr
           @errors.each do |message|
             error message
           end
-          
+
           raise GotErrors
         end
       end

data/lib/rubbr.rb

@@ -2,9 +2,10 @@ require 'optparse'
 $:.unshift File.dirname(__FILE__)
 
 module Rubbr
-  VERSION = '1.1.5.1'
+  VERSION = '1.1.6'
 
   autoload :Options,       'rubbr/options'
+  autoload :OS,            'rubbr/os'
   autoload :Cli,           'rubbr/cli'
   autoload :Config,        'rubbr/config'
   autoload :Scm,           'rubbr/scm'

metadata

@@ -1,36 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: be9-rubbr
-version: !ruby/object:Gem::Version 
-  hash: 65
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 5
-  - 1
-  version: 1.1.5.1
+version: !ruby/object:Gem::Version
+  version: 1.1.6
 platform: ruby
-authors: 
+authors:
 - Eivind Uggedal
 - Oleg Dashevskii
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-14 00:00:00 +07:00
-default_executable: 
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies: []
-
 description: Build LaTeX documents.
-email: 
+email:
 - olegdashevskii@gmail.com
-executables: 
+executables:
 - rubbr
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - History.txt
@@ -46,6 +34,7 @@ files:
 - lib/rubbr/change.rb
 - lib/rubbr/cli.rb
 - lib/rubbr/options.rb
+- lib/rubbr/os.rb
 - lib/rubbr/runner.rb
 - lib/rubbr/runner/bibtex.rb
 - lib/rubbr/runner/dvips.rb
@@ -62,39 +51,27 @@ files:
 - lib/rubbr/viewer/pdf.rb
 - lib/rubbr/viewer/ps.rb
 - rubbr.gemspec
-has_rdoc: true
 homepage: http://github.com/be9/rubbr
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: rubbr
-rubygems_version: 1.6.2
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: LaTeX builder
 test_files: []
-