upstart-exporter 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4fce4ef046663f8e1e24c0d055b8c6f44f28fa88
-  data.tar.gz: aae98fdaf485adaaa86bacd3ced81e96744860f9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGNiN2VjMWY1MzJlN2UyNTIyMGZlMDUxNWUxNGZhYmFkZDQ3Njk2OQ==
+  data.tar.gz: !binary |-
+    NDg0OTBiODNkMmMwNzliNTNiNDUwOGI0YjEzZWE2ZTNhODA1YmJjZQ==
 SHA512:
-  metadata.gz: fca66cae4aaa262c3585a85d19bb3e852198758695b36c883061caa1b89386fd2644e02ffbb986596f4877c367c65cf2c3e37415ddefded6500888877560941c
-  data.tar.gz: 0c97df4a412222f422d212c27e75f568ea1894c0d95af395d3b49a7725a4c53575fe0a6b70efee9cb5a5e278d478a8a0d585779b42f7eab04b30579a5cbeb3c0
+  metadata.gz: !binary |-
+    NGY5N2NiNzEyN2UzNzczNWJhNTE3ZTIyMDc0MzI3NTlhZjUxMTA1MzE1MThl
+    N2NiMTViMzJkNGY0NGJhYjliZTE5YmJmNWM2MGU4ZjU2MWZiYTkxMTMwZGFj
+    NzJkOTMyYmI5NmY2YTNkN2Y3Nzk0NDAzOWZiNmIyMGZlY2Y4MzU=
+  data.tar.gz: !binary |-
+    MTNjNzExYjFkNDM1YTM0Y2ZjMTEyMzBkMzEzMTBlNzBkNGNhMWQ0NTcxMzg2
+    ZWYyNzU2NWEwNjdmNWNkNmVmZWI0M2YyZWE1YzBmYzQ5ZTJkMzAzMjhhZTA3
+    YTYyMTNlODRhMmIxNmRlZDkwNmVkYmExNTYwYzAxNjFjYmVkMTk=

data/README.md

@@ -28,6 +28,7 @@ Configuration
 The export process is configured through the only config, `/etc/upstart-exporter.yaml`,
 which is a simple YAML file of the following format:
 
+```yaml
     ---
     run_user: www # The user under which all installed through upstart-exporter background jobs are run
     run_group: www # The group of run_user
@@ -37,9 +38,11 @@ which is a simple YAML file of the following format:
     respawn: # Controls how often job can fail and be restarted, set to false to prohibit restart after failure
       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:
 
+```yaml
     helper_dir: /var/local/upstart_helpers/
     upstart_dir: /etc/init/
     run_user: service
@@ -47,6 +50,7 @@ The config is not installed by default. If this config is absent, the default va
     respawn:
       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:
 
@@ -78,13 +82,17 @@ Procfile v.1
 After upstart-exporter is installed and configured, you may export background jobs
 from an arbitrary Procfile-like file of the following format:
 
+```yaml
     cmdlabel1: cmd1
     cmdlabel2: cmd2
+```
 
 i.e. a file `./myprocfile` containing:
 
+```yaml
     my_tail_cmd: /usr/bin/tail -F /var/log/messages
     my_another_tail_cmd: /usr/bin/tail -F /var/log/messages
+```
 
 For security purposes, command labels are allowed to contain only letters, digits, and underscores.
 
@@ -94,6 +102,7 @@ Procfile v.2
 Another format of Procfile scripts is YAML config. A configuration script may
 look like this:
 
+```yaml
     version: 2
     start_on_runlevel: "[2345]"
     stop_on_runlevel: "[06]"
@@ -120,6 +129,7 @@ look like this:
       my_multi_tail_cmd:
         command: /usr/bin/tail -F /var/log/messages
         count: 2
+```
 
 `start_on_runlevel` and `stop_on_runlevel` are two global options that can't be
 redefined. For more information on these options look into

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

@@ -57,10 +57,17 @@ module Upstart::Exporter::Options
           :working_directory => validate_path(cmd[:working_directory]),
           :respawn => validate_respawn(cmd[:respawn]),
           :count => validate_digits(cmd[:count]),
-          :kill_timeout => validate_digits(cmd[:kill_timeout])
+          :kill_timeout => validate_digits(cmd[:kill_timeout]),
+          :env => validate_env(cmd[:env])
         }
       end
 
+      def validate_env(params)
+        return unless params
+        params.each_key {|k| reject_special_symbols(k)}
+        params
+      end
+
       def validate_respawn(options)
         return options unless options.is_a?(Hash)
 

data/lib/upstart-exporter/version.rb

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

data/spec/lib/upstart-exporter_spec.rb

@@ -47,6 +47,22 @@ commands:
       expect(File.read('/u/p-app-second_cmd.conf')).not_to include("respawn")
       expect(File.read('/u/p-app-third_cmd.conf')).to include("respawn\nrespawn limit 7 14")
     end
+
+    it 'correctly sets env variables' do
+      yaml = <<-EOS
+version: 2
+env:
+  env-key: env-value
+commands:
+  first_cmd:
+    command: ping 127.0.0.1
+      EOS
+
+      make_procfile('Procfile', yaml)
+
+      exporter.export
+      expect(File.read('/h/p-app-first_cmd.sh')).to include("env-key=env-value")
+    end
   end
 
   describe '#export' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upstart-exporter
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Ilya Averyanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies: []
 description: Gem for converting extended Procfile-like files to upstart scripts
 email:
@@ -20,14 +20,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rbenv-version"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
-- ".yardoc/checksums"
-- ".yardoc/objects/root.dat"
-- ".yardoc/proxy_types"
+- .gitignore
+- .rbenv-version
+- .rspec
+- .ruby-version
+- .travis.yml
+- .yardoc/checksums
+- .yardoc/objects/root.dat
+- .yardoc/proxy_types
 - Gemfile
 - README.md
 - Rakefile
@@ -86,17 +86,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Gem for converting extended Procfile-like files to upstart scripts