breaktime 0.1.2 → 0.1.3

data/bin/breaktime

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'breaktime'
 Breaktime::Main.start

data/breaktime.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.executables   = ['breaktime']
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib","lib/breaktime"]
   gem.add_dependency 'green_shoes', '~> 1.1.373'
   gem.add_dependency 'trollop', '~> 2.0.0'
   gem.add_dependency 'rufus-scheduler', '~> 2.0.17'

data/lib/breaktime.rb

@@ -5,9 +5,6 @@
 # This should be run as the command line tool `breaktime`. For more information
 # try running `breaktime --help`.
 module Breaktime
-  lib_dir = File.dirname(__FILE__) + File::SEPARATOR + 'breaktime'
-  $:.unshift lib_dir
-
   # Exit status codes.
   EX_OK = 0                # Everything fine
   EX_UNKNOWN = 1           # Unknown exception
@@ -18,9 +15,7 @@ module Breaktime
   EX_BREAK_CANCELLED = 254 # Cancel from the countdown GUI
   EX_CLI = 255             # CLI option errors
 
-  require 'rubygems'
-  require 'bundler/setup'
-  require 'version'
-  require 'command'
-  require 'main'
+  require 'breaktime/version'
+  require 'breaktime/command'
+  require 'breaktime/main'
 end

data/lib/breaktime/command.rb

@@ -1,4 +1,4 @@
-require 'linux_win_manager'
+require 'breaktime/linux_win_manager'
 
 # Used to determine and run the screensaver command.
 class Breaktime::Command
@@ -13,7 +13,6 @@ class Breaktime::Command
   def self.system_default(log)
     case RbConfig::CONFIG['target_os']
     when 'linux'
-      require 'linux_win_manager'
       log.debug { "Using Linux, detecting window manager and appropriate command" }
       Breaktime::LinuxWinManager.detect_command(log)
 
@@ -21,7 +20,7 @@ class Breaktime::Command
       log.debug { "Using Mac OSX10" }
       'open -a /System/Library/Frameworks/ScreenSaver.framework/Versions/A/Resources/ScreenSaverEngine.app'
 
-    when /mswin.*$/
+    when /(mswin|mingw).*$/
       log.debug { "Using Windows" }
       'rundll32.exe user32.dll,LockWorkStation'
 

data/lib/breaktime/main.rb

@@ -1,8 +1,8 @@
 require 'yaml'
 require 'log4r'
-require 'schedule'
+require 'breaktime/schedule'
 require 'dante'
-require 'cli'
+require 'breaktime/cli'
 
 # Handles configuration options, CLI stuff and process daemonizing.
 class Breaktime::Main
@@ -66,7 +66,7 @@ class Breaktime::Main
     # Open a dialog to notify the user about an impending screen break.
     when "dialog"
 			@log.info { "Opening dialog" }
-      require 'dialog'
+      require 'breaktime/dialog'
       # Automatically loads green shoes window
 
     # Run the command that will start the break.
@@ -80,6 +80,18 @@ class Breaktime::Main
     end
   end
 
+  # Check if Process has the fork method, but also check for Java
+  #
+  # Apparently jRuby doesn't implement this correctly, hence the secondary
+  # check.
+  def fork_implemented?
+    if Process.respond_to?(:fork)
+      RUBY_PLATFORM !~ /java/ && RUBY_ENGINE != 'macruby'
+    else
+      false
+    end
+  end
+
   # Start the scheduler as a daemon.
   #
   # The process can be kept on top if the "daemonize" option is set to be false
@@ -95,7 +107,12 @@ class Breaktime::Main
                   :log_path => @options['log_path']}
 
     if dante_opts[:daemonize]
-      @log.info { "Starting daemon, PID file => #{dante_opts[:pid_path]}, log file => #{dante_opts[:log_path]}" }
+      if not fork_implemented?
+        dante_opts[:daemonize] = false
+        @log.warn { "Daemonizing is not available, as fork is not implemented - running on top" }
+      else
+        @log.info { "Starting daemon, PID file => #{dante_opts[:pid_path]}, log file => #{dante_opts[:log_path]}" }
+      end
     end
 
     schedule = Breaktime::Schedule.new(@options['interval'], @options['days'], @cli.options, @log)

data/lib/breaktime/version.rb

@@ -1,3 +1,3 @@
 module Breaktime
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: breaktime
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: green_shoes
@@ -120,7 +120,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- lib/breaktime
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements: