trinidad_init_services 1.1.0.pre3 → 1.1.0

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.0 (2012-01-04)
+
+* Fix bug that didn't allow to create several services with different ids.
+* Allow to provide a configuration file to load the options from.
+
 == 1.1.0.pre (2011-09-30)
 
 * Load prunsrv on Windows according with the architecture

data/README

@@ -16,6 +16,27 @@ 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
 ====
 

data/bin/trinidad_init_service

@@ -1,3 +1,12 @@
+#!/usr/bin/env jruby
+
 require 'trinidad_init_services/configuration'
+require 'yaml'
 
-Trinidad::InitServices::Configuration.new.configure
+if ARGV.size > 0
+  config_file = File.read(ARGV[0])
+  config = YAML.load(config_file)
+  Trinidad::InitServices::Configuration.new.configure(config)
+else
+  Trinidad::InitServices::Configuration.new.configure
+end

data/lib/trinidad_init_services/configuration.rb

@@ -19,11 +19,11 @@ module Trinidad
         @classpath << File.join(@jruby_home, 'lib', 'jruby.jar')
       end
 
-      def collect_windows_opts(options_ask)
+      def collect_windows_opts(options_ask, defaults)
         options_ask << '(separated by `;`)'
         name_ask = 'Service name? {Alphanumeric and spaces only}'
         name_default = 'Trinidad'
-        @trinidad_name = ask(name_ask, name_default)
+        @trinidad_name = defaults["trinidad_name"] || ask(name_ask, name_default)
       end
 
       def configure_jruby_opts
@@ -36,29 +36,29 @@ module Trinidad
         opts
       end
 
-      def configure
-        @app_path = ask_path('Application path?')
+      def configure(defaults={})
+        @app_path = defaults["app_path"] || ask_path('Application path?')
         @trinidad_options = ["-d #{@app_path}"]
         options_ask = 'Trinidad options?'
         options_default = '-e production'
-        collect_windows_opts(options_ask) if windows?
+        collect_windows_opts(options_ask, defaults) if windows?
 
-        @trinidad_options << ask(options_ask, options_default)
-        @jruby_home = ask_path('JRuby home?', default_jruby_home)
-        @ruby_compat_version = ask('Ruby 1.8.x or 1.9.x compatibility?', default_ruby_compat_version)
+        @trinidad_options << (defaults["trinidad_options"] || ask(options_ask, options_default))
+        @jruby_home = defaults["jruby_home"] || ask_path('JRuby home?', default_jruby_home)
+        @ruby_compat_version = defaults["ruby_compat_version"] || ask('Ruby 1.8.x or 1.9.x compatibility?', default_ruby_compat_version)
         @jruby_opts = configure_jruby_opts
         initialize_paths
 
-        windows? ? configure_windows_service : configure_unix_daemon
+        windows? ? configure_windows_service : configure_unix_daemon(defaults)
         puts 'Done.'
       end
 
-      def configure_unix_daemon
-        @jsvc = jsvc_path
-        @java_home = ask_path('Java home?', default_java_home)
-        @output_path = ask_path('init.d output path?', '/etc/init.d')
-        @pid_file = ask_path('pid file?', '/var/run/trinidad/trinidad.pid')
-        @log_file = ask_path('log file?', '/var/log/trinidad/trinidad.log')
+      def configure_unix_daemon(defaults)
+        @jsvc = defaults["jsvc_path"] || jsvc_path
+        @java_home = defaults["java_home"] || ask_path('Java home?', default_java_home)
+        @output_path = defaults["output_path"] || ask_path('init.d output path?', '/etc/init.d')
+        @pid_file = defaults["pid_file"] || ask_path('pid file?', '/var/run/trinidad/trinidad.pid')
+        @log_file = defaults["log_file"] || ask_path('log file?', '/var/log/trinidad/trinidad.log')
 
         daemon = ERB.new(
           File.read(
@@ -77,20 +77,30 @@ module Trinidad
 
       def configure_windows_service
         srv_path = prunsrv_path
-        command = %Q{//IS//Trinidad --DisplayName="#{@trinidad_name}" \
---Install="#{srv_path}" --Jvm=auto --StartMode=jvm --StopMode=jvm \
+        trinidad_service_id = @trinidad_name.gsub(/\W/, '')
+
+        command = %Q{//IS//#{trinidad_service_id} --DisplayName="#{@trinidad_name}" \
+--Install=#{srv_path} --Jvm=auto --StartMode=jvm --StopMode=jvm \
 --StartClass=com.msp.procrun.JRubyService --StartMethod=start \
---StartParams="#{@trinidad_daemon_path};#{@trinidad_options.join(";")}" \
---StopClass=com.msp.procrun.JRubyService --StopMethod=stop --Classpath="#{@classpath.join(";")}" \
+--StartParams="#{escape(@trinidad_daemon_path)};#{format_path(@trinidad_options)}" \
+--StopClass=com.msp.procrun.JRubyService --StopMethod=stop --Classpath="#{format_path(@classpath)}" \
 --StdOutput=auto --StdError=auto \
---LogPrefix="#{@trinidad_name.downcase.gsub(/\W/,'')}" \
-++JvmOptions="#{@jruby_opts.join(";")}"
+--LogPrefix="#{trinidad_service_id.downcase}" \
+++JvmOptions="#{format_path(@jruby_opts)}"
 }
         system "#{srv_path} #{command}"
       end
 
       private
 
+      def escape(path)
+        path.gsub(%r{/}, '\\')
+      end
+
+      def format_path(option)
+        option.map {|o| escape(o)}.join(';')
+      end
+
       def default_jruby_home
         Java::JavaLang::System.get_property("jruby.home")
       end

data/lib/trinidad_init_services.rb

@@ -3,7 +3,7 @@ require 'trinidad'
 
 module Trinidad
   module Daemon
-    VERSION = '1.1.0.pre3'
+    VERSION = '1.1.0'
 
     def init
     end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+begin
+  require 'rspec'
+rescue LoadError
+  require 'rubygems'
+  gem 'rspec'
+  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

data/spec/trinidad_init_services/configuration_spec.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'yaml'
+
+describe Trinidad::InitServices::Configuration do
+
+  before do
+    Dir.mkdir(tmp_dir) unless File.exist?(tmp_dir)
+    Dir.mkdir(init_dir) 
+    
+    config = <<YAML
+app_path: "tmp/app"
+trinidad_options: "-e production"
+jruby_home: "tmp/jruby"
+ruby_compat_version: RUBY1_8
+trinidad_name: Trinidad
+jsvc_path: "tmp/jsvc"
+java_home: "tmp/java"
+output_path: "tmp/etc_init.d"
+pid_file: "tmp/trinidad.pid"
+log_file: "tmp/trinidad.log"
+YAML
+
+    defaults = YAML::load(config)
+
+    subject.configure(defaults)
+  end
+
+  after do
+    File.delete(init_file)
+    Dir.rmdir(init_dir)
+    Dir.rmdir(tmp_dir)
+  end
+
+	it "is creates the init.d file" do
+		File.exist?(init_file).should be_true
+
+    init_file_content = File.read(init_file)
+
+    init_file_content.match(/JSVC=tmp\/jsvc/).should be_true
+    init_file_content.match(/JAVA_HOME=tmp\/java/).should be_true
+    init_file_content.match(/JRUBY_HOME=tmp\/jruby/).should be_true
+    init_file_content.match(/APP_PATH=tmp\/app/).should be_true
+    init_file_content.match(/TRINIDAD_OPTS="-d tmp\/app -e production"/).should be_true
+  end
+
+  def init_file
+    "#{init_dir}/trinidad"
+  end
+
+  def init_dir
+    "#{tmp_dir}/etc_init.d/"
+  end
+
+  def tmp_dir
+    "#{root_dir}/tmp"
+  end
+
+  def root_dir
+    File.dirname(__FILE__) + "/../../"
+  end
+end

data/trinidad_init_services.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## 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.0.pre3'
-  s.date              = '2011-11-03'
+  s.version           = '1.1.0'
+  s.date              = '2012-01-04'
   s.rubyforge_project = 'trinidad_init_services'
 
   ## Make sure your summary is short. The description may be as long
@@ -59,6 +59,8 @@ Gem::Specification.new do |s|
     init.d/trinidad.erb
     lib/trinidad_init_services.rb
     lib/trinidad_init_services/configuration.rb
+    spec/spec_helper.rb
+    spec/trinidad_init_services/configuration_spec.rb
     trinidad-libs/commons-daemon.jar
     trinidad-libs/jruby-jsvc.jar
     trinidad-libs/jsvc_darwin

metadata

@@ -1,90 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trinidad_init_services
-version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.1.0.pre3
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
-  - David Calavera
+authors:
+- David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-03 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.2.2
-    type: :runtime
-    version_requirements: *id001
-description: Trinidad init service scripts on Apache Commons Daemon and JRuby-jsvc, compatible with Unix and Windows services
+date: 2012-01-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: trinidad
+  requirement: &2154417140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2154417140
+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
-  - 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
+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/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
 licenses: []
-
-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 
+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
   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: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: trinidad_init_services
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: Trinidad init service scripts based on Apache Commons Daemon
 test_files: []
-
+has_rdoc: