trinidad_daemon_extension 0.3.1 → 0.4.0

data/Gemfile

@@ -1,3 +1,9 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gemspec
+gemspec
+
+gem 'jruby-openssl', :platform => :jruby
+
+group :test do
+  gem 'rake', :require => nil
+end

data/History.txt

@@ -1,3 +1,10 @@
+== 0.4.0 (2013-01-14)
+
+* Update akuma.jar to 1.8
+* load jars instead of requiring them (polluting LOADED_FEATURES)
+* Avoid akuma chdir-ing to root (#10)
+* gem depends explicitly on the trinidad gem
+
 == 0.3.1 (2012-05-06)
 
 * Update jna.jar 3.4.0 from https://github.com/twall/jna/downloads (#9)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 David Calavera
+Copyright (c) 2013 Team Trinidad and contributors http://github.com/trinidad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -46,4 +46,5 @@ http://wiki.github.com/calavera/trinidad/extensions
 
 ## Copyright
 
-Copyright (c) 2010-2012 David Calavera. See LICENSE for details.
+Copyright (c) 2013 [Team Trinidad](https://github.com/trinidad). 
+See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.

data/Rakefile

@@ -1,36 +1,10 @@
-require 'rubygems'
-require 'rake'
-require 'date'
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-def version
-  line = File.read("lib/#{name}/version.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def gemspec_file
-  "#{name}.gemspec"
+begin
+  require 'bundler/setup'
+rescue LoadError => e
+  require('rubygems') && retry
+  raise e
 end
 
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
-
 task :default => :spec
 
 require 'rspec/core/rake_task'
@@ -38,70 +12,11 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = ['--color', "--format documentation"]
 end
 
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
-  sh "open coverage/index.html"
-end
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end
-
-#############################################################################
-#
-# Custom tasks (add your own tasks here)
-#
-#############################################################################
-
-
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin master --tags"
-  sh "gem push pkg/#{name}-#{version}.gem"
-end
-
-task :build => :validate do
-  sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end
-
-task :install => :build do
-  sh "gem install pkg/#{name}-#{version}.gem"
-end
+require 'bundler/gem_tasks'
 
-task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
-  unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-    exit!
-  end
-  unless Dir['VERSION*'].empty?
-    puts "A `VERSION` file at root level violates Gem best practices."
-    exit!
-  end
+desc "Clear out all built (pkg/* and *.gem) artifacts"
+task :clear do
+  rm Dir["*.gem"]
+  rm_r Dir["pkg/*"] if File.exist?("pkg")
 end
+task :clean => :clear

data/lib/trinidad_daemon_extension.rb

@@ -1,6 +1,4 @@
 require 'trinidad'
-require 'trinidad/jars'
-require 'trinidad/extensions'
 
 require 'trinidad_daemon_extension/jars'
 require 'trinidad_daemon_extension/tomcat_wrapper'

data/lib/trinidad_daemon_extension/jars.rb

@@ -5,5 +5,5 @@ trinidad_libs =
   Trinidad::Extensions::Daemon::TRINIDAD_LIBS : 
   File.expand_path('../../../trinidad-libs', __FILE__)
 
-require File.join(trinidad_libs, 'akuma.jar')
-require File.join(trinidad_libs, 'jna.jar')
+load File.join(trinidad_libs, 'akuma.jar')
+load File.join(trinidad_libs, 'jna.jar')

data/lib/trinidad_daemon_extension/tomcat_wrapper.rb

@@ -32,7 +32,7 @@ module Trinidad
         end
         
         def start
-          daemon = com.sun.akuma.Daemon.new
+          daemon = com.sun.akuma.Daemon::WithoutChdir.new
           if daemon.isDaemonized
             pid = com.sun.akuma.CLibrary::LIBC.getpid
             puts "Starting Trinidad as a daemon"
@@ -74,7 +74,7 @@ module Trinidad
               if arg.to_java.startsWith("-Xbootclasspath")
                 # add here the custom arguments, otherwhise are added after
                 # trinidad script and break optionParser
-                jvm_args.each { |custom| args.add(custom) }
+                jvm_args.each { |custom| args.add(custom) } if jvm_args
               end
               # I don't understand this hack but without it the daemon goes off, 
               # could be others
@@ -86,4 +86,4 @@ module Trinidad
       end
     end
   end
-end
+end

data/lib/trinidad_daemon_extension/version.rb

@@ -1,7 +1,7 @@
 module Trinidad
   module Extensions
     module Daemon
-      VERSION = '0.3.1'
+      VERSION = '0.4.0'
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,15 @@
 begin
   require 'rspec'
+rescue LoadError => e
+  require('rubygems') && retry
+  raise e
+end
+begin
+  require 'mocha/api'
 rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'rspec'
+  require 'mocha'
 end
 
-require 'mocha'
-
 RSpec.configure do |config|
   config.mock_with :mocha
 end

data/spec/trinidad_daemon_extension_spec.rb

@@ -57,6 +57,10 @@ end
 
 describe Trinidad::Extensions::Daemon::TomcatWrapper do
 
+  let(:tomcat_wrapper) do
+    Trinidad::Extensions::Daemon::TomcatWrapper.new Trinidad::Tomcat::Tomcat.new
+  end
+  
   it "responds to tomcat methods" do
     tomcat_wrapper.respond_to?(:start).should be true
     tomcat_wrapper.respond_to?(:stop).should be true
@@ -86,10 +90,6 @@ describe Trinidad::Extensions::Daemon::TomcatWrapper do
     tomcat.host.app_base.should == '/app-base'
   end
   
-  def tomcat_wrapper
-    Trinidad::Extensions::Daemon::TomcatWrapper.new Trinidad::Tomcat::Tomcat.new
-  end
-  
   context "mocked" do
     
     @@tmpdir = nil
@@ -102,27 +102,27 @@ describe Trinidad::Extensions::Daemon::TomcatWrapper do
       ENV['TMPDIR'] = @@tmpdir
     end
     
-    before :each do
-      @tomcat = mock('tomcat')
-      @tomcat_wrapper = Trinidad::Extensions::Daemon::TomcatWrapper.new(@tomcat)
-    end    
+    let(:tomcat) { mock('tomcat') }
+    let(:tomcat_wrapper) do
+      Trinidad::Extensions::Daemon::TomcatWrapper.new tomcat
+    end
     
     it "starts tomcat" do
       current_pid = $$
-      com.sun.akuma.Daemon.expects(:new).returns daemon = mock("daemon")
+      com.sun.akuma.Daemon::WithoutChdir.expects(:new).returns daemon = mock("daemon")
       daemon.expects(:isDaemonized).returns true
       daemon.expects(:init).with("#{File.dirname(__FILE__)}/trinidad.pid")
 
-      @tomcat.expects(:start)
-      @tomcat.expects(:server).returns server = mock("tomcat.server")
+      tomcat.expects(:start)
+      tomcat.expects(:server).returns server = mock("tomcat.server")
       server.expects(:await)
 
-      @tomcat_wrapper.start
+      tomcat_wrapper.start
     end
 
     it "stops tomcat" do
-      @tomcat.expects(:stop)
-      @tomcat_wrapper.stop
+      tomcat.expects(:stop)
+      tomcat_wrapper.stop
     end
     
   end

data/trinidad_daemon_extension.gemspec

@@ -3,16 +3,12 @@ $:.push File.expand_path("../lib", __FILE__)
 require 'trinidad_daemon_extension/version'
 
 Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
-  
   s.name              = 'trinidad_daemon_extension'
   s.version           = Trinidad::Extensions::Daemon::VERSION
   s.rubyforge_project = 'trinidad_daemon_extension'
   
-  s.summary     = "Trinidad daemon extension"
-  s.description = "Trinidad extension to run the Apache Tomcat server as a daemon"
+  s.summary     = "Daemon extension for Trinidad"
+  s.description = "Trinidad extension to run the Apache Tomcat server as a daemon (for Unix only)."
   
   s.authors  = ["David Calavera"]
   s.email    = 'calavera@apache.org'
@@ -22,15 +18,14 @@ Gem::Specification.new do |s|
   
   s.require_paths = %w[lib]
   
-  s.add_dependency('trinidad_jars', ">= 1.0.0")
+  s.add_dependency('trinidad', ">= 1.3.5")
   
-  s.add_development_dependency('rspec', '~> 2.8')
-  s.add_development_dependency('mocha', '>= 0.10.4')
+  s.add_development_dependency('rspec', '~> 2.10')
+  s.add_development_dependency('mocha', '>= 0.11')
   
   s.files = `git ls-files`.split("\n").sort.
     reject { |file| file =~ /^\./ }.
     reject { |file| file =~ /^(rdoc|pkg|src|git-hooks)/ }
   
   s.test_files = s.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
-  
 end

metadata

@@ -2,7 +2,7 @@
 name: trinidad_daemon_extension
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
   - David Calavera
@@ -10,42 +10,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-06 00:00:00 Z
+date: 2013-01-14 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: trinidad_jars
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    name: trinidad
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.3.5
+    requirement: *id001
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: "2.8"
+            version: "2.10"
+    requirement: *id002
+    prerelease: false
     type: :development
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: mocha
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.10.4
+            version: "0.11"
+    requirement: *id003
+    prerelease: false
     type: :development
-    version_requirements: *id003
-description: Trinidad extension to run the Apache Tomcat server as a daemon
+description: Trinidad extension to run the Apache Tomcat server as a daemon (for Unix only).
 email: calavera@apache.org
 executables: []
 
@@ -82,19 +82,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: trinidad_daemon_extension
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 2
-summary: Trinidad daemon extension
+specification_version: 3
+summary: Daemon extension for Trinidad
 test_files: 
   - spec/trinidad_daemon_extension_spec.rb