trinidad_init_services 1.1.3 → 1.1.4

data/lib/trinidad_init_services/version.rb

@@ -0,0 +1,5 @@
+module Trinidad
+  module InitServices
+    VERSION = '1.1.4'
+  end
+end

data/spec/spec_helper.rb

@@ -6,14 +6,13 @@ rescue LoadError
   require 'rspec'
 end
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'trinidad_init_services/configuration'
-
-require 'java'
 require 'mocha'
-require 'fileutils'
 
 RSpec.configure do |config|
   config.mock_with :mocha
 end
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'trinidad_init_services'
+require 'trinidad/daemon'

data/spec/trinidad_daemon_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
-require 'trinidad_init_services'
 
 Trinidad::Daemon.module_eval do
   def server; @server; end

data/spec/trinidad_init_services/configuration_spec.rb

@@ -1,6 +1,9 @@
 require File.expand_path('spec_helper', File.join(File.dirname(__FILE__), '..'))
+
 require 'yaml'
 require 'rbconfig'
+require 'fileutils'
+require 'java'
 
 describe Trinidad::InitServices::Configuration do
   
@@ -65,7 +68,37 @@ describe Trinidad::InitServices::Configuration do
       subject.configure(config_defaults.merge 'run_user' => username)
 
       init_file_content = File.read(init_file) rescue ''
-      init_file_content.match(/RUN_USER="#{username}"/).should be_true
+      init_file_content.should =~ /RUN_USER="#{username}"/
+    end
+
+    unless (`which make` rescue '').empty?
+      
+      before(:all) do
+        FileUtils.rm_r "/tmp/jsvc-unix-src" if File.exist? "/tmp/jsvc-unix-src"
+      end
+      
+      it "configures and compiles jsvc" do
+        config_options = config_defaults.merge 'jsvc_path' => nil
+        config_options['jsvc_unpack_dir'] = '/tmp'
+        
+        java_home = java.lang.System.get_property("java.home")
+        java_home = java_home[0...-4] if java_home[-4..-1] == '/jre'
+        config_options['java_home'] = java_home # need a JDK dir
+        
+        subject = Trinidad::InitServices::Configuration.new
+        subject.instance_eval do # a bit of stubbing/mocking :
+          def detect_jsvc_path; nil; end
+          def ask_path(path, default = nil) 
+            raise path unless path =~ /path to jsvc .*/; default
+          end
+        end
+        
+        subject.configure(config_options)
+
+        init_file_content = File.read(init_file) rescue ''
+        init_file_content.should =~ /JSVC=\/tmp\/jsvc\-unix\-src\/jsvc/
+      end
+      
     end
     
   end

data/trinidad_init_services.gemspec

@@ -1,33 +1,22 @@
-## This is the rakegem gemspec template. Make sure you read and understand
-## all of the comments. Some sections require modification, and others can
-## be deleted if you don't need them. Once you understand the contents of
-## this file, feel free to delete any comments that begin with two hash marks.
-## You can find comprehensive Gem::Specification documentation, at
-## http://docs.rubygems.org/read/chapter/20
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'trinidad_init_services/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'
-
-  ## Leave these as is they will be modified for you by the rake gemspec task.
-  ## If your rubyforge_project name is different, then edit it and comment out
-  ## the sub! line in the Rakefile
+  
   s.name              = 'trinidad_init_services'
-  s.version           = '1.1.3'
-  s.date              = '2012-02-20'
+  s.version           = Trinidad::InitServices::VERSION
   s.rubyforge_project = 'trinidad_init_services'
-
-  ## Make sure your summary is short. The description may be as long
-  ## as you like.
+  
   s.summary     = "Trinidad init service scripts based on Apache Commons Daemon"
-  s.description = "Trinidad init service scripts on Apache Commons Daemon and JRuby-jsvc, compatible with Unix and Windows services"
-
-  ## List the primary authors. If there are a bunch of authors, it's probably
-  ## better to set the email to an email list or something. If you don't have
-  ## a custom homepage, consider using your GitHub URL or the like.
+  s.description = "Trinidad init service scripts on Apache Commons Daemon and JRuby-Jsvc, compatible with Unix and Windows services"
+  
   s.authors  = ["David Calavera"]
   s.email    = 'calavera@apache.org'
-  s.homepage = 'http://github.com/calavera/trinidad_daemon'
+  s.homepage = 'http://github.com/trinidad/trinidad_init_services'
 
   ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
@@ -35,12 +24,12 @@ Gem::Specification.new do |s|
 
   ## If your gem includes any executables, list them here.
   s.executables = ["trinidad_init_service"]
-  s.default_executable = 'trinidad_daemon_install'
+  s.default_executable = 'trinidad_init_service'
 
   ## Specify any RDoc options here. You'll want to add your README and
   ## LICENSE files to the extra_rdoc_files list.
   s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README LICENSE]
+  s.extra_rdoc_files = %w[README.md LICENSE]
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
@@ -49,39 +38,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '>= 2.7.1')
   s.add_development_dependency('mocha', '>= 0.10')
   
-  ## Leave this section as-is. It will be automatically generated from the
-  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
-  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
-  # = MANIFEST =
-  s.files = %w[
-    History.txt
-    LICENSE
-    README
-    Rakefile
-    bin/trinidad_init_service
-    init.d/trinidad.erb
-    lib/trinidad_init_services.rb
-    lib/trinidad_init_services/configuration.rb
-    spec/spec_helper.rb
-    spec/stubs/trinidad.rb
-    spec/stubs/trinidad.yml
-    spec/trinidad_daemon_spec.rb
-    spec/trinidad_init_services/configuration_spec.rb
-    trinidad-libs/commons-daemon.jar
-    trinidad-libs/jruby-jsvc.jar
-    trinidad-libs/jsvc_darwin
-    trinidad-libs/jsvc_linux
-    trinidad-libs/prunsrv_amd64.exe
-    trinidad-libs/prunsrv_ia64.exe
-    trinidad_init_services.gemspec
-  ]
-  # = MANIFEST =
+  s.files = `git ls-files`.split("\n")
 
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   ## s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
 
-s.post_install_message = <<TEXT
+  s.post_install_message = <<TEXT
 
 ------------------------------------------------------------------------------------
 

metadata

@@ -1,104 +1,163 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: trinidad_init_services
-version: !ruby/object:Gem::Version
-  version: 1.1.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.1.4
 platform: ruby
-authors:
-- David Calavera
+authors: 
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: trinidad
-  requirement: &2162638580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *2162638580
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2162638100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.7.1
-  type: :development
-  prerelease: false
-  version_requirements: *2162638100
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &2162637580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: *2162637580
-description: Trinidad init service scripts on Apache Commons Daemon and JRuby-jsvc,
-  compatible with Unix and Windows services
+
+date: 2012-03-01 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: trinidad
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.3.2
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.7.1
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0.10"
+    type: :development
+    version_requirements: *id003
+description: Trinidad init service scripts on Apache Commons Daemon and JRuby-Jsvc, compatible with Unix and Windows services
 email: calavera@apache.org
-executables:
-- trinidad_init_service
+executables: 
+  - trinidad_init_service
 extensions: []
-extra_rdoc_files:
-- README
-- LICENSE
-files:
-- History.txt
-- LICENSE
-- README
-- Rakefile
-- bin/trinidad_init_service
-- init.d/trinidad.erb
-- lib/trinidad_init_services.rb
-- lib/trinidad_init_services/configuration.rb
-- spec/spec_helper.rb
-- spec/stubs/trinidad.rb
-- spec/stubs/trinidad.yml
-- spec/trinidad_daemon_spec.rb
-- spec/trinidad_init_services/configuration_spec.rb
-- trinidad-libs/commons-daemon.jar
-- trinidad-libs/jruby-jsvc.jar
-- trinidad-libs/jsvc_darwin
-- trinidad-libs/jsvc_linux
-- trinidad-libs/prunsrv_amd64.exe
-- trinidad-libs/prunsrv_ia64.exe
-- trinidad_init_services.gemspec
-homepage: http://github.com/calavera/trinidad_daemon
+
+extra_rdoc_files: 
+  - README.md
+  - LICENSE
+files: 
+  - .gitignore
+  - Gemfile
+  - History.txt
+  - LICENSE
+  - README.md
+  - Rakefile
+  - bin/trinidad_init_service
+  - init.d/trinidad.erb
+  - jsvc-unix-src/CHANGES.txt
+  - jsvc-unix-src/INSTALL.txt
+  - jsvc-unix-src/Makedefs.in
+  - jsvc-unix-src/Makefile.in
+  - jsvc-unix-src/configure
+  - jsvc-unix-src/configure.in
+  - jsvc-unix-src/man/README
+  - jsvc-unix-src/man/fetch.sh
+  - jsvc-unix-src/man/jsvc.1.xml
+  - jsvc-unix-src/native/.indent.pro
+  - jsvc-unix-src/native/Makefile.in
+  - jsvc-unix-src/native/arguments.c
+  - jsvc-unix-src/native/arguments.h
+  - jsvc-unix-src/native/debug.c
+  - jsvc-unix-src/native/debug.h
+  - jsvc-unix-src/native/dso-dlfcn.c
+  - jsvc-unix-src/native/dso-dyld.c
+  - jsvc-unix-src/native/dso.h
+  - jsvc-unix-src/native/help.c
+  - jsvc-unix-src/native/help.h
+  - jsvc-unix-src/native/home.c
+  - jsvc-unix-src/native/home.h
+  - jsvc-unix-src/native/java.c
+  - jsvc-unix-src/native/java.h
+  - jsvc-unix-src/native/jsvc-unix.c
+  - jsvc-unix-src/native/jsvc.h
+  - jsvc-unix-src/native/location.c
+  - jsvc-unix-src/native/location.h
+  - jsvc-unix-src/native/locks.c
+  - jsvc-unix-src/native/locks.h
+  - jsvc-unix-src/native/replace.c
+  - jsvc-unix-src/native/replace.h
+  - jsvc-unix-src/native/signals.c
+  - jsvc-unix-src/native/signals.h
+  - jsvc-unix-src/native/version.h
+  - jsvc-unix-src/support/apfunctions.m4
+  - jsvc-unix-src/support/apjava.m4
+  - jsvc-unix-src/support/apsupport.m4
+  - jsvc-unix-src/support/buildconf.sh
+  - jsvc-unix-src/support/config.guess
+  - jsvc-unix-src/support/config.sub
+  - jsvc-unix-src/support/install.sh
+  - jsvc-unix-src/support/mkdist.sh
+  - lib/trinidad/daemon.rb
+  - lib/trinidad_init_services.rb
+  - lib/trinidad_init_services/configuration.rb
+  - lib/trinidad_init_services/version.rb
+  - spec/spec_helper.rb
+  - spec/stubs/trinidad.rb
+  - spec/stubs/trinidad.yml
+  - spec/trinidad_daemon_spec.rb
+  - spec/trinidad_init_services/configuration_spec.rb
+  - trinidad-libs/commons-daemon.jar
+  - trinidad-libs/jruby-jsvc.jar
+  - trinidad-libs/jsvc_darwin
+  - trinidad-libs/prunsrv_amd64.exe
+  - trinidad-libs/prunsrv_ia64.exe
+  - trinidad_init_services.gemspec
+homepage: http://github.com/trinidad/trinidad_init_services
 licenses: []
