jettywrapper 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813ec58e9127d32a6aaed77b56e1c2cb31d1bdbb
-  data.tar.gz: 753964035ecaa0ed84892a19b1aab2b46b2895f8
+  metadata.gz: f7d661a0b7e7c0b5237898916aa1a4c7a325f2ce
+  data.tar.gz: a2e348d77b9c9a9532fa7aa9d6633c37dfc7ec7d
 SHA512:
-  metadata.gz: aa1910b5f5bc64b14dafde8a86ab1e0350b6058b6c23f5a584c55ff284409d48533c148cf6bf218408a7d6c1587b4194e4895bb56da948ce496ab09427fbe67b
-  data.tar.gz: 38a177af1bf449317caa58cf8af91b2b5818a4b9cb7d48df7cb80ab79710dc37afe56042dcf97b89a0af7918ff56785fd9c6717b560f517af06b8dbbf2cb5d50
+  metadata.gz: 4a63cd1bd6ef04567f343e5e222a4764b5b0be3c735e70de32b61acf1084d4330b86ff8633863fb31445a9ae2399ca16a4fd2ac6de3b63809f496d83672aff5a
+  data.tar.gz: c25b1b9f5ff6290b76708bdc7857c3d15440b9db29091872a51dd11eb6ac141309af8caff1c368932d9158dd2426e399c55c3b7e25eb98c1d5a3f25ea2a95834

data/History.txt

@@ -1,3 +1,6 @@
+1.8.0
+  2014-07-16: Removed mediashelf-loggable dependency [Justin Coyne]
+
 1.4.0
   Download jetty from a zip file
 

data/jettywrapper.gemspec

@@ -20,14 +20,13 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   
   s.add_dependency "logger"
-  s.add_dependency "mediashelf-loggable"
   s.add_dependency "childprocess"
   s.add_dependency "i18n"
   s.add_dependency "activesupport", ">=3.0.0"
   
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", '~> 2.99'
+  s.add_development_dependency "rspec-its"
   s.add_development_dependency 'rake'
-
   
   s.add_development_dependency 'yard'#, '0.6.5'  # Yard > 0.6.5 won't generate docs.
                                                 # I don't know why & don't have time to 

data/lib/jettywrapper.rb

@@ -1,4 +1,3 @@
-require 'loggable'
 require 'singleton'
 require 'fileutils'
 require 'shellwords'
