trinidad_init_services 1.2.1 → 1.2.2

data/Rakefile

@@ -1,31 +1,10 @@
-require 'rubygems'
-require 'rake'
-require 'date'
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-$:.push File.expand_path("../lib", __FILE__)
-
-def version
-  require 'trinidad_init_services/version'
-  Trinidad::InitServices::VERSION
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
+begin
+  require 'bundler/gem_helper'
+rescue LoadError => e
+  require('rubygems') && retry
+  raise e
 end
+Bundler::GemHelper.install_tasks
 
 #############################################################################
 #
@@ -39,66 +18,3 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = ['--color', "--format documentation"]
 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
-#
-#############################################################################
-
-desc 'Release gem'
-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/#{gem_file}"
-end
-
-desc 'Build gem'
-task :build do
-  sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end
-
-desc 'Install gem'
-task :install => :build do
-  sh "gem install pkg/#{gem_file}"
-end
-
-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
-end

data/init.d/trinidad.erb

@@ -1,14 +1,9 @@
 #!/usr/bin/env bash
-# Generic script for running ruby scripts as daemons using
-# jsvc and a java class to control the daemon.
+# Trinidad init.d script using `jsvc` customized from the jsvc-wrapper.sh
+# http://github.com/nicobrevin/jruby-jsvc/blob/master/bin/jsvc-wrapper.sh
 #
-# Contains common parameters and start/stop
-
-# Things you'll need to set on a per script/daemon basis:
+# set on a per script/daemon basis (optional) :
 # APP_NAME - name of your application (defaults to "trinidad")
-#
-# Things you can set:
-# PROG_OPTS - Arguments to send to the program. A few defaults are appended to this.
 
 # https://github.com/trinidad/trinidad_init_services/wiki/Installing-JSVC
 JSVC=<%= @jsvc %>
@@ -48,10 +43,6 @@ MAIN_CLASS=com.msp.jsvc.JRubyDaemon
 
 CLASSPATH=<%= @classpath.join(":") %>
 
-if [ -z "$JRUBY_OPTS" ] ; then
-  JRUBY_OPTS=""
-fi
-
 JRUBY_SHELL=/bin/sh
 
 JRUBY_NATIVE_PATH=""
@@ -65,28 +56,46 @@ if [ -d "$JRUBY_HOME/lib/native/" ]; then
   done
 fi
 
+# JAVA_MEM, JAVA_MEM_MIN & JAVA_STACK are compatible with jruby's binary
+
 if [ -z "$JAVA_MEM" ] ; then
-  JAVA_MEM=500m
+  JAVA_MEM=-Xmx500m
+fi
+# backwards compatibility we accept the non-full option (e.g. JAVA_MEM=500m)
+if [[ "$JAVA_MEM" != "-Xmx"* ]] ; then
+  JAVA_MEM="-Xmx$JAVA_MEM"
+fi
+
+# we accept the non-full option (e.g. JAVA_MEM_MIN=500m)
+if [[ -n "$JAVA_MEM_MIN" && "$JAVA_MEM_MIN" != "-Xms"* ]] ; then
+  JAVA_MEM_MIN="-Xms$JAVA_MEM_MIN"
+fi
+if [ -z "$JAVA_MEM_MIN" ] ; then
+  JAVA_MEM_MIN=""
 fi
 
 if [ -z "$JAVA_STACK" ] ; then
-  JAVA_STACK=2048k
+  JAVA_STACK=-Xss2048k
 fi
+# backwards compatibility we accept the non-full option (e.g. JAVA_STACK=2048k)
+if [[ "$JAVA_STACK" != "-Xss"* ]] ; then
+  JAVA_STACK="-Xss$JAVA_STACK"
+fi
+
+# A custom (daemon) script will be started (not jruby -S) thus JRUBY_OPTS
+# won't be used here, feel free to hand tune JAVA_OPTS here instead ...
 
-JAVA_OPTS="-Xmx${JAVA_MEM} -Xss${JAVA_STACK} -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
+JAVA_OPTS="$JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
 
 # force file.encoding to UTF-8 :
 if [[ -z "$JAVA_ENCODING" ]]; then
-  JAVA_OPTS="${JAVA_OPTS} -Dfile.encoding=UTF-8"
+  JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8"
 fi
 
 JAVA_PROPS="$JAVA_PROPS \
-  -Djruby.memory.max=$JAVA_MEM \
-  -Djruby.stack.max=$JAVA_STACK \
   -Djruby.shell=$JRUBY_SHELL \
   -Djffi.boot.library.path=$JRUBY_NATIVE_PATH \
-  <%= @jruby_opts.join(' ') %> \
-  $JRUBY_OPTS"
+  <%= @jruby_opts.join(' ') %> "
   
 PROC_NAME=${SCRIPT_NAME:-${APP_NAME:-"trinidad"}}
 
@@ -123,7 +132,7 @@ case "$1" in
           $START_COMMAND
           EXIT_CODE=$?
           if [ "$EXIT_CODE" != 0 ]; then
-        echo "Daemon exited with status: $EXIT_CODE. Check pidfile and log"
+              echo "Daemon exited with status: $EXIT_CODE. Check pidfile and log"
           fi
       fi
       ;;
@@ -151,7 +160,7 @@ case "$1" in
           $START_COMMAND
           EXIT_CODE=$?
           if [ "$EXIT_CODE" != 0 ]; then
-        echo "Daemon exited with status: $EXIT_CODE. Check pidfile and log"
+              echo "Daemon exited with status: $EXIT_CODE. Check pidfile and log"
           fi
       fi
       ;;
@@ -160,9 +169,9 @@ case "$1" in
           PID=`cat $PIDFILE`
           OUTPUT=`ps $PID | egrep "^$PID "`
           if [ ${#OUTPUT} -gt 0 ]; then
-        echo "Service running with pid: $PID"
+              echo "Service running with pid: $PID"
           else
-        echo "Pidfile present, but process not running"
+              echo "Pidfile present, but process not running"
           fi
       else
           echo "No pidfile present"

data/lib/trinidad/daemon.rb

@@ -1,5 +1,9 @@
-require 'rubygems'
-require 'trinidad'
+begin
+  require 'trinidad'
+rescue LoadError => e
+  require('rubygems') && retry
+  raise e
+end
 
 module Trinidad
   module Daemon
@@ -7,10 +11,15 @@ module Trinidad
     def init
     end
 
+    # checked from com.msp.jsvc.JRubyDaemon.init
+    # as Trinidad::Daemon#setup? to check whether
+    # daemon's init setup has been succesful ...
     def setup?
       true
     end
 
+    # called from com.msp.jsvc.JRubyDaemon.start
+    # as Trinidad::Daemon#start
     def start(args = ARGV)
       Trinidad::CommandLineParser.parse(args)
       Trinidad.configuration.trap = false
@@ -18,6 +27,8 @@ module Trinidad
       @server.start
     end
 
+    # called from com.msp.jsvc.JRubyDaemon.stop
+    # as Trinidad::Daemon#stop
     def stop
       @server.stop
     end

data/lib/trinidad_init_services/configuration.rb

@@ -30,7 +30,7 @@ module Trinidad
       end
 
       def configure(defaults = {})
-        @app_path = defaults["app_path"] || ask_path('Application path?')
+        @app_path = defaults["app_path"] || ask_path('Application path', false)
         @trinidad_options = ["-d #{@app_path}"]
         options_ask = 'Trinidad options?'
         options_default = '-e production'
@@ -38,8 +38,8 @@ module Trinidad
 
         @trinidad_options << (defaults["trinidad_options"] || ask(options_ask, options_default))
         @trinidad_options.map! { |opt| Shellwords.shellsplit(opt) }.flatten!
-        @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_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(@jruby_home)
 
@@ -58,20 +58,20 @@ module Trinidad
       end
       
       def configure_unix_daemon(defaults)
-        @java_home = defaults["java_home"] || ask_path('Java home?', default_java_home)
+        @java_home = defaults["java_home"] || ask_path('Java home', default_java_home)
         unless @jsvc = defaults["jsvc_path"] || detect_jsvc_path
-          @jsvc = ask_path("path to jsvc binary (leave blank and we'll try to compile)?", '')
+          @jsvc = ask_path("path to jsvc binary (leave blank and we'll try to compile)", '')
           if @jsvc.empty? # unpack and compile :
-            jsvc_unpack_dir = defaults["jsvc_unpack_dir"] || ask_path("dir where jsvc dist should be unpacked?", '/usr/local/src')
+            jsvc_unpack_dir = defaults["jsvc_unpack_dir"] || ask_path("dir where jsvc dist should be unpacked", '/usr/local/src')
             @jsvc = compile_jsvc(jsvc_unpack_dir, @java_home)
             say "jsvc binary available at: #{@jsvc} " + 
                  "(consider adding it to $PATH if you plan to re-run trinidad_init_service)"
           end
         end
-        @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')
-        @run_user = defaults["run_user"] || ask('run daemon as user (enter a non-root username or leave blank)?', '')
+        @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')
+        @run_user = defaults["run_user"] || ask('run daemon as user (enter a non-root username or leave blank)', '')
         
         if @run_user != '' && `id -u #{@run_user}` == ''
           raise ArgumentError, "user '#{@run_user}' does not exist (leave blank if you're planning to `useradd' later)"
@@ -107,7 +107,7 @@ module Trinidad
         @trinidad_service_id = defaults["trinidad_service_id"] || ask(id_ask, id_default)
 
         desc_ask = 'Service description? {Alphanumeric and spaces only}'
-        desc_default = 'Embedded Apache Tomcat running rack and rails applications'
+        desc_default = 'Embedded Apache Tomcat running Rack and Rails applications'
         @trinidad_service_desc = defaults["trinidad_service_desc"] || ask(desc_ask, desc_default)
       end
       
@@ -200,7 +200,11 @@ module Trinidad
       
       def compile_jsvc(jsvc_unpack_dir, java_home = default_java_home)
         unless File.exist?(jsvc_unpack_dir)
-          raise "specified path does not exist: #{jsvc_unpack_dir.inspect}"
+          begin
+            FileUtils.mkdir(jsvc_unpack_dir)
+          rescue
+            raise "specified path does not exist: #{jsvc_unpack_dir.inspect}"
+          end
         end
         unless File.directory?(jsvc_unpack_dir)
           raise "specified path: #{jsvc_unpack_dir.inspect} is not a directory"
@@ -284,13 +288,18 @@ module Trinidad
       
       def ask_path(question, default = nil)
         path = ask(question, default)
+        unless path # nil, false
+          raise "#{question.inspect} not provided!" if path == false
+          return path # nil
+        end
         path.empty? ? path : File.expand_path(path)
       end
 
       def ask(question, default = nil)
         return default if ! @stdin.tty? || @ask == false
-
-        question << " [#{default}]" if default && ! default.empty?
+        
+        question = "#{question}?" unless question.index('?')
+        question += " [#{default}]" if default && ! default.empty?
 
         result = nil
         while result.nil?

data/lib/trinidad_init_services/version.rb

@@ -1,5 +1,5 @@
 module Trinidad
   module InitServices
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
 begin
   require 'rspec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'rspec'
+rescue LoadError => e
+  require('rubygems') && retry
+  raise e
 end
 
 require 'mocha'
@@ -12,7 +11,7 @@ RSpec.configure do |config|
   config.mock_with :mocha
 end
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'trinidad_init_services'
 require 'trinidad/daemon'

data/spec/trinidad_init_services/configuration_spec.rb

@@ -156,6 +156,24 @@ describe Trinidad::InitServices::Configuration do
     }x
   end
   
+	it "ask_path works when non tty and default nil" do
+    subject.ask = false
+    stdin = mock('stdin')
+    stdin.stubs(:tty?).returns false
+    subject.instance_variable_set(:@stdin, stdin)
+    subject.send(:ask_path, 'Home', nil).should be nil
+  end
+
+	it "ask_path raises when non tty and default false" do
+    subject.ask = false
+    stdin = mock('stdin')
+    stdin.stubs(:tty?).returns false
+    subject.instance_variable_set(:@stdin, stdin)
+    expect( lambda {
+      subject.send(:ask_path, 'Home', false)
+    } ).to raise_error RuntimeError
+  end
+  
 	it "ask= forces trinidad to not ask on tty" do
     subject.ask = false
     outcome = subject.send :ask, 'hello?', :there
@@ -164,7 +182,7 @@ describe Trinidad::InitServices::Configuration do
     outcome = subject.send :ask, 'de-ja-vu?', nil
     outcome.should be nil
   end
-
+  
 	it "say= silences standard output" do
     def subject.puts(msg)
       raise msg

data/trinidad_init_services.gemspec

@@ -3,10 +3,6 @@ $:.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'
-  
   s.name              = 'trinidad_init_services'
   s.version           = Trinidad::InitServices::VERSION
   s.rubyforge_project = 'trinidad_init_services'
@@ -29,13 +25,13 @@ Gem::Specification.new do |s|
   ## 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.md 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.
-  s.add_dependency('trinidad', '>= 1.3.2')
+  s.add_dependency('trinidad', '>= 1.3.5')
 
-  s.add_development_dependency('rspec', '>= 2.7.1')
+  s.add_development_dependency('rspec', '>= 2.10')
   s.add_development_dependency('mocha', '>= 0.10')
   
   s.files = `git ls-files`.split("\n")

metadata

@@ -2,7 +2,7 @@
 name: trinidad_init_services
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 Z
+date: 2012-10-23 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.3.2
+            version: 1.3.5
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 2.7.1
+            version: "2.10"
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -156,9 +156,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: trinidad_init_services
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Trinidad init service scripts based on Apache Commons Daemon
 test_files: []