-post_install_message: ! "\n------------------------------------------------------------------------------------\n\nPlease
-  now run:\n\n  $ jruby -S trinidad_init_service\n\nto complete the installation.\n\n------------------------------------------------------------------------------------\n\n"
-rdoc_options:
-- --charset=UTF-8
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+post_install_message: |+
+  
+  ------------------------------------------------------------------------------------
+  
+  Please now run:
+  
+    $ jruby -S trinidad_init_service
+  
+  to complete the installation.
+  
+  ------------------------------------------------------------------------------------
+  
+rdoc_options: 
+  - --charset=UTF-8
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: trinidad_init_services
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 2
 summary: Trinidad init service scripts based on Apache Commons Daemon
 test_files: []
-has_rdoc: 
+

data/README

@@ -1,63 +0,0 @@
-Trinidad init services
-===============
-
-Trinidad's init services library based on Apache Commons Daemon and JRuby-jsvc. Works on Unix and Windows systems.
-
-Installation
-============
-
-$ jruby -S gem install trinidad_init_services
-
-When the gem is installed the user must launch the installation process:
-
-    $ jruby -S trinidad_init_service
-
-This installer guides you through the configuration process and generates a
-init.d script if you are on a unix system or creates the service if you are
-on a windows box.
-
-You can optionally provide a configuration file to the trinidad_init_service
-command.  An example configuration file might look like this:
-
-    app_path: "/home/myuser/app"
-    trinidad_options: "-e production"
-    jruby_home: "/opt/jruby"
-    ruby_compat_version: RUBY1_8
-    trinidad_name: Trinidad
-    jsvc_path: "/usr/bin/jsvc"
-    java_home: "/opt/java"
-    output_path: "/etc/init.d"
-    pid_file: "/tmp/trinidad.pid"
-    log_file: "/tmp/trinidad.log"
-
-You can then run the installer like so:
-
-    $ jruby -S trinidad_init_service trinidad_init_config.yml
-
-If any of the required options are not provided in the configuration file, then the installer will prompt you
-for them.
-
-Unix
-====
-
-  Execution
-  =========
-
-  When the installation process finishes you can use the script trinidad-daemon.sh
-  generated to launch the server as a daemon with the options start|stop|restart,
-  i.e:
-
-      $ /etc/init.d/trinidad restart
-
-Windows
-=======
-
-  Execution
-  =========
-
-  Open the `Services` panel under `Administrative Tools` and look for a
-  service called `Trinidad`.
-
-== Copyright
-
-Copyright (c) 2011 David Calavera<calavera@apache.org>. See LICENSE for details.