@@ -16,7 +15,6 @@ Dir[File.expand_path(File.join(File.dirname(__FILE__),"tasks/*.rake"))].each { |
 class Jettywrapper
   
   include Singleton
-  include Loggable
   include ActiveSupport::Benchmarkable
   
   
@@ -304,155 +302,167 @@ class Jettywrapper
         return false
       end
     end
+
+    def logger=(logger)
+      @@logger = logger
+    end
+  
+    # If ::Rails.logger is defined, that will be returned.
+    # If no logger has been defined, a new STDOUT Logger will be created.
+    def logger
+      @@logger ||= defined?(::Rails) ? ::Rails.logger : ::Logger.new(STDOUT)
+    end
+
+  end #end of class << self
     
-    end #end of class << self
-    
+  def logger
+    self.class.logger
+  end
         
-   # What command is being run to invoke jetty? 
-   def jetty_command
-     ["java", java_variables, java_opts, "-jar", "start.jar", jetty_opts].flatten
-   end
-
-   def java_variables
-     ["-Djetty.port=#{@port}",
-      "-Dsolr.solr.home=#{Shellwords.escape(@solr_home)}"]
-   end
-
-   # Start the jetty server. Check the pid file to see if it is running already, 
-   # and stop it if so. After you start jetty, write the PID to a file. 
-   # This is the instance start method. It must be called on Jettywrapper.instance
-   # You're probably better off using Jettywrapper.start(:jetty_home => "/path/to/jetty")
-   # @example
-   #    Jettywrapper.configure(params)
-   #    Jettywrapper.instance.start
-   #    return Jettywrapper.instance
-   def start
-     logger.debug "Starting jetty with these values: "
-     logger.debug "jetty_home: #{@jetty_home}"
-     logger.debug "jetty_command: #{jetty_command.join(' ')}"
-     
-     # Check to see if we can start.
-     # 1. If there is a pid, check to see if it is really running
-     # 2. Check to see if anything is blocking the port we want to use     
-     if pid
-       if Jettywrapper.is_pid_running?(pid)
-         raise("Server is already running with PID #{pid}")
-       else
-         logger.warn "Removing stale PID file at #{pid_path}"
-         File.delete(pid_path)
-       end
-     end
-     if Jettywrapper.is_port_in_use?(self.port)
-       raise("Port #{self.port} is already in use.")
-     end
-     benchmark "Started jetty" do
-       Dir.chdir(@jetty_home) do
-         process.start
-       end
-       FileUtils.makedirs(pid_dir) unless File.directory?(pid_dir)
-       begin
-         f = File.new(pid_path,  "w")
-       rescue Errno::ENOENT, Errno::EACCES
-         f = File.new(File.join(base_path,'tmp',pid_file),"w")
-       end
-       f.puts "#{process.pid}"
-       f.close
-       logger.debug "Wrote pid file to #{pid_path} with value #{process.pid}"
-       startup_wait!
-     end
-   end
-
-   # Wait for the jetty server to start and begin listening for requests
-   def startup_wait!
-     begin
-     Timeout::timeout(startup_wait) do
-       sleep 1 until (Jettywrapper.is_port_in_use? self.port)
-     end 
-     rescue Timeout::Error
-       logger.warn "Waited #{startup_wait} seconds for jetty to start, but it is not yet listening on port #{self.port}. Continuing anyway."
-     end
-   end
- 
-   def process
-     @process ||= begin
-        process = ChildProcess.build(*jetty_command)
-        if self.quiet
-          process.io.stderr = File.open(File.expand_path("jettywrapper.log"), "w+")
-          process.io.stdout = process.io.stderr
-           logger.warn "Logging jettywrapper stdout to #{File.expand_path(process.io.stderr.path)}"
-        else
-          process.io.inherit!
-        end
-        process.detach = true
+  # What command is being run to invoke jetty? 
+  def jetty_command
+    ["java", java_variables, java_opts, "-jar", "start.jar", jetty_opts].flatten
+  end
+
+  def java_variables
+    ["-Djetty.port=#{@port}",
+     "-Dsolr.solr.home=#{Shellwords.escape(@solr_home)}"]
+  end
 
-        process
+  # Start the jetty server. Check the pid file to see if it is running already, 
+  # and stop it if so. After you start jetty, write the PID to a file. 
+  # This is the instance start method. It must be called on Jettywrapper.instance
+  # You're probably better off using Jettywrapper.start(:jetty_home => "/path/to/jetty")
+  # @example
+  #    Jettywrapper.configure(params)
+  #    Jettywrapper.instance.start
+  #    return Jettywrapper.instance
+  def start
+    logger.debug "Starting jetty with these values: "
+    logger.debug "jetty_home: #{@jetty_home}"
+    logger.debug "jetty_command: #{jetty_command.join(' ')}"
+   
+    # Check to see if we can start.
+    # 1. If there is a pid, check to see if it is really running
+    # 2. Check to see if anything is blocking the port we want to use     
+    if pid
+      if Jettywrapper.is_pid_running?(pid)
+        raise("Server is already running with PID #{pid}")
+      else
+        logger.warn "Removing stale PID file at #{pid_path}"
+        File.delete(pid_path)
+      end
+    end
+    if Jettywrapper.is_port_in_use?(self.port)
+      raise("Port #{self.port} is already in use.")
+    end
+    benchmark "Started jetty" do
+      Dir.chdir(@jetty_home) do
+        process.start
+      end
+      FileUtils.makedirs(pid_dir) unless File.directory?(pid_dir)
+      begin
+        f = File.new(pid_path,  "w")
+      rescue Errno::ENOENT, Errno::EACCES
+        f = File.new(File.join(base_path,'tmp',pid_file),"w")
       end
-   end
-
-   def reset_process!
-     @process = nil
-   end
-   # Instance stop method. Must be called on Jettywrapper.instance
-   # You're probably better off using Jettywrapper.stop(:jetty_home => "/path/to/jetty")
-   # @example
-   #    Jettywrapper.configure(params)
-   #    Jettywrapper.instance.stop
-   #    return Jettywrapper.instance
-   def stop    
-     logger.debug "Instance stop method called for pid '#{pid}'"
-     if pid
-       if @process
-         @process.stop
+      f.puts "#{process.pid}"
+      f.close
+      logger.debug "Wrote pid file to #{pid_path} with value #{process.pid}"
+      startup_wait!
+    end
+  end
+
+  # Wait for the jetty server to start and begin listening for requests
+  def startup_wait!
+    begin
+    Timeout::timeout(startup_wait) do
+      sleep 1 until (Jettywrapper.is_port_in_use? self.port)
+    end 
+    rescue Timeout::Error
+      logger.warn "Waited #{startup_wait} seconds for jetty to start, but it is not yet listening on port #{self.port}. Continuing anyway."
+    end
+  end
+ 
+  def process
+    @process ||= begin
+       process = ChildProcess.build(*jetty_command)
+       if self.quiet
+         process.io.stderr = File.open(File.expand_path("jettywrapper.log"), "w+")
+         process.io.stdout = process.io.stderr
+         logger.warn "Logging jettywrapper stdout to #{File.expand_path(process.io.stderr.path)}"
        else
-         Process.kill("KILL", pid) rescue nil
+         process.io.inherit!
        end
+       process.detach = true
 
-       begin
-         File.delete(pid_path)
-       rescue
-       end
+       process
      end
-   end
- 
+  end
 
-   # The fully qualified path to the pid_file
-   def pid_path
-     #need to memoize this, becasuse the base path could be relative and the cwd can change in the yield block of wrap
-     @path ||= File.join(pid_dir, pid_file)
-   end
+  def reset_process!
+    @process = nil
+  end
+
+  # Instance stop method. Must be called on Jettywrapper.instance
+  # You're probably better off using Jettywrapper.stop(:jetty_home => "/path/to/jetty")
+  # @example
+  #    Jettywrapper.configure(params)
+  #    Jettywrapper.instance.stop
+  #    return Jettywrapper.instance
+  def stop    
+    logger.debug "Instance stop method called for pid '#{pid}'"
+    if pid
+      if @process
+        @process.stop
+      else
+        Process.kill("KILL", pid) rescue nil
+      end
 
-   # The file where the process ID will be written
-   def pid_file
-     jetty_home_to_pid_file(@jetty_home)
-   end
-   
-    # Take the @jetty_home value and transform it into a legal filename
-    # @return [String] the name of the pid_file
-    # @example
-    #    /usr/local/jetty1 => _usr_local_jetty1.pid
-    def jetty_home_to_pid_file(jetty_home)
       begin
-        jetty_home.gsub(/\//,'_') << "_#{self.class.env}" << ".pid"
-      rescue Exception => e
-        raise "Couldn't make a pid file for jetty_home value #{jetty_home}\n  Caused by: #{e}"
+        File.delete(pid_path)
+      rescue
       end
     end
+  end
+ 
 
-   # The directory where the pid_file will be written
-   def pid_dir
-     File.expand_path(File.join(base_path,'tmp','pids'))
-   end
+  # The fully qualified path to the pid_file
+  def pid_path
+    #need to memoize this, becasuse the base path could be relative and the cwd can change in the yield block of wrap
+    @path ||= File.join(pid_dir, pid_file)
+  end
+
+  # The file where the process ID will be written
+  def pid_file
+    jetty_home_to_pid_file(@jetty_home)
+  end
    
-   # Check to see if there is a pid file already
-   # @return true if the file exists, otherwise false
-   def pid_file?
-      return true if File.exist?(pid_path)
-      false
-   end
-
-   # the process id of the currently running jetty instance
-   def pid
-      File.open( pid_path ) { |f| return f.gets.to_i } if File.exist?(pid_path)
-   end
+  # Take the @jetty_home value and transform it into a legal filename
+  # @return [String] the name of the pid_file
+  # @example
+  #    /usr/local/jetty1 => _usr_local_jetty1.pid
+  def jetty_home_to_pid_file(jetty_home)
+    begin
+      jetty_home.gsub(/\//,'_') << "_#{self.class.env}" << ".pid"
+    rescue Exception => e
+      raise "Couldn't make a pid file for jetty_home value #{jetty_home}\n  Caused by: #{e}"
+    end
+  end
+
+  # The directory where the pid_file will be written
+  def pid_dir
+    File.expand_path(File.join(base_path,'tmp','pids'))
+  end
    
+  # Check to see if there is a pid file already
+  # @return true if the file exists, otherwise false
+  def pid_file?
+    File.exist?(pid_path)
+  end
+
+  # the process id of the currently running jetty instance
+  def pid
+    File.open( pid_path ) { |f| return f.gets.to_i } if File.exist?(pid_path)
+  end
 end

data/lib/jettywrapper/version.rb

@@ -1,3 +1,3 @@
 class Jettywrapper
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
   SimpleCov.start
 end
 
-require 'rspec/autorun'
+require 'rspec/its'
 require 'jettywrapper'
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jettywrapper
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -27,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mediashelf-loggable
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -41,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: childprocess
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,35 +55,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: '2.99'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="