environmate 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1bdb8c25d8984a570f00aef4785602606ace3c0814632af3ece05bce65f9e29
-  data.tar.gz: b74436cfa6163db3b929f03d387c0fb386d82786cb90c3986fbf907776cb1e54
+  metadata.gz: 98fb305001e05a7f76386aa35d5a72ab4b1171534b0489a90a924e10238d7d78
+  data.tar.gz: c004d95e8cb5f418ead0066a4644644761843c20c53ba08a1761076074b8b0a2
 SHA512:
-  metadata.gz: 3386c66146a0efccabc5e48d1a56cf337e77ade6e4b1269ee108b16aa8160c06aa2b4ec81edf3459e6be799141762c2e4976d49523969b034d9ab64b80b8b4ce
-  data.tar.gz: ec6aa20a58c8b3a69ff351a0ebedaa2f0a41bc9734a6692f1f76f7d5e90a210cc12dbd1226b25afc73ef2edd3250d5f322cff4a5d9fab9251831a2acc05d61cc
+  metadata.gz: a4d5b97829cf4e74eb27c201fc4212aae576fb2047506aa0839bada14466ade54f5eed6b2f0fa96c8f3bfd49fd28c5c76d628335a276c6cba9adfc7befb3bab5
+  data.tar.gz: 472adb7f866ced6285d6ec336ba4c731fb52b6158465a8a01c5716d31df982fed642a79d347fc93d05c503f13b17f034ae1cf6222cbb9b11b9ae16020d095516

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
+*.gem
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Change Log
+All notable changes to Enviornmate will be documented in this file.
+
+## [0.1.1] - 2018-02-12
+### Fixed
+- Sinatra environment handling
+- Some small updates to the Documentation
+
+## [0.1.0] - 2018-01-15
+### Added
+- Initial release of Environmate

data/README.md

@@ -19,7 +19,7 @@ your puppet master by running:
 
 ## Usage
 
-Environmate comes with puma included and no additional setup
+Environmate comes with a webserver included and no additional setup
 is required. Simply run environmate from the console:
 
     $ /opt/puppetlabs/puppet/bin/environmate --help
@@ -105,14 +105,14 @@ It will use the first yaml file it finds:
 Additionally you can provide a configuration file when starting the environmate
 service:
 
-    $ /opt/puppetlabs/puppet/bin/environmate --config /path/to/my/conf.yml
+    $ /opt/puppetlabs/puppet/bin/environmate --config /path/to/my/conf.yml --rack_env production
 
 Here is a complete example config:
 
     production:
       environment_path: '/etc/puppetlabs/code/environments'
 
-      lockfile_path: '/var/run/lock/puppet_deploy_lock'
+      lockfile_path: '/var/run/lock/environmate_deploy'
       lockfile_options:
         timeout: 300
 
@@ -124,6 +124,7 @@ Here is a complete example config:
       master_path: '/etc/puppetlabs/code/environmate_master'
 
       dynamic_environments_prefix: 'env/'
+      install_modules_command: 'librarian-puppet install --destructive'
 
       static_environments:
         nonprod:
@@ -140,7 +141,7 @@ Here is a complete example config:
 
       server_settings:
         :Port: 4443
-        :Bind: '0.0.0.0'
+        :Host: '0.0.0.0'
         :SSLEnable: true
         :SSLCertificate: '/path/to/your/cert.pem'
         :SSLPrivateKey: '/path/to/your/key.pem'
@@ -166,11 +167,11 @@ revisions. If no good starting point can be evaluated it will default to the mas
 To easily debug environmate you can start it manually with the foreground flag to get all
 the log output to the console. This way you don't have to adjust the config:
 
-    $ /opt/puppetlabs/puppet/bin/environmate --foreground --verbosity DEBUG
+    $ /opt/puppetlabs/puppet/bin/environmate --foreground --verbosity DEBUG --rack_env production
 
 If you want to see stacktraces add the trace flag:
 
-    $ /opt/puppetlabs/puppet/bin/environmate --foreground --verbosity DEBUG --trace
+    $ /opt/puppetlabs/puppet/bin/environmate --foreground --verbosity DEBUG --rack_env production --trace
 
 ## Contributing
 

data/environmate.gemspec

@@ -11,10 +11,16 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Manage Puppet environments with a GIT workflow'
   spec.description   = 'Environmate is a Webhook receiver for various GIT '\
-                       'web frontends for deloying Puppet environments to'\
+                       'web frontends for deloying Puppet environments to '\
                        'the master/server'
   spec.homepage      = 'https://github.com/puzzle/environmate'
   spec.license       = 'GPL-3.0'
+	spec.metadata      = {
+		'bug_tracker_uri'   => 'https://github.com/puzzle/environmate/issues',
+		'changelog_uri'     => 'https://github.com/puzzle/environmate/blob/master/CHANGELOG.md',
+		'documentation_uri' => 'https://github.com/puzzle/environmate/blob/master/README.md',
+		'source_code_uri'   => 'https://github.com/puzzle/environmate',
+	}
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

data/exe/environmate

@@ -18,7 +18,7 @@ parser = OptionParser.new do|opts|
 		options[:config_file] = config_file
 	end
 
-  opts.on('-e', '--rack_env RAILS_ENV', 'Rack environment') do |rack_env|
+  opts.on('-e', '--rack_env RACK_ENV', 'Rack environment') do |rack_env|
 		ENV['RACK_ENV'] = rack_env
 	end
 

data/lib/environmate/app.rb

@@ -9,6 +9,7 @@ module Environmate
   class App < Sinatra::Base
 
     def self.run!(options = {})
+      set :environment, ENV['RACK_ENV'] unless ENV['RACK_ENV'].nil?
       Environmate.load_configuration(settings.environment.to_s, options[:config_file])
       configuration = Environmate.configuration
 

data/lib/environmate/configuration.rb

@@ -13,8 +13,11 @@ module Environmate
     unless File.exists?(config_file)
       raise "Configuration file #{config_file} does not exist"
     end
-    config = YAML.load_file(config_file)[environment]
-    @configuration = config_defaults.merge(config)
+    config = YAML.load_file(config_file)
+    if config[environment].nil?
+      raise "No configuration for environment '#{environment}' found in file #{config_file}"
+    end
+    @configuration = config_defaults.merge(config[environment])
   end
 
   def self.configuration

data/lib/environmate/version.rb

@@ -1,3 +1,3 @@
 module Environmate
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: environmate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andreas Zuber
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.51'
 description: Environmate is a Webhook receiver for various GIT web frontends for deloying
-  Puppet environments tothe master/server
+  Puppet environments to the master/server
 email:
 - zuber@puzzle.ch
 executables:
@@ -162,6 +162,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -187,7 +188,11 @@ files:
 homepage: https://github.com/puzzle/environmate
 licenses:
 - GPL-3.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/puzzle/environmate/issues
+  changelog_uri: https://github.com/puzzle/environmate/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/puzzle/environmate/blob/master/README.md
+  source_code_uri: https://github.com/puzzle/environmate
 post_install_message: 
 rdoc_options: []
 require_paths: