trinidad_init_services 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba0572bd277127f8bd63d447aa351dc206931e8
-  data.tar.gz: 93784996ee1140fa3fd1a1d69f39877079a9d77c
+  metadata.gz: b9c7a3f4c19960b876a0eb77476b3671a9381898
+  data.tar.gz: a4245f606d7e1efe6bb5d13eb3c668760288b0e3
 SHA512:
-  metadata.gz: 2b2f768bf987bd52589a4bcc0f00fbfdf1f4310c47405eefb938f2557e7c5bf187318a5136f4f890254f6040be05392d5a95b5e8864b50d60d9cc8c76ba43986
-  data.tar.gz: 82739292c9a61af042a06168954deb467f9836b959e8f0ba57b1afa38cc5cc42ed14e2b43f020fb7cebd3a6480f7e69e9f245b1d9c78a52357e403cbe0e1a7d6
+  metadata.gz: 3e4fb893a3e6830ff6f78227846dc66f99e3813e636561cb3de2a97661a407846df2c69e0e9a013b8fe3ec7eab9e03772f305e3cd925306146fb99c00ab2e66e
+  data.tar.gz: fa587bd61e50c68c0341ef3842425a282b7e2e5bb86e888be318301a6d81860ff9b202b799a7b3fd306ec9c5b60517819c5466433f04823e2b88a1ca49ec5831

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.1 (2014-07-26)
+
+* make sure generated init.d script is valid shell (bash) script ... (fixes #43)
+* fix wrong user instruction for installing service (thanks @davidhq at #43)
+* normalize ruby compat version before setting it (user can input '2.0' now)
+
 ## 1.3.0 (2014-07-03)
 
 * `--no-ask` is now known as `--know`

data/init.d/trinidad.erb

@@ -119,7 +119,7 @@ if [ -z "$JAVA_OPTS" ] ; then
 else
   for opt in Xmx Xss; do
     if case ${JAVA_OPTS} in *"-${opt}"*) true;; *) false;; esac ; then
-      # JAVA_OPTS contains option - do no thing
+      : # JAVA_OPTS contains option - do no-thing
     else
       if [ "${opt}" == "Xmx" ] ; then
         JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN"

data/lib/trinidad_init_services/configuration.rb

@@ -70,7 +70,8 @@ module Trinidad
         end
 
         @jruby_home = defaults['jruby_home'] || ask_path('JRuby home', default_jruby_home)
-        @ruby_compat_version = defaults["ruby_compat_version"] || default_ruby_compat_version
+        ruby_compat_version = defaults['ruby_compat_version'] || default_ruby_compat_version
+        @ruby_compat_version = normalize_ruby_compat_version(ruby_compat_version)
         @jruby_opts = configure_jruby_opts(@jruby_home, @ruby_compat_version)
         initialize_paths(@jruby_home)
 
@@ -253,7 +254,7 @@ module Trinidad
         if chkconfig?
           command = "chkconfig #{@service_id} on"
         else
-          command = "update-rc.d -f #{@service_id} remove"
+          command = "update-rc.d -f #{@service_id} defaults"
         end
         if service_file.start_with?('/etc')
           unless exec_system(command, :allow_failure)
@@ -487,6 +488,14 @@ module Trinidad
 
       def default_ruby_compat_version; current_ruby_compat_version end
 
+      def normalize_ruby_compat_version(version)
+        # e.g. '2.0' -> 'RUBY2_0'
+        if version.start_with?('RUBY')
+          version = version[4..-1]
+        end
+        "RUBY#{version.sub('.','_')}"
+      end
+
       def current_ruby_compat_version
         # deprecated on 9k but still working (returns RUBY2_1)
         JRuby.runtime.getInstanceConfig.getCompatVersion.to_s

data/lib/trinidad_init_services/version.rb

@@ -1,5 +1,5 @@
 module Trinidad
   module InitServices
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/spec/trinidad_init_services/configuration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.join(File.dirname(__FILE__), '..'))
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 require 'yaml'
 require 'fileutils'
@@ -15,11 +15,13 @@ describe Trinidad::InitServices::Configuration do
   after :each do
     FileUtils.rm_r init_dir
     Dir.rmdir(tmp_dir) if Dir.entries(tmp_dir) == [ '.', '..' ]
-    ENV_JAVA.update @@env_java
+    ENV_JAVA.clear; ENV_JAVA.update @@env_java
   end
 
   before(:all) { @@env_java = ENV_JAVA.dup }
 
+  before(:each) { subject.ask = false } # do not ask by default
+
 	it "creates the init.d file" do
     subject.configure config_defaults.merge 'java_home' => 'tmp/java', 'jruby_home' => 'tmp/jruby'
 
@@ -40,6 +42,15 @@ describe Trinidad::InitServices::Configuration do
     expect( init_file_content ).to match(/RUN_USER=""/)
   end
 
+	it "creates a (source) valid init.d file" do
+    subject.configure config_defaults.merge 'java_opts' => '-Xmx512M -Xss1024k'
+
+		expect( File.exist?(init_file) ).to be true
+
+    fail('not a valid bash source (see output above)') unless system "bash -n #{init_file}"
+
+  end unless (`which bash` rescue '').chomp.empty?
+
 	it "configures memory requirements using JAVA_OPTS (Java 6)" do
     ENV_JAVA['java.version'] = '1.6.0_43'
     ENV_JAVA['os.arch'] = 'x64'
@@ -222,7 +233,7 @@ describe Trinidad::InitServices::Configuration do
     subject = windows_configuration
     config_options = {
       'app_path' => "C:/MyApp",
-      'ruby_compat_version' => "RUBY1_9",
+      'ruby_compat_version' => "1.9",
       'service_id' => "TrinidadService",
       'service_name' => "Trinidad",
       'service_desc' => "Trinidad Service Description",

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: trinidad_init_services
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - David Calavera
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: trinidad
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
-  name: trinidad
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
-- !ruby/object:Gem::Dependency
+        version: '2.14'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
-  name: rspec
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
+        version: 1.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-  name: mocha
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 description: Trinidad init service scripts on Apache Commons Daemon and JRuby-Jsvc, compatible with Unix and Windows services
 email: calavera@apache.org
 executables: