upstart-exporter 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dee17e8ba6b4e4ab976d7ae3ecc16f171829c914
-  data.tar.gz: 732bf68bdcaded54a5daa625f93ebb1af8fdc7cf
+  metadata.gz: 4fce4ef046663f8e1e24c0d055b8c6f44f28fa88
+  data.tar.gz: aae98fdaf485adaaa86bacd3ced81e96744860f9
 SHA512:
-  metadata.gz: f13d22de2f4d5e595be058ffefc448bd30514813114676c60e3ff44277432014d969d0f4065b36860e0460270b4fe796e325bbf418edd6795197cdfb83753d54
-  data.tar.gz: 708f2bab35e591f91697bd8512ab76a54c3cf9b8ccc878f81b68b6e4f15c81574cf756d345c9bcb655bb1481fd423ac3c0a45349c45141bf20dff976731a139c
+  metadata.gz: fca66cae4aaa262c3585a85d19bb3e852198758695b36c883061caa1b89386fd2644e02ffbb986596f4877c367c65cf2c3e37415ddefded6500888877560941c
+  data.tar.gz: 0c97df4a412222f422d212c27e75f568ea1894c0d95af395d3b49a7725a4c53575fe0a6b70efee9cb5a5e278d478a8a0d585779b42f7eab04b30579a5cbeb3c0

data/README.md

@@ -35,7 +35,7 @@ which is a simple YAML file of the following format:
     upstart_dir: /var/upstart_dir # Directory where upstart scripts should be placed
     prefix: 'myupstartjobs-' # Prefix added to app's log folders and upstart scripts
     respawn: # Controls how often job can fail and be restarted, set to false to prohibit restart after failure
-      limit: 10 # Number of allowed restarts in given interval
+      count: 10 # Number of allowed restarts in given interval
       interval: 10 # Interval in seconds
 
 The config is not installed by default. If this config is absent, the default values are the following:
@@ -45,7 +45,7 @@ The config is not installed by default. If this config is absent, the default va
     run_user: service
     prefix: 'fb-'
     respawn:
-      limit: 5
+      count: 5
       interval: 10
 
 To give a certain user (i.e. `deployuser`) the ability to use this script, you can place the following lines into `sudoers` file:

data/lib/upstart-exporter.rb

@@ -21,7 +21,7 @@ module Upstart
       command_line_options = Options::CommandLine.new(command_line_args)
 
       @options = global_options.merge(command_line_options)
-      Upstart::Exporter::Options::Validator.new(@options).validate!
+      @options = Upstart::Exporter::Options::Validator.new(@options).call
 
       ensure_dirs
     end
@@ -100,6 +100,7 @@ module Upstart
         :cmd_name => cmd_name,
         :helper_cmd_conf => helper_cmd_conf(cmd_name)
       )
+
       File.open(upstart_cmd_conf(cmd_name), 'w') do |f|
         f.write(cmd_upstart_conf_content)
       end

data/lib/upstart-exporter/expanded_exporter.rb

@@ -29,11 +29,11 @@ class Upstart::Exporter
   private
 
     def export_cmd(command, cmd_options)
-      cmd_options = {
+      cmd_options = cmd_options.merge(
         :working_directory => working_directory(cmd_options),
         :log => log(cmd_options),
         :kill_timeout => kill_timeout(cmd_options)
-      }.merge(cmd_options)
+      )
 
       script = cmd_options[:command]
       script = add_env_command(script, cmd_options)

data/lib/upstart-exporter/options/validator.rb

@@ -9,44 +9,65 @@ module Upstart::Exporter::Options
       @options = options
     end
 
-    def validate!
-      validate_path(options[:helper_dir])
-      validate_path(options[:upstart_dir])
-
-      reject_special_symbols(options[:run_user])
-      reject_special_symbols(options[:run_group])
-      reject_special_symbols(options[:prefix])
-
-      validate_runlevel(options[:start_on_runlevel])
-      validate_runlevel(options[:stop_on_runlevel])
-
-      validate_digits(options[:kill_timeout])
-
-      validate_respawn(options[:respawn])
-
-      if options[:procfile_commands][:version] == 2
-        validate_procfile_v2(options[:procfile_commands])
-      end
+    def call
+      clean_params = {
+        :app_name => reject_special_symbols(options[:app_name]),
+        :helper_dir => validate_path(options[:helper_dir]),
+        :upstart_dir => validate_path(options[:upstart_dir]),
+        :run_user => reject_special_symbols(options[:run_user]),
+        :run_group => reject_special_symbols(options[:run_group]),
+        :prefix => reject_special_symbols(options[:prefix]),
+        :start_on_runlevel => validate_runlevel(options[:start_on_runlevel]),
+        :stop_on_runlevel => validate_runlevel(options[:stop_on_runlevel]),
+        :kill_timeout => validate_digits(options[:kill_timeout]),
+        :respawn => validate_respawn(options[:respawn]),
+        :working_directory => validate_path(options[:working_directory]),
+        :procfile_commands => validate_procfile(options[:procfile_commands])
+      }
+
+      clean_params
     end
 
     private
 
+      def validate_procfile(config)
+        if config[:version] == 2
+          validate_procfile_v2(config)
+        else
+          config
+        end
+      end
+
       def validate_procfile_v2(config)
-        validate_command_params(config)
-        config[:commands].values.each {|cmd| validate_command_params(cmd)}
+        clean_params = validate_command_params(config)
+        clean_params[:version] = config[:version]
+
+        if config[:commands]
+          clean_params[:commands] = Hash[config[:commands].map {|name, cmd| [name, validate_command_params(cmd)]}]
+        end
+
+        clean_params
       end
 
       def validate_command_params(cmd)
-        validate_runlevel(cmd[:start_on_runlevel])
-        validate_runlevel(cmd[:stop_on_runlevel])
-        validate_path(cmd[:working_directory])
-        validate_respawn(cmd[:respawn])
+        {
+          :command => cmd[:command],
+          :start_on_runlevel => validate_runlevel(cmd[:start_on_runlevel]),
+          :stop_on_runlevel => validate_runlevel(cmd[:stop_on_runlevel]),
+          :working_directory => validate_path(cmd[:working_directory]),
+          :respawn => validate_respawn(cmd[:respawn]),
+          :count => validate_digits(cmd[:count]),
+          :kill_timeout => validate_digits(cmd[:kill_timeout])
+        }
       end
 
       def validate_respawn(options)
-        return unless options
-        validate_digits(options[:kill_timeout])
-        validate_digits(options[:interval])
+        return options unless options.is_a?(Hash)
+
+        {
+          :count => validate_digits(options[:count]),
+          :interval => validate_digits(options[:interval])
+        }
       end
 
       def validate_path(val)
@@ -66,12 +87,14 @@ module Upstart::Exporter::Options
       end
 
       def validate(val, regexp)
-        val = val.to_s
-        return if val == ""
+        str_val = val.to_s
+        return if str_val == ""
 
-        unless val =~ regexp
+        unless str_val =~ regexp
           error("value #{val} is insecure and can't be accepted")
         end
+
+        val
       end
 
   end

data/lib/upstart-exporter/version.rb

@@ -1,5 +1,5 @@
 module Upstart
   class Exporter
-    VERSION = "2.1.3"
+    VERSION = "2.1.4"
   end
 end

data/spec/lib/upstart-exporter/options/validator_spec.rb

@@ -4,24 +4,24 @@ describe Upstart::Exporter::Options::Validator do
 
   it "validates paths" do
     validator = described_class.new(:helper_dir => "/some/dir;")
-    expect {validator.validate!}.to raise_error(Upstart::Exporter::Error)
+    expect {validator.call}.to raise_error(Upstart::Exporter::Error)
   end
 
   it "validates user names" do
     validator = described_class.new(:run_user => "bad_user_name!")
-    expect {validator.validate!}.to raise_error(Upstart::Exporter::Error)
+    expect {validator.call}.to raise_error(Upstart::Exporter::Error)
   end
 
   it "validates runlevels" do
     validator = described_class.new(:start_on_runlevel => "[not_a_digit]")
-    expect {validator.validate!}.to raise_error(Upstart::Exporter::Error)
+    expect {validator.call}.to raise_error(Upstart::Exporter::Error)
   end
 
   describe "procfile v2" do
     it "validates respawn" do
-      options = {:procfile_commands => {:version => 2, :respawn => {:kill_timeout => "10;"}}}
+      options = {:procfile_commands => {:version => 2, :respawn => {:count => "10;"}}}
       validator = described_class.new(options)
-      expect {validator.validate!}.to raise_error(Upstart::Exporter::Error)
+      expect {validator.call}.to raise_error(Upstart::Exporter::Error)
     end
 
     it "validates options for individual commands" do
@@ -35,7 +35,7 @@ describe Upstart::Exporter::Options::Validator do
         }
       }
       validator = described_class.new(options)
-      expect {validator.validate!}.to raise_error(Upstart::Exporter::Error)
+      expect {validator.call}.to raise_error(Upstart::Exporter::Error)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upstart-exporter
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Ilya Averyanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies: []
 description: Gem for converting extended Procfile-like files to upstart scripts
 